spree_core 0.70.5 → 0.70.6

data/app/models/product.rb

@@ -71,36 +71,37 @@ class Product < ActiveRecord::Base
 
   alias :options :product_option_types
 
-  include ::Scopes::Product
+  cattr_accessor :search_scopes do
+    []
+  end
 
-  #RAILS3 TODO -  scopes are duplicated here and in scopes/product.rb - can we DRY it up?
-  # default product scope only lists available and non-deleted products
-  class << self
-    def not_deleted
-      where(Product.arel_table[:deleted_at].eq(nil))
-    end
+  def self.add_search_scope(name, &block)
+    define_singleton_method name.intern, &block
+    search_scopes << name.intern
+  end
 
-    def available(available_on = nil)
-      where(Product.arel_table[:available_on].lteq(available_on || Time.zone.now ))
-    end
+  include ::Scopes::Product
 
-    #RAILS 3 TODO - this scope doesn't match the original 2.3.x version, needs attention (but it works)
-    def active
-      not_deleted.available
-    end
+  add_search_scope :not_deleted do
+    where("products.deleted_at is NULL")
+  end
 
-    def on_hand
-      where(Product.arel_table[:count_on_hand].gteq(0))
-    end
+  add_search_scope :available do |*on|
+    where("products.available_on <= ?", on.first || Time.zone.now)
+  end
 
-    def id_equals(input_id)
-      where(Product.arel_table[:id].eq(input_id))
-    end
+  add_search_scope :active do
+    not_deleted.available
+  end
 
-    def taxons_name_eq(name)
-      joins(:taxons).where(Taxon.arel_table[:name].eq(name))
-    end
+  add_search_scope :on_hand do
+    where("products.count_on_hand > 0")
+  end
+
+  add_search_scope :taxons_name_eq do |name|
+    joins(:taxons).where(Taxon.arel_table[:name].eq(name))
   end
+
   if (ActiveRecord::Base.connection.adapter_name == 'PostgreSQL')
     if Product.table_exists?
       scope :group_by_products_id, { :group => Product.column_names.map{|col_name| "#{Product.table_name}.#{col_name}"} }
@@ -108,8 +109,17 @@ class Product < ActiveRecord::Base
   else
     scope :group_by_products_id, { :group => "#{Product.table_name}.id" }
   end
+  search_scopes << :group_by_products_id
   search_methods :group_by_products_id
 
+  add_search_scope :id_equals do |input_id|
+    where("products.id = ?", input_id)
+  end
+
+  add_search_scope :taxons_name_eq do |name|
+    joins(:taxons).where("taxons.name = ?", name)
+  end
+
   # ----------------------------------------------------------------------------------------------------------
   #
   # The following methods are deprecated and will be removed in a future version of Spree

data/app/models/product_group.rb

@@ -90,10 +90,14 @@ class ProductGroup < ActiveRecord::Base
   end
 
   def add_scope(scope_name, arguments=[])
-    self.product_scopes << ProductScope.new({
-        :name => scope_name.to_s,
-        :arguments => [*arguments]
-      })
+    if Product.search_scopes.include?(scope_name)
+      self.product_scopes << ProductScope.new({
+          :name => scope_name.to_s,
+          :arguments => [*arguments]
+        })
+    else
+      raise ArgumentError.new("'#{scope_name}` can't be used as scope")
+    end
     self
   end
 

data/lib/product_filters.rb

@@ -58,15 +58,20 @@ module ProductFilters
   Product.scope :price_range_any,
     lambda {|*opts|
       conds = opts.map {|o| ProductFilters.price_filter[:conds][o]}.reject {|c| c.nil?}
-      Product.scoped(:joins => :master).conditions_any(conds)
+      scope = conds.shift
+      conds.each do |new_scope|
+        scope = scope.or(new_scope)
+      end
+      Product.scoped(:joins => :master).where(scope)
     }
 
   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" ] ]
