spree_core 0.40.4 → 0.50.0

data/lib/spree_core/enumerable_constants.rb

@@ -1,35 +1,35 @@
 
 module EnumerableConstant
-  
+
   # default (overridable) value for any
   def self.any_value
     -1
   end
-  
+
   def self.any
     [any_value, '[any]']
   end
-  
+
   class Tupple
-    
+
     include Comparable
-    
+
     attr_accessor :name, :value, :display_name
-    
+
     def initialize(name, value=nil, display_name=nil)
       @name = name
       @value = value
       @display_name = display_name
     end
-    
+
     def <=> other
       self.display_name <=> other.display_name
     end
-    
+
     def title_translated
       t("order_status_#{self.name.downcase}")
     end
-    
+
     def title
       if @display_name
         self.display_name
@@ -37,21 +37,21 @@ module EnumerableConstant
         self.name.titleize.strip
       end
     end
-    
+
     def id
       self.value
     end
-    
+
   end
-  
+
   class Base
-    
+
     include Comparable
 
     def <=>
-      
+
     end
-    
+
     def self.class_var_prefix
       self.name.gsub!('::', '_').underscore
     end
@@ -86,14 +86,14 @@ module EnumerableConstant
       # puts "display_name: #{display_name}" if display_name
       class_eval("@@#{self.class_var_prefix}_constants << EnumerableConstant::Tupple.new(name, value, display_name)")
     end
-    
+
     # TODO: add method_missing for class methods so you can do stuff like:
     # :my_constant = 2
     # :my_constant 2
     # MY_CONSTANT = 2
     # MY_CONSTANT 2
     # def self.method_missing(symbol, *params)
-    #  
+    #
     # end
     def self.from_value value
       self.constants.each do |constant|
@@ -101,11 +101,11 @@ module EnumerableConstant
       end
       nil
     end
-    
+
     def self.constants
       class_eval("@@#{self.class_var_prefix}_constants")
     end
-    
+
     def self.constant_names
       result = []
       class_eval("@@#{self.class_var_prefix}_constants").map do |tupple|
@@ -113,7 +113,7 @@ module EnumerableConstant
       end
       result
     end
-    
+
     def self.names
       result = []
       class_eval("@@#{self.class_var_prefix}_constants").map do |tupple|
@@ -121,7 +121,7 @@ module EnumerableConstant
       end
       result
     end
-    
+
     def self.values
       result = []
       class_eval("@@#{self.class_var_prefix}_constants").map do |tupple|
@@ -129,25 +129,25 @@ module EnumerableConstant
       end
       result
     end
-    
+
   end
-  
+
   module VERSION
     MAJOR = 1
     MINOR = 0
     TINY  = 0
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
-  
+
 end
 
 class ActiveRecord::Base
-  
+
   def self.enumerable_constant(attribute_name, options={})
     raise ArgumentError, "you must specify a list of constants" unless options[:constants]
     set_name = attribute_name.to_s.camelize
     set_class = "#{self.name}::#{set_name}"
-    
+
     constant_definitions = ""
     options[:constants].each do |constant|
       if constant.is_a? Hash
@@ -157,25 +157,25 @@ class ActiveRecord::Base
         # puts "constant name: #{constant_name}"
         # puts "display name: #{display_name}"
         # puts "c name: #{constant_name.to_s.underscore.upcase}"
-        constant_definitions << "constant '#{constant_name.to_s.underscore.upcase}', nil, '#{display_name}'\n" 
+        constant_definitions << "constant '#{constant_name.to_s.underscore.upcase}', nil, '#{display_name}'\n"
       else
-        # puts "constant '#{constant.to_s.underscore.upcase}'\n" 
-        constant_definitions << "constant '#{constant.to_s.underscore.upcase}'\n" 
+        # puts "constant '#{constant.to_s.underscore.upcase}'\n"
+        constant_definitions << "constant '#{constant.to_s.underscore.upcase}'\n"
       end
     end
-    
+
     # allow for :connector and :skip_last_comma as used in Array#to_sentence
     if options[:connector]
-      connector = options[:connector] 
+      connector = options[:connector]
     else
       connector = 'or'
     end
     unless options[:skip_last_comma].kind_of? NilClass
