alchemy_spree 1.0.0.beta → 2.0.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c85623e15a5d44f28558ce70f514589423e5418c
-  data.tar.gz: faeeec7cef1249a91eaa03bfba29f35f7c577198
+SHA256:
+  metadata.gz: 52eb7795e263cdaf793dd1643038cc34474d3421134d5dbc3ccdf4898da89a17
+  data.tar.gz: 1e00185c4dfd8881a793969db48005247efd291b3a8e17b1359020e3990ab12f
 SHA512:
-  metadata.gz: 300e1ba2611427bf96a7a697485d2d7a5fd9cd65821a48ba2102b8ef81c391d37dc0b36ef0e34ea2e9f182ae6df071346379dc6b0d11212e1e4c243a152e852f
-  data.tar.gz: e49b7e103f6341e765ca5e2e6c82b460815968c098744a017a662c98f768f15845282af4d84a5d43f8cf91c2a90b8fedc0067d5a2ca630ccf3589567e536c95b
+  metadata.gz: d2c1d482368b64f9716a0bdd145e282dbedcf55bc4a216959c7f11dbaee1d41fcd47f5b8f45df1dbbb810b11e572ee73bdfb9b19bfea46f968a6569164085fc7
+  data.tar.gz: 85acfa71f621de22169a5affd9b5f6cbec509b8c8b5e385cde4642f11c2924e0995ca6fddf12cb5965dd360f19b326a8657d3cb46f77fdd083abb26887c683f8

data/README.md

@@ -1,202 +1,7 @@
-# Alchemy CMS Spree Extension
+# End of life notice
 
-The World's Most Flexible E-Commerce Platform meets The World's Most Flexible Content Management System!
+**THIS GEM IS NOT SUPPORTED ANYMORE**
 