+    v = Spree::Variant.arel_table
+    conds = [ [ I18n.t(:under_price, :price => format_price(10))   , v[:price].lteq(10)],
+              [ "#{format_price(10)} - #{format_price(15)}"        , v[:price].in(10..15)],
+              [ "#{format_price(15)} - #{format_price(18)}"        , v[:price].in(15..18)],
+              [ "#{format_price(18)} - #{format_price(20)}"        , v[:price].in(18..20)],
+              [ I18n.t(:or_over_price, :price => format_price(20)) , v[:price].gteq(20)]]
     { :name   => "Price Range",
       :scope  => :price_range_any,
       :conds  => Hash[*conds.flatten],
@@ -92,12 +97,17 @@ module ProductFilters
     Product.scope :brand_any,
       lambda {|*opts|
         conds = opts.map {|o| ProductFilters.brand_filter[:conds][o]}.reject {|c| c.nil?}
-        Product.with_property("brand").conditions_any(conds)
+        scope = conds.shift
+        conds.each do |new_scope|
+          scope = scope.or(new_scope)
+        end
+        Product.with_property("brand").where(scope)
       }
 
     def ProductFilters.brand_filter
       brands = ProductProperty.where(:property_id => @@brand_property).map(&:value).compact.uniq
-      conds  = Hash[*brands.map {|b| [b, "product_properties.value = '#{b}'"]}.flatten]
+      pp = Spree::ProductProperty.arel_table
+      conds  = Hash[*brands.map {|b| [b, pp.value.eq(b)]}.flatten]
       { :name   => "Brands",
         :scope  => :brand_any,
         :conds  => conds,

data/lib/scopes/product.rb

@@ -48,11 +48,16 @@ module Scopes::Product
     order_text << ((r[1] == 'ascend') ?  "asc" : "desc")
 
     Product.send(:scope, name.to_s, Product.send(:relation).order(order_text) )
+    Product.search_scopes << name.intern
   end
 
-  ::Product.scope :ascend_by_master_price, Product.joins(:variants_with_only_master).order("#{Variant.table_name}.price asc")
+  ::Product.add_search_scope :ascend_by_master_price do
+    joins(:variants_with_only_master).order('variants.price asc')
+  end
 
-  ::Product.scope :descend_by_master_price, Product.joins(:variants_with_only_master).order("#{Variant.table_name}.price desc")
+  ::Product.add_search_scope :descend_by_master_price do
+    joins(:variants_with_only_master).order('variants.price desc')
+  end
 
   ATTRIBUTE_HELPER_METHODS = {
     :with_ids => :product_picker_field
@@ -60,105 +65,99 @@ module Scopes::Product
 
   # Ryan Bates - http://railscasts.com/episodes/112
   # general merging of conditions, names following the searchlogic pattern
-  ::Product.scope :conditions, lambda { |*args| {:conditions => args}}
+  ::Product.add_search_scope :conditions do |*args|
+    where(args)
+  end
 
-  # conditions_all is a more descriptively named enhancement of the above
-  ::Product.scope :conditions_all, lambda { |*args| {:conditions => [args].flatten}}
+  ::Product.add_search_scope :conditions_all do |*args|
+    where([args].flatten)
+  end
 
   # forming the disjunction of a list of conditions (as strings)
-  ::Product.scope :conditions_any, lambda { |*args|
+  ::Product.add_search_scope :conditions_any do |*args|
     args = [args].flatten
     raise "non-strings in conditions_any" unless args.all? {|s| s.is_a? String}
-    {:conditions => args.map {|c| "(#{c})"}.join(" OR ")}
-  }
+    where(args.map {|c| "(#{c})"}.join(" OR "))
+  end
 
 
-  ::Product.scope :price_between, lambda { |low, high|
-    { :joins => :master, :conditions => ["#{Variant.table_name}.price BETWEEN ? AND ?", low, high] }
-  }
-
-  ::Product.scope :master_price_lte, lambda { |price|
-    { :joins => :master, :conditions => ["#{Variant.table_name}.price <= ?", price] }
-  }
+  ::Product.add_search_scope :price_between do |low, high|
+    joins(:master).where("variants.price" => (low.to_f)..(high.to_f))
+  end
 
-  ::Product.scope :master_price_gte, lambda { |price|
-    { :joins => :master, :conditions => ["#{Variant.table_name}.price >= ?", price] }
-  }
+  ::Product.add_search_scope :master_price_lte do |price|
+    joins(:master).where("variants.price <= ?", price)
+  end
 
+  ::Product.add_search_scope :master_price_gte do |price|
+    joins(:master).where("variants.price >= ?", price)
+  end
 
   # This scope selects products in taxon AND all its descendants
   # If you need products only within one taxon use
   #
   #   Product.taxons_id_eq(x)
   #
-  ::Product.scope :in_taxon, lambda {|taxon|
-    { :joins => :taxons, :conditions => ["#{Taxon.table_name}.id IN (?) ", taxon.self_and_descendants.map(&:id)]}
-  }
+  ::Product.add_search_scope :in_taxon do |taxon|
+    joins(:taxons).where("taxons.id" => taxon.self_and_descendants.map(&:id))
+  end
 
   # This scope selects products in all taxons AND all its descendants
   # If you need products only within one taxon use
   #
   #   Product.taxons_id_eq([x,y])
   #
-  Product.scope :in_taxons, lambda {|*taxons|
+  ::Product.add_search_scope :in_taxons do |*taxons|
     taxons = get_taxons(taxons)
-    taxons.first ? prepare_taxon_conditions(taxons) : {}
-  }
+    taxons.first ? prepare_taxon_conditions(taxons) : scoped
+  end
 
   # for quick access to products in a group, WITHOUT using the association mechanism
-  Product.scope :in_cached_group, lambda {|product_group|
-    { :joins => "JOIN product_groups_products ON products.id = product_groups_products.product_id",
-      :conditions => ["product_groups_products.product_group_id = ?", product_group]
-    }
-  }
+  Product.add_search_scope :in_cached_group do |product_group|
+    joins("JOIN product_groups_products ON products.id = product_groups_products.product_id").
+    where(["product_groups_products.product_group_id = ?", product_group])
+  end
 
 
   # a scope that finds all products having property specified by name, object or id
-  Product.scope :with_property, lambda {|property|
+  Product.add_search_scope :with_property do |property|
     conditions = case property
     when String   then ["properties.name = ?", property]
     when Property then ["properties.id = ?", property.id]
     else               ["properties.id = ?", property.to_i]
     end
 
-    {
-      :joins => :properties,
-      :conditions => conditions
-    }
-  }
+    joins(:properties).
+    where(conditions)
+  end
 
   # a scope that finds all products having an option_type specified by name, object or id
-  Product.scope :with_option, lambda {|option|
+  Product.add_search_scope :with_option do |option|
     conditions = case option
     when String     then ["option_types.name = ?", option]
     when OptionType then ["option_types.id = ?",   option.id]
     else                 ["option_types.id = ?",   option.to_i]
     end
 
-    {
-      :joins => :option_types,
-      :conditions => conditions
-    }
-  }
+    joins(:option_types).
+    where(conditions)
+  end
 
   # a simple test for product with a certain property-value pairing
   # note that it can test for properties with NULL values, but not for absent values
-  Product.scope :with_property_value, lambda { |property, value|
+  Product.add_search_scope :with_property_value do |property, value|
     conditions = case property
     when String   then ["properties.name = ?", property]
     when Property then ["properties.id = ?", property.id]
     else               ["properties.id = ?", property.to_i]
     end
     conditions = ["product_properties.value = ? AND #{conditions[0]}", value, conditions[1]]
-
-    {
-      :joins => :properties,
-      :conditions => conditions
-    }
-  }
+    joins(:properties).
+    where(conditions)
+  end
 
   # a scope that finds all products having an option value specified by name, object or id
-  Product.scope :with_option_value, lambda {|option, value|
+  Product.add_search_scope :with_option_value do |option, value|
     option_type_id = case option
     when String
       option_type = OptionType.find_by_name(option) || option.to_i
@@ -172,36 +171,32 @@ module Scopes::Product
       value, option_type_id
     ]
 
-    {
-      :joins => {:variants => :option_values},
-      :conditions => conditions
-    }
-  }
+    joins(:variants => :option_values).
+    where(conditions)
+  end
 
   # finds product having option value OR product_property
-  Product.scope :with, lambda{|value|
-    {
-      :conditions => ["option_values.name = ? OR product_properties.value = ?", value, value],
-      :joins => {:variants => :option_values, :product_properties => []}
-    }
-  }
+  Product.add_search_scope :with do |value|
+    joins(:product_properties, :variants => :option_values).
+    where("option_values.name = ? OR product_properties.value = ?", value, value)
+  end
 
-  Product.scope :in_name, lambda{|words|
+  Product.add_search_scope :in_name do |words|
     Product.like_any([:name], prepare_words(words))
-  }
+  end
 
-  Product.scope :in_name_or_keywords, lambda{|words|
+  Product.add_search_scope :in_name_or_keywords do |words|
     Product.like_any([:name, :meta_keywords], prepare_words(words))
-  }
+  end
 
-  Product.scope :in_name_or_description, lambda{|words|
+  Product.add_search_scope :in_name_or_description do |words|
     Product.like_any([:name, :description, :meta_description, :meta_keywords], prepare_words(words))
-  }
+  end
 
-  Product.scope :with_ids, lambda{|ids|
+  Product.add_search_scope :with_ids do |ids|
     ids = ids.split(',') if ids.is_a?(String)
-    { :conditions => {:id => ids} }
-  }
+    where(:id => ids)
+  end
 
   # Sorts products from most popular (poularity is extracted from how many
   # times use has put product in cart, not completed orders)
@@ -211,7 +206,7 @@ module Scopes::Product
   #
   # :joins => "LEFT OUTER JOIN (SELECT line_items.variant_id as vid, COUNT(*) as cnt FROM line_items GROUP BY line_items.variant_id) AS popularity_count ON variants.id = vid",
   # :order => 'COALESCE(cnt, 0) DESC'
-  Product.scope :descend_by_popularity,
+  Product.add_search_scope :descend_by_popularity do
     {
       :joins => :master,
       :order => <<SQL
@@ -229,10 +224,11 @@ module Scopes::Product
          ), 0) DESC
 SQL
     }
