alchemy_spree 0.1.0 → 0.1.2

data/Gemfile

@@ -3,9 +3,6 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in alchemy_spree.gemspec
 gemspec
 
-gem "alchemy_cms", :path => '../alchemy_cms'
-gem "spree", :path => '../spree'
-
 group :developmemt, :test do
 	gem 'sqlite3'
 end

data/README.md

@@ -4,10 +4,11 @@ The World's Most Flexible E-Commerce Platform meets The World's Most Flexible Co
 
 This gem is a [Alchemy CMS](https://github.com/magiclabs/alchemy_cms) and [Spree](https://github.com/spree/spree) connector.
 
-### For now it does two things:
+### 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:
 

data/Versionfile

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

data/alchemy_spree.gemspec

@@ -4,8 +4,8 @@ require File.expand_path('../lib/alchemy_spree/version', __FILE__)
 Gem::Specification.new do |gem|
   gem.authors       = ["Thomas von Deyen"]
   gem.email         = ["tvd@magiclabs.de"]
-  gem.description   = %q{An Alchemy CMS and Spree connector}
-  gem.summary       = %q{An Alchemy CMS and Spree connector}
+  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.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
@@ -15,6 +15,6 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = AlchemySpree::VERSION
 
-  gem.add_dependency('alchemy_cms', ['~> 2.1.5'])
-  gem.add_dependency('spree', ['>= 1.0.0'])
+  gem.add_dependency('alchemy_cms', ['~> 2.1.6'])
+  gem.add_dependency('spree', ['~> 1.0.1'])
 end

data/app/overrides/include_tinymce_js.rb

@@ -0,0 +1,6 @@
+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/alchemy/admin/spree/index.html.erb

@@ -1,4 +1,5 @@
-<iframe src="<%= spree.admin_url %>" frameborder=0 width="100%" id="spree_admin" style="display: none"></iframe>
+<%= 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');
@@ -9,6 +10,7 @@
 		$frame.on('load', function() {
 			$('#main_content').css({'background-color': '#162F54'});
 			sizeSpreeFrame();
+			$('#frame_load_info').hide();
 			$frame.show();
 		});
 		$(window).on('resize', sizeSpreeFrame);

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

@@ -3,6 +3,7 @@
 	<%= 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'
+		:class => ['alchemy_select', html_options[:class]].join(' '),
+		:style => html_options[:style]
 	) %>
 </div>

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

@@ -0,0 +1,36 @@
+<script type="text/javascript">
+  var tinyMCEPreInit = {
+    base: '/assets/tiny_mce',
+    suffix: ''
+  };
+</script>
+<script type="text/javascript" src="/assets/tiny_mce/tiny_mce"></script>
+<script type="text/javascript">
+  jQuery(function($) {
+    var myConfig = { dompath: true };
+    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 : "/assets/alchemy/tinymce_dialog.css",
+        content_css : "/assets/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/engine.rb

@@ -3,5 +3,15 @@ require "alchemy_spree/alchemy_module"
 module AlchemySpree
 	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/overrides/**/*.rb")) do |c|
+				Rails.application.config.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 +1,3 @@
 module AlchemySpree
-  VERSION = "0.1.0"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_spree
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,31 +9,31 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-01 00:00:00.000000000 Z
+date: 2012-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alchemy_cms
-  requirement: &70259663685060 !ruby/object:Gem::Requirement
+  requirement: &70180004895480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.5
+        version: 2.1.6
   type: :runtime
   prerelease: false
-  version_requirements: *70259663685060
+  version_requirements: *70180004895480
 - !ruby/object:Gem::Dependency
   name: spree
-  requirement: &70259663684340 !ruby/object:Gem::Requirement
+  requirement: &70180004894260 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70259663684340
-description: An Alchemy CMS and Spree connector
+  version_requirements: *70180004894260
+description: A Alchemy CMS and Spree connector
 email:
 - tvd@magiclabs.de
 executables: []
@@ -45,13 +45,16 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- Versionfile
 - alchemy_spree.gemspec
 - app/assets/images/alchemy_spree/alchemy_module_icon.png
 - app/controllers/alchemy/admin/spree_controller.rb
 - app/models/alchemy/essence_spree_product.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
 - config/authorization_rules.rb
 - config/routes.rb
 - db/migrate/20120229160509_create_alchemy_essence_spree_products.rb
@@ -108,7 +111,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2556095942562390661
+      hash: 2926926103786300071
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -117,13 +120,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2556095942562390661
+      hash: 2926926103786300071
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
-summary: An Alchemy CMS and Spree connector
+summary: The World's Most Flexible E-Commerce Platform meets The World's Most Flexible
+  Content Management System!
 test_files:
 - test/alchemy_spree_test.rb
 - test/dummy/Rakefile