spree_additional_calculators 0.1.0 → 0.1.1

data/.gitignore

@@ -10,3 +10,4 @@ nbproject
 spec/test_app
 Gemfile
 *.gem
+.rvmrc

data/README.md

@@ -49,10 +49,15 @@ You can test the extension by executing following commands:
     $ rake
   
   
+Screenshots
+-----------
+
+There are some [screenshots](https://github.com/jurgis/spree-additional-calculators/wiki/Screenshots) in the wiki.
+  
+  
 TODO
 ----
 
-* Add RSpec tests
 * Possibly add some cucumber scenarios
 * Possibly use unobtrusive javascript
   

data/Rakefile

@@ -12,7 +12,9 @@ if File.exists?(gemfile) && (%w(spec cucumber).include?(ARGV.first.to_s) || ARGV
 
   require 'rspec'
   require 'rspec/core/rake_task'
-  RSpec::Core::RakeTask.new
+  RSpec::Core::RakeTask.new do |t|
+    t.rspec_opts = %w{--color --format doc}
+  end
 
   require 'cucumber/rake/task'
   Cucumber::Rake::Task.new do |t|

data/Versionfile

@@ -1 +1,2 @@
 "0.50.x" => { :branch => "master" }
+"0.60.x" => { :branch => "master" }

data/app/models/additional_calculator/weight_and_quantity.rb

@@ -13,31 +13,36 @@ class AdditionalCalculator::WeightAndQuantity < AdditionalCalculator::Base
     return nil if line_items.nil?
 
     total_qnty = get_total_qnty(line_items)
-    weight_rate = get_rate(get_total_weight(line_items), AdditionalCalculatorRate::WEIGHT)
+    total_weight = get_total_weight(line_items)
+    weight_rate = get_rate(total_weight, AdditionalCalculatorRate::WEIGHT)
 
-    # NOTE: Maybe that has been fixed in the spree 0.50.x
-    # # sometimes the compute method is called without checking if the calculator is available
-    # if weight_rate.nil?
-    #   logger.warn("The calculator's #{name} weight_rate is nil - returning. Availability is not checked!")
-    #   return nil
-    # end
+    # sometimes the compute method is called without checking if the calculator is available
+    if weight_rate.nil?
+      logger.warn("The calculator's #{name} weight_rate is nil - returning. Availability is not checked!")
+      return nil
+    end
 
     # quantity rate might be nil if the specified range is not available
     qnty_rate = get_rate(total_qnty, AdditionalCalculatorRate::QNTY)
     # find the previous qnty rate or set it to 0 if not found
-    qnty_rate = get_previous_rate(total_qnty, AdditionalCalculatorRate::QNTY) || 0 if qnty_rate.nil?
+    previous_qnty_rate = get_previous_rate(total_qnty, AdditionalCalculatorRate::QNTY)
 
     # the total rate is sum of weight and quantity rates
-    weight_rate + qnty_rate
+    # the rate is available if
+    # 1) qnty_rate is not nil
+    # 2) qnty_rate is nil AND previous_qnty_rate is nil (quantity configuration not defined at all)
+    if !qnty_rate.nil?
+      weight_rate + qnty_rate
+    elsif previous_qnty_rate.nil?
+      weight_rate
+    else
+      nil
+    end
   end
 
   # check if this calculator is available for the Order
   def available?(object)
-    line_items = object_to_line_items(object)
-    return false if line_items.nil?
-
-    weight_rate = get_rate(get_total_weight(line_items), AdditionalCalculatorRate::WEIGHT)
-    !weight_rate.nil? # available only if the weight rate is not nil
+    !self.compute(object).nil?
   end
 
   protected

data/app/models/additional_calculator_rate.rb

@@ -12,8 +12,12 @@ class AdditionalCalculatorRate < ActiveRecord::Base
 
   validates :calculator_id, :rate_type, :from_value, :to_value, :rate, :presence => true
   validates :from_value, :to_value, :rate, :numericality => true, :allow_blank => true
+  validate :validate_from_value_smaller_than_to_value
+
+  def validate_from_value_smaller_than_to_value
+    # ignore following cases
+    return if from_value.nil? || to_value.nil?
 
-  def validate
     errors.add(:base, I18n.t('errors.from_value_greater_than_to_value')) if from_value > to_value
   end
 
@@ -24,14 +28,14 @@ class AdditionalCalculatorRate < ActiveRecord::Base
 
   # Find the rate for the specified value
   def self.find_rate(calculator_id, rate_type, value)
-    # get the lowes rate if multiple rates are defined (overlaps)
+    # get the lowes rate if multiple rates are defined (overlap)
     rate = for_calculator(calculator_id).for_type(rate_type).for_value(value).order("rate").first()
     rate.nil? ? nil : rate.rate
   end
 
   # Find the previous rate for the specified value
   def self.find_previous_rate(calculator_id, rate_type, value)
-    rate = for_calculator(calculator_id).for_type(rate_type).where("to_value <= ?", value).order("rate DESC").first()
+    rate = for_calculator(calculator_id).for_type(rate_type).where("to_value < ?", value).order("rate DESC").first()
     rate.nil? ? nil : rate.rate
   end
 end

data/spec.opts

@@ -0,0 +1 @@
+--color

data/spec/app/models/additional_calculator/weight_and_quantity_spec.rb

@@ -0,0 +1,299 @@
+require 'spec_helper'
+
+describe AdditionalCalculator::WeightAndQuantity do
+  before(:all) do
+    @shipping_method = Factory(:shipping_method)
+    @calculator = Factory(:weight_and_quantity_calculator)
+  end
+
+  before(:each) do
+    @weight_rate1 = Factory.build(:additional_calculator_rate_for_weight, :from_value => 0, :to_value => 100, :rate => 100)
+    @weight_rate2 = Factory.build(:additional_calculator_rate_for_weight, :from_value => 100.1, :to_value => 500, :rate => 500)
+    @qnty_rate1 = Factory.build(:additional_calculator_rate_for_qnty, :from_value => 1, :to_value => 10, :rate => 10)
+    @qnty_rate2 = Factory.build(:additional_calculator_rate_for_qnty, :from_value => 11, :to_value => 20, :rate => 20)
+    @qnty_rate3 = Factory.build(:additional_calculator_rate_for_qnty, :from_value => 21, :to_value => 50, :rate => 50)
+    @empty_order = Factory(:order)
+    @order_with_one_item = Factory(:order_with_one_item)
+    @order_with_items_without_weight = Factory(:order_with_items_without_weight)
+  end
+
+
+  context "there are no items in the order" do
+    before(:each) do
+      @empty_order.item_count.should == 0
+    end
+
+    it "the rate should be nil" do
+      rate = @calculator.compute(@empty_order)
+      rate.should be_nil
+    end
+
+    it "the calculator should not be available" do
+      @calculator.available?(@empty_order).should be_false
+    end
+  end
+
+
+  context "the weight table is empty" do
+    before(:each) do
+      @order_with_one_item.item_count.should_not == 0
+    end
+
+    it "the calculator should not be available" do
+      @calculator.available?(@order_with_one_item).should be_false
+    end
+
+    it "the rate should not be valid" do
+      rate = @calculator.compute(@order_with_one_item)
+      rate.should be_nil
+    end
+  end
+
+
+  context "just weight" do
+    before(:each) do
+      @weight_rate1.save!
+      @weight_rate2.save!
+      # default_item_weight
+    end
+
+    after(:each) do
+      # reset the default item weight
+      @calculator.preferred_default_item_weight = 0
+      @calculator.save!
+    end
+
+    it "should use the default item weight 0" do
+      @calculator.preferred_default_item_weight = 0
+      @calculator.save!
+
+      rate = @calculator.compute(@order_with_items_without_weight)
+      rate.should_not be_nil
+      rate.should == 100 # 0..100 => 100
+    end
+
+    it "should use the default item weight 50" do
+      @calculator.preferred_default_item_weight = 50
+      @calculator.save!
+
+      rate = @calculator.compute(@order_with_items_without_weight)
+      rate.should_not be_nil
+      rate.should == 100 # 0..100 => 100
+    end
+
+    it "should use the default item weight 99" do
+      @calculator.preferred_default_item_weight = 99
+      @calculator.save!
+
+      rate = @calculator.compute(@order_with_items_without_weight)
+      rate.should_not be_nil
+      rate.should == 100 # 0..100 => 100
+    end
+
+    it "should use the default item weight 100" do
+      @calculator.preferred_default_item_weight = 100
+      @calculator.save!
+
+      rate = @calculator.compute(@order_with_items_without_weight)
+      rate.should_not be_nil
+      rate.should == 100 # 0..100 => 100
+    end
+
+    it "should use the default item weight 101" do
+      @calculator.preferred_default_item_weight = 101
+      @calculator.save!
+
+      rate = @calculator.compute(@order_with_items_without_weight)
+      rate.should_not be_nil
+      rate.should == 500 # 100.1..500 => 500
+    end
+
+    it "should use the default item weight 499" do
+      @calculator.preferred_default_item_weight = 499
+      @calculator.save!
+
+      rate = @calculator.compute(@order_with_items_without_weight)
+      rate.should_not be_nil
+      rate.should == 500 # 100.1..500 => 500
+    end
+
+    it "should use the default item weight 500" do
+      @calculator.preferred_default_item_weight = 500
+      @calculator.save!
+
+      rate = @calculator.compute(@order_with_items_without_weight)
+      rate.should_not be_nil
+      rate.should == 500 # 100.1..500 => 500
+    end
+
+    it "should use the default item weight 501" do
+      @calculator.preferred_default_item_weight = 501
+      @calculator.save!
+
+      rate = @calculator.compute(@order_with_items_without_weight)
+      rate.should be_nil
+    end
+
+
+    context "items with specific weight" do
+      before(:each) do
+        @order = Factory(:order_with_one_item)
+      end
+
+      it "should calculate correct rate for 1 item with weight 0" do
+        @order.line_items[0].variant.weight = 0
+        @order.save!
+
+        rate = @calculator.compute(@order)
+        rate.should_not be_nil
+        rate.should == 100 # 0..100 => 100
+      end
+
+      it "should calculate correct rate for 1 item with weight 50" do
+        @order.line_items[0].variant.weight = 50
+        @order.save!
+
+        rate = @calculator.compute(@order)
+        rate.should_not be_nil
+        rate.should == 100 # 0..100 => 100
+      end
+
+      it "should calculate correct rate for 1 item with weight 99" do
+        @order.line_items[0].variant.weight = 99
+        @order.save!
+
+        rate = @calculator.compute(@order)
+        rate.should_not be_nil
+        rate.should == 100 # 0..100 => 100
+      end
+
+      it "should calculate correct rate for 1 item with weight 100" do
+        @order.line_items[0].variant.weight = 100
+        @order.save!
+
+        rate = @calculator.compute(@order)
+        rate.should_not be_nil
+        rate.should == 100 # 0..100 => 100
+      end
+
+      it "should calculate correct rate for 1 item with weight 101" do
+        @order.line_items[0].variant.weight = 101
+        @order.save!
+
+        rate = @calculator.compute(@order)
+        rate.should_not be_nil
+        rate.should == 500 # 100.1..500 => 500
+      end
+
+      it "should calculate correct rate for 1 item with weight 499" do
+        @order.line_items[0].variant.weight = 499
+        @order.save!
+
+        rate = @calculator.compute(@order)
+        rate.should_not be_nil
+        rate.should == 500 # 100.1..500 => 500
+      end
+
+      it "should calculate correct rate for 1 item with weight 500" do
+        @order.line_items[0].variant.weight = 500
+        @order.save!
+
+        rate = @calculator.compute(@order)
+        rate.should_not be_nil
+        rate.should == 500 # 100.1..500 => 500
+      end
+
+      it "should calculate correct rate for 1 item with weight 501" do
+        @order.line_items[0].variant.weight = 501
+        @order.save!
+
+        rate = @calculator.compute(@order)
+        rate.should be_nil
+      end
+    end
+  end
+
+
+  context "weight and qnty" do
+    before(:each) do
+      @weight_rate1.save!
+      @weight_rate2.save!
+      @qnty_rate1.save!
+      @qnty_rate2.save!
+      @qnty_rate3.save!
+      @order1 = Factory(:order_with_one_item)
+      @order2 = Factory(:order_with_two_items)
+    end
+
+    it "should calculate correct rate for weight 10 and quantity 1" do
+      @order1.line_items[0].variant.weight = 10
+      @order1.line_items[0].quantity = 1
+      @order1.save!
+
+      rate = @calculator.compute(@order1)
+      rate.should_not be_nil
+      rate.should == 100 + 10 # weight: 0..100 => 100, qnty: 1..10 => 10
+    end
+
+    it "should calculate correct rate for weight 10 and quantity 5" do
+      @order1.line_items[0].variant.weight = 10
+      @order1.line_items[0].quantity = 5
+      @order1.save!
+
+      rate = @calculator.compute(@order1)
+      rate.should_not be_nil
+      rate.should == 100 + 10 # weight: 0..100 => 100, qnty: 1..10 => 10
+    end
+
+    it "should calculate correct rate for weight 10 and quantity 10" do
+      @order1.line_items[0].variant.weight = 10
+      @order1.line_items[0].quantity = 10
+      @order1.save!
+
+      rate = @calculator.compute(@order1)
+      rate.should_not be_nil
+      rate.should == 100 + 10 # weight: 0..100 => 100, qnty: 1..10 => 10
+    end
+
+    it "should calculate correct rate for weight 10 and quantity 11" do
+      @order1.line_items[0].variant.weight = 10
+      @order1.line_items[0].quantity = 11
+      @order1.save!
+
+      rate = @calculator.compute(@order1)
+      rate.should_not be_nil
+      rate.should == 500 + 20 # weight: 100.1..500 => 500, qnty: 11..20 => 20
+    end
+
+    it "should calculate correct rate for weight 10 and quantity 20" do
+      @order1.line_items[0].variant.weight = 10
+      @order1.line_items[0].quantity = 20
+      @order1.save!
+
+      rate = @calculator.compute(@order1)
+      rate.should_not be_nil
+      rate.should == 500 + 20 # weight: 100.1..500 => 500, qnty: 11..20 => 20
+    end
+
+    it "should calculate correct rate for weight 10 and quantity 21" do
+      @order1.line_items[0].variant.weight = 10
+      @order1.line_items[0].quantity = 21
+      @order1.save!
+
+      rate = @calculator.compute(@order1)
+      rate.should_not be_nil
+      rate.should == 500 + 50 # weight: 100.1..500 => 500, qnty: 21..50 => 50
+    end
+
+    it "should calculate nil rate and not be available when quantity is exceeded" do
+      @order1.line_items[0].variant.weight = 1
+      @order1.line_items[0].quantity = 100
+      @order1.save!
+
+      @calculator.available?(@order1).should be_false
+      rate = @calculator.compute(@order1)
+      rate.should be_nil # weight: 0..100 => 100, qnty: 21..50 => 50 (when qnty is exceeded and there are qnty rates, return nil)
+    end
+
+  end
+end

data/spec/app/models/additional_calculator_rate_spec.rb

@@ -1,7 +1,152 @@
 require 'spec_helper'
 
 describe AdditionalCalculatorRate do
-  it "should do ..." do
+  before(:all) do
+    @shipping_method = Factory(:shipping_method)
+    @calculator = Factory(:weight_and_quantity_calculator)
+  end
+
+  before(:each) do
+    @rate = Factory.build(:additional_calculator_rate_for_weight, :from_value => 0, :to_value => 100, :rate => 100)
+    @rate2 = Factory.build(:additional_calculator_rate_for_weight, :from_value => 100.1, :to_value => 500, :rate => 500)
+  end
+
+
+  context "without validation errors" do
+    it "should not have validation errors with valid attributes" do
+      @rate.should be_valid
+      @rate.save!
+    end
+
+    it "should allow equal from_value and to_value" do
+      @rate.from_value = @rate.to_value = 30.1
+      @rate.should be_valid
+      @rate.save!
+    end
+  end
+
+  context "with validation errors" do
+    context "from_value" do
+      it "should be entered" do
+        @rate.from_value = nil
+        @rate.should_not be_valid
+        @rate.errors_on(:from_value).should_not be_blank
+      end
+
+      it "should be numeric" do
+        @rate.from_value = 'foo'
+        @rate.should_not be_valid
+        @rate.errors_on(:from_value).should_not be_blank
+      end
+
+      it "should be less or equal than to_value" do
+        @rate.from_value = 21.1
+        @rate.to_value = 20.2
+        @rate.should_not be_valid
+        @rate.errors_on(:base).should_not be_blank
+      end
+    end
+
+    context "to_value" do
+      it "should be entered" do
+        @rate.to_value = nil
+        @rate.should_not be_valid
+        @rate.errors_on(:to_value).should_not be_blank
+      end
+
+      it "should be numeric" do
+        @rate.to_value = 'foo'
+        @rate.should_not be_valid
+        @rate.errors_on(:to_value).should_not be_blank
+      end
+    end
+
+    context "rate" do
+      it "should be entered" do
+        @rate.rate = nil
+        @rate.should_not be_valid
+        @rate.errors_on(:rate).should_not be_blank
+      end
 
+      it "should be numeric" do
+        @rate.rate = 'foo'
+        @rate.should_not be_valid
+        @rate.errors_on(:rate).should_not be_blank
+      end
+    end
   end
+
+  context "find_rate" do
+    it "should find nothing when there are no rates" do
+      AdditionalCalculatorRate.all.should have(0).records
+      AdditionalCalculatorRate.find_rate(@calculator.id, AdditionalCalculatorRate::WEIGHT, 0).should be_nil
+    end
+
+    it "should find a valid rate (from a single entry)" do
+      @rate.save!
+
+      AdditionalCalculatorRate.all.should have(1).records
+      AdditionalCalculatorRate.find_rate(@calculator.id, AdditionalCalculatorRate::WEIGHT, 0).should == 100
+      AdditionalCalculatorRate.find_rate(@calculator.id, AdditionalCalculatorRate::WEIGHT, 0.1).should == 100
+      AdditionalCalculatorRate.find_rate(@calculator.id, AdditionalCalculatorRate::WEIGHT, 1).should == 100
+      AdditionalCalculatorRate.find_rate(@calculator.id, AdditionalCalculatorRate::WEIGHT, 50).should == 100
+      AdditionalCalculatorRate.find_rate(@calculator.id, AdditionalCalculatorRate::WEIGHT, 99).should == 100
+      AdditionalCalculatorRate.find_rate(@calculator.id, AdditionalCalculatorRate::WEIGHT, 99.9).should == 100
+      AdditionalCalculatorRate.find_rate(@calculator.id, AdditionalCalculatorRate::WEIGHT, 100).should == 100
+      AdditionalCalculatorRate.find_rate(@calculator.id, AdditionalCalculatorRate::WEIGHT, 100.1).should be_nil
+    end
+
+    it "should find a valid rate (from two entries)" do
+      @rate.save!
+      @rate2.save!
+
+      AdditionalCalculatorRate.find_rate(@calculator.id, AdditionalCalculatorRate::WEIGHT, 0).should == 100
+      AdditionalCalculatorRate.find_rate(@calculator.id, AdditionalCalculatorRate::WEIGHT, 0.1).should == 100
+      AdditionalCalculatorRate.find_rate(@calculator.id, AdditionalCalculatorRate::WEIGHT, 1).should == 100
+      AdditionalCalculatorRate.find_rate(@calculator.id, AdditionalCalculatorRate::WEIGHT, 50).should == 100
+      AdditionalCalculatorRate.find_rate(@calculator.id, AdditionalCalculatorRate::WEIGHT, 99).should == 100
+      AdditionalCalculatorRate.find_rate(@calculator.id, AdditionalCalculatorRate::WEIGHT, 99.9).should == 100
+      AdditionalCalculatorRate.find_rate(@calculator.id, AdditionalCalculatorRate::WEIGHT, 100).should == 100
+      AdditionalCalculatorRate.find_rate(@calculator.id, AdditionalCalculatorRate::WEIGHT, 100.1).should == 500
+      AdditionalCalculatorRate.find_rate(@calculator.id, AdditionalCalculatorRate::WEIGHT, 101).should == 500
+      AdditionalCalculatorRate.find_rate(@calculator.id, AdditionalCalculatorRate::WEIGHT, 499).should == 500
+      AdditionalCalculatorRate.find_rate(@calculator.id, AdditionalCalculatorRate::WEIGHT, 499.9).should == 500
+      AdditionalCalculatorRate.find_rate(@calculator.id, AdditionalCalculatorRate::WEIGHT, 500).should == 500
+      AdditionalCalculatorRate.find_rate(@calculator.id, AdditionalCalculatorRate::WEIGHT, 500.1).should be_nil
+    end
+  end
+
+  context "find_previous_rate" do
+    it "should find nothing when there are no rates" do
+      AdditionalCalculatorRate.all.should have(0).records
+      AdditionalCalculatorRate.find_previous_rate(@calculator.id, AdditionalCalculatorRate::WEIGHT, 0).should be_nil
+    end
+
+    it "should find nothing when there is a single rate entry" do
+      @rate.save!
+
+      AdditionalCalculatorRate.all.should have(1).records
+      AdditionalCalculatorRate.find_previous_rate(@calculator.id, AdditionalCalculatorRate::WEIGHT, 0).should be_nil
+      AdditionalCalculatorRate.find_previous_rate(@calculator.id, AdditionalCalculatorRate::WEIGHT, 50).should be_nil
+      AdditionalCalculatorRate.find_previous_rate(@calculator.id, AdditionalCalculatorRate::WEIGHT, 99.9).should be_nil
+      AdditionalCalculatorRate.find_previous_rate(@calculator.id, AdditionalCalculatorRate::WEIGHT, 100).should be_nil
+      AdditionalCalculatorRate.find_previous_rate(@calculator.id, AdditionalCalculatorRate::WEIGHT, 100.1).should == 100
+    end
+
+    it "should find a valid rate (from two entries)" do
+      @rate.save!
+      @rate2.save!
+
+      AdditionalCalculatorRate.find_previous_rate(@calculator.id, AdditionalCalculatorRate::WEIGHT, 0).should be_nil
+      AdditionalCalculatorRate.find_previous_rate(@calculator.id, AdditionalCalculatorRate::WEIGHT, 99.9).should be_nil
+      AdditionalCalculatorRate.find_previous_rate(@calculator.id, AdditionalCalculatorRate::WEIGHT, 100).should be_nil
+      AdditionalCalculatorRate.find_previous_rate(@calculator.id, AdditionalCalculatorRate::WEIGHT, 100.1).should == 100
+      AdditionalCalculatorRate.find_previous_rate(@calculator.id, AdditionalCalculatorRate::WEIGHT, 101).should == 100
+      AdditionalCalculatorRate.find_previous_rate(@calculator.id, AdditionalCalculatorRate::WEIGHT, 499).should == 100
+      AdditionalCalculatorRate.find_previous_rate(@calculator.id, AdditionalCalculatorRate::WEIGHT, 499.9).should == 100
+      AdditionalCalculatorRate.find_previous_rate(@calculator.id, AdditionalCalculatorRate::WEIGHT, 500).should == 100
+      AdditionalCalculatorRate.find_previous_rate(@calculator.id, AdditionalCalculatorRate::WEIGHT, 500.1).should == 500
+    end
+  end
+
 end

data/spec/factories.rb

@@ -0,0 +1,180 @@
+# -------------------------------------- sequences --------------------------------------
+
+
+Factory.sequence(:email_sequence) {|n| "user#{n}@example.com"}
+Factory.sequence(:sku_sequence) {|n| n}
+Factory.sequence(:product_sequence) {|n| "Product ##{n} - #{rand(9999)}"}
+
+
+# -------------------------------------- shipping_method --------------------------------------
+
+
+Factory.define :shipping_method do |f|
+  f.name 'Test Shipping Method'
+  f.zone { Zone.first }
+end
+
+
+# -------------------------------------- calculators --------------------------------------
+
+
+Factory.define :weight_and_quantity_calculator, :class => AdditionalCalculator::WeightAndQuantity do |f|
+  f.calculable { ShippingMethod.first }
+  f.is_additional_calculator true
+end
+
+
+# -------------------------------------- additional_calculator_rate --------------------------------------
+
+
+Factory.define :additional_calculator_rate_for_weight, :class => AdditionalCalculatorRate,  do |f|
+  f.calculator { Calculator.where(:is_additional_calculator => true).order(:id).last }
+  f.calculator_type 'Calculator'
+  f.rate_type AdditionalCalculatorRate::WEIGHT
+end
+
+
+Factory.define :additional_calculator_rate_for_qnty, :class => AdditionalCalculatorRate,  do |f|
+  f.calculator { Calculator.where(:is_additional_calculator => true).order(:id).last }
+  f.calculator_type 'Calculator'
+  f.rate_type AdditionalCalculatorRate::QNTY
+end
+
+
+# -------------------------------------- orders --------------------------------------
+
+
+Factory.define :order do |f|
+  f.association(:user, :factory => :user)
+  f.association(:bill_address, :factory => :address)
+  f.completed_at nil
+  f.bill_address_id nil
+  f.ship_address_id nil
+end
+
+
+Factory.define :order_with_one_item, :parent => :order do |f|
+  f.after_create { |order| Factory(:line_item, :order => order) }
+end
+
+Factory.define :order_with_two_items, :parent => :order do |f|
+  f.after_create do |order|
+    Factory(:line_item, :order => order)
+    Factory(:line_item, :order => order)
+  end
+end
+
+Factory.define :order_with_items_without_weight, :parent => :order do |f|
+  f.after_create { |order| Factory(:line_item_without_weight, :order => order) }
+end
+
+
+# -------------------------------------- line_items --------------------------------------
+
+
+Factory.define(:line_item) do |f|
+  f.quantity 1
+  f.price { BigDecimal.new("10.00") }
+
+  # associations:
+  f.association(:order, :factory => :order)
+  f.association(:variant, :factory => :variant)
+end
+
+Factory.define(:line_item_without_weight, :parent => :line_item) do |f|
+  # associations:
+  f.association(:order, :factory => :order)
+  f.association(:variant, :factory => :variant_without_weight)
+end
+
+
+# -------------------------------------- variants --------------------------------------
+
+
+Factory.define(:variant) do |f|
+  f.price 19.99
+  f.cost_price 17.00
+  f.sku { Factory.next(:sku_sequence) }
+  f.weight { BigDecimal.new("#{rand(200)}.#{rand(99)}") }
+  # f.height { BigDecimal.new("#{rand(200)}.#{rand(99)}") }
+  # f.width  { BigDecimal.new("#{rand(200)}.#{rand(99)}") }
+  # f.depth  { BigDecimal.new("#{rand(200)}.#{rand(99)}") }
+
+  # associations:
+  f.product { |p| p.association(:product) }
+  # f.option_values { [Factory(:option_value)] }
+end
+
+
+Factory.define(:variant_without_weight, :parent => :variant) do |f|
+  f.weight nil
+end
+
+
+# -------------------------------------- products --------------------------------------
+
+
+Factory.define :product do |f|
+  f.name { Factory.next(:product_sequence) }
+  f.description {|p| p.name }
+
+  # associations:
+  # f.tax_category {|r| TaxCategory.find(:first) || r.association(:tax_category)}
+  # f.shipping_category {|r| ShippingCategory.find(:first) || r.association(:shipping_category)}
+
+  f.price 19.99
+  f.cost_price 17.00
+  f.sku "ABC"
+  f.available_on { 1.year.ago }
+  f.deleted_at nil
+end
+
+
+# -------------------------------------- users --------------------------------------
+
+
+Factory.define(:user) do |f|
+  f.email { Factory.next(:email_sequence) }
+  f.password 'password'
+  f.password_confirmation 'password'
+end
+
+
+# -------------------------------------- addresses --------------------------------------
+
+
+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
+
+
+# -------------------------------------- states --------------------------------------
+
+
+Factory.define :state do |f|
+  f.name 'ALABAMA'
+  f.abbr 'AL'
+  f.country do |country|
+    if usa = Country.find_by_numcode(840)
+      country = usa
+    else
+      country.association(:country)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -3,6 +3,7 @@
 ENV["RAILS_ENV"] ||= 'test'
 require File.expand_path("../test_app/config/environment", __FILE__)
 require 'rspec/rails'
+require 'factories'
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.

data/spree_additional_calculators.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_additional_calculators'
-  s.version     = '0.1.0'
+  s.version     = '0.1.1'
   s.summary     = 'Additional calculators for spree'
   s.description = 'Allows to calculate shipping costs based on total item weigh and quantity in the order'
   s.required_ruby_version = '>= 1.8.7'

metadata

@@ -1,37 +1,34 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: spree_additional_calculators
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.1.1
   prerelease: 
-  version: 0.1.0
 platform: ruby
-authors: 
+authors:
 - Jurgis Jurksta
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-03 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-06-17 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: spree_core
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &8498870 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.50.2
   type: :runtime
-  version_requirements: *id001
-description: Allows to calculate shipping costs based on total item weigh and quantity in the order
+  prerelease: false
+  version_requirements: *8498870
+description: Allows to calculate shipping costs based on total item weigh and quantity
+  in the order
 email: jurgis@emails.lv
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - LICENSE
 - README.md
@@ -56,37 +53,40 @@ files:
 - lib/tasks/install.rake
 - lib/tasks/spree_additional_calculators.rake
 - public/javascripts/additional_calculators.js
+- spec.opts
+- spec/app/models/additional_calculator/weight_and_quantity_spec.rb
 - spec/app/models/additional_calculator_rate_spec.rb
+- spec/factories.rb
 - spec/spec_helper.rb
 - spree_additional_calculators.gemspec
 - test_app.sh
 homepage: https://github.com/jurgis/spree-additional-calculators
 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
       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"
-requirements: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements:
 - none
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Additional calculators for spree
-test_files: 
+test_files:
+- spec/app/models/additional_calculator/weight_and_quantity_spec.rb
 - spec/app/models/additional_calculator_rate_spec.rb
+- spec/factories.rb
 - spec/spec_helper.rb