+  end
 
   # Produce an array of keywords for use in scopes.
   # Always return array with at least an empty string to avoid SQL errors
-  def self.prepare_words(words)
+  def Product.prepare_words(words)
     return [''] if words.blank?
     a = words.split(/[,\s]/).map(&:strip)
     a.any? ? a : ['']
@@ -244,7 +240,7 @@ SQL
     end
   end
 
-  def self.get_taxons(*ids_or_records_or_names)
+  def Product.get_taxons(*ids_or_records_or_names)
     ids_or_records_or_names.flatten.map { |t|
       case t
       when Integer then Taxon.find_by_id(t)
@@ -259,8 +255,8 @@ SQL
   end
 
   # specifically avoid having an order for taxon search (conflicts with main order)
-  def self.prepare_taxon_conditions(taxons)
+  def Product.prepare_taxon_conditions(taxons)
     ids = taxons.map{|taxon| taxon.self_and_descendants.map(&:id)}.flatten.uniq
-    { :joins => :taxons, :conditions => ["taxons.id IN (?)", ids] }
+    joins(:taxons).where("taxons.id" => ids)
   end
 end

data/lib/spree_core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "0.70.5"
+    "0.70.6"
   end
 end

metadata

@@ -1,190 +1,277 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: spree_core
-version: !ruby/object:Gem::Version
-  version: 0.70.5
+version: !ruby/object:Gem::Version 
+  hash: 267
   prerelease: 
+  segments: 
+  - 0
+  - 70
+  - 6
+  version: 0.70.6
 platform: ruby
-authors:
+authors: 
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-12 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: acts_as_list
-  requirement: &70367143666360 !ruby/object:Gem::Requirement
+
+date: 2012-07-05 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 0
+        - 1
+        - 4
         version: 0.1.4
+  requirement: *id001
   type: :runtime
   prerelease: false
-  version_requirements: *70367143666360
-- !ruby/object:Gem::Dependency
-  name: nested_set
-  requirement: &70367143738880 !ruby/object:Gem::Requirement
+  name: acts_as_list
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 1
+        - 6
+        - 8
         version: 1.6.8
+  requirement: *id002
   type: :runtime
   prerelease: false
-  version_requirements: *70367143738880
-- !ruby/object:Gem::Dependency
-  name: rd_find_by_param
-  requirement: &70367143737900 !ruby/object:Gem::Requirement
+  name: nested_set
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 1
+        - 1
         version: 0.1.1
+  requirement: *id003
   type: :runtime
   prerelease: false
-  version_requirements: *70367143737900
-- !ruby/object:Gem::Dependency
-  name: jquery-rails
-  requirement: &70367143736620 !ruby/object:Gem::Requirement
+  name: rd_find_by_param
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 0
+        - 14
         version: 1.0.14
+  requirement: *id004
   type: :runtime
   prerelease: false
-  version_requirements: *70367143736620
-- !ruby/object:Gem::Dependency
-  name: highline
-  requirement: &70367143735040 !ruby/object:Gem::Requirement
+  name: jquery-rails
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 6
+        - 2
         version: 1.6.2
+  requirement: *id005
   type: :runtime
   prerelease: false
-  version_requirements: *70367143735040
-- !ruby/object:Gem::Dependency
-  name: stringex
-  requirement: &70367143733400 !ruby/object:Gem::Requirement
+  name: highline
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 1
+        - 3
+        - 0
         version: 1.3.0
+  requirement: *id006
   type: :runtime
   prerelease: false
-  version_requirements: *70367143733400
-- !ruby/object:Gem::Dependency
-  name: state_machine
-  requirement: &70367143757160 !ruby/object:Gem::Requirement
+  name: stringex
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 1
+        - 0
+        - 1
         version: 1.0.1
+  requirement: *id007
   type: :runtime
   prerelease: false
-  version_requirements: *70367143757160
-- !ruby/object:Gem::Dependency
-  name: faker
-  requirement: &70367143754240 !ruby/object:Gem::Requirement
+  name: state_machine
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
+  requirement: *id008
   type: :runtime
   prerelease: false
-  version_requirements: *70367143754240
-- !ruby/object:Gem::Dependency
-  name: paperclip
-  requirement: &70367143752740 !ruby/object:Gem::Requirement
+  name: faker
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 2
+        - 5
+        - 0
         version: 2.5.0
+  requirement: *id009
   type: :runtime
   prerelease: false
-  version_requirements: *70367143752740
-- !ruby/object:Gem::Dependency
-  name: rd_resource_controller
-  requirement: &70367143750960 !ruby/object:Gem::Requirement
+  name: paperclip
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id010
   type: :runtime
   prerelease: false
-  version_requirements: *70367143750960
-- !ruby/object:Gem::Dependency
-  name: meta_search
-  requirement: &70367143774920 !ruby/object:Gem::Requirement
+  name: rd_resource_controller
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 1
+        - 1
+        - 1
         version: 1.1.1
+  requirement: *id011
   type: :runtime
   prerelease: false
-  version_requirements: *70367143774920
-- !ruby/object:Gem::Dependency
-  name: activemerchant
-  requirement: &70367143773260 !ruby/object:Gem::Requirement
+  name: meta_search
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 83
+        segments: 
+        - 1
+        - 17
+        - 0
         version: 1.17.0
+  requirement: *id012
   type: :runtime
   prerelease: false
-  version_requirements: *70367143773260
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: &70367143772420 !ruby/object:Gem::Requirement
+  name: activemerchant
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id013 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 3
+        - 1
+        - 1
         version: 3.1.1
     - - <=
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 3
+        - 1
+        - 4
         version: 3.1.4
+  requirement: *id013
   type: :runtime
   prerelease: false
-  version_requirements: *70367143772420
-- !ruby/object:Gem::Dependency
-  name: kaminari
-  requirement: &70367143770960 !ruby/object:Gem::Requirement
+  name: rails
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id014 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 39
+        segments: 
+        - 0
+        - 12
+        - 4
         version: 0.12.4
+  requirement: *id014
   type: :runtime
   prerelease: false
-  version_requirements: *70367143770960
-- !ruby/object:Gem::Dependency
-  name: deface
-  requirement: &70367143769780 !ruby/object:Gem::Requirement
+  name: kaminari
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id015 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        - 7
+        - 0
         version: 0.7.0
+  requirement: *id015
   type: :runtime
   prerelease: false
-  version_requirements: *70367143769780
+  name: deface
 description: Required dependency for Spree
 email: sean@railsdog.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - LICENSE
 - README.md
 - app/assets/images/admin/bg/active-tab.png
@@ -937,26 +1024,33 @@ 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
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 57
+      segments: 
+      - 1
+      - 8
+      - 7
       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
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: -1049287416961651904
-requirements:
+      version: "0"
+requirements: 
 - none
 rubyforge_project: spree_core
 rubygems_version: 1.8.10
@@ -964,3 +1058,4 @@ signing_key:
 specification_version: 3
 summary: Core e-commerce functionality for the Spree project.
 test_files: []
+