spree_essentials 0.3.3 → 0.4.0.rc1

data/README.md

@@ -26,15 +26,8 @@ Installation
 If you don't already have an existing Spree site, [click here](https://gist.github.com/946719) then come back later... You can also read the Spree docs [here](http://spreecommerce.com/documentation/getting_started.html)...
 
 Spree Essentials can be installed by itself by adding the following to your Gemfile:
-      
-    # Spree 1.0.x
-    gem 'spree_essentials', '~> 0.4.0.rc2'
-
-    # Spree 0.70.x
-    gem 'spree_essentials', '~> 0.3.3'
 
-    # Spree 0.60.x
-    gem 'spree_essentials', '~> 0.2.3'
+    gem 'spree_essentials', '>= 0.3.2'
   
 This isn't necessary if you're using spree_essentials based extensions. If that's the case, just include the extensions normally:
   
@@ -134,7 +127,7 @@ You can easily use the test/dummy app as a demo of spree_essentials. Just `cd` t
     
     git clone git://github.com/citrus/spree_essentials.git
     cd spree_essentials
-    mv lib/dummy_hooks/after_migrate.rb.sample lib/dummy_hooks/after_migrate.rb
+    cp test/dummy_hooks/after_migrate.rb.sample test/dummy_hooks/after_migrate.rb
     bundle install
     bundle exec dummier
     cd test/dummy
@@ -154,9 +147,10 @@ To Do
 Change Log
 ----------
 
-**0.3.3 - 2012/1/20**
+**0.4.0.rc1 - 2012/1/16**
 
-* Precompile admin assets in production
+* Add Spree 1.0.0 compatibility
+* Breaks with previous versions of Spree
 
 
 **0.3.2 - 2011/12/30**

data/app/controllers/{admin → spree/admin}/markdown_controller.rb

@@ -1,4 +1,4 @@
-class Admin::MarkdownController < Admin::BaseController
+class Spree::Admin::MarkdownController < Spree::Admin::BaseController
 
   def preview
     render :text => RDiscount.new(params[:data].to_s).to_html

data/app/controllers/{admin → spree/admin}/uploads_controller.rb

@@ -1,7 +1,7 @@
-class Admin::UploadsController < Admin::ResourceController
+class Spree::Admin::UploadsController < Spree::Admin::ResourceController
   
 	def index
-	  render :template => request.xhr? ? 'admin/uploads/picker' : 'admin/uploads/index', :layout => !request.xhr?
+	  render :template => "spree/admin/uploads/#{request.xhr? ? 'picker' : 'index'}", :layout => !request.xhr?
   end
   
   private
@@ -13,7 +13,7 @@ class Admin::UploadsController < Admin::ResourceController
     def collection
       params[:search] ||= {}
       params[:search][:meta_sort] ||= "created_at.desc"
-      @search = Upload.metasearch(params[:search])
+      @search = Spree::Upload.metasearch(params[:search])
       @collection = @search.page(params[:page]).per(Spree::Config[:orders_per_page])
     end
 

data/app/helpers/{admin → spree/admin}/spree_essentials_helper.rb

@@ -1,4 +1,4 @@
-module Admin::SpreeEssentialsHelper
+module Spree::Admin::SpreeEssentialsHelper
   
   def contents_tab
     routes = SpreeEssentials.essentials.map do |key, cls|
@@ -8,7 +8,7 @@ module Admin::SpreeEssentialsHelper
     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
+      link_to I18n.t('spree.admin.shared.contents_tab.content'), routes.first
     end
   end
   

data/app/models/spree/asset_decorator.rb

@@ -0,0 +1,7 @@
+::Spree::Asset.class_eval do
+  
+  def has_alt?
+    alt.present?
+  end
+
+end

data/app/models/{upload.rb → spree/upload.rb}

@@ -1,4 +1,4 @@
-class Upload < Asset
+class Spree::Upload < ::Spree::Asset
   
   default_scope where(:type => "Upload") if table_exists?
   

data/app/overrides/spree_essentials.rb

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

data/app/views/{admin → spree/admin}/shared/_contents_sub_menu.html.erb

@@ -3,6 +3,6 @@
     <% SpreeEssentials.essentials.each_pair do |name, cls| %>
       <%= tab *cls.sub_tab if defined?(cls.sub_tab) %>
     <% end %>
-    <%= tab :uploads, :label => 'admin.subnav.uploads' %>
+    <%= tab :uploads, :label => 'spree.admin.subnav.uploads' %>
   </ul>
 <% end %>

data/app/views/{admin → spree/admin}/uploads/edit.html.erb

@@ -1,4 +1,4 @@
-<%= render :partial => 'admin/shared/contents_sub_menu' %>
+<%= render :partial => "spree/admin/shared/contents_sub_menu" %>
 
 <h1><%= t('.edit_upload') %></h1>
 

data/app/views/{admin → spree/admin}/uploads/index.html.erb

@@ -1,4 +1,4 @@
-<%= render :partial => 'admin/shared/contents_sub_menu' %>
+<%= render :partial => "spree/admin/shared/contents_sub_menu" %>
 
 <h1><%= t('.listing_uploads') %></h1>
 

