alchemy_spree 0.1.2 → 0.1.4

data/app/controllers/spree/base_controller_decorator.rb

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

data/app/controllers/spree/user_sessions_controller_decorator.rb

@@ -0,0 +1,3 @@
+Spree::UserSessionsController.class_eval do
+  include AlchemyCrm::AlchemyLanguageIdStore
+end

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

@@ -1,13 +1,13 @@
+<% prefix = Rails.application.config.assets.prefix -%>
 <script type="text/javascript">
   var tinyMCEPreInit = {
-    base: '/assets/tiny_mce',
+    base: '<%= prefix -%>/tiny_mce',
     suffix: ''
   };
 </script>
-<script type="text/javascript" src="/assets/tiny_mce/tiny_mce"></script>
+<script type="text/javascript" src="<%= prefix -%>/tiny_mce/tiny_mce.js"></script>
 <script type="text/javascript">
   jQuery(function($) {
-    var myConfig = { dompath: true };
     if ($('textarea#product_description').length > 0) {
       tinyMCE.init({
         mode : "exact",
@@ -17,8 +17,8 @@
         skin : "o2k7",
         skin_variant : 'silver',
         inlinepopups_skin : 'alchemy',
-        popup_css : "/assets/alchemy/tinymce_dialog.css",
-        content_css : "/assets/alchemy/tinymce_content.css",
+        popup_css : "<%= prefix -%>/alchemy/tinymce_dialog.css",
+        content_css : "<%= prefix -%>/alchemy/tinymce_content.css",
         width : "100%",
         plugins : "paste,inlinepopups",
 

data/lib/alchemy_spree/alchemy_language_id_store.rb

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

data/lib/alchemy_spree/engine.rb

@@ -1,17 +1,16 @@
 require "alchemy_spree/alchemy_module"
+require 'alchemy_spree/alchemy_language_id_store'
 
 module AlchemySpree
-	class Engine < ::Rails::Engine
-		engine_name 'alchemy_spree'
+  class Engine < ::Rails::Engine
+    engine_name 'alchemy_spree'
 
-		config.autoload_paths += %W(#{config.root}/lib)
+    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
 
-		def self.activate
-			Dir.glob(File.join(File.dirname(__FILE__), "../app/overrides/**/*.rb")) do |c|
-				Rails.application.config.cache_classes ? require(c) : load(c)
-			end
-		end
-
-		config.to_prepare &method(:activate).to_proc
-	end
+    config.to_prepare &method(:activate).to_proc
+  end
 end

data/lib/alchemy_spree/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_spree
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-10 00:00:00.000000000 Z
+date: 2012-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alchemy_cms
-  requirement: &70180004895480 !ruby/object:Gem::Requirement
+  requirement: &70101865134720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.1.6
   type: :runtime
   prerelease: false
-  version_requirements: *70180004895480
+  version_requirements: *70101865134720
 - !ruby/object:Gem::Dependency
   name: spree
-  requirement: &70180004894260 !ruby/object:Gem::Requirement
+  requirement: &70101865133520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: 1.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70180004894260
+  version_requirements: *70101865133520
 description: A Alchemy CMS and Spree connector
 email:
 - tvd@magiclabs.de
@@ -49,6 +49,8 @@ files:
 - 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/overrides/include_tinymce_js.rb
 - app/views/alchemy/admin/spree/index.html.erb
@@ -59,6 +61,7 @@ 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_module.rb
 - lib/alchemy_spree/engine.rb
 - lib/alchemy_spree/version.rb
@@ -111,7 +114,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2926926103786300071
+      hash: -4177371760149923254
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -120,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2926926103786300071
+      hash: -4177371760149923254
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15