alchemy_spree 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 301fe68273f680a0824558febf122a0dbc9af5d7
-  data.tar.gz: 3852285bdf2a9973c9ab163eee3152d5b447dce0
+  metadata.gz: 953d2bd54c42ee048850217613a981122584dfc8
+  data.tar.gz: a5e80e786905bf2798eb05b204e0bc07ea78ffac
 SHA512:
-  metadata.gz: 2f650b88632215540b284184e17f02358ddfd9b599ecfb142222c623e94519422e5bd004f299b7a55ac42a4f1b8525a4fac957df81407e2fed09f0f6b9eb1960
-  data.tar.gz: 4d326c6ede1c990b529868f33f2bb9451840c441134d61f7153b99331f42b4f06a67ea1b43f7a508bb43530b872299f5bb131ac5cc783ceb850db7b4386db118
+  metadata.gz: c2e878aa1e0ea152da467326b319d7f8de8d7dab31b1fbdbf32936a90dd6ddf7653e16a81890e421fde2ebcd68dbd83dc4f4f4b83a11c0696109d4a63f1d9bec
+  data.tar.gz: 3fe19a7605050fa4ac334a256fc7306506e9660784121b80ace70b419368cd6ea5053a507a39989cc2dd3dcc1fdc10dda48ba17c3f744ea655ad5aff83e9f040

data/Gemfile

@@ -2,9 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in alchemy_spree.gemspec
 gemspec
-
-group :developmemt, :test do
-  gem "spree", github: 'tvdeyen/spree', branch: 'alchemy'
-  gem 'money', '~> 5.1'
-  gem 'sqlite3'
-end

data/LICENSE

@@ -1,22 +1,24 @@
-Copyright (c) 2012 magic labs*
+Copyright (c) 2012-14, magic labs*
+All rights reserved.
 
-MIT License
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+* Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation and/or
+  other materials provided with the distribution.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+* Neither the name of magic labs* nor the names of its contributors may be used to
+  endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/README.md

