alchemy_spree 0.1.5 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 301fe68273f680a0824558febf122a0dbc9af5d7
+  data.tar.gz: 3852285bdf2a9973c9ab163eee3152d5b447dce0
+SHA512:
+  metadata.gz: 2f650b88632215540b284184e17f02358ddfd9b599ecfb142222c623e94519422e5bd004f299b7a55ac42a4f1b8525a4fac957df81407e2fed09f0f6b9eb1960
+  data.tar.gz: 4d326c6ede1c990b529868f33f2bb9451840c441134d61f7153b99331f42b4f06a67ea1b43f7a508bb43530b872299f5bb131ac5cc783ceb850db7b4386db118

data/Gemfile

@@ -3,9 +3,8 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in alchemy_spree.gemspec
 gemspec
 
-gem 'alchemy_cms', '2.2.rc12', :github => 'magiclabs/alchemy_cms'
-gem 'spree', '1.2.0.beta', :github => 'spree/spree', :branch => 'auth-take-two'
-
 group :developmemt, :test do
+  gem "spree", github: 'tvdeyen/spree', branch: 'alchemy'
+  gem 'money', '~> 5.1'
   gem 'sqlite3'
 end

data/README.md

@@ -1,4 +1,4 @@
-# Alchemy CMS Spree Connector
+# Alchemy CMS Spree Extension
 
 The World's Most Flexible E-Commerce Platform meets The World's Most Flexible Content Management System!
 
