spree_essentials 0.2.3 → 0.3.1

data/README.md

@@ -27,7 +27,7 @@ If you don't already have an existing Spree site, [click here](https://gist.gith
 
 Spree Essentials can be installed by itself by adding the following to your Gemfile:
 
-    gem 'spree_essentials', '>= 0.2.3'
+    gem 'spree_essentials', '>= 0.3.1""
   
 This isn't necessary if you're using spree_essentials based extensions. If that's the case, just include the extensions normally:
   
@@ -78,7 +78,7 @@ Setting up an essential aware extension is easy. In your `lib/[extension_name].r
     module SpreeEssentialPress
       
       def self.tab
-        [:press, { :route => :admin_press_index }]
+        { :label => "Press", :route => :admin_press_index }
       end
       
       def self.sub_tab
@@ -92,10 +92,7 @@ Setting up an essential aware extension is easy. In your `lib/[extension_name].r
     
     end
     
-    if SpreeEssentialPress.independent?
-      # your own admin tab would be here
-      require 'spree_essential_press/custom_hooks'
-    else 
+    unless SpreeEssentialPress.independent?
       # register with Spree Essentials and reside under the "Content" tab
       SpreeEssentials.register :press, SpreeEssentialPress 
     end
@@ -114,7 +111,7 @@ Please let me know if you find any bugs or have feature requests you'd like to s
 Testing
 -------
 
-The test suite is very limited at the moment but can be run like so:
+The test suite can be run like so:
 
     git clone git://github.com/citrus/spree_essentials.git
     cd spree_essentials
@@ -122,16 +119,6 @@ The test suite is very limited at the moment but can be run like so:
     bundle exec dummier
     rake
     
-
-You can also boot spork to run the tests much faster
-
-    # in one window
-    cd spree_essentials
-    spork
-    
-    # in another window
-    testdrb test/**/*_test.rb
-    
     
 Demo
 ----
@@ -160,9 +147,16 @@ To Do
 Change Log
 ----------
 
-**0.2.3 - 2012/1/6**
+**0.3.1 - 2011/12/13**
+
+* Fix broken markitup editor
+* Rework 'selected' class on content tab 
+
+
+**0.3.0 - 2011/12/13**
 
-* Removed automatic attachment config with SpreeHeroku 
+* Upgrade to Spree 0.70.x
+* Remove spork dependency
 
 
 **0.2.2 - 2011/7/22**
@@ -210,4 +204,4 @@ If you'd like to help out feel free to fork and send me pull requests!
 License
 -------
 
-Copyright (c) 2011 Spencer Steffen, released under the New BSD License All rights reserved.
+Copyright (c) 2011 Spencer Steffen & Citrus, released under the New BSD License All rights reserved.

data/Rakefile

@@ -1,21 +1,10 @@
 # encoding: UTF-8
-require 'rubygems'
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must run `gem install bundler` and `bundle install` to run rake tasks'
-end
-
-require 'rake'
+require "bundler/gem_tasks"
 require 'rake/testtask'
 
-Bundler::GemHelper.install_tasks
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
+Rake::TestTask.new do |t|
+  t.libs << 'lib' << 'test'
   t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
 end
 
 task :default => :test

data/{public → app/assets}/javascripts/jquery.markitup.js

@@ -3,7 +3,7 @@
 // v 1.1.x
 // Dual licensed under the MIT and GPL licenses.
 // ----------------------------------------------------------------------------
-// Copyright (C) 2007-2010 Jay Salvat
+// Copyright (C) 2007-2011 Jay Salvat
 // http://markitup.jaysalvat.com/
 // ----------------------------------------------------------------------------
 // Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -35,7 +35,8 @@
 					previewInWindow:		'', // 'width=800, height=600, resizable=yes, scrollbars=yes'
 					previewAutoRefresh:		true,
 					previewPosition:		'after',
-					previewTemplatePath:	'',
+					previewTemplatePath:	'~/templates/preview.html',
+					previewParser:			false,
 					previewParserPath:		'',
 					previewParserVar:		'data',
 					resizeHandle:			true,
