spree_core 0.60.1 → 0.60.2

data/app/models/creditcard.rb

@@ -2,6 +2,7 @@ class Creditcard < ActiveRecord::Base
   has_many :payments, :as => :source
 
   before_save :set_last_digits
+  after_validation :set_card_type
 
   attr_accessor :number, :verification_value
 
@@ -22,7 +23,20 @@ class Creditcard < ActiveRecord::Base
     verification_value.to_s.gsub!(/\s/,'') unless number.nil?
     self.last_digits ||= number.to_s.length <= 4 ? number : number.to_s.slice(-4..-1)
   end
-
+  
+  # cheap hack to get to the type? method from deep within ActiveMerchant without stomping on
+  # potentially existing methods in CreditCard
+  class CardDetector
+    class << self
+      include ActiveMerchant::Billing::CreditCardMethods::ClassMethods
+    end
+  end
+  
+  # sets self.cc_type while we still have the card number
+  def set_card_type
+    self.cc_type ||= CardDetector.type?(self.number)
+  end
+  
   def name?
     first_name? && last_name?
   end
@@ -239,8 +253,8 @@ class Creditcard < ActiveRecord::Base
   end
 
   def spree_cc_type
-    return "visa" if ENV['RAILS_ENV'] == "development"
-    self.class.type?(number)
+    return "visa" if ::Rails.env == "development"
+    self.cc_type
   end
 
   # Saftey check to make sure we're not accidentally performing operations on a live gateway.

data/app/models/order.rb

@@ -264,7 +264,7 @@ class Order < ActiveRecord::Base
 
   # Creates a new shipment (adjustment is created by shipment model)
   def create_shipment!
-    shipping_method.reload
+    shipping_method(true)
     if shipment.present?
       shipment.update_attributes(:shipping_method => shipping_method)
     else

data/app/models/product.rb

@@ -38,6 +38,7 @@ class Product < ActiveRecord::Base
   after_create :set_master_variant_defaults
   after_create :add_properties_and_option_types_from_prototype
   before_save :recalculate_count_on_hand
+  before_update :sanitize_permalink
   after_save :update_memberships if ProductGroup.table_exists?
   after_save :set_master_on_hand_to_zero_when_product_has_variants
   after_save :save_master
@@ -222,6 +223,10 @@ class Product < ActiveRecord::Base
   end
 
   private
+  
+  def sanitize_permalink
+    self.permalink = self.permalink.to_url
+  end
 
   def recalculate_count_on_hand
     product_count_on_hand = has_variants? ?

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 scope_name.to_s !~ /eval|send|system|[^a-z0-9_!?]/
+      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/app/models/product_scope.rb

@@ -31,7 +31,7 @@ class ProductScope < ActiveRecord::Base
                       Product.send(self.name.intern, *array)
                   end
     else
-      relation2 = Product.search({self.name.intern => array}).relation
+      relation2 = Product.metasearch({self.name.intern => array}).relation
     end
     unless another_scope.class == ActiveRecord::Relation
       another_scope = another_scope.send(:relation)

data/lib/spree_core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "0.60.1"
+    "0.60.2"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spree_core
 version: !ruby/object:Gem::Version 
-  hash: 237
+  hash: 235
   prerelease: 
   segments: 
   - 0
   - 60
-  - 1
-  version: 0.60.1
+  - 2
+  version: 0.60.2
 platform: ruby
 authors: 
 - Sean Schofield
@@ -15,12 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-21 00:00:00 -04:00
-default_executable: 
+date: 2011-10-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -31,28 +29,28 @@ dependencies:
         - 1
         - 2
         version: 0.1.2
-  version_requirements: *id001
-  name: acts_as_list
+  requirement: *id001
+  type: :runtime
   prerelease: false
+  name: acts_as_list
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 1
         segments: 
         - 1
         - 6