@@ -7,12 +7,8 @@ This gem is a [Alchemy CMS](https://github.com/magiclabs/alchemy_cms) and [Spree
 ### 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 a new Essence for Alchemy called EssenceSpreeProduct that you can use to place a Spree product on your page.
-3. It adds a TinyMCE editor to the Spree product description textarea.
-
-### TODO:
-
-1. Share admin session between Alchemy 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.
 
 ## Installation
 
@@ -28,35 +24,48 @@ Or install it yourself as:
 
     $ gem install alchemy_spree
 
-## Usage
+Install the migrations:
+
+    $ rake alchemy_spree:install:migrations
 
-### Mount the engine into your routes
+Migrate the database:
 
-	# config/routes.rb
-	mount AlchemySpree::Engine => '/'
+    $ rake db:migrate
+
+## Usage
 
 ### Create a new Element for Alchemy
 
-	# config/alchemy/elements.yml
-	- name: product
-	  contents:
-	  - name: spree_product
-	    type: EssenceSpreeProduct
+  # config/alchemy/elements.yml
+  - name: product
+    contents:
+    - name: spree_product
+      type: EssenceSpreeProduct
+
+  - name: product_category
+    contents:
+    - name: spree_taxon
+      type: EssenceSpreeTaxon
 
 ### Generate the views
 
-	$ rails g alchemy:elements --skip
+  $ rails g alchemy:elements --skip
 
 ### Place this element on a page layout
 
-	# config/alchemy/page_layouts.yml
-	- name: products
-	  elements: [product]
+  # config/alchemy/page_layouts.yml
+  - name: product
+    elements: [product]
+  - name: products
+    elements: [product_category]
+
+### You can haz Spree product and taxons!
 
-### You can haz Spree product!
+  # app/views/alchemy/elements/_product_view.html.erb
+  <%= element.ingredient('spree_product') %>
 
-	# 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 <3 Spree!
 

data/alchemy_spree.gemspec

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-require File.expand_path('../lib/alchemy_spree/version', __FILE__)
+require File.expand_path('../lib/alchemy/spree/version', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.authors       = ["Thomas von Deyen"]
@@ -13,8 +13,8 @@ Gem::Specification.new do |gem|
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.name          = "alchemy_spree"
   gem.require_paths = ["lib"]
-  gem.version       = AlchemySpree::VERSION
+  gem.version       = Alchemy::Spree::VERSION
 
-  #gem.add_dependency('alchemy_cms', ['~> 2.2.rc12'])
-  #gem.add_dependency('spree', ['~> 1.1.0.beta'])
+  gem.add_dependency('alchemy_cms', ['~> 2.7.0'])
+  gem.add_dependency('spree', ['~> 2.0.0'])
 end

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

@@ -1,9 +1,5 @@
-module Alchemy
-	module Admin
-		class SpreeController < Alchemy::Admin::BaseController
-			def index
-				render
-			end
-		end
-	end
+class Alchemy::Admin::SpreeController < Alchemy::Admin::BaseController
+  def index
+    render
+  end
 end

data/app/models/alchemy/essence_spree_product.rb

@@ -1,15 +1,16 @@
 module Alchemy
-	class EssenceSpreeProduct < ActiveRecord::Base
+  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, :readonly => true
-		acts_as_essence(
-			:ingredient_column => :spree_product_id,
-			:preview_text_method => :name
-		)
+    acts_as_essence(
+      ingredient_column: 'spree_product_id',
+      preview_text_method: 'name'
+    )
 
-		def ingredient
-			product
-		end
+    attr_accessible :spree_product_id
 
-	end
+    def ingredient
+      product
+    end
+  end
 end

data/app/models/alchemy/essence_spree_taxon.rb

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

data/app/models/alchemy/user_decorator.rb

@@ -1,14 +1,11 @@
-module Alchemy
-  User.class_eval do
+Alchemy::User.class_eval do
 
-    def spree_roles
-      @spree_admin_role ||= Spree::Role.find_or_create_by_name("admin")
-      if admin?
-        [@spree_admin_role]
-      else
-        []
-      end
+  def spree_roles
+    if admin?
+      ::Spree::Role.where(name: 'admin')
+    else
+      ::Spree::Role.where('1 = 0') # aka. empty relation
     end
-
   end
+
 end

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

@@ -1,27 +1,33 @@
-<%= image_tag('alchemy/ajax_loader.gif', :id => "frame_load_info", :style => "position: absolute; top: 50%; left: 50%; margin-top: -12px; margin-left: -12px") %>
-<iframe src="<%= spree.admin_url(:protocol => Rails.env.production? ? 'https' : nil) %>" frameborder=0 width="100%" id="spree_admin" style="display: none"></iframe>
+<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();
-    $('#archive_all').css({padding: 0});
+    $('#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 = '#EDEDED';
+      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--) {

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

@@ -1,9 +1,9 @@
-<div class="content_editor">
-	<label><%= render_content_name(content) %></label>
-	<%= select_tag(
-		content.form_field_name,
-		options_from_collection_for_select(Spree::Product.not_deleted, :id, :name, content.essence.spree_product_id),
-		:class => ['alchemy_select', html_options[:class]].join(' '),
-		:style => html_options[:style]
-	) %>
+<div class="content_editor essence_spree_product">
+  <label><%= render_content_name(content) %></label>
+  <%= 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(' '),
+    style: html_options[:style]
+  ) %>
 </div>

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

@@ -0,0 +1,16 @@
+<div class="content_editor">
+  <label><%= render_content_name(content) %></label>
+  <%= select_tag(
+    content.form_field_name,
+    option_groups_from_collection_for_select(
+      Spree::Taxon.all,
+      :children,
+      :name,
+      :id,
+      :name,
+      content.essence.taxon_id
+    ),
+    :class => ['alchemy_selectbox very_long', html_options[:class]].join(' '),
+    :style => html_options[:style]
+  ) %>
+</div>

data/config/authorization_rules.rb

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

data/config/initializers/alchemy.rb

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

data/config/routes.rb

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

data/db/migrate/20131029215548_add_spree_fields_to_custom_user_table.rb

@@ -0,0 +1,7 @@
+class AddSpreeFieldsToCustomUserTable < ActiveRecord::Migration
+  def up
+    add_column "alchemy_users", :spree_api_key, :string, :limit => 48
+    add_column "alchemy_users", :ship_address_id, :integer
+    add_column "alchemy_users", :bill_address_id, :integer
+  end
+end

data/db/migrate/20131030140218_create_alchemy_essence_spree_taxons.rb

@@ -0,0 +1,10 @@
+class CreateAlchemyEssenceSpreeTaxons < ActiveRecord::Migration
+  def change
+    create_table :alchemy_essence_spree_taxons do |t|
+      t.references :taxon
+
+      t.timestamps
+    end
+    add_index :alchemy_essence_spree_taxons, :taxon_id
+  end
+end

data/lib/alchemy/spree/engine.rb

@@ -0,0 +1,23 @@
+require 'alchemy/spree/alchemy_language_store'
+
+module Alchemy
+  module Spree
+    class Engine < ::Rails::Engine
+      engine_name 'alchemy_spree'
+
+      initializer 'spree.user_class', after: 'alchemy.include_authentication_helpers' do
+        ::Spree.user_class = "Alchemy::User"
+        require File.join(File.dirname(__FILE__), '../../spree/authentication_helpers')
+      end
+
+      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::Auth::Engine.get_instance.load(File.join(File.dirname(__FILE__), '../..', 'config/authorization_rules.rb'))
+      end
+
+      config.to_prepare &method(:activate).to_proc
+    end
+  end
+end

data/lib/alchemy/spree/version.rb

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

data/lib/alchemy_spree.rb

@@ -1 +1,2 @@
-require "alchemy_spree/engine"
+require "alchemy_cms"
+require "alchemy/spree/engine"

data/lib/spree/authentication_helpers.rb

@@ -8,7 +8,7 @@ module Spree
     end
 
     def spree_current_user
-      current_alchemy_user
+      current_user
     end
 
     def spree_login_path

metadata

@@ -1,16 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_spree
 version: !ruby/object:Gem::Version
-  version: 0.1.5
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Thomas von Deyen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-11 00:00:00.000000000 Z
-dependencies: []
+date: 2013-11-07 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
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.7.0
+- !ruby/object:Gem::Dependency
+  name: spree
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 description: A Alchemy CMS and Spree connector
 email:
 - tvd@magiclabs.de
@@ -30,20 +57,23 @@ files:
 - 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/models/alchemy/user_decorator.rb
-- app/overrides/include_tinymce_js.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/partials/_tinymce_javascript.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/alchemy_language_store.rb
+- lib/alchemy/spree/engine.rb
+- lib/alchemy/spree/version.rb
 - lib/alchemy_spree.rb
-- lib/alchemy_spree/alchemy_language_store.rb
-- lib/alchemy_spree/alchemy_module.rb
-- lib/alchemy_spree/engine.rb
-- lib/alchemy_spree/version.rb
 - lib/spree/authentication_helpers.rb
 - script/rails
 - test/alchemy_spree_test.rb
@@ -82,33 +112,26 @@ files:
 - test/test_helper.rb
 homepage: https://github.com/magiclabs/alchemy_spree
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1812501221866682820
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1812501221866682820
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.1.10
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: The World's Most Flexible E-Commerce Platform meets The World's Most Flexible
   Content Management System!
 test_files:

data/app/overrides/include_tinymce_js.rb

@@ -1,6 +0,0 @@
-Deface::Override.new(
-  :virtual_path => "spree/layouts/admin",
-  :name => "include_tinymce_js",
-  :insert_bottom => "[data-hook='admin_inside_head'], #admin_inside_head[data-hook]",
-  :text => "<%= render :partial => 'partials/tinymce_javascript' -%>"
-)

data/app/views/partials/_tinymce_javascript.html.erb

@@ -1,36 +0,0 @@
-<% prefix = Rails.application.config.assets.prefix -%>
-<script type="text/javascript">
-  var tinyMCEPreInit = {
-    base: '<%= prefix -%>/tiny_mce',
-    suffix: ''
-  };
-</script>
-<script type="text/javascript" src="<%= prefix -%>/tiny_mce/tiny_mce.js"></script>
-<script type="text/javascript">
-  jQuery(function($) {
-    if ($('textarea#product_description').length > 0) {
-      tinyMCE.init({
-        mode : "exact",
-        elements : 'product_description',
-        theme : "advanced",
-        language : '<%= ::I18n.locale.to_s.split('-')[0].downcase -%>',
-        skin : "o2k7",
-        skin_variant : 'silver',
-        inlinepopups_skin : 'alchemy',
-        popup_css : "<%= prefix -%>/alchemy/tinymce_dialog.css",
-        content_css : "<%= prefix -%>/alchemy/tinymce_content.css",
-        width : "100%",
-        plugins : "paste,inlinepopups",
-
-        // Theme options
-        theme_advanced_buttons1 : "bold,italic,underline,strikethrough,sub,sup,|,numlist,bullist,indent,outdent,|,removeformat,cleanup",
-        theme_advanced_buttons2 : "pastetext,pasteword,|,link,unlink,|,charmap,code,help",
-        theme_advanced_buttons3 : "",
-        theme_advanced_toolbar_location : "top",
-        theme_advanced_toolbar_align : "left",
-        theme_advanced_statusbar_location : "bottom",
-        theme_advanced_resizing : true
-      });
-    }
-  });
-</script>

data/lib/alchemy_spree/alchemy_module.rb

@@ -1,16 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-require "alchemy_cms"
-
-Alchemy::Modules.register_module({
-	:name => 'spree',
-	:engine_name => 'alchemy_spree',
-	:navigation => {
-		:controller => 'alchemy/admin/spree',
-		:action => 'index',
-		:name => 'Shop',
-		:image => '/assets/alchemy_spree/alchemy_module_icon.png'
-	}
-})
-
-Alchemy::AuthEngine.get_instance.load(File.join(File.dirname(__FILE__), '../..', 'config/authorization_rules.rb'))

data/lib/alchemy_spree/engine.rb

@@ -1,23 +0,0 @@
-require "alchemy_spree/alchemy_module"
-require 'alchemy_spree/alchemy_language_store'
-
-module AlchemySpree
-  class Engine < ::Rails::Engine
-    engine_name 'alchemy_spree'
-
-    if defined?(Spree.user_class)
-      initializer 'spree.user_class', :after => 'alchemy.include_authentication_helpers' do
-        Spree.user_class = "Alchemy::User"
-        require File.join(File.dirname(__FILE__), '../spree/authentication_helpers')
-      end
-    end
-
-    def self.activate
-      Dir.glob(File.join(File.dirname(__FILE__), "../../app/**/*_decorator*.rb")) do |c|
-        Rails.configuration.cache_classes ? require(c) : load(c)
-      end
-    end
-
-    config.to_prepare &method(:activate).to_proc
-  end
-end

data/lib/alchemy_spree/version.rb

@@ -1,3 +0,0 @@
-module AlchemySpree
-  VERSION = "0.1.5"
-end