@@ -10,64 +10,110 @@ This gem is a [Alchemy CMS](https://github.com/magiclabs/alchemy_cms) and [Spree
 2. It gives you new Essences for Alchemy called EssenceSpreeProduct and EssenceSpreeTaxon that you can use to place a Spree product and Taxon on your pages.
 3. Shares admin session between Alchemy and Spree.
 
+### Compatibility
+
+## Spree
+
+This version runs with Spreecommerce 2.1 and above.
+
+## Alchemy
+
+This version runs with Alchemy 3.0
+
 ## Installation
 
 Add this line to your application's Gemfile:
 
-    gem 'alchemy_spree'
+```ruby
+gem 'alchemy_spree', github: 'magiclabs/alchemy_spree', branch: 'master'
+```
 
 And then execute:
 
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install alchemy_spree
+```sh
+$ bundle
+```
 
 Install the migrations:
 
-    $ rake alchemy_spree:install:migrations
+```sh
+$ rake alchemy_spree:install:migrations
+```
 
 Migrate the database:
 
-    $ rake db:migrate
+```sh
+$ rake db:migrate
+```
+
+### Authentication system installation
+
+Since Alchemy 3.0 has dropped the authentication from its core, you will need to choose one authentication system. The easiest choice is to use the [alchemy-devise gem](https://github.com/magiclabs/alchemy-devise).
+
+To install alchemy-devise:
+
+```ruby
+# Gemfile
+gem 'alchemy-devise', '~> 2.0'
+```
+
+And then execute:
+
+```sh
+$ bundle
+```
+
+Finally, you'll need to instruct Spree accordingly:
+
+```ruby
+# config/initializers/spree.rb
+Spree.user_class = "Alchemy::User"
+```
 
 ## Usage
 
 ### Create a new Element for Alchemy
 
-  # config/alchemy/elements.yml
-  - name: product
-    contents:
-    - name: spree_product
-      type: EssenceSpreeProduct
+```yaml
+# config/alchemy/elements.yml
+- name: product
+  contents:
+  - name: spree_product
+    type: EssenceSpreeProduct
 
-  - name: product_category
-    contents:
-    - name: spree_taxon
-      type: EssenceSpreeTaxon
+- name: product_category
+  contents:
+  - name: spree_taxon
+    type: EssenceSpreeTaxon
+```
 
 ### Generate the views
 
-  $ rails g alchemy:elements --skip
+```sh
+$ rails g alchemy:elements --skip
+```
 
 ### Place this element on a page layout
 
-  # config/alchemy/page_layouts.yml
-  - name: product
-    elements: [product]
-  - name: products
-    elements: [product_category]
+```yaml
+# config/alchemy/page_layouts.yml
+- name: product
+  elements: [product]
+- name: products
+  elements: [product_category]
+```
 
 ### You can haz Spree product and taxons!
 
-  # app/views/alchemy/elements/_product_view.html.erb
-  <%= element.ingredient('spree_product') %>
+```erb
+# app/views/alchemy/elements/_product_view.html.erb
+<%= element.ingredient('spree_product') %>
 
-  # app/views/alchemy/elements/_product_category_view.html.erb
-  <%= element.ingredient('spree_taxon') %>
+# app/views/alchemy/elements/_product_category_view.html.erb
+<%= element.ingredient('spree_taxon') %>
+```
 
-Alchemy <3 Spree!
+Alchemy :heart: Spree!
 
 ## Contributing
 

data/Versionfile

@@ -1,3 +1,5 @@
-'1.0.x' => {:branch => 'master'}
-'1.1.x' => {:branch => 'master'}
-'1.2.x' => {:branch => 'master'}
+"2.4.x" => { :branch => "master" }
+"2.3.x" => { :branch => "master" }
+"2.2.x" => { :branch => "0.3-stable" }
+"2.1.x" => { :branch => "0.3-stable" }
+"2.0.x" => { :branch => "0.2-stable" }

data/alchemy_spree.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |gem|
   gem.email         = ["tvd@magiclabs.de"]
   gem.description   = %q{A Alchemy CMS and Spree connector}
   gem.summary       = %q{The World's Most Flexible E-Commerce Platform meets The World's Most Flexible Content Management System!}
-  gem.homepage      = "https://github.com/magiclabs/alchemy_spree"
-
+  gem.homepage      = "https://github.com/AlchemyCMS/alchemy_spree"
+  gem.license       = 'BSD New'
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
@@ -15,6 +15,6 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Alchemy::Spree::VERSION
 
-  gem.add_dependency('alchemy_cms', ['~> 2.7.0'])
-  gem.add_dependency('spree', ['~> 2.0.0'])
+  gem.add_dependency('alchemy_cms', ['~> 3.0.0'])
+  gem.add_dependency('spree', ['>= 2.1', '< 2.3'])
 end

data/app/controllers/alchemy/admin/spree_controller.rb

@@ -1,5 +1,6 @@
 class Alchemy::Admin::SpreeController < Alchemy::Admin::BaseController
   def index
+    authorize! :index, :alchemy_admin_spree
     render
   end
 end

data/app/models/alchemy/essence_spree_product.rb

@@ -1,14 +1,12 @@
 module Alchemy
   class EssenceSpreeProduct < ActiveRecord::Base
-    belongs_to :product, class_name: "Spree::Product", foreign_key: 'spree_product_id', readonly: true
+    belongs_to :product, class_name: "Spree::Product", foreign_key: 'spree_product_id'
 
     acts_as_essence(
       ingredient_column: 'spree_product_id',
       preview_text_method: 'name'
     )
 
-    attr_accessible :spree_product_id
-
     def ingredient
       product
     end

data/app/models/alchemy/essence_spree_taxon.rb

@@ -1,14 +1,12 @@
 module Alchemy
   class EssenceSpreeTaxon < ActiveRecord::Base
-    belongs_to :taxon, class_name: "Spree::Taxon", foreign_key: 'taxon_id', readonly: true
+    belongs_to :taxon, class_name: "Spree::Taxon", foreign_key: 'taxon_id'
 
     acts_as_essence(
       ingredient_column: 'taxon_id',
       preview_text_method: 'name'
     )
 
-    attr_accessible :taxon_id
-
     def ingredient
       taxon
     end

data/config/initializers/alchemy.rb

@@ -5,6 +5,6 @@ Alchemy::Modules.register_module({
     controller: 'alchemy/admin/spree',
     action: 'index',
     name: 'Spree',
-    image: '/assets/alchemy_spree/alchemy_module_icon.png'
+    image: 'alchemy_spree/alchemy_module_icon.png'
   }
 })

data/config/routes.rb

@@ -1,3 +1,3 @@
-Alchemy::Engine.routes.prepend do
+Alchemy::Engine.routes.draw do
   get '/admin/spree' => 'admin/spree#index', :as => :spree_admin
 end

data/lib/alchemy/spree/ability.rb

@@ -0,0 +1,14 @@
+module Alchemy
+  module Spree
+    class Ability
+      include CanCan::Ability
+
+      def initialize(user)
+        if user && user.is_admin?
+          can :index, :alchemy_admin_spree
+        end
+      end
+
+    end
+  end
+end

data/lib/alchemy/spree/engine.rb

@@ -1,4 +1,6 @@
+require 'alchemy/spree/ability'
 require 'alchemy/spree/alchemy_language_store'
+require 'spree'
 
 module Alchemy
   module Spree
@@ -14,7 +16,7 @@ module Alchemy
         Dir.glob(File.join(File.dirname(__FILE__), "../../../app/**/*_decorator*.rb")) do |c|
           Rails.configuration.cache_classes ? require(c) : load(c)
         end
-        Alchemy::Auth::Engine.get_instance.load(File.join(File.dirname(__FILE__), '../..', 'config/authorization_rules.rb'))
+        Alchemy.register_ability(Alchemy::Spree::Ability)
       end
 
       config.to_prepare &method(:activate).to_proc

data/lib/alchemy/spree/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
   module Spree
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

data/lib/spree/authentication_helpers.rb

@@ -26,3 +26,4 @@ module Spree
 end
 
 ApplicationController.send :include, Spree::AuthenticationHelpers
+Spree::Api::BaseController.send :include, Spree::AuthenticationHelpers

metadata

@@ -1,43 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_spree
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Thomas von Deyen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-07 00:00:00.000000000 Z
+date: 2015-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alchemy_cms
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: spree
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.1'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.3'
 description: A Alchemy CMS and Spree connector
 email:
 - tvd@magiclabs.de
@@ -45,7 +51,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README.md
@@ -64,12 +70,12 @@ files:
 - app/views/alchemy/essences/_essence_spree_product_view.html.erb
 - app/views/alchemy/essences/_essence_spree_taxon_editor.html.erb
 - app/views/alchemy/essences/_essence_spree_taxon_view.html.erb
-- config/authorization_rules.rb
 - config/initializers/alchemy.rb
 - config/routes.rb
 - db/migrate/20120229160509_create_alchemy_essence_spree_products.rb
 - db/migrate/20131029215548_add_spree_fields_to_custom_user_table.rb
 - db/migrate/20131030140218_create_alchemy_essence_spree_taxons.rb
+- lib/alchemy/spree/ability.rb
 - lib/alchemy/spree/alchemy_language_store.rb
 - lib/alchemy/spree/engine.rb
 - lib/alchemy/spree/version.rb
@@ -110,8 +116,9 @@ files:
 - test/dummy/script/rails
 - test/integration/navigation_test.rb
 - test/test_helper.rb
-homepage: https://github.com/magiclabs/alchemy_spree
-licenses: []
+homepage: https://github.com/AlchemyCMS/alchemy_spree
+licenses:
+- BSD New
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -119,17 +126,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: The World's Most Flexible E-Commerce Platform meets The World's Most Flexible

data/config/authorization_rules.rb

@@ -1,5 +0,0 @@
-authorization do
-  role :admin do
-    has_permission_on :alchemy_admin_spree, :to => [:index]
-  end
-end