spree 0.4.1 → 0.5.0

data/vendor/extensions/shipping/shipping_extension.rb

@@ -0,0 +1,39 @@
+# Uncomment this if you reference any of your controllers in activate
+require_dependency 'application'
+
+class ShippingExtension < Spree::Extension
+  version "1.0"
+  description "Describe your extension here"
+  url "http://yourwebsite.com/shipping"
+
+  define_routes do |map|
+    map.namespace :admin do |admin|
+      admin.resources :shipping_methods
+      admin.resources :shipping_categories  
+    end  
+    map.resources :shipments
+    map.resources :orders, :has_many => :shipments, :member => {:fatal_shipping => :get}
+  end
+  
+  def activate
+
+    Order.class_eval do
+      has_many :shipments, :dependent => :destroy
+      include Spree::ShippingCalculator
+    end    
+    AddressesController.class_eval do
+      # limit the countries to the ones that are possible to ship to
+      def load_countries
+        @countries = @order.shipping_countries
+        @countries = [Country.find(Spree::Config[:default_country_id])] if @countries.empty?
+      end
+    end
+    Admin::ConfigurationsController.class_eval do
+      before_filter :add_shipping_links, :only => :index
+      def add_shipping_links
+        @extension_links << {:link => admin_shipping_methods_path, :link_text => Globalite.localize(:ext_shipping_shipping_methods), :description => Globalite.localize(:ext_shipping_shipping_methods_description)}
+        @extension_links << {:link => admin_shipping_categories_path, :link_text => Globalite.localize(:ext_shipping_shipping_categories), :description => Globalite.localize(:ext_shipping_shipping_categories_description)}
+      end
+    end
+  end
+end

data/vendor/extensions/shipping/spec/controllers/admin/shipping_categories_controller_spec.rb

@@ -0,0 +1,10 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe Admin::ShippingCategoriesController do
+
+  #Delete this example and add some real ones
+  it "should use Admin::ShippingCategoriesController" do
+    controller.should be_an_instance_of(Admin::ShippingCategoriesController)
+  end
+
+end

data/vendor/extensions/shipping/spec/controllers/admin/shipping_methods_controller_spec.rb

@@ -0,0 +1,10 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe Admin::ShippingMethodsController do
+
+  #Delete this example and add some real ones
+  it "should use Admin::ShippingMethodsController" do
+    controller.should be_an_instance_of(Admin::ShippingMethodsController)
+  end
+
+end

data/vendor/extensions/shipping/spec/models/order_spec.rb