data/app/views/{admin → spree/admin}/uploads/new.html.erb

@@ -1,4 +1,4 @@
-<%= render :partial => 'admin/shared/contents_sub_menu' unless request.xhr? %>
+<%= render :partial => "spree/admin/shared/contents_sub_menu" unless request.xhr? %>
 
 <h3><%= t('.new_upload') %></h3>
 

data/config/locales/en.yml

@@ -8,6 +8,9 @@ en:
     parsed_with: Parsed With
 
   activerecord:
+    attributes:
+      order:
+        completed_at: Completed At
     errors:
       messages:
         invalid_date_time: is an invalid date.
@@ -17,25 +20,26 @@ en:
     file_name: File Name
     size: Size
   
-  admin:
-    shared:
-      contents_tab:
-        content: Content
-      
-    subnav:
-      uploads: Uploads      
-                
-    uploads:
-      new:
-        new_upload: New Upload
-      edit:
-        edit_upload: Edit Upload
-        preview: Preview
-        link: Link
-      index:
-        listing_uploads: Listing Uploads
-        new_upload: Upload a file
-
+  spree:
+    admin:
+      shared:
+        contents_tab:
+          content: Content
+        
+      subnav:
+        uploads: Uploads      
+                  
+      uploads:
+        new:
+          new_upload: New Upload
+        edit:
+          edit_upload: Edit Upload
+          preview: Preview
+          link: Link
+        index:
+          listing_uploads: Listing Uploads
+          new_upload: Upload a file
+    
   faker:
     lorem:
       words: [alias, consequatur, perferendis, voluptatem, accusantium, doloremque, aperiam, eaque, ipsa, quae, illo, inventore, veritatis, quasi, architecto, beatae, vitae, dicta, sunt, explicabo, aspernatur, aut, odit, aut, fugit, sed, quia, consequuntur, magni, dolores, eos, qui, ratione, voluptatem, sequi, nesciunt, neque, dolorem, ipsum, quia, dolor, sit, amet, consectetur, adipisci, velit, sed, quia, non, numquam, eius, modi, tempora, incidunt, ut, labore, et, dolore, magnam, aliquam, quaerat, voluptatem, ut, enim, ad, minima, veniam, quis, nostrum, exercitationem, ullam, corporis, nemo, enim, ipsam, voluptatem, quia, voluptas, sit, suscipit, laboriosam, nisi, ut, aliquid, ex, ea, commodi, consequatur, quis, autem, vel, eum, iure, reprehenderit, qui, in, ea, voluptate, velit, esse, quam, nihil, molestiae, et, iusto, odio, dignissimos, ducimus, qui, blanditiis, praesentium, laudantium, totam, rem, voluptatum, deleniti, atque, corrupti, quos, dolores, et, quas, molestias, excepturi, sint, occaecati, cupiditate, non, provident, sed, ut, perspiciatis, unde, omnis, iste, natus, error, similique, sunt, in, culpa, qui, officia, deserunt, mollitia, animi, id, est, laborum, et, dolorum, fuga, et, harum, quidem, rerum, facilis, est, et, expedita, distinctio, nam, libero, tempore, cum, soluta, nobis, est, eligendi, optio, cumque, nihil, impedit, quo, porro, quisquam, est, qui, minus, id, quod, maxime, placeat, facere, possimus, omnis, voluptas, assumenda, est, omnis, dolor, repellendus, temporibus, autem, quibusdam, et, aut, consequatur, vel, illum, qui, dolorem, eum, fugiat, quo, voluptas, nulla, pariatur, accusamus, officiis, debitis, aut, rerum, necessitatibus, saepe, eveniet, ut, et, voluptates, repudiandae, sint, molestiae, non, recusandae, itaque, earum, rerum, tenetur, sapiente, delectus, reiciendis, voluptatibus, maiores, doloribus, asperiores, repellat]

data/config/routes.rb

@@ -1,10 +1,6 @@
-Rails.application.routes.draw do
-  
-  namespace :admin do
-  
+Spree::Core::Engine.routes.draw do
+  namespace :admin do 
     post "/markdown/preview" => "markdown#preview"
-    resources :uploads
-    
-  end
-  
+    resources :uploads        
+  end  
 end

data/lib/generators/templates/db/migrate/add_attachment_file_size_to_assets.rb

@@ -1,9 +1,9 @@
 class AddAttachmentFileSizeToAssets < ActiveRecord::Migration
   def self.up
-    add_column :assets, :attachment_file_size, :integer
+    add_column :spree_assets, :attachment_file_size, :integer
   end
 
   def self.down
-    remove_column :assets, :attachment_file_size
+    remove_column :spree_assets, :attachment_file_size
   end
 end

data/lib/spree_essentials.rb

