spree_essentials 0.4.0 → 0.5.0.rc1

data/CHANGELOG.md

@@ -2,6 +2,18 @@
 Change Log
 ------------------------------------------------------------------------------
 
+**0.50.0.rc1 - 2012/4/11**
+
+* Spree 1.1.x compatibility
+
+
+**0.40.0 - 2012/4/11**
+
+* Add Italian translation - (@iloveitaly)
+* Add Russian translation - (@shaggyone)
+* Release v0.40.0
+
+
 **0.40.0.rc3 - 2012/3/7**
 
 * Normalize upload attachment location

data/README.md

@@ -25,7 +25,10 @@ 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:
     
-```ruby  
+```ruby
+# Spree 1.1.x
+gem 'spree_essentials', '~> 0.5.0.rc1'
+
 # Spree 1.0.x
 gem 'spree_essentials', '~> 0.4.0'
 
@@ -164,7 +167,7 @@ That's all there is to it!
 Notes
 ------------------------------------------------------------------------------
 
-Spree Essentials is under constant development... Development is being done on OSX with Ruby 1.9.3 and usually the latest version of Spree. (currently 1.0.1)
+Spree Essentials is under constant development... Development is being done on OSX with Ruby 1.9.3 and usually the latest version of Spree. (currently 1.1.0.rc1)
 
 Please let me know if you find any bugs or have feature requests you'd like to see. 
 
@@ -212,6 +215,11 @@ To Do
 Change Log
 ------------------------------------------------------------------------------
 
+**0.50.0.rc1 - 2012/4/11**
+
+* Spree 1.1.x compatibility
+
+
 **0.40.0 - 2012/4/11**
 
 * Add Italian translation - (@iloveitaly)
@@ -263,7 +271,10 @@ Change Log
 Contributors
 ------------------------------------------------------------------------------
 
-So far it's just me; Spencer Steffen. 
+* Spencer Steffen ([@citrus](https://github.com/citrus))
+* Michael Bianco ([@iloveitaly](https://github.com/iloveitaly))
+* Victor Zagorski ([@shaggyone](https://github.com/shaggyone))
+
 
 If you'd like to help out feel free to fork and send me pull requests!
 

data/Versionfile

@@ -1,3 +1,4 @@
+"1.1.x"  => { :version => "0.5.0.rc1" }
 "1.0.x"  => { :version => "0.4.0" }
 "0.70.x" => { :version => "0.3.2" }
 "0.60.x" => { :version => "0.2.3" }

data/app/controllers/spree/admin/uploads_controller.rb

@@ -7,10 +7,10 @@ class Spree::Admin::UploadsController < Spree::Admin::ResourceController
   private
   
     def collection
-      params[:search] ||= {}
-      params[:search][:meta_sort] ||= "created_at.desc"
-      @search = Spree::Upload.metasearch(params[:search])
-      @collection = @search.page(params[:page]).per(Spree::Config[:orders_per_page])
+      params[:q] ||= {}
+      params[:q][:sort] ||= "created_at.desc"
+      @search = Spree::Upload.search(params[:q])
+      @collection = @search.result.page(params[:page]).per(Spree::Config[:orders_per_page])
     end
 
 end

data/app/models/spree/upload.rb

@@ -1,5 +1,7 @@
 class Spree::Upload < ::Spree::Asset
   
+  attr_accessible :attachment, :alt
+  
   default_scope where(:type => "Upload") if table_exists?
   
   validate :no_attachement_errors

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

@@ -32,6 +32,21 @@
 
 <%= paginate @uploads %>
 
+
+<% content_for :sidebar do %>
+
+<div class="box">
+  <h3><%= t(:search) %></h3>
+  <%= search_form_for [ :admin, @search ] do |f| %>
+    <p>
+      <%= f.label :alt_cont, t("description") %><br />
+      <%= f.text_field :alt_cont, :size => 25 %>
+    </p>
+    <p><%= button t("search") %></p>
+  <% end %>
+</div>
+<% end %>
+
 <div id="images"></div>
 <br/>
 <p>

data/config/locales/en.yml

@@ -19,6 +19,10 @@ en:
     model_name: Upload
     file_name: File Name
     size: Size
+    
+  # spree hack  
+  first_name_start: "First Name starts with"
+  last_name_start: "Last Name starts with"
   
   spree:
     admin:
@@ -39,7 +43,3 @@ en:
         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/locales/it.yml

@@ -38,7 +38,3 @@ it:
         index:
           listing_uploads: Elenco allegati
           new_upload: Carica un 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/lib/spree_essentials/version.rb

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

data/spree_essentials.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency('spree_core',  '~> 1.0.0')
+  s.add_runtime_dependency('spree_core',  '~> 1.1.0.rc1')
   s.add_runtime_dependency('rdiscount',   '~> 1.6.8')
 
   s.add_development_dependency('shoulda',      '~> 3.0.0')

data/test/integration/spree/admin/upload_integration_test.rb

@@ -56,7 +56,7 @@ class Spree::Admin::UploadIntegrationTest < SpreeEssentials::IntegrationCase
     should "display the index" do
       visit spree.admin_uploads_path
       assert has_link?("1.png", :href => @upload.attachment.url(:original))
-      assert_seen "Just an image!", :within => "tr#spree_upload_#{@upload.id}"
+      assert_seen "Just an image!", :within => "tr#upload_#{@upload.id}"
       within "td.actions" do
         assert find("a.icon_link").native.attribute("href").include?(spree.edit_admin_upload_path(@upload))
         assert has_selector?("a[href='#']")
@@ -65,7 +65,7 @@ class Spree::Admin::UploadIntegrationTest < SpreeEssentials::IntegrationCase
     
     should "edit the upload" do
       visit spree.edit_admin_upload_path(@upload)
-      assert_seen "Preview", :within => ".edit_spree_upload p b"
+      assert_seen "Preview", :within => ".edit_upload p b"
       assert has_xpath?("//img[@src='#{@upload.attachment.url(:small)}']")
       attach_file "Attachment", @image2
       fill_in "Description", :with => "Just another image"

data/test/spree_essential_example/app/models/spree/example.rb

@@ -1,2 +1,5 @@
 class Spree::Example < ActiveRecord::Base
+
+  attr_accessible :title, :body
+  
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: spree_essentials
 version: !ruby/object:Gem::Version
-  version: 0.4.0
-  prerelease: 
+  version: 0.5.0.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Spencer Steffen
@@ -13,18 +13,18 @@ date: 2012-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
-  requirement: &70211538537700 !ruby/object:Gem::Requirement
+  requirement: &70113426359420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0.rc1
   type: :runtime
   prerelease: false
-  version_requirements: *70211538537700
+  version_requirements: *70113426359420
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70211538537140 !ruby/object:Gem::Requirement
+  requirement: &70113426358360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.8
   type: :runtime
   prerelease: false
-  version_requirements: *70211538537140
+  version_requirements: *70113426358360
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70211538536560 !ruby/object:Gem::Requirement
+  requirement: &70113426373740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *70211538536560
+  version_requirements: *70113426373740
 - !ruby/object:Gem::Dependency
   name: dummier
-  requirement: &70211538535980 !ruby/object:Gem::Requirement
+  requirement: &70113426373240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.3.0
   type: :development
   prerelease: false
-  version_requirements: *70211538535980
+  version_requirements: *70113426373240
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70211538535400 !ruby/object:Gem::Requirement
+  requirement: &70113426372760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70211538535400
+  version_requirements: *70113426372760
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70211538534800 !ruby/object:Gem::Requirement
+  requirement: &70113426372040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.1.2
   type: :development
   prerelease: false
-  version_requirements: *70211538534800
+  version_requirements: *70113426372040
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70211538533740 !ruby/object:Gem::Requirement
+  requirement: &70113426371080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.3.4
   type: :development
   prerelease: false
-  version_requirements: *70211538533740
+  version_requirements: *70113426371080
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70211538532140 !ruby/object:Gem::Requirement
+  requirement: &70113426370380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,7 +98,7 @@ dependencies:
         version: 0.6.1
   type: :development
   prerelease: false
-  version_requirements: *70211538532140
+  version_requirements: *70113426370380
 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.
@@ -232,16 +232,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4076361323675622024
+      hash: -3957380634603286502
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -4076361323675622024
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.17