@@ -0,0 +1,98 @@
+require File.dirname(__FILE__) + '/../spec_helper.rb'
+
+describe Order do
+  before(:each) do
+    @order = Order.new(:address => @address = mock_model(Address, :null_object => true))
+    #add_stubs(@order, :save => true)
+  end
+
+  describe "shipping_countries" do
+    it "should return an empty array if there are no shipping methods configured" do
+      ShippingMethod.stub!(:all).and_return([])
+      @order.shipping_countries.should == []
+    end
+    it "should contain only a single country even if multiple shipping methods are configured with that same country" do
+      country = mock_model(Country)
+      method1 = mock_model(ShippingMethod, :zone => mock_model(Zone, :country_list => [country]))
+      method2 = mock_model(ShippingMethod, :zone => mock_model(Zone, :country_list => [country]))
+      ShippingMethod.stub!(:all).and_return([method1, method2])
+      @order.shipping_countries.should == [country]
+    end
+    it "should contain the unique list of countries that fall within at least one shipping method's zone" do
+      country1 = mock_model(Country)
+      country2 = mock_model(Country)
+      method1 = mock_model(ShippingMethod, :zone => mock_model(Zone, :country_list => [country1]))
+      method2 = mock_model(ShippingMethod, :zone => mock_model(Zone, :country_list => [country2]))
+      ShippingMethod.stub!(:all).and_return([method1, method2])
+      @order.shipping_countries.should == [country1, country2]
+    end
+  end
+  
+  describe "shipping_methods" do
+    it "should return empty array if there are no shipping methods configured" do
+      ShippingMethod.stub!(:all).and_return([])
+      @order.shipping_methods.should == []
+    end
+    it "should check the shipping address against the shipping method's zone" do
+      zone = mock_model(Zone)
+      method = mock_model(ShippingMethod, :zone => zone)
+      ShippingMethod.stub!(:all).and_return([method])
+      zone.should_receive(:include?).with(@address)
+      @order.shipping_methods
+    end
+    it "should return empty array if none of the configured shipping methods cover the shipping address" do
+      method = mock_model(ShippingMethod, :zone => mock_model(Zone, :include? => false))
+      ShippingMethod.stub!(:all).and_return([method])
+      @order.shipping_methods.should == []
+    end
+    it "should return all shipping methiods that cover the shipping address" do
+      method1 = mock_model(ShippingMethod, :zone => mock_model(Zone, :include? => true))
+      method2 = mock_model(ShippingMethod, :zone => mock_model(Zone, :include? => true))
+      method3 = mock_model(ShippingMethod, :zone => mock_model(Zone, :include? => false))
+      ShippingMethod.stub!(:all).and_return([method1, method2, method3])
+      @order.shipping_methods.should == [method1, method2]
+    end
+  end
+  
+  describe "state_machine in 'address' state" do
+    before :each do
+      @order.state = 'address'
+    end
+    describe "when there are no shipping methods" do
+      it "next! should transition to 'creditcard_payment'" do
+        @order.stub!(:shipping_methods).and_return([])
+        @order.next!
+        @order.state.should == "creditcard_payment"
+      end
+    end
+    describe "when there is only one shipping method" do
+      before :each do
+        @shipping_method = ShippingMethod.new
+        @order.stub!(:shipping_methods).and_return([@shipping_method]) 
+      end
+      it "next! should transition to 'creditcard_payment'" do
+        @order.next!
+        @order.state.should == "creditcard_payment"
+      end
+      it "should automatically calculate the shipping cost using the single shipping method" do
+        @order.next!
+        @order.shipments.first.shipping_method.should == @shipping_method
+      end
+    end
+    describe "when there is only one shipping method" do
+      it "next! should transition to 'shipment'" do
+        @order.stub!(:shipping_methods).and_return([ShippingMethod.new, ShippingMethod.new])
+        @order.next!
+        @order.state.should == "shipment"
+      end
+    end
+  end
+  
+  describe "state_machine in 'shipment' state" do
+    it "next! should transition to 'creditcard_payment'" do
+      @order.state = 'shipment'
+      @order.next!
+      @order.state.should == "creditcard_payment"
+    end
+  end  
+end

data/vendor/extensions/shipping/spec/models/shipment_spec.rb

@@ -0,0 +1,26 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+class MockCalculator
+end
+
+describe Shipment do
+  before :each do
+    @order = Order.new
+    @shipping_method = ShippingMethod.new(:shipping_calculator => "MockCalculator")
+    @shipment = Shipment.new(:order => @order, :shipping_method => @shipping_method)
+    @calculator = MockCalculator.new
+    MockCalculator.stub!(:new).and_return(@calculator)
+  end
+  
+  describe "update" do
+    it "should calculate the shipping cost using the specified calculator" do
+      @calculator.should_receive(:calculate_shipping).with(@order)
+      @shipment.save
+    end
+    it "should assign the calculated cost to the order" do
+      @calculator.stub!(:calculate_shipping).with(@order).and_return(8.95)
+      @order.should_receive(:update_attribute).with(:ship_amount, 8.95)
+      @shipment.save
+    end
+  end
+end

data/vendor/extensions/shipping/spec/models/shipping_category_spec.rb

@@ -0,0 +1,8 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe ShippingCategory do
+  before(:each) do
+    @shipping_category = ShippingCategory.new
+  end
+
+end