@@ -25,11 +25,7 @@ module SpreeEssentials
   class Engine < Rails::Engine
 
     config.autoload_paths += %W(#{config.root}/lib)
-    
-    initializer :assets do |config| 
-      Rails.application.config.assets.precompile += %w( markitup.css date.js jquery.autodate.js jquery.markitup.js markdown.set.js )
-    end
-    
+        
     config.to_prepare do
       #loads application's model / class decorators
       Dir.glob File.expand_path("../../app/**/*_decorator.rb", __FILE__) do |c|

data/lib/spree_essentials/test_helper.rb

@@ -1,8 +1,7 @@
-require 'rails/test_help'
-require 'shoulda'
-require 'factory_girl'
-require 'sqlite3'
-require 'faker'
+require "rails/test_help"
+require "shoulda"
+require "factory_girl"
+require "sqlite3"
 
 ActionMailer::Base.delivery_method    = :test
 ActionMailer::Base.perform_deliveries = true
@@ -22,8 +21,8 @@ Capybara.default_selector = :css
 class ActiveSupport::IntegrationCase < ActiveSupport::TestCase
   
   include Capybara::DSL
-  include Rails.application.routes.url_helpers
-  
+  include Spree::Core::Engine.routes.url_helpers
+
   
   # Extreme hax! wtf is this for anyways.. and why is it erroring?
   def testmail_admin_mail_method_url(*args)
@@ -39,7 +38,7 @@ class ActiveSupport::IntegrationCase < ActiveSupport::TestCase
   teardown do
     unless source.blank?
       matches = source.match(/translation[\s-]+missing[^"]*/) || []
-      assert_equal 0, matches.length, "Translation Missing! - #{matches[0]}"
+      assert_equal 0, matches.length, "** #{matches[0]}"
     end
   end
   

data/lib/spree_essentials/version.rb

@@ -1,3 +1,3 @@
 module SpreeEssentials
-  VERSION = "0.3.3"
+  VERSION = "0.4.0.rc1"
 end

metadata

@@ -1,30 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: spree_essentials
 version: !ruby/object:Gem::Version
-  version: 0.3.3
-  prerelease: 
+  version: 0.4.0.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Spencer Steffen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-21 00:00:00.000000000Z
+date: 2012-01-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: spree_core
-  requirement: &70123953835120 !ruby/object:Gem::Requirement
+  name: spree
+  requirement: &70184704119680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.70.0
+        version: 1.0.0.rc1
   type: :runtime
   prerelease: false
-  version_requirements: *70123953835120
+  version_requirements: *70184704119680
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70123953833680 !ruby/object:Gem::Requirement
+  requirement: &70184704118720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.8
   type: :runtime
   prerelease: false
-  version_requirements: *70123953833680
+  version_requirements: *70184704118720
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70123953823520 !ruby/object:Gem::Requirement
+  requirement: &70184704117940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 3.0.0.beta2
   type: :development
   prerelease: false
-  version_requirements: *70123953823520
+  version_requirements: *70184704117940
 - !ruby/object:Gem::Dependency
   name: dummier
-  requirement: &70123953822140 !ruby/object:Gem::Requirement
+  requirement: &70184704113180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.2.4
   type: :development
   prerelease: false
-  version_requirements: *70123953822140
+  version_requirements: *70184704113180
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70123953821420 !ruby/object:Gem::Requirement
+  requirement: &70184704112600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 2.3.2
   type: :development
   prerelease: false
-  version_requirements: *70123953821420
+  version_requirements: *70184704112600
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70123953820000 !ruby/object:Gem::Requirement
+  requirement: &70184704095680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 1.1.2
   type: :development
   prerelease: false
-  version_requirements: *70123953820000
+  version_requirements: *70184704095680
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70123953818660 !ruby/object:Gem::Requirement
+  requirement: &70184704094600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: 1.3.4
   type: :development
   prerelease: false
-  version_requirements: *70123953818660
+  version_requirements: *70184704094600
 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.
@@ -137,20 +137,20 @@ files:
 - 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/spree_essentials_helper.rb
-- app/models/image_decorator.rb
-- app/models/upload.rb
+- app/controllers/spree/admin/markdown_controller.rb
+- app/controllers/spree/admin/uploads_controller.rb
+- app/helpers/spree/admin/spree_essentials_helper.rb
+- app/models/spree/asset_decorator.rb
+- app/models/spree/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
-- app/views/admin/uploads/_form.html.erb
-- app/views/admin/uploads/edit.html.erb
-- app/views/admin/uploads/index.html.erb
-- app/views/admin/uploads/new.html.erb
-- app/views/admin/uploads/picker.html.erb
+- app/views/spree/admin/shared/_contents_sub_menu.html.erb
+- app/views/spree/admin/shared/_contents_tab.html.erb
+- app/views/spree/admin/uploads/_form.html.erb
+- app/views/spree/admin/uploads/edit.html.erb
+- app/views/spree/admin/uploads/index.html.erb
+- app/views/spree/admin/uploads/new.html.erb
+- app/views/spree/admin/uploads/picker.html.erb
 - Rakefile
 homepage: https://github.com/citrus/spree_essentials
 licenses: []
@@ -166,16 +166,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4082963416670233000
+      hash: 917132819264177002
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 4082963416670233000
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10

data/app/models/image_decorator.rb

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