Merge pull request #116 from AlchemyCMS/bump-alchemy-requirement

Bump minimum Alchemy version to 7.2.0

Author: tvdeyen

.github/workflows/ci.yml

@@ -13,21 +13,14 @@ jobs:
       fail-fast: false
       matrix:
         alchemy_branch:
-          - 7.0-stable
-          - 7.1-stable
           - 7.2-stable
           - 7.3-stable
           - 7.4-stable
         ruby:
-          - "3.1"
           - "3.2"
           - "3.3"
           - "3.4"
         exclude:
-          - alchemy_branch: 7.0-stable
-            ruby: "3.4"
-          - alchemy_branch: 7.1-stable
-            ruby: "3.4"
           - alchemy_branch: 7.2-stable
             ruby: "3.4"
           - alchemy_branch: 7.3-stable

alchemy-json_api.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
 
   spec.files = Dir["{app,config,db,lib}/**/*", "LICENSE", "Rakefile", "README.md"]
 
-  spec.add_dependency "alchemy_cms", [">= 7.0.0.a", "< 8"]
+  spec.add_dependency "alchemy_cms", [">= 7.2.0", "< 8"]
   spec.add_dependency "jsonapi.rb", [">= 1.6.0", "< 2.2"]
 
   spec.add_development_dependency "factory_bot"

app/controllers/alchemy/json_api/admin/pages_controller.rb

@@ -18,11 +18,7 @@ def caching_options
         end
 
         def set_current_preview
-          if Alchemy.const_defined?(:Current)
-            Alchemy::Current.preview_page = @page
-          else
-            Alchemy::Page.current_preview = @page
-          end
+          Alchemy::Current.preview_page = @page
         end
 
         def page_cache_key(page)

app/controllers/alchemy/json_api/pages_controller.rb

@@ -138,11 +138,7 @@ def base_page_scope
       end
 
       def current_language
-        if Alchemy.const_defined?(:Current)
-          Alchemy::Current.language
-        else
-          Alchemy::Language.current
-        end
+        Alchemy::Current.language
       end
 
       def jsonapi_serializer_class(_resource, _is_collection)

spec/controllers/alchemy/json_api/admin/pages_controller_spec.rb

@@ -17,11 +17,7 @@
 
     it "stores page as preview" do
       get :show, params: {path: page.urlname}
-      if Alchemy.const_defined?(:Current)
-        expect(Alchemy::Current.preview_page).to eq(page)
-      else
-        expect(Alchemy::Page.current_preview).to eq(page.id)
-      end
+      expect(Alchemy::Current.preview_page).to eq(page)
     end
   end
 end