data/vendor/extensions/shipping/spec/models/shipping_method_spec.rb

@@ -0,0 +1,53 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+class MockCalculator
+  def calculate_shipping(order)
+    2.5
+  end
+end
+
+describe ShippingMethod do
+  before(:each) do
+    @zone = mock_model(Zone)
+    @address = mock_model(Address)
+    @shipping_method = ShippingMethod.new(:zone => @zone, :shipping_calculator => "MockCalculator")
+    @order = mock_model(Order, :address => @address)
+  end
+
+  describe "available?" do
+    it "should check the shipping address against the zone" do
+      @zone.should_receive(:include?).with(@address)
+      @shipping_method.available?(@order)
+    end
+    it "should be true if the shipping address is located within the method's zone" do
+      @zone.stub!(:include?).with(@address).and_return(true)
+      @shipping_method.available?(@order).should be_true
+    end
+    it "should be false if the shipping address is located outside of the method's zone" do
+      @zone.stub!(:include?).with(@address).and_return(false)
+      @shipping_method.available?(@order).should be_false
+    end
+  end
+  
+  describe "calculate_shipping" do
+    it "should be 0 if the shipping address does not fall within the method's zone" do
+      @zone.stub!(:include?).with(@address).and_return(false)
+      @shipping_method.calculate_shipping(@order).should == 0
+    end
+    describe "when the shipping address is included within the method's zone" do
+      before :each do
+        @zone.stub!(:include?).with(@address).and_return(true)
+        # TODO - stub out instatiation code        
+      end
+      it "should use the calculate_shipping method of the specified calculator" do
+        @calculator = MockCalculator.new
+        MockCalculator.stub!(:new).and_return(@calculator)
+        @calculator.should_receive(:calculate_shipping).with(@order)
+        @shipping_method.calculate_shipping(@order)
+      end
+      it "should return the correct amount" do
+        @shipping_method.calculate_shipping(@order).should == 2.5
+      end
+    end
+  end
+end

data/vendor/extensions/shipping/spec/spec.opts

@@ -0,0 +1,6 @@
+--colour
+--format
+progress
+--loadby
+mtime
+--reverse

data/vendor/extensions/shipping/spec/spec_helper.rb

@@ -0,0 +1,37 @@
+unless defined? SPREE_ROOT
+  ENV["RAILS_ENV"] = "test"
+  case
+  when ENV["SPREE_ENV_FILE"]
+    require ENV["SPREE_ENV_FILE"]
+  when File.dirname(__FILE__) =~ %r{vendor/SPREE/vendor/extensions}
+    require "#{File.expand_path(File.dirname(__FILE__) + "/../../../../../../")}/config/environment"
+  else
+    require "#{File.expand_path(File.dirname(__FILE__) + "/../../../../")}/config/environment"
+  end
+end
+require "#{SPREE_ROOT}/spec/spec_helper"
+
+if File.directory?(File.dirname(__FILE__) + "/scenarios")
+  Scenario.load_paths.unshift File.dirname(__FILE__) + "/scenarios"
+end
+if File.directory?(File.dirname(__FILE__) + "/matchers")
+  Dir[File.dirname(__FILE__) + "/matchers/*.rb"].each {|file| require file }
+end
+
+Spec::Runner.configure do |config|
+  # config.use_transactional_fixtures = true
+  # config.use_instantiated_fixtures  = false
+  # config.fixture_path = RAILS_ROOT + '/spec/fixtures'
+
+  # You can declare fixtures for each behaviour like this:
+  #   describe "...." do
+  #     fixtures :table_a, :table_b
+  #
+  # Alternatively, if you prefer to declare them only once, you can
+  # do so here, like so ...
+  #
+  #   config.global_fixtures = :table_a, :table_b
+  #
+  # If you declare global fixtures, be aware that they will be declared
+  # for all of your examples, even those that don't use them.
+end

data/vendor/extensions/tax_calculator/lib/spree/sales_tax_calculator.rb