-        - 6
-        version: 1.6.6
-  version_requirements: *id002
-  name: nested_set
+        - 7
+        version: 1.6.7
+  requirement: *id002
+  type: :runtime
   prerelease: false
+  name: nested_set
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -63,12 +61,12 @@ dependencies:
         - 1
         - 0
         version: 0.1.0
-  version_requirements: *id003
-  name: rd_unobtrusive_date_picker
+  requirement: *id003
+  type: :runtime
   prerelease: false
+  name: rd_unobtrusive_date_picker
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -79,12 +77,12 @@ dependencies:
         - 1
         - 1
         version: 0.1.1
-  version_requirements: *id004
-  name: rd_find_by_param
+  requirement: *id004
+  type: :runtime
   prerelease: false
+  name: rd_find_by_param
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -95,12 +93,12 @@ dependencies:
         - 5
         - 1
         version: 1.5.1
-  version_requirements: *id005
-  name: highline
+  requirement: *id005
+  type: :runtime
   prerelease: false
+  name: highline
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -111,12 +109,12 @@ dependencies:
         - 0
         - 3
         version: 1.0.3
-  version_requirements: *id006
-  name: stringex
+  requirement: *id006
+  type: :runtime
   prerelease: false
+  name: stringex
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -127,12 +125,12 @@ dependencies:
         - 9
         - 4
         version: 0.9.4
-  version_requirements: *id007
-  name: state_machine
+  requirement: *id007
+  type: :runtime
   prerelease: false
+  name: state_machine
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -143,12 +141,12 @@ dependencies:
         - 9
         - 5
         version: 0.9.5
-  version_requirements: *id008
-  name: faker
+  requirement: *id008
+  type: :runtime
   prerelease: false
+  name: faker
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -159,12 +157,12 @@ dependencies:
         - 3
         - 11
         version: 2.3.11
-  version_requirements: *id009
-  name: paperclip
+  requirement: *id009
+  type: :runtime
   prerelease: false
+  name: paperclip
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -173,12 +171,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id010
-  name: rd_resource_controller
+  requirement: *id010
+  type: :runtime
   prerelease: false
+  name: rd_resource_controller
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -189,12 +187,12 @@ dependencies:
         - 0
         - 5
         version: 1.0.5
-  version_requirements: *id011
-  name: meta_search
+  requirement: *id011
+  type: :runtime
   prerelease: false
+  name: meta_search
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -205,12 +203,12 @@ dependencies:
         - 15
         - 0
         version: 1.15.0
-  version_requirements: *id012
-  name: activemerchant
+  requirement: *id012
+  type: :runtime
   prerelease: false
+  name: activemerchant
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  version_requirements: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -222,12 +220,12 @@ dependencies:
         - pre
         - 2
         version: 3.0.pre2
-  version_requirements: *id013
-  name: will_paginate
+  requirement: *id013
+  type: :runtime
   prerelease: false
+  name: will_paginate
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  version_requirements: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -238,12 +236,12 @@ dependencies:
         - 0
         - 9
         version: 3.0.9
-  version_requirements: *id014
-  name: rails
+  requirement: *id014
+  type: :runtime
   prerelease: false
+  name: rails
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  version_requirements: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -254,9 +252,10 @@ dependencies:
         - 2
         - 6
         version: 0.2.6
-  version_requirements: *id015
-  name: jquery-rails
+  requirement: *id015
+  type: :runtime
   prerelease: false
+  name: jquery-rails
 description: Required dependancy for Spree
 email: sean@railsdog.com
 executables: []
@@ -1111,7 +1110,6 @@ files:
 - public/stylesheets/datepicker.css
 - public/stylesheets/jquery.autocomplete.css
 - public/stylesheets/screen.css
-has_rdoc: true
 homepage: http://spreecommerce.com
 licenses: []
 
@@ -1143,7 +1141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - none
 rubyforge_project: spree_core
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Core e-commerce functionality for the Spree project.