-This gem is a [Alchemy CMS](https://github.com/magiclabs/alchemy_cms) and [Spree](https://github.com/spree/spree) connector.
+If possible for you switch to [Solidus](https://github.com/solidusio/solidus) (the successor of Spree) and it's Alchemy integration [`alchemy-solidus`](https://github.com/AlchemyCMS/alchemy-solidus).
 
-### For now it does this:
-
-1. It provides an Alchemy module that displays Spree admin in an iframe inside Alchemy admin.
-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 and above.
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'alchemy_spree', github: 'magiclabs/alchemy_spree', branch: 'master'
-```
-
-Install the gem with:
-
-```shell
-$ bundle install
-```
-
-### Authentication system installation
-
-Both Alchemy 3.0 and Spree come without an authentication system in place. You will need to choose an authentication system yourself. There are 3 available options. Whichever you choose, you need to instruct Spree & Alchemy about your choice of authentication system.
-
-Here are the steps for each option:
-
-#### 1. Option: Use [Spree Auth Devise](https://github.com/spree/spree_auth_devise)
-
-**Recommended for:**
-  - An existing Spree installation (`gem 'spree_auth_devise'` should already be in your Gemfile).
-  - You are just adding Alchemy
-
-To use Spree Auth Devise, instruct Alchemy to use the `Spree::User` class:
-
-```ruby
-# config/initializers/alchemy.rb
-
-# Tell Alchemy to use the Spree::User class
-Alchemy.user_class_name = 'Spree::User'
-Alchemy.current_user_method = :spree_current_user
-
-# Load the Spree.user_class decorator for Alchemy roles
-require 'alchemy/spree/spree_user_decorator'
-
-# Include the Spree controller helpers to render the
-# alchemy pages within the default Spree layout
-Alchemy::BaseHelper.send :include, Spree::BaseHelper
-Alchemy::BaseController.send :include, Spree::Core::ControllerHelpers::Common
-Alchemy::BaseController.send :include, Spree::Core::ControllerHelpers::Store
-```
-
-#### 2. Option: Use [Alchemy Devise](https://github.com/magiclabs/alchemy-devise)
-
-**Recommended for:**
-  - An existing Alchemy installation
-  - You don't have an authentication system and don't want to role an authentication system on your own.
-
-Add `alchemy-devise` to your `Gemfile`
-
-```ruby
-# Gemfile
-gem 'alchemy-devise', '~> 2.0'
-```
-
-and install it:
-
-```shell
-$ bundle install
-$ bundle exec rails g alchemy:devise:install
-```
-
-Run the Spree installer:
-
-*NOTE*: Skip this if you already have a running Spree installation.
-
-```shell
-$ bundle exec rails g spree:install
-```
-
-Then run the spree custom user generator:
-
-```shell
-$ bundle exec rails g spree:custom_user Alchemy::User
-```
-
-Now you'll need to instruct Spree to use the Alchemy User class:
-
-```ruby
-# config/initializers/spree.rb
-...
-Spree.user_class = "Alchemy::User"
-require 'alchemy/spree/alchemy_user_decorator'
-...
-```
-
-and tell Spree about Alchemy's path helpers:
-
-```ruby
-# lib/spree/authentication_helpers.rb
-    ...
-    def spree_login_path
-      alchemy.login_path
-    end
-
-    def spree_signup_path
-      alchemy.signup_path
-    end
-
-    def spree_logout_path
-      alchemy.logout_path
-    end
-    ...
-```
-
-#### 3. Option: Build their own authentication
-
-Please follow the [spree custom authentication](https://guides.spreecommerce.com/developer/authentication.html) and the [Alchemy custom authentication](http://guides.alchemy-cms.com/edge/custom_authentication.html) guides in order to integrate your custom user with Spree and Alchemy.
-
-#### In either case
-
-Install the migrations
-
-```shell
-$ bundle exec rake alchemy_spree:install:migrations
-```
-
-Run the installer of Alchemy
-
-```shell
-$ bundle exec rake alchemy:install
-```
-
-and follow the on screen instructions.
-
-## Usage
-
-### Create a new Element for Alchemy
-
-```yaml
-# config/alchemy/elements.yml
-- name: product
-  contents:
-  - name: spree_product
-    type: EssenceSpreeProduct
-
-- name: product_category
-  contents:
-  - name: spree_taxon
-    type: EssenceSpreeTaxon
-```
-
-### Generate the views
-
-```sh
-$ rails g alchemy:elements --skip
-```
-
-### Place this element on a page layout
-
-```yaml
-# config/alchemy/page_layouts.yml
-- name: product
-  elements: [product]
-- name: products
-  elements: [product_category]
-```
-
-### You can haz Spree product and taxons!
-
-```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') %>
-```
-
-Alchemy :heart: Spree!
-
-## Contributing
-
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Added some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+If someone still want to support this gem, please take over maintenance of this gem.

data/alchemy_spree.gemspec

@@ -6,7 +6,7 @@ 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")
@@ -15,6 +15,6 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Alchemy::Spree::VERSION
 
-  gem.add_dependency('alchemy_cms', ['>= 3.1.0.rc1', '< 3.2'])
-  gem.add_dependency('spree', ['>= 2.3', '< 3.0'])
+  gem.add_dependency('alchemy_cms', ['>= 3.3.0.rc1', '< 4.0'])
+  gem.add_dependency('spree', ['>= 3.0', '< 4.0'])
 end

data/app/models/alchemy/essence_spree_product.rb

@@ -1,10 +1,11 @@
 module Alchemy
   class EssenceSpreeProduct < ActiveRecord::Base
     belongs_to :product, class_name: "Spree::Product", foreign_key: 'spree_product_id'
+    delegate :name, to: :product, allow_nil: true
 
     acts_as_essence(
       ingredient_column: 'spree_product_id',
-      preview_text_method: 'name'
+      preview_text_column: 'name'
     )
 
     def ingredient

data/app/models/alchemy/essence_spree_taxon.rb

@@ -1,10 +1,11 @@
 module Alchemy
   class EssenceSpreeTaxon < ActiveRecord::Base
     belongs_to :taxon, class_name: "Spree::Taxon", foreign_key: 'taxon_id'
+    delegate :name, to: :taxon, allow_nil: true
 
     acts_as_essence(
       ingredient_column: 'taxon_id',
-      preview_text_method: 'name'
+      preview_text_column: 'name'
     )
 
     def ingredient

data/app/views/alchemy/essences/_essence_spree_product_editor.html.erb

@@ -1,9 +1,15 @@
-<div class="content_editor essence_spree_product">
-  <label><%= render_content_name(content) %></label>
+<div class="content_editor essence_spree_product essence_select">
+  <%= content_label(content) %>
   <%= select_tag(
     content.form_field_name,
-    options_from_collection_for_select(Spree::Product.not_deleted, :id, :name, content.essence.spree_product_id),
-    class: ['alchemy_selectbox very_long', html_options[:class]].join(' '),
+    options_from_collection_for_select(
+      local_assigns.fetch(:options, {})[:products] || Spree::Product.not_deleted,
+      :id,
+      :name,
+      content.essence.spree_product_id
+    ),
+    include_blank: t(".none"),
+    class: ["alchemy_selectbox", "essence_editor_select", html_options[:class]].join(' '),
     style: html_options[:style]
   ) %>
 </div>

data/app/views/alchemy/essences/_essence_spree_product_view.html.erb

@@ -0,0 +1,18 @@
+<% product = content.ingredient %>
+<% url = spree.product_url(product, taxon_id: @taxon.try(:id)) %>
+
+<div id="product_<%= product.id %>" class="col-md-3 col-sm-6 product-list-item" data-hook="products_list_item" itemscope itemtype="http://schema.org/Product">
+  <div class="panel panel-default">
+    <% cache(@taxon.present? ? [I18n.locale, current_currency, @taxon, product] : [I18n.locale, current_currency, product]) do %>
+      <div class="panel-body text-center product-body">
+        <%= link_to small_image(product, itemprop: "image"), url, itemprop: 'url' %><br/>
+        <%= link_to truncate(product.name, length: 50), url, class: 'info', itemprop: "name", title: product.name %>
+      </div>
+      <div class="panel-footer text-center">
+        <span itemprop="offers" itemscope itemtype="http://schema.org/Offer">
+          <span class="price selling lead" itemprop="price"><%= display_price(product) %></span>
+        </span>
+      </div>
+    <% end %>
+  </div>
+</div>

data/app/views/alchemy/essences/_essence_spree_taxon_editor.html.erb

@@ -1,16 +1,15 @@
-<div class="content_editor">
-  <label><%= render_content_name(content) %></label>
+<div class="content_editor essence_spree_taxon essence_select">
+  <%= content_label(content) %>
   <%= select_tag(
     content.form_field_name,
-    option_groups_from_collection_for_select(
-      Spree::Taxon.all,
-      :children,
-      :name,
+    options_from_collection_for_select(
+      local_assigns.fetch(:options, {})[:taxons] || Spree::Taxon.all,
       :id,
-      :name,
+      :pretty_name,
       content.essence.taxon_id
     ),
-    :class => ['alchemy_selectbox very_long', html_options[:class]].join(' '),
-    :style => html_options[:style]
+    include_blank: t(".none"),
+    class: ["alchemy_selectbox", "essence_editor_select", html_options[:class]].join(' '),
+    style: html_options[:style]
   ) %>
 </div>

data/app/views/alchemy/essences/_essence_spree_taxon_view.html.erb

@@ -0,0 +1,8 @@
+<% taxon = content.ingredient %>
+
+<div class="taxon" data-hook="taxon">
+  <h5 class="subtaxon-title">
+    <%= link_to taxon.name, seo_url(taxon), class: 'breadcrumbs' %>
+  </h5>
+  <%= render 'spree/shared/products', products: taxon_preview(taxon), taxon: taxon %>
+</div>

data/config/initializers/alchemy.rb

@@ -1,8 +1,8 @@
 Alchemy::Modules.register_module({
-  engine_name: 'alchemy',
+  engine_name: 'spree',
   name: 'spree',
   navigation: {
-    controller: 'alchemy/admin/spree',
+    controller: 'spree/admin/orders',
     action: 'index',
     name: 'Spree',
     image: 'alchemy_spree/alchemy_module_icon.png'

data/config/locales/alchemy_spree.de.yml

@@ -0,0 +1,7 @@
+de:
+  alchemy:
+    essences:
+      essence_spree_product_editor:
+        none: "Keins"
+      essence_spree_taxon_editor:
+        none: "Keins"

data/config/locales/alchemy_spree.en.yml

@@ -0,0 +1,7 @@
+en:
+  alchemy:
+    essences:
+      essence_spree_product_editor:
+        none: "None"
+      essence_spree_taxon_editor:
+        none: "None"

data/config/locales/alchemy_spree.es.yml

@@ -0,0 +1,7 @@
+es:
+  alchemy:
+    essences:
+      essence_spree_product_editor:
+        none: "Ninguno"
+      essence_spree_taxon_editor:
+        none: "Ninguno"

data/lib/alchemy/spree/alchemy_user_decorator.rb

@@ -3,8 +3,10 @@ Alchemy::User.class_eval do
   def spree_roles
     if admin?
       ::Spree::Role.where(name: 'admin')
+    elsif has_alchemy_role?(:member)
+      ::Spree::Role.where(name: 'user')
     else
-      ::Spree::Role.where('1 = 0') # aka. empty relation
+      ::Spree::Role.none
     end
   end
 end

data/lib/alchemy/spree/engine.rb

@@ -1,5 +1,3 @@
-require 'alchemy/spree/ability'
-require 'alchemy/spree/alchemy_language_store'
 require 'spree'
 
 module Alchemy
@@ -8,10 +6,7 @@ module Alchemy
       engine_name 'alchemy_spree'
 
       def self.activate
-        Dir.glob(File.join(File.dirname(__FILE__), "../../../app/**/*_decorator*.rb")) do |c|
-          Rails.configuration.cache_classes ? require(c) : load(c)
-        end
-        Alchemy.register_ability(Alchemy::Spree::Ability)
+        Alchemy.register_ability(::Spree::Ability)
       end
 
       config.to_prepare &method(:activate).to_proc

data/lib/alchemy/spree/spree_user_decorator.rb

@@ -3,8 +3,10 @@ Spree::User.class_eval do
   def alchemy_roles
     if has_spree_role?(:admin)
       %w(admin)
+    elsif has_spree_role?(:user)
+      %w(member)
     else
-      []
+      %w()
     end
   end
 end

data/lib/alchemy/spree/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
   module Spree
-    VERSION = "1.0.0.beta"
+    VERSION = "2.0.0.beta"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_spree
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta
+  version: 2.0.0.beta
 platform: ruby
 authors:
 - Thomas von Deyen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-30 00:00:00.000000000 Z
+date: 2020-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alchemy_cms
@@ -16,40 +16,40 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0.rc1
+        version: 3.3.0.rc1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0.rc1
+        version: 3.3.0.rc1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: spree
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 description: A Alchemy CMS and Spree connector
 email:
 - tvd@magiclabs.de
@@ -65,22 +65,18 @@ files:
 - Versionfile
 - alchemy_spree.gemspec
 - app/assets/images/alchemy_spree/alchemy_module_icon.png
-- app/controllers/alchemy/admin/spree_controller.rb
-- app/controllers/spree/base_controller_decorator.rb
-- app/controllers/spree/user_sessions_controller_decorator.rb
 - app/models/alchemy/essence_spree_product.rb
 - app/models/alchemy/essence_spree_taxon.rb
-- app/views/alchemy/admin/spree/index.html.erb
 - app/views/alchemy/essences/_essence_spree_product_editor.html.erb
 - 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/initializers/alchemy.rb
-- config/routes.rb
+- config/locales/alchemy_spree.de.yml
+- config/locales/alchemy_spree.en.yml
+- config/locales/alchemy_spree.es.yml
 - db/migrate/20120229160509_create_alchemy_essence_spree_products.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/alchemy_user_decorator.rb
 - lib/alchemy/spree/engine.rb
 - lib/alchemy/spree/spree_user_decorator.rb
@@ -121,7 +117,7 @@ files:
 - test/dummy/script/rails
 - test/integration/navigation_test.rb
 - test/test_helper.rb
-homepage: https://github.com/magiclabs/alchemy_spree
+homepage: https://github.com/AlchemyCMS/alchemy_spree
 licenses:
 - BSD New
 metadata: {}
@@ -140,8 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: The World's Most Flexible E-Commerce Platform meets The World's Most Flexible

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

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

data/app/controllers/spree/base_controller_decorator.rb

@@ -1,3 +0,0 @@
-Spree::BaseController.class_eval do
-  include AlchemySpree::AlchemyLanguageStore
-end

data/app/controllers/spree/user_sessions_controller_decorator.rb

@@ -1,5 +0,0 @@
-if defined? Spree::UserSessionsController
-  Spree::UserSessionsController.class_eval do
-    include AlchemySpree::AlchemyLanguageStore
-  end
-end

data/app/views/alchemy/admin/spree/index.html.erb

@@ -1,47 +0,0 @@
-<iframe src="<%= spree.admin_url %>" frameborder=0 width="100%" id="spree_admin" style="display: none"></iframe>
-<script type="text/javascript">
-  jQuery(document).ready(function($) {
-    var $frame = $('iframe#spree_admin');
-
-    spinner = Alchemy.Spinner.medium();
-    spinner.spin($("#main_content")[0])
-
-    function sizeSpreeFrame() {
-      $frame.css({height: $(window).height() - 30});
-    }
-
-    $('#toolbar').remove();
-    $('#main_content').css({
-      padding: '27px 0px 0px 66px',
-      backgroundColor: 'white'
-    });
-
-    $frame.on('load', function() {
-      var frame_document;
-      var frame_window = (this.contentWindow || this.contentDocument);
-      var elements = ['header', 'footer', 'admin-menu', 'sub-menu', 'content'];
-      spinner.stop();
-      if (frame_window.document) {
-        frame_document = frame_window.document;
-      } else {
-        frame_document = frame_window;
-        frame_window = frame_document.window;
-      }
-      frame_document.body.style.backgroundColor = '#fff';
-      frame_document.body.style.fontFamily = '"Lucida Grande", Arial, sans-serif';
-      frame_document.body.style.fontSize = '12px';
-      for (var i = elements.length - 1; i >= 0; i--) {
-        element = frame_document.getElementById(elements[i]);
-        if (element) {
-          if (element.id === 'header' || element.id === 'footer') element.style.display = 'none';
-          element.style.margin = 0;
-        }
-      }
-      sizeSpreeFrame();
-      $('#frame_load_info').hide();
-      $frame.show();
-    });
-
-    $(window).on('resize', sizeSpreeFrame);
-  });
-</script>

data/config/routes.rb

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

data/lib/alchemy/spree/ability.rb

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

data/lib/alchemy/spree/alchemy_language_store.rb

@@ -1,17 +0,0 @@
-module AlchemySpree
-  module AlchemyLanguageStore
-    def self.included(c)
-      c.send(:before_filter, :store_alchemy_language)
-    end
-
-  private
-
-    def store_alchemy_language
-      @alchemy_language ||= Alchemy::Language.find_by_code(::I18n.locale.to_s)
-      @alchemy_language ||= Alchemy::Language.get_default
-      session[:language_id] = @alchemy_language.id
-      session[:language_code] = @alchemy_language.code
-    end
-
-  end
-end