@@ -3,18 +3,26 @@ module Spree #:nodoc:
 
     def self.calculate_tax(order, rates) 
       return 0 if rates.empty?
+      # note: there is a bug with associations in rails 2.1 model caching so we're using this hack
+      # (see http://rails.lighthouseapp.com/projects/8994/tickets/785-caching-models-fails-in-development)
+      cache_hack = rates.first.respond_to?(:tax_category_id)
+            
       taxable_totals = {}
       order.line_items.each do |line_item|
         next unless tax_category = line_item.variant.product.tax_category
-        next unless rate = rates[tax_category]
-        taxable_totals[tax_category] ||= 0
+        next unless rate = rates.find { | sales_rate | sales_rate.tax_category_id == tax_category.id } if cache_hack        
+        next unless rate = rates.find { | sales_rate | sales_rate.tax_category == tax_category } unless cache_hack        
+
+        taxable_totals[tax_category] ||= 0        
         taxable_totals[tax_category] += line_item.total
       end
 
       return 0 if taxable_totals.empty?
       tax = 0
-      rates.each do |category, rate|
-        return unless taxable_total = taxable_totals[category]   
+      rates.each do |rate|
+        tax_category = rate.tax_category unless cache_hack
+        tax_category = TaxCategory.find(rate.tax_category_id) if cache_hack
+        next unless taxable_total = taxable_totals[tax_category]   
         tax += taxable_total * rate.amount
       end
       tax

data/vendor/extensions/tax_calculator/spec/controllers/tax_calculator_spec.rb

@@ -3,10 +3,6 @@ require File.dirname(__FILE__) + '/../spec_helper'
 describe ApplicationController do
   
   before(:each) do 
-    @new_york = mock_model State, :name => "New York"
-    @ship_address = mock_model Address, {:state => @new_york}
-    @order = mock_model Order, {:item_total => 100, :ship_address => @ship_address}
-    @tax_rate = mock_model TaxRate, {:state => @new_york, :rate => 0.075} 
   end
     
   it "should map :controller => 'admin/tax_rates', :action => 'index') to /admin/tax_rates" do

data/vendor/extensions/tax_calculator/spec/models/sales_tax_calculator_spec.rb

@@ -14,40 +14,40 @@ describe Spree::SalesTaxCalculator do
   end
   
   it "should calc zero tax if no rates provided" do
-    Spree::SalesTaxCalculator.calculate_tax(@order, {}).should == 0
+    Spree::SalesTaxCalculator.calculate_tax(@order, []).should == 0
   end
   
   it "should calc zero tax if none of the line items contains a taxable product" do
-    tax_category = mock_model(TaxCategory)
+    tax_category = TaxCategory.create(:name => "foo")
     tax_rate = mock_model(TaxRate, :amount => 0.05, :category => tax_category)
     @product1.should_receive(:tax_category).and_return(nil)
     @product2.should_receive(:tax_category).and_return(nil)
-    Spree::SalesTaxCalculator.calculate_tax(@order, {tax_category => tax_rate}).should == 0
+    Spree::SalesTaxCalculator.calculate_tax(@order, [tax_rate]).should == 0
   end
 
   it "should calc tax only on the items that are taxable" do
-    tax_category = mock_model(TaxCategory)
-    tax_rate = mock_model(TaxRate, :amount => 0.05, :category => tax_category)
+    tax_category = TaxCategory.create(:name => "foo")
+    tax_rate = TaxRate.new(:amount => 0.05, :tax_category => tax_category)
     @product1.should_receive(:tax_category).and_return(nil)
     @product2.should_receive(:tax_category).and_return(tax_category)
-    Spree::SalesTaxCalculator.calculate_tax(@order, {tax_category => tax_rate}).should == 5
+    Spree::SalesTaxCalculator.calculate_tax(@order, [tax_rate]).should == 5
   end
   
   it "should apply tax to the total of all taxable line items" do
-    tax_category = mock_model(TaxCategory)
-    tax_rate = mock_model(TaxRate, :amount => 0.10, :category => tax_category)
+    tax_category = TaxCategory.create(:name => "foo")
+    tax_rate = TaxRate.new(:amount => 0.10, :tax_category => tax_category)
     @product1.stub!(:tax_category).and_return(tax_category)
     @product2.stub!(:tax_category).and_return(tax_category)
-    Spree::SalesTaxCalculator.calculate_tax(@order, {tax_category => tax_rate}).should == 20
+    Spree::SalesTaxCalculator.calculate_tax(@order, [tax_rate]).should == 20
   end
   
   it "should apply the correct tax rates based on tax category" do
-    tax_category1 = mock_model(TaxCategory)
-    tax_category2 = mock_model(TaxCategory)
-    tax_rate1 = mock_model(TaxRate, :amount => 0.10, :category => tax_category1)
-    tax_rate2 = mock_model(TaxRate, :amount => 0.05, :category => tax_category2)
+    tax_category1 = TaxCategory.create(:name => "foo")
+    tax_category2 = TaxCategory.create(:name => "bar")
+    tax_rate1 = TaxRate.create(:amount => 0.10, :tax_category => tax_category1)
+    tax_rate2 = TaxRate.create(:amount => 0.05, :tax_category => tax_category2)
     @product1.stub!(:tax_category).and_return(tax_category1)
     @product2.stub!(:tax_category).and_return(tax_category2)
-    Spree::SalesTaxCalculator.calculate_tax(@order, {tax_category1 => tax_rate1, tax_category2 => tax_rate2}).should == 15
+    Spree::SalesTaxCalculator.calculate_tax(@order, [tax_rate1, tax_rate2]).should == 15
   end
 end

data/vendor/extensions/tax_calculator/tax_calculator_extension.rb

@@ -43,8 +43,4 @@ class TaxCalculatorExtension < Spree::Extension
       end
     end
   end
-  
-  def deactivate
-  end
-  
 end

data/vendor/plugins/resource_controller/README.rdoc

@@ -4,13 +4,9 @@ resource_controller makes RESTful controllers easier, more maintainable, and sup
 
 == Get It
 
-Add it as a gem dependency
+Install it as a plugin:
 
-  config.gem 'giraffesoft-resource_controller', :lib => 'resource_controller', :source => 'http://gems.github.com'
-  
-Or install it as a gem manually  
-  
-  sudo gem install giraffesoft-resource_controller
+  script/plugin install git://github.com/giraffesoft/resource_controller.git
   
 Or grab the source
   
@@ -102,6 +98,42 @@ With actions that can fail, the scoping defaults to success.  That means that cr
     end
     
   end
+  
+== Singleton Resource
+
+If you want to create a singleton RESTful controller inherit from ResourceController::Singleton.
+
+  class AccountsController < ResourceController::Singleton
+  end
+
+*Note:* This type of controllers handle a single resource only so the index action and all the collection helpers (collection_url, collection_path...) are not available for them.
+
+Loading objects in singletons is similar to plural controllers with one exception. For non-nested singleton controllers you should override the object method as it defaults to nil for them.
+
+  class AccountsController < ResourceController::Singleton
+    private
+      def object
+        @object ||= Account.find(session[:account_id])
+      end
+   end
+
+In other cases you can use the default logic and override it only if you use permalinks or anything special. 
+
+Singleton nesting with both :has_many and :has_one associations is provided...
+
+  map.resource :account, :has_many => :options  # /account/options, account is a singleton parent
+  map.resources :users, :has_one => :image  # /users/1/image, image is a singleton child
+
+If you have the :has_many association with a singleton parent remember to override parent_object for your :has_many controller as it returns nil by default in this case.
+
+  class OptionsController < ResourceController::Base
+    belongs_to :account
+
+    protected
+    def parent_object
+      Account.find(session[:account_id])
+    end
+  end
 
 == Helpers (ResourceController::Helpers)