-      skip_last_comma = options[:skip_last_comma] 
+      skip_last_comma = options[:skip_last_comma]
     else
       skip_last_comma = true
     end
-    
+
     if options[:base]
       use_base = options[:base]
     else
@@ -185,7 +185,7 @@ class ActiveRecord::Base
     # keep glue_text for back compat
     if options[:glue_text]
       connector = options[:glue_text].strip
-    end    
+    end
 
     class_eval <<-EOF
       class #{set_name} < EnumerableConstant::Base
@@ -195,15 +195,15 @@ class ActiveRecord::Base
     EOF
 
     should_be_in_text = set_class.constantize.names.to_sentence :words_connector => connector, :last_word_connector => skip_last_comma
-  
+
     unless options[:no_validation]
-      class_eval <<-EOF  
+      class_eval <<-EOF
         validates :#{attribute_name.to_s}, :presence => {
-          :in => #{set_name}::values, 
+          :in => #{set_name}::values,
           :message => "should be #{should_be_in_text}"
           }
       EOF
     end
   end
-  
+
 end

data/lib/spree_core/find_by_param.rb

@@ -85,12 +85,14 @@ module Railslove
 
           base_value = to_param
           permalink_value = base_value
-          query = self.class.send("where", "#{permalink_options[:field]} = ?", permalink_value)
           counter = 0
-          unless query.limit(1).empty?
-            permalink_value = "#{base_value}-#{counter += 1}"
+
+          begin
+            permalink_value = base_value + ((counter == 0) ? "" : "-#{counter}")
             query = self.class.send("where", "#{permalink_options[:field]} = ?", permalink_value)
-          end
+            counter += 1
+          end while query.limit(1).present?
+
           write_attribute(permalink_options[:field], permalink_value)
           true
 
@@ -102,7 +104,7 @@ module Railslove
 end
 
 class ActiveRecord::Base
-  class_inheritable_accessor :permalink_options
+  class_attribute :permalink_options
   self.permalink_options = {:param => :id}
 
   #default finders these are overwritten if you use make_permalink in your model
@@ -114,4 +116,4 @@ class ActiveRecord::Base
   end
 
 end
-ActiveRecord::Base.send(:include, Railslove::Plugins::FindByParam)
+ActiveRecord::Base.send(:include, Railslove::Plugins::FindByParam)

data/lib/spree_core/preferences/preference_definition.rb

@@ -9,24 +9,24 @@ module Spree
       def initialize(name, *args) #:nodoc:
         options = args.extract_options!
         options.assert_valid_keys(:default)
-        
+
         @type = args.first ? args.first.to_s : 'boolean'
-        
+
         # Create a column that will be responsible for typecasting
         @column = ActiveRecord::ConnectionAdapters::Column.new(name.to_s, options[:default], @type == 'any' ? nil : @type)
       end
-      
+
       # The attribute which is being preferenced
       def name
         @column.name
       end
-      
+
       # The default value to use for the preference in case none have been
-      # previously defined      
+      # previously defined
       def default_value
         @column.default
       end
-      
+
       # Typecasts the value based on the type of preference that was defined
       def type_cast(value)
         if @type == 'any'
@@ -35,7 +35,7 @@ module Spree
           @column.type_cast(value)
         end
       end
-      
+
       # Typecasts the value to true/false depending on the type of preference
       def query(value)
         unless value = type_cast(value)

data/lib/spree_core/railtie.rb

@@ -0,0 +1,58 @@
+module SpreeCore
+  class Engine < Rails::Engine
+
+    config.autoload_paths += %W(#{config.root}/lib)
+    # TODO - register state monitor observer?
+
+    def self.activate
+
+      Spree::ThemeSupport::HookListener.subclasses.each do |hook_class|
+        Spree::ThemeSupport::Hook.add_listener(hook_class)
+      end
+
+      #register all payment methods (unless we're in middle of rake task since migrations cannot be run for this first time without this check)
+      if File.basename( $0 ) != "rake"
+        [
+          Gateway::Bogus,
+          Gateway::AuthorizeNet,
+          Gateway::AuthorizeNetCim,
+          Gateway::Eway,
+          Gateway::Linkpoint,
+          Gateway::PayPal,
+          Gateway::SagePay,
+          Gateway::Beanstream,
+          Gateway::Braintree,
+          PaymentMethod::Check
+        ].each{|gw|
+          begin
+            gw.register
+          rescue Exception => e
+            $stderr.puts "Error registering gateway #{gw}: #{e}"
+          end
+        }
+
+        #register all calculators
+        [
+          Calculator::FlatPercentItemTotal,
+          Calculator::FlatRate,
+          Calculator::FlexiRate,
+          Calculator::PerItem,
+          Calculator::SalesTax,
+          Calculator::Vat,
+          Calculator::PriceBucket
+        ].each{|c_model|
+          begin
+            c_model.register if c_model.table_exists?
+          rescue Exception => e
+            $stderr.puts "Error registering calculator #{c_model}"
+          end
+        }
+
+      end
+
+    end
+
+    config.to_prepare &method(:activate).to_proc
+
+  end
+end

data/lib/spree_core/ssl_requirement.rb

@@ -52,9 +52,10 @@
 
 # Modified version of the ssl_requirement plugin by DHH
 module SslRequirement
-  def self.included(controller)
-    controller.extend(ClassMethods)
-    controller.before_filter(:ensure_proper_protocol)
+  extend ActiveSupport::Concern
+
+  included do
+    before_filter(:ensure_proper_protocol)
   end
 
   module ClassMethods

data/lib/spree_core/testing_support/factories.rb

@@ -0,0 +1,13 @@
+Zone.class_eval do
+  def self.global
+    find_by_name("GlobalZone") || Factory(:global_zone)
+  end
+end
+
+require 'factory_girl'
+
+Dir["#{File.dirname(__FILE__)}/factories/**"].each do |f|
+  fp =  File.expand_path(f)
+  require fp
+end
+

data/lib/spree_core/testing_support/factories/address_factory.rb

@@ -0,0 +1,20 @@
+Factory.define :address do |f|
+  f.firstname 'John'
+  f.lastname 'Doe'
+  f.address1 '10 Lovely Street'
+  f.address2 'Northwest'
+  f.city   "Herndon"
+  f.zipcode '20170'
+  f.phone '123-456-7890'
+  f.alternative_phone "123-456-7899"
+
+  f.state  { |address| address.association(:state) }
+  f.country do |address|
+    if address.state
+      address.state.country
+    else
+      address.association(:country)
+    end
+  end
+end
+

data/lib/spree_core/testing_support/factories/adjustment_factory.rb

@@ -0,0 +1,6 @@
+Factory.define :adjustment do  |f|
+  f.order { Factory(:order) }
+  f.amount "100.0"
+  f.label 'Shipping'
+  f.source { Factory(:shipment) }
+end

data/lib/spree_core/testing_support/factories/calculator_factory.rb

@@ -0,0 +1,5 @@
+Factory.define :calculator, :class => Calculator::FlatRate do |f|
+  f.after_create do |c|
+    c.set_preference(:amount, 10.0)
+  end
+end

data/lib/spree_core/testing_support/factories/configuraion_factory.rb

@@ -0,0 +1,4 @@
+Factory.define :configuration do |f|
+  f.name "Default Configuration"
+  f.type "app_configuration"
+end

data/lib/spree_core/testing_support/factories/country_factory.rb

@@ -0,0 +1,7 @@
+Factory.define :country do |f|
+  f.iso_name 'UNITED STATES'
+  f.name 'UNITED STATES'
+  f.iso 'US'
+  f.iso3 'USA'
+  f.numcode 840
+end

data/lib/spree_core/testing_support/factories/creditcard_factory.rb

@@ -0,0 +1,11 @@
+# allows creditcard info to be saved to the datbase which is needed for factories to work properly
+class TestCard < Creditcard
+  def remove_readonly_attributes(attributes) attributes; end
+end
+
+Factory.define(:creditcard, :class => TestCard) do |f|
+  f.verification_value 123
+  f.month 12
+  f.year 2013
+  f.number "4111111111111111"
+end

data/lib/spree_core/testing_support/factories/inventory_unit_factory.rb

@@ -0,0 +1,7 @@
+Factory.define(:inventory_unit) do |record|
+  record.variant { Factory(:variant) }
+  record.order { Factory(:order) }
+  record.state "sold"
+  record.shipment { Factory(:shipment, :state => 'pending') }
+  #record.return_authorization { Factory(:return_authorization) }
+end