alchemy-solidus 1.1.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: ac57a79bd6280227d79158a0b226314fa4ce87782ae1052797f868893f3a6c45
-  data.tar.gz: 3ca299684d546dd61fed733e0e56352db65853e9c0ac1810a5359b784a4f501f
+SHA1:
+  metadata.gz: fe744e3d741fe188949a0ace21e3ce53341b8ede
+  data.tar.gz: 3e2a5a3650b059886286e65d6f0a77aef228d1e0
 SHA512:
-  metadata.gz: 64eabb1045ef2cd55629abc352585ffe51fadc2c68fa23df03562b09b43d0671cb744690f4a2c1e5663afa188ab42d4ea64adee27072061e09fc20f3bedca1fe
-  data.tar.gz: 80ab559a97ff30c4dc5139c06d32a0b02f5e2e6b5f784ca84645dc40286a0b0dfabe90a93dc0d3855d06b89c4d483f93b40bf492598aaa1a54caf13413c29b8b
+  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/config/initializers/alchemy.rb

@@ -1,50 +1,10 @@
-alchemy_module = {
+Alchemy::Modules.register_module({
   engine_name: 'spree',
   name: 'solidus',
   navigation: {
     controller: 'spree/admin/orders',
     action: 'index',
-    name: 'Store',
-    image: 'alchemy/solidus/alchemy_module_icon.png',
-    data: { turbolinks: false },
-    sub_navigation: [
-      {
-        controller: 'spree/admin/orders',
-        action: 'index',
-        name: 'Orders'
-      },
-      {
-        controller: 'spree/admin/products',
-        action: 'index',
-        name: 'Products'
-      },
-      {
-        controller: 'spree/admin/reports',
-        action: 'index',
-        name: 'Reports'
-      },
-      {
-        controller: 'spree/admin/promotions',
-        action: 'index',
-        name: 'Promotions'
-      },
-      {
-        controller: 'spree/admin/stock_items',
-        action: 'index',
-        name: 'Stock'
-      }
-    ]
+    name: 'Shop',
+    image: 'alchemy/solidus/alchemy_module_icon.png'
   }
-}
-
-if defined?(Spree::Auth::Engine)
-  alchemy_module[:navigation][:sub_navigation].push(
-    {
-      controller: 'spree/admin/users',
-      action: 'index',
-      name: 'Users'
-    }
-  )
-end
-
-Alchemy::Modules.register_module(alchemy_module)
+})

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/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.1"
+    VERSION = "2.0.0"
   end
 end

data/lib/alchemy-solidus.rb

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

metadata

@@ -1,43 +1,63 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-solidus
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Thomas von Deyen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-13 00:00:00.000000000 Z
+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
@@ -106,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: The World's Most Flexible E-Commerce Platform meets The World's Most Flexible