@@ -164,7 +165,7 @@
 							return false;
 						}).bind("focusin", function(){
                             $$.focus();
-						}).mousedown(function() {
+						}).mouseup(function() {
 							if (button.call) {
 								eval(button.call)();
 							}
@@ -233,22 +234,38 @@
 
 			// build block to insert
 			function build(string) {
-				var openWith 	= prepare(clicked.openWith);
-				var placeHolder = prepare(clicked.placeHolder);
-				var replaceWith = prepare(clicked.replaceWith);
-				var closeWith 	= prepare(clicked.closeWith);
+				var openWith 			= prepare(clicked.openWith);
+				var placeHolder 		= prepare(clicked.placeHolder);
+				var replaceWith 		= prepare(clicked.replaceWith);
+				var closeWith 			= prepare(clicked.closeWith);
+				var openBlockWith 		= prepare(clicked.openBlockWith);
+				var closeBlockWith 		= prepare(clicked.closeBlockWith);
+				var multiline 			= clicked.multiline;
+				
 				if (replaceWith !== "") {
 					block = openWith + replaceWith + closeWith;
 				} else if (selection === '' && placeHolder !== '') {
 					block = openWith + placeHolder + closeWith;
 				} else {
-					string = string || selection;						
-					if (string.match(/ $/)) {
-						block = openWith + string.replace(/ $/, '') + closeWith + ' ';
-					} else {
-						block = openWith + string + closeWith;
+					string = string || selection;
+
+					var lines = selection.split(/\r?\n/), blocks = [];
+					
+					for (var l=0; l < lines.length; l++) {
+						line = lines[l];
+						var trailingSpaces;
+						if (trailingSpaces = line.match(/ *$/)) {
+							blocks.push(openWith + line.replace(/ *$/g, '') + closeWith + trailingSpaces);
+						} else {
+							blocks.push(openWith + line + closeWith);
+						}
 					}
+					
+					block = blocks.join("\n");
 				}
+
+				block = openBlockWith + block + closeBlockWith;
+
 				return {	block:block, 
 							openWith:openWith, 
 							replaceWith:replaceWith, 
@@ -262,7 +279,6 @@
 				var len, j, n, i;
 				hash = clicked = button;
 				get();
-
 				$.extend(hash, {	line:"", 
 						 			root:options.root,
 									textarea:textarea, 
@@ -276,12 +292,12 @@
 				// callbacks before insertion
 				prepare(options.beforeInsert);
 				prepare(clicked.beforeInsert);
-				if (ctrlKey === true && shiftKey === true) {
+				if ((ctrlKey === true && shiftKey === true) || button.multiline === true) {
 					prepare(clicked.beforeMultiInsert);
 				}			
 				$.extend(hash, { line:1 });
-				
-				if (ctrlKey === true && shiftKey === true) {
+
+				if ((ctrlKey === true && shiftKey === true)) {
 					lines = selection.split(/\r?\n/);
 					for (j = 0, n = lines.length, i = 0; i < n; i++) {
 						if ($.trim(lines[i]) !== '') {
@@ -333,7 +349,7 @@
 				$.extend(hash, { line:'', selection:selection });
 
 				// callbacks after insertion
-				if (ctrlKey === true && shiftKey === true) {
+				if ((ctrlKey === true && shiftKey === true) || button.multiline === true) {
 					prepare(clicked.afterMultiInsert);
 				}
 				prepare(clicked.afterInsert);
@@ -358,7 +374,7 @@
 			// Substract linefeed in IE
 			function fixIeBug(string) {
 				if ($.browser.msie) {
-					return string.length - string.replace(/\r/g, '').length;
+					return string.length - string.replace(/\r*/g, '').length;
 				}
 				return 0;
 			}
@@ -398,21 +414,21 @@
 
 				scrollPosition = textarea.scrollTop;
 				if (document.selection) {
-					selection = document.selection;	
-					if ($.browser.msie) { // ie	
-						var range = selection.createRange();
-						var stored_range = range.duplicate();
-						stored_range.moveToElementText(textarea);
-						stored_range.setEndPoint('EndToEnd', range);
-						var s = stored_range.text.length - range.text.length;
-	
-						caretPosition = s - (textarea.value.substr(0, s).length - textarea.value.substr(0, s).replace(/\r/g, '').length);
-						selection = range.text;
+					selection = document.selection.createRange().text;
+					if ($.browser.msie) { // ie
+						var range = document.selection.createRange(), rangeCopy = range.duplicate();
+						rangeCopy.moveToElementText(textarea);
+						caretPosition = -1;
+						while(rangeCopy.inRange(range)) {
+							rangeCopy.moveStart('character');
+							caretPosition ++;
+						}
 					} else { // opera
 						caretPosition = textarea.selectionStart;
 					}
 				} else { // gecko & webkit
 					caretPosition = textarea.selectionStart;
+
 					selection = textarea.value.substring(caretPosition, textarea.selectionEnd);
 				} 
 				return selection;
@@ -458,7 +474,10 @@
 
 			function renderPreview() {		
 				var phtml;
-				if (options.previewParserPath !== '') {
+				if (options.previewParser && typeof options.previewParser === 'function') {
+					var data = options.previewParser( $$.val() );
+					writeInPreview( localize(data, 1) ); 
+				} else if (options.previewParserPath !== '') {
 					$.ajax({
 						type: 'POST',
 						dataType: 'text',
@@ -502,15 +521,15 @@
 			function keyPressed(e) { 
 				shiftKey = e.shiftKey;
 				altKey = e.altKey;
-				ctrlKey = (!(e.altKey && e.ctrlKey)) ? e.ctrlKey : false;
+				ctrlKey = (!(e.altKey && e.ctrlKey)) ? (e.ctrlKey || e.metaKey) : false;
 
 				if (e.type === 'keydown') {
 					if (ctrlKey === true) {
-						li = $("a[accesskey="+String.fromCharCode(e.keyCode)+"]", header).parent('li');
+						li = $('a[accesskey="'+String.fromCharCode(e.keyCode)+'"]', header).parent('li');
 						if (li.length !== 0) {
 							ctrlKey = false;
 							setTimeout(function() {
-								li.triggerHandler('mousedown');
+								li.triggerHandler('mouseup');
 							},1);
 							return false;
 						}

data/{public/stylesheets/markitup.css → app/assets/stylesheets/markitup.css.erb}

@@ -19,7 +19,7 @@
 }
 .markItUpContainer  {
 	border:1px solid #3C769D;	
-	background:#FFF url(../images/markitup/bg-container.png) repeat-x top left;
+	background:#FFF url(<%= asset_path('markitup/bg-container.png') %>) repeat-x top left;
 	padding:5px 27px 2px 5px;
 	font:11px Verdana, Arial, Helvetica, sans-serif;
 }
@@ -29,7 +29,7 @@
 	border:1px solid #3C769D;
 	width:100%;
 	height:320px;
-	background:#FFF url(../images/markitup/bg-editor.png) repeat-x top right;
+	background:#FFF url(<%= asset_path('markitup/bg-editor.png') %>) repeat-x top right;
 	clear:both;
 	line-height:18px;
 	overflow:auto;
@@ -54,7 +54,7 @@
 	width:22px; height:5px;
 	margin-left:auto;
 	margin-right:auto;
-	background-image:url(../images/markitup/handle.png);
+	background-image:url(<%= asset_path('markitup/handle.png') %>);
 	cursor:n-resize;
 }
 /***************************************************************************************/
@@ -71,7 +71,7 @@
 	display:block;
 }
 .markItUpHeader ul .markItUpDropMenu {
-	background:transparent url(../images/markitup/menu.png) no-repeat 115% 50%;
+	background:transparent url(<%= asset_path('markitup/menu.png') %>) no-repeat 115% 50%;
 	margin-right:5px;
 }
 .markItUpHeader ul .markItUpDropMenu li {
@@ -102,7 +102,7 @@
 	border-bottom:1px solid #3C769D;
 }
 .markItUpHeader ul ul .markItUpDropMenu {
-	background:#F5F5F5 url(../images/markitup/submenu.png) no-repeat 100% 50%;
+	background:#F5F5F5 url(<%= asset_path('markitup/submenu.png') %>) no-repeat 100% 50%;
 }
 /* next rows of buttons */
 .markItUpHeader ul ul ul {
@@ -134,20 +134,20 @@
 }
 /***************************************************************************************/
 .html .markItUpEditor {
-	background-image:url(../images/markitup/bg-editor-html.png);
+	background-image:url(<%= asset_path('markitup/bg-editor-html.png') %>);
 }
 .markdown .markItUpEditor {
-	background-image:url(../images/markitup/bg-editor-markdown.png);
+	background-image:url(<%= asset_path('markitup/bg-editor-markdown.png') %>);
 }
 .textile .markItUpEditor {
-	background-image:url(../images/markitup/bg-editor-textile.png);
+	background-image:url(<%= asset_path('markitup/bg-editor-textile.png') %>);
 }
 .bbcode .markItUpEditor {
-	background-image:url(../images/markitup/bg-editor-bbcode.png);
+	background-image:url(<%= asset_path('markitup/bg-editor-bbcode.png') %>);
 }
 .wiki .markItUpEditor,
 .dotclear .markItUpEditor {
-	background-image:url(../images/markitup/bg-editor-wiki.png);
+	background-image:url(<%= asset_path('markitup/bg-editor-wiki.png') %>);
 }
 
 
@@ -157,59 +157,59 @@
 // By Jay Salvat - http://markitup.jaysalvat.com/
 // ------------------------------------------------------------------*/
 .markItUp .markItUpButton1 a {
-	background-image:url(../images/markitup/h1.png); 
+	background-image:url(<%= asset_path('markitup/h1.png') %>); 
 }
 .markItUp .markItUpButton2 a {
-	background-image:url(../images/markitup/h2.png); 
+	background-image:url(<%= asset_path('markitup/h2.png') %>); 
 }
 .markItUp .markItUpButton3 a {
-	background-image:url(../images/markitup/h3.png); 
+	background-image:url(<%= asset_path('markitup/h3.png') %>); 
 }
 .markItUp .markItUpButton4 a {
-	background-image:url(../images/markitup/h4.png); 
+	background-image:url(<%= asset_path('markitup/h4.png') %>); 
 }
 .markItUp .markItUpButton5 a {
-	background-image:url(../images/markitup/h5.png); 
+	background-image:url(<%= asset_path('markitup/h5.png') %>); 
 }
 .markItUp .markItUpButton6 a {
-	background-image:url(../images/markitup/h6.png); 
+	background-image:url(<%= asset_path('markitup/h6.png') %>); 
 }
 
 .markItUp .markItUpButton7 a {
-	background-image:url(../images/markitup/bold.png);
+	background-image:url(<%= asset_path('markitup/bold.png') %>);
 }
 .markItUp .markItUpButton8 a {
-	background-image:url(../images/markitup/italic.png);
+	background-image:url(<%= asset_path('markitup/italic.png') %>);
 }
 
 .markItUp .markItUpButton9 a {
-	background-image:url(../images/markitup/list-bullet.png);
+	background-image:url(<%= asset_path('markitup/list-bullet.png') %>);
 }
 .markItUp .markItUpButton10 a {
-	background-image:url(../images/markitup/list-numeric.png);
+	background-image:url(<%= asset_path('markitup/list-numeric.png') %>);
 }
 
 .markItUp .markItUpButton11 a {
-	background-image:url(../images/markitup/picture.png); 
+	background-image:url(<%= asset_path('markitup/picture.png') %>); 
 }
 .markItUp .markItUpButton12 a {
-	background-image:url(../images/markitup/link.png);
+	background-image:url(<%= asset_path('markitup/link.png') %>);
 }
 
 .markItUp .markItUpButton13 a	{
-	background-image:url(../images/markitup/quotes.png);
+	background-image:url(<%= asset_path('markitup/quotes.png') %>);
 }
 .markItUp .markItUpButton14 a	{
-	background-image:url(../images/markitup/code.png);
+	background-image:url(<%= asset_path('markitup/code.png') %>);
 }
 .markItUp .markItUpButton15 a	{
-	background-image:url(../images/markitup/more-tag.png);
+	background-image:url(<%= asset_path('markitup/more-tag.png') %>);
 }
 .markItUp .markItUpButton16 a {
-	background-image:url(../images/markitup/image-picker.png);
+	background-image:url(<%= asset_path('markitup/image-picker.png') %>);
 }
 .markItUp .markItUpButton17 a {
-	background-image:url(../images/markitup/preview.png);
+	background-image:url(<%= asset_path('markitup/preview.png') %>);
 }
 
 
@@ -222,7 +222,7 @@ div.image-picker {
   width: 100%;
   height: 0;
   overflow: hidden;
-  background: #fff url(../images/markitup/bg-picker.png) repeat-x bottom left;
+  background: #fff url(<%= asset_path('markitup/bg-picker.png') %>) repeat-x bottom left;
   border: 1px solid #ccc;
 }
 div.image-picker ul,

data/app/controllers/admin/uploads_controller.rb

@@ -14,7 +14,7 @@ class Admin::UploadsController < Admin::ResourceController
       params[:search] ||= {}
       params[:search][:meta_sort] ||= "created_at.desc"
       @search = Upload.metasearch(params[:search])
-      @collection = @search.paginate(:per_page => Spree::Config[:orders_per_page], :page => params[:page])
+      @collection = @search.page(params[:page]).per(Spree::Config[:orders_per_page])
     end
 
 end

data/app/helpers/admin/spree_essentials_helper.rb

@@ -0,0 +1,25 @@
+module Admin::SpreeEssentialsHelper
+  
+  def contents_tab
+    routes = SpreeEssentials.essentials.map do |key, cls|
+      route = cls.tab[:route] || "admin_#{key}"
+      send("#{route}_path") rescue "##{key}"
+    end
+    routes.push admin_uploads_path
+    cls = request.path.scan(Regexp.new(routes.join("|"))).empty? ? nil : 'selected'
+    content_tag :li, :class => cls do
+      link_to I18n.t('admin.shared.contents_tab.content'), routes.first
+    end
+  end
+  
+  def markdown_helper
+    content_tag('em', :class => 'small') do
+      [ 
+       " ",
+        t('essentials.parsed_with'),
+        link_to("Markdown", "http://daringfireball.net/projects/markdown/basics", :onclick => 'window.open(this.href); return false')
+      ].join(" ").html_safe
+    end
+  end
+  
+end

data/app/models/{asset_decorator.rb → image_decorator.rb}

@@ -1,7 +1,7 @@
-Asset.class_eval do
+Image.class_eval do
 
   def has_alt?
     !alt.blank?
   end
 
-end
+end

data/app/models/upload.rb

@@ -1,12 +1,26 @@
 class Upload < Asset
   
-  default_scope where(:type => "Upload")
+  default_scope where(:type => "Upload") if table_exists?
   
   validate :no_attachement_errors
   
-  has_attached_file :attachment,
-    :styles => Proc.new{ |clip| clip.instance.attachment_sizes },
-    :default_style => :medium
+  # Check for spree_heroku
+  #   https://github.com/paxer/spree-heroku
+  #
+  if defined?(SpreeHeroku)
+    has_attached_file :attachment,
+      :styles => Proc.new{ |clip| clip.instance.attachment_sizes },
+      :default_style => :medium,
+      :path => "assets/uploads/:id/:style/:basename.:extension",
+      :storage => "s3",
+      :s3_credentials => "#{Rails.root}/config/s3.yml"
+  else
+    has_attached_file :attachment,
+      :styles => Proc.new{ |clip| clip.instance.attachment_sizes },
+      :default_style => :medium,
+      :url => "/assets/uploads/:id/:style/:basename.:extension",
+      :path => ":rails_root/public/assets/uploads/:id/:style/:basename.:extension"
+  end
   
   def image_content?
     attachment_content_type.match(/\/(jpeg|png|gif|tiff|x-photoshop)/)

data/app/overrides/spree_essentials.rb

@@ -0,0 +1,5 @@
+Deface::Override.new(:virtual_path  => "layouts/admin",
+                     :name          => "spree_essential_admin_tabs",
+                     :insert_bottom => "[data-hook='admin_tabs'], #admin_tabs[data-hook]",
+                     :partial       => "admin/shared/contents_tab",
+                     :disabled      => false)

data/app/views/admin/shared/_contents_sub_menu.html.erb

@@ -1,10 +1,8 @@
 <% content_for :sub_menu do %>
-  <ul id="sub_nav">
-    <%= hook :admin_contents_sub_tabs do %>
-      <% SpreeEssentials.essentials.each_pair do |name, cls| %>
-        <%= tab *cls.sub_tab if defined?(cls.sub_tab) %>
-      <% end %>
-      <%= tab :uploads, :label => 'admin.subnav.uploads' %>
+  <ul id="sub_nav" data-hook="essentials_sub_nav">
+    <% SpreeEssentials.essentials.each_pair do |name, cls| %>
+      <%= tab *cls.sub_tab if defined?(cls.sub_tab) %>
     <% end %>
+    <%= tab :uploads, :label => 'admin.subnav.uploads' %>
   </ul>
 <% end %>

data/app/views/admin/shared/_contents_tab.html.erb

@@ -1,2 +1 @@
-<%= tab *[SpreeEssentials.essentials.map{|key, cls| cls.tab if defined?(cls.tab) }, :uploads, { :label => '.content' }].flatten %>
-
+<%= contents_tab %>

data/app/views/admin/uploads/index.html.erb

@@ -31,7 +31,7 @@
  
 </table>
 
-<%= will_paginate(:prev => "&#171; #{t('previous')}", :next => "#{t('next')} &#187;") %>
+<%= paginate @uploads %>
 
 <div id="images"></div>
 <br/>

data/lib/generators/essentials_base.rb

@@ -4,15 +4,24 @@ module SpreeEssentials
     
       include Rails::Generators::Migration      
 
-      def self.count!
+      def self.count
         @count ||= 0
         (@count += 1) * 3
       end
+      
+      def self.new_migration_number
+        (Time.new.utc + self.count).strftime("%Y%m%d%H%M%S")
+      end
 
       def self.next_migration_number(path)
         @time ||= Time.new.utc
         if ActiveRecord::Base.timestamped_migrations
-          (@time + self.count!).strftime("%Y%m%d%H%M%S")
+          files = Dir.entries(Rails.root.join("db/migrate"))
+          migration = new_migration_number
+          while files.join.include?(migration)
+            migration = new_migration_number
+          end
+          migration
         else
           "%.3d" % (current_migration_number(dirname) + 1)
         end
@@ -20,4 +29,4 @@ module SpreeEssentials
       
     end
   end
-end
+end

data/lib/spree_essentials.rb

@@ -30,17 +30,18 @@ module SpreeEssentials
       app.middleware.insert_before ::Rack::Lock, ::ActionDispatch::Static, "#{config.root}/public"
     end
         
-    def self.activate
-      Dir.glob(File.join(File.dirname(__FILE__), "../app/**/*_decorator.rb")) do |c|
-        Rails.env.production? ? require(c) : load(c)
+    config.to_prepare do
+      #loads application's model / class decorators
+      Dir.glob File.expand_path("../../app/**/*_decorator*.rb") do |c|
+        Rails.configuration.cache_classes ? require(c) : load(c)
       end
-    end
 
-    config.to_prepare &method(:activate).to_proc    
-  end
-  
-  class CustomHooks < Spree::ThemeSupport::HookListener
-    insert_after :admin_tabs, 'admin/shared/contents_tab'
+      #loads application's deface view overrides
+      Dir.glob File.expand_path("../../app/overrides/*.rb", __FILE__) do |c|
+        Rails.application.config.cache_classes ? require(c) : load(c)
+      end
+    end
+      
   end
-  
+
 end

data/lib/spree_essentials/test_helper.rb

@@ -21,9 +21,18 @@ Capybara.default_selector = :css
 # Define a bare test case to use with Capybara
 class ActiveSupport::IntegrationCase < ActiveSupport::TestCase
   
-  include Capybara
+  include Capybara::DSL
   include Rails.application.routes.url_helpers
   
+  
+  # Extreme hax! wtf is this for anyways.. and why is it erroring?
+  def testmail_admin_mail_method_url(*args)
+    "#wtf"  
+  end
+  alias :testmail_admin_mail_method_path :testmail_admin_mail_method_url
+  
+  
+    
   self.use_transactional_fixtures = false
 
   # Checks for missing translations after each test

data/lib/spree_essentials/version.rb

@@ -1,3 +1,3 @@
 module SpreeEssentials
-  VERSION = "0.2.3"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_essentials
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-06 00:00:00.000000000Z
+date: 2011-12-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
-  requirement: &70343609052760 !ruby/object:Gem::Requirement
+  requirement: &70108455614680 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.60.0
+        version: 0.70.0
   type: :runtime
   prerelease: false
-  version_requirements: *70343609052760
+  version_requirements: *70108455614680
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70343609052140 !ruby/object:Gem::Requirement
+  requirement: &70108455614020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,84 +32,62 @@ dependencies:
         version: 1.6.8
   type: :runtime
   prerelease: false
-  version_requirements: *70343609052140
+  version_requirements: *70108455614020
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70343609051340 !ruby/object:Gem::Requirement
+  requirement: &70108455613300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.11.3
+        version: 3.0.0.beta2
   type: :development
   prerelease: false
-  version_requirements: *70343609051340
+  version_requirements: *70108455613300
 - !ruby/object:Gem::Dependency
   name: dummier
-  requirement: &70343609050500 !ruby/object:Gem::Requirement
+  requirement: &70108455612720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.4
   type: :development
   prerelease: false
-  version_requirements: *70343609050500
+  version_requirements: *70108455612720
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70343609050020 !ruby/object:Gem::Requirement
+  requirement: &70108455611860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta4
+        version: 2.3.2
   type: :development
   prerelease: false
-  version_requirements: *70343609050020
+  version_requirements: *70108455611860
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70343609049440 !ruby/object:Gem::Requirement
+  requirement: &70108455610640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.2
   type: :development
   prerelease: false
-  version_requirements: *70343609049440
+  version_requirements: *70108455610640
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70343609048820 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.3.3
-  type: :development
-  prerelease: false
-  version_requirements: *70343609048820
-- !ruby/object:Gem::Dependency
-  name: spork
-  requirement: &70343609048360 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.9.0.rc9
-  type: :development
-  prerelease: false
-  version_requirements: *70343609048360
-- !ruby/object:Gem::Dependency
-  name: spork-testunit
-  requirement: &70343609047760 !ruby/object:Gem::Requirement
+  requirement: &70108455598500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 1.3.4
   type: :development
   prerelease: false
-  version_requirements: *70343609047760
+  version_requirements: *70108455598500
 description: Spree Essentials provides a base for several other Spree Commerce extensions.
   The idea is to provide other extensions with common functionality such as an asset-upload
   interface, a markdown editor, and a common admin-navigation tab.
@@ -129,11 +107,42 @@ files:
 - lib/spree_essentials/test_helper.rb
 - lib/spree_essentials/version.rb
 - lib/spree_essentials.rb
+- app/assets/images/admin/icons/pages.png
+- app/assets/images/blog/rss.png
+- app/assets/images/markitup/bg-container.png
+- app/assets/images/markitup/bg-editor.png
+- app/assets/images/markitup/bg-picker.png
+- app/assets/images/markitup/bold.png
+- app/assets/images/markitup/code.png
+- app/assets/images/markitup/h1.png
+- app/assets/images/markitup/h2.png
+- app/assets/images/markitup/h3.png
+- app/assets/images/markitup/h4.png
+- app/assets/images/markitup/h5.png
+- app/assets/images/markitup/h6.png
+- app/assets/images/markitup/handle.png
+- app/assets/images/markitup/image-picker.png
+- app/assets/images/markitup/italic.png
+- app/assets/images/markitup/link.png
+- app/assets/images/markitup/list-bullet.png
+- app/assets/images/markitup/list-numeric.png
+- app/assets/images/markitup/menu.png
+- app/assets/images/markitup/more-tag.png
+- app/assets/images/markitup/picture.png
+- app/assets/images/markitup/preview.png
+- app/assets/images/markitup/quotes.png
+- app/assets/images/markitup/submenu.png
+- app/assets/javascripts/date.js
+- app/assets/javascripts/jquery.autodate.js
+- app/assets/javascripts/jquery.markitup.js
+- app/assets/javascripts/markdown.set.js
+- app/assets/stylesheets/markitup.css.erb
 - app/controllers/admin/markdown_controller.rb
 - app/controllers/admin/uploads_controller.rb
-- app/helpers/admin/base_helper_decorator.rb
-- app/models/asset_decorator.rb
+- app/helpers/admin/spree_essentials_helper.rb
+- app/models/image_decorator.rb
 - app/models/upload.rb
+- app/overrides/spree_essentials.rb
 - app/validators/datetime_validator.rb
 - app/views/admin/shared/_contents_sub_menu.html.erb
 - app/views/admin/shared/_contents_tab.html.erb
@@ -142,36 +151,6 @@ files:
 - app/views/admin/uploads/index.html.erb
 - app/views/admin/uploads/new.html.erb
 - app/views/admin/uploads/picker.html.erb
-- public/images/admin/icons/pages.png
-- public/images/blog/rss.png
-- public/images/markitup/bg-container.png
-- public/images/markitup/bg-editor.png
-- public/images/markitup/bg-picker.png
-- public/images/markitup/bold.png
-- public/images/markitup/code.png
-- public/images/markitup/h1.png
-- public/images/markitup/h2.png
-- public/images/markitup/h3.png
-- public/images/markitup/h4.png
-- public/images/markitup/h5.png
-- public/images/markitup/h6.png
-- public/images/markitup/handle.png
-- public/images/markitup/image-picker.png
-- public/images/markitup/italic.png
-- public/images/markitup/link.png
-- public/images/markitup/list-bullet.png
-- public/images/markitup/list-numeric.png
-- public/images/markitup/menu.png
-- public/images/markitup/more-tag.png
-- public/images/markitup/picture.png
-- public/images/markitup/preview.png
-- public/images/markitup/quotes.png
-- public/images/markitup/submenu.png
-- public/javascripts/date.js
-- public/javascripts/jquery.autodate.js
-- public/javascripts/jquery.markitup.js
-- public/javascripts/markdown.set.js
-- public/stylesheets/markitup.css
 - Rakefile
 homepage: https://github.com/citrus/spree_essentials
 licenses: []
@@ -187,7 +166,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4112717621804391650
+      hash: -706572084736491213
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -196,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4112717621804391650
+      hash: -706572084736491213
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10

data/app/helpers/admin/base_helper_decorator.rb

@@ -1,18 +0,0 @@
-Spree::BaseHelper.class_eval do
-   
-  def markdown_helper
-    content_tag('em', :class => 'small') do
-      [ 
-       " ",
-        t('essentials.parsed_with'),
-        link_to("Markdown", "http://daringfireball.net/projects/markdown/basics", :onclick => 'window.open(this.href); return false')
-      ].join(" ").html_safe
-    end
-  end
-      
-  def method_missing(method, *args, &block)
-    return super unless method.to_s =~ /_path$/
-    "/" + method.to_s.sub(/_path$/, '').gsub('_', '-')
-  end
-      
-end