alchemy-solidus 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89fc2d82897ec63ccd01a0b9739985407a869999
-  data.tar.gz: 5d448d85de69dc282a0838c5b267a74d9a5a3e0a
+  metadata.gz: fe744e3d741fe188949a0ace21e3ce53341b8ede
+  data.tar.gz: 3e2a5a3650b059886286e65d6f0a77aef228d1e0
 SHA512:
-  metadata.gz: 816557248ccabb25bb7c28186a6f8a71a64361573319f671d751aa520606b747c2ba93a600943c8b28de6b2796ccc1d4920ae6021f10c2a80cb55fb7e41e3f96
-  data.tar.gz: c707e4f69c3da52fac89f21d17ab3d6ec52c7df27ff5765f3dada0df0419ad83c93fcc559f3283b07adbb129d2d6e5ab581593f0e5bcae7aec92d76d4f3b72ee
+  metadata.gz: d2110d7a4374b625c4c1d5676e4093c27b1981e0c88d9a24ad96df3c8dded252ca11b8292e64532c385e0a56d4ef3d39cd92c04cb9f9d7479daaff9e6907c08a
+  data.tar.gz: fdce3777e229d0d7006ee6272e51df38e779cc7de25ba36a73115243c429343e6e500213565014c40290c849df8c2ffd04a46b6a048b430631cc8f0d9afd0142

data/alchemy-solidus.gemspec

@@ -15,7 +15,8 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Alchemy::Solidus::VERSION
 
-  gem.add_dependency('alchemy_cms', ['~> 3.2'])
-  gem.add_dependency('solidus', ['~> 1.0'])
+  gem.add_dependency('alchemy_cms', ['>= 4.0.0.beta', '< 5.0'])
+  gem.add_dependency('solidus_core', ['~> 2.0'])
+  gem.add_dependency('solidus_backend', ['~> 2.0'])
   gem.add_dependency('deface', ['~> 1.0'])
 end

data/db/migrate/20120229160509_create_alchemy_essence_spree_products.rb

@@ -1,4 +1,4 @@
-class CreateAlchemyEssenceSpreeProducts < ActiveRecord::Migration
+class CreateAlchemyEssenceSpreeProducts < ActiveRecord::Migration[4.2]
 	def change
 		create_table 'alchemy_essence_spree_products' do |t|
 			t.integer :spree_product_id

data/db/migrate/20131030140218_create_alchemy_essence_spree_taxons.rb

@@ -1,4 +1,4 @@
-class CreateAlchemyEssenceSpreeTaxons < ActiveRecord::Migration
+class CreateAlchemyEssenceSpreeTaxons < ActiveRecord::Migration[4.2]
   def change
     create_table :alchemy_essence_spree_taxons do |t|
       t.references :taxon

data/lib/alchemy-solidus.rb

@@ -1,3 +1 @@
-require "alchemy_cms"
-require "solidus"
 require "alchemy/solidus/engine"

data/lib/alchemy/solidus/alchemy_user_extension.rb

@@ -1,9 +1,17 @@
-module Alchemy::SpreeUserExtension
-  def spree_roles
-    if admin?
-      ::Spree::Role.where(name: 'admin')
-    else
-      ::Spree::Role.none
+module Alchemy
+  module Solidus
+    module AlchemyUserExtension
+      def self.included(klass)
+        klass.include Spree::UserMethods
+      end
+
+      def spree_roles
+        if admin?
+          ::Spree::Role.where(name: 'admin')
+        else
+          ::Spree::Role.none
+        end
+      end
     end
   end
 end

data/lib/alchemy/solidus/engine.rb

@@ -1,5 +1,8 @@
 require 'alchemy/solidus/alchemy_user_extension'
 require 'alchemy/solidus/spree_user_extension'
+require 'alchemy_cms'
+require 'solidus_core'
+require 'solidus_backend'
 
 module Alchemy
   module Solidus
@@ -15,8 +18,16 @@ module Alchemy
       config.to_prepare do
         Alchemy.register_ability ::Spree::Ability
         ::Spree::Ability.register_ability ::Alchemy::Permissions
-        Spree::User.include Spree::AlchemyUserExtension if Alchemy.user_class_name == 'Spree::User'
-        Alchemy::User.include Alchemy::SpreeUserExtension if Alchemy.user_class_name == 'Alchemy::User'
+
+        if Alchemy.user_class_name == 'Spree::User'
+          require 'alchemy/solidus/spree_user_extension'
+          Spree::User.include Alchemy::Solidus::SpreeUserExtension
+        end
+
+        if Alchemy.user_class_name == 'Alchemy::User'
+          require 'alchemy/solidus/alchemy_user_extension'
+          Alchemy::User.include Alchemy::Solidus::AlchemyUserExtension
+        end
       end
     end
   end

data/lib/alchemy/solidus/spree_user_extension.rb

@@ -1,9 +1,13 @@
-module Spree::AlchemyUserExtension
-  def alchemy_roles
-    if has_spree_role?(:admin)
-      %w(admin)
-    else
-      []
+module Alchemy
+  module Solidus
+    module SpreeUserExtension
+      def alchemy_roles
+        if has_spree_role?(:admin)
+          %w(admin)
+        else
+          []
+        end
+      end
     end
   end
 end

data/lib/alchemy/solidus/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
   module Solidus
-    VERSION = "1.1.0"
+    VERSION = "2.0.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-solidus
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -12,32 +12,52 @@ date: 2017-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alchemy_cms
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.0.beta
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.0.beta
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: solidus
+  name: solidus_backend
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: deface
   requirement: !ruby/object:Gem::Requirement