spree_core 1.0.0.rc1 → 1.0.0.rc2

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "1.0.0.rc1"
+    "1.0.0.rc2"
   end
 end

data/lib/spree/product_filters.rb

@@ -46,7 +46,9 @@ module Spree
   # happen until Taxon class is loaded. Ensure that Taxon class is loaded before
   # you try something like Product.price_range_any
   module ProductFilters
-
+    extend ActionView::Helpers::NumberHelper
+    extend Spree::BaseHelper
+    
     # Example: filtering by price
     #   The named scope just maps incoming labels onto their conditions, and builds the conjunction
     #   'price' is in the base scope's context (ie, "select foo from products where ...") so
@@ -63,12 +65,12 @@ module Spree
       }
 
     def ProductFilters.price_filter
-      conds = [ [ "Under $10",    "price             <= 10" ],
-                [ "$10 - $15",    "price between 10 and 15" ],
-                [ "$15 - $18",    "price between 15 and 18" ],
-                [ "$18 - $20",    "price between 18 and 20" ],
-                [ "$20 or over",  "price             >= 20" ] ]
-      { :name   => "Price Range",
+      conds = [ [ "Under #{format_price(10)}",                 "price             <= 10" ],
+                [ "#{format_price(10)} - #{format_price(15)}", "price between 10 and 15" ],
+                [ "#{format_price(15)} - #{format_price(18)}", "price between 15 and 18" ],
+                [ "#{format_price(18)} - #{format_price(20)}", "price between 18 and 20" ],
+                [ "#{format_price(20)} or over",               "price             >= 20" ] ]
+      { :name   => I18n.t(:price_range),
         :scope  => :price_range_any,
         :conds  => Hash[*conds.flatten],
         :labels => conds.map {|k,v| [k,k]}

metadata

@@ -1,265 +1,171 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: spree_core
-version: !ruby/object:Gem::Version 
-  hash: 15424055
+version: !ruby/object:Gem::Version
+  version: 1.0.0.rc2
   prerelease: 6
-  segments: 
-  - 1
-  - 0
-  - 0
-  - rc
-  - 1
-  version: 1.0.0.rc1
 platform: ruby
-authors: 
+authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-23 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 0
-        - 1
-        - 4
-        version: 0.1.4
-  requirement: *id001
-  type: :runtime
-  prerelease: false
+date: 2012-01-14 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: acts_as_list
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &70152003681720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 6
-        - 8
-        version: 1.6.8
-  requirement: *id002
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 0.1.4
   type: :runtime
   prerelease: false
+  version_requirements: *70152003681720
+- !ruby/object:Gem::Dependency
   name: nested_set
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 1
-        - 1
-        version: 0.1.1
-  requirement: *id003
-  type: :runtime
-  prerelease: false
-  name: rd_find_by_param
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &70152003680940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 51
-        segments: 
-        - 1
-        - 0
-        - 18
-        version: 1.0.18
-  requirement: *id004
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 1.6.8
   type: :runtime
   prerelease: false
+  version_requirements: *70152003680940
+- !ruby/object:Gem::Dependency
   name: jquery-rails
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &70152003680160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 6
-        - 2
-        version: 1.6.2
-  requirement: *id005
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.18
+    - - <=
+      - !ruby/object:Gem::Version
+        version: 1.0.19
   type: :runtime
   prerelease: false
+  version_requirements: *70152003680160
+- !ruby/object:Gem::Dependency
   name: highline
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: &70152003678860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 1
-        - 0
-        version: 1.1.0
-  requirement: *id006
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 1.6.8
   type: :runtime
   prerelease: false
+  version_requirements: *70152003678860
+- !ruby/object:Gem::Dependency
   name: state_machine
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: &70152003678180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 61
-        segments: 
-        - 1
-        - 10
-        - 1
-        version: 1.10.1
-  requirement: *id007
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 1.1.1
   type: :runtime
   prerelease: false
+  version_requirements: *70152003678180
+- !ruby/object:Gem::Dependency
   name: ffaker
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  requirement: &70152003677480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 2
-        - 4
-        - 1
-        version: 2.4.1
-  requirement: *id008
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.12.0
   type: :runtime
   prerelease: false
+  version_requirements: *70152003677480
+- !ruby/object:Gem::Dependency
   name: paperclip
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  requirement: &70152003676860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 1
-        - 1
-        - 1
-        version: 1.1.1
-  requirement: *id009
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 2.4.1
   type: :runtime
   prerelease: false
+  version_requirements: *70152003676860
+- !ruby/object:Gem::Dependency
   name: meta_search
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  requirement: &70152003676300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 83
-        segments: 
-        - 1
-        - 17
-        - 0
-        version: 1.17.0
-  requirement: *id010
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 1.1.1
   type: :runtime
   prerelease: false
+  version_requirements: *70152003676300
+- !ruby/object:Gem::Dependency
   name: activemerchant
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  requirement: &70152003675740 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 1.20.1
+  type: :runtime
+  prerelease: false
+  version_requirements: *70152003675740
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: &70152003675120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 3
-        - 1
-        - 1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.1.1
     - - <=
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 3
-        - 1
-        - 3
+      - !ruby/object:Gem::Version
         version: 3.1.3
-  requirement: *id011
   type: :runtime
   prerelease: false
-  name: rails
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: *70152003675120
+- !ruby/object:Gem::Dependency
+  name: kaminari
+  requirement: &70152003673840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 0
-        - 13
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.13.0
-  requirement: *id012
   type: :runtime
   prerelease: false
-  name: kaminari
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id013 !ruby/object:Gem::Requirement 
+  version_requirements: *70152003673840
+- !ruby/object:Gem::Dependency
+  name: deface
+  requirement: &70152003673080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 7
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.7.2
-  requirement: *id013
   type: :runtime
   prerelease: false
-  name: deface
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id014 !ruby/object:Gem::Requirement 
+  version_requirements: *70152003673080
+- !ruby/object:Gem::Dependency
+  name: stringex
+  requirement: &70152003672340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 3
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.3.0
-  requirement: *id014
   type: :runtime
   prerelease: false
-  name: stringex
+  version_requirements: *70152003672340
 description: Required dependency for Spree
-email: sean@railsdog.com
+email: sean@spreecommerce.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - LICENSE
 - README.md
 - app/assets/images/admin/bg/active-tab.png
@@ -366,6 +272,7 @@ files:
 - app/assets/javascripts/admin/orders/edit_form.js
 - app/assets/javascripts/admin/payments/new.js
 - app/assets/javascripts/admin/products.js
+- app/assets/javascripts/admin/shipping_methods.js
 - app/assets/javascripts/admin/spree_core.js
 - app/assets/javascripts/admin/taxonomy.js
 - app/assets/javascripts/admin/underscore-min.js
@@ -756,26 +663,13 @@ files:
 - lib/generators/spree/dummy/templates/rails/boot.rb
 - lib/generators/spree/dummy/templates/rails/database.yml
 - lib/generators/spree/dummy/templates/rails/routes.rb
-- lib/generators/spree/extension/extension_generator.rb
-- lib/generators/spree/extension/templates/app/assets/javascripts/admin/%file_name%.js
-- lib/generators/spree/extension/templates/app/assets/javascripts/store/%file_name%.js
-- lib/generators/spree/extension/templates/app/assets/stylesheets/admin/%file_name%.css
-- lib/generators/spree/extension/templates/app/assets/stylesheets/store/%file_name%.css
-- lib/generators/spree/extension/templates/config/locales/en.yml
-- lib/generators/spree/extension/templates/config/routes.rb
-- lib/generators/spree/extension/templates/extension.gemspec
-- lib/generators/spree/extension/templates/Gemfile
-- lib/generators/spree/extension/templates/gitignore
-- lib/generators/spree/extension/templates/lib/%file_name%/engine.rb.tt
-- lib/generators/spree/extension/templates/lib/%file_name%.rb.tt
-- lib/generators/spree/extension/templates/lib/generators/%file_name%/install/install_generator.rb.tt
-- lib/generators/spree/extension/templates/LICENSE
-- lib/generators/spree/extension/templates/Rakefile
-- lib/generators/spree/extension/templates/README.md
-- lib/generators/spree/extension/templates/rspec
-- lib/generators/spree/extension/templates/script/rails.tt
-- lib/generators/spree/extension/templates/spec/spec_helper.rb.tt
-- lib/generators/spree/extension/templates/Versionfile
+- lib/generators/spree/dummy/templates/rails/script/rails
+- lib/generators/spree/install/install_generator.rb
+- lib/generators/spree/install/templates/app/assets/javascripts/admin/all.js
+- lib/generators/spree/install/templates/app/assets/javascripts/store/all.js
+- lib/generators/spree/install/templates/app/assets/stylesheets/admin/all.css
+- lib/generators/spree/install/templates/app/assets/stylesheets/store/all.css
+- lib/generators/spree/install/templates/config/initializers/spree.rb
 - lib/generators/spree/sandbox/sandbox_generator.rb
 - lib/generators/spree/sandbox/templates/rails/routes.rb
 - lib/spree/core/action_callbacks.rb
@@ -953,6 +847,8 @@ files:
 - db/migrate/20111216154844_add_inc_tax_to_tax_rates.rb
 - db/migrate/20111219203242_rename_inc_price_attribute.rb
 - db/migrate/20111219205902_add_default_tax_zone.rb
+- db/migrate/20120105193911_associate_shipping_methods_and_shipping_categories.rb
+- db/migrate/20120105195817_add_match_rules_to_shipping_methods.rb
 - db/sample/users.rb
 - db/seeds.rb
 - vendor/assets/images/datepicker/cal.gif
@@ -1030,35 +926,23 @@ files:
 - vendor/assets/stylesheets/jquery-ui.datepicker.css.erb
 homepage: http://spreecommerce.com
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 57
-      segments: 
-      - 1
-      - 8
-      - 7
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
       version: 1.3.1
-requirements: 
+requirements:
 - none
 rubyforge_project: spree_core
 rubygems_version: 1.8.10
@@ -1066,4 +950,3 @@ signing_key:
 specification_version: 3
 summary: Core e-commerce functionality for the Spree project.
 test_files: []
-