alchemy_spree 0.1.4 → 0.1.5

data/Gemfile

@@ -3,6 +3,9 @@ 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 'sqlite3'
+  gem 'sqlite3'
 end

data/Versionfile

@@ -1 +1,3 @@
-'1.0.x' => {:branch => 'master'}
+'1.0.x' => {:branch => 'master'}
+'1.1.x' => {:branch => 'master'}
+'1.2.x' => {:branch => 'master'}

data/alchemy_spree.gemspec

@@ -15,6 +15,6 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = AlchemySpree::VERSION
 
-  gem.add_dependency('alchemy_cms', ['~> 2.1.6'])
-  gem.add_dependency('spree', ['~> 1.0.1'])
+  #gem.add_dependency('alchemy_cms', ['~> 2.2.rc12'])
+  #gem.add_dependency('spree', ['~> 1.1.0.beta'])
 end

data/app/controllers/spree/base_controller_decorator.rb

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

data/app/controllers/spree/user_sessions_controller_decorator.rb

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

data/app/models/alchemy/user_decorator.rb

@@ -0,0 +1,14 @@
+module 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
+    end
+
+  end
+end

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

@@ -1,18 +1,41 @@
 <%= 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>
 <script type="text/javascript">
-	jQuery(document).ready(function($) {
-		var $frame = $('iframe#spree_admin');
-		function sizeSpreeFrame() {
-			$frame.css({height: $(window).height()-62});
-		}
-		$('#toolbar').remove();
-		$frame.on('load', function() {
-			$('#main_content').css({'background-color': '#162F54'});
-			sizeSpreeFrame();
-			$('#frame_load_info').hide();
-			$frame.show();
-		});
-		$(window).on('resize', sizeSpreeFrame);
-	});
+  jQuery(document).ready(function($) {
+    var $frame = $('iframe#spree_admin');
+
+    function sizeSpreeFrame() {
+      $frame.css({height: $(window).height() - 30});
+    }
+
+    $('#toolbar').remove();
+    $('#archive_all').css({padding: 0});
+
+    $frame.on('load', function() {
+      var frame_document;
+      var frame_window = (this.contentWindow || this.contentDocument);
+      var elements = ['header', 'footer', 'admin-menu', 'sub-menu', 'content'];
+      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.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/lib/alchemy_spree.rb

@@ -1 +1 @@
-require "alchemy_spree/engine"
+require "alchemy_spree/engine"

data/lib/alchemy_spree/alchemy_language_store.rb

@@ -0,0 +1,17 @@
+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

data/lib/alchemy_spree/engine.rb

@@ -1,10 +1,17 @@
 require "alchemy_spree/alchemy_module"
-require 'alchemy_spree/alchemy_language_id_store'
+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)

data/lib/alchemy_spree/version.rb

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

data/lib/spree/authentication_helpers.rb

@@ -0,0 +1,28 @@
+module Spree
+  module AuthenticationHelpers
+    def self.included(receiver)
+      receiver.send :helper_method, :spree_login_path
+      receiver.send :helper_method, :spree_signup_path
+      receiver.send :helper_method, :spree_logout_path
+      receiver.send :helper_method, :spree_current_user
+    end
+
+    def spree_current_user
+      current_alchemy_user
+    end
+
+    def spree_login_path
+      alchemy.login_path
+    end
+
+    def spree_signup_path
+      alchemy.signup_path
+    end
+
+    def spree_logout_path
+      alchemy.logout_path
+    end
+  end
+end
+
+ApplicationController.send :include, Spree::AuthenticationHelpers

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_spree
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,30 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-12 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: alchemy_cms
-  requirement: &70101865134720 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.1.6
-  type: :runtime
-  prerelease: false
-  version_requirements: *70101865134720
-- !ruby/object:Gem::Dependency
-  name: spree
-  requirement: &70101865133520 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.1
-  type: :runtime
-  prerelease: false
-  version_requirements: *70101865133520
+date: 2012-06-11 00:00:00.000000000 Z
+dependencies: []
 description: A Alchemy CMS and Spree connector
 email:
 - tvd@magiclabs.de
@@ -52,6 +30,7 @@ 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/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
@@ -61,10 +40,11 @@ files:
 - config/routes.rb
 - db/migrate/20120229160509_create_alchemy_essence_spree_products.rb
 - lib/alchemy_spree.rb
-- lib/alchemy_spree/alchemy_language_id_store.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
 - test/dummy/Rakefile
@@ -114,7 +94,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4177371760149923254
+      hash: -1812501221866682820
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -123,10 +103,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4177371760149923254
+      hash: -1812501221866682820
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: The World's Most Flexible E-Commerce Platform meets The World's Most Flexible

data/lib/alchemy_spree/alchemy_language_id_store.rb

@@ -1,14 +0,0 @@
-module AlchemyCrm
-  module AlchemyLanguageIdStore
-    def self.included(c)
-      c.send(:before_filter, :store_alchemy_language_id)
-    end
-
-    private
-
-    def store_alchemy_language_id
-      session[:language_id] ||= Alchemy::Language.get_default.id
-    end
-
-  end
-end