spree 0.6.0 → 0.7.0

data/vendor/extensions/shipping/app/controllers/admin/shipments_controller.rb

@@ -1,5 +1,5 @@
 class Admin::ShipmentsController < Admin::BaseController
-  before_filter :load_data
+  before_filter :load_data, :except => :country_changed
   before_filter :load_shipment_presenter, :only => [:create, :update]
 
   resource_controller
@@ -14,10 +14,8 @@ class Admin::ShipmentsController < Admin::BaseController
     shipment.address = @shipment_presenter.address
     unless @shipment_presenter.valid? and shipment.save
       render :action => "new" and return
-    end    
-    if params['mark_shipped']
-      @order.ship!
     end 
+    @order.state_events.create(:name => t('ship'), :user => current_user, :previous_state => @order.state) if params[:mark_shipped]  
     flash[:notice] = t('created_successfully')
     redirect_to collection_url
   end
@@ -35,12 +33,15 @@ class Admin::ShipmentsController < Admin::BaseController
     @shipment.shipped_at = Time.now if params[:mark_shipped]    
     unless @shipment_presenter.valid? and @shipment.save
       render :action => "edit" and return
-    end    
+    end
+    @order.state_events.create(:name => t('ship'), :user => current_user, :previous_state => @order.state) if params[:mark_shipped]
     flash[:notice] = t('updated_successfully')
     redirect_to edit_object_url
   end
 
   def country_changed
+    @selected_country_id = params[:shipment_presenter][:address_country_id].to_i if params.has_key?('shipment_presenter')
+    @states = State.find_all_by_country_id(@selected_country_id, :order => 'name')  
     render :partial => "shared/states", :locals => {:presenter_type => "shipment"}
   end
   

data/vendor/extensions/shipping/app/views/admin/shipments/index.html.erb

@@ -14,7 +14,7 @@
       <td><%= shipment.shipping_method.name if shipment.shipping_method %></td>
       <td><%= shipment.cost %></td>
       <td><%= shipment.tracking %></td>
-      <td><%= shipment.shipped_at.to_s(:db) if shipment.shipped_at %></td>
+      <td><%= shipment.shipped_at.to_s(:date_time24) if shipment.shipped_at %></td>
       <td><%= link_to t('edit'), edit_admin_order_shipment_url(@order, shipment) %></td>
     </tr>
   <% end %>

data/vendor/extensions/shipping/config/locales/nb-NO.yml

@@ -0,0 +1,25 @@
+--- 
+nb-NO: 
+  activerecord: 
+    attributes: 
+      product: 
+        shipping_category: "Fraktkategori"
+    models: 
+      shipping_category: 
+        one: "Fraktkategori"
+        other: "Fraktkategorier"
+  ext_shipping_calculator: Kalkulator
+  ext_shipping_cost: Kostnad
+  ext_shipping_editing_shipping_category: Endre fraktkategori
+  ext_shipping_editing_shipping_method: "Endre leveransemåte"
+  ext_shipping_mark_shipped: "Merk som levert"
+  ext_shipping_method: Leveransemåte
+  ext_shipping_new_shipping_category: "Ny fraktkategori"
+  ext_shipping_new_shipping_method: "Ny leveransemåte"
+  ext_shipping_shipment_number: "Leveransenummer"
+  ext_shipping_shipping_categories: "Fraktkategorier"
+  ext_shipping_shipping_categories_description: "Konfigurer fraktkategorier for å styre hvilke produkter som kan bruke de ulike leveransemåtene."
+  ext_shipping_shipping_methods: "Leveransemåter"
+  ext_shipping_shipping_methods_description: "Konfigurer leveransemåter."
+  ext_shipping_tracking: Sporing
+  select_preferred_shipping_option: "Velg ønsket leveransemåte"

data/vendor/extensions/shipping/config/locales/ru-RU.yml

@@ -0,0 +1,25 @@
+--- 
+ru-RU: 
+  activerecord: 
+    attributes: 
+      product: 
+        shipping_category: "Категория доставки"
+    models: 
+      shipping_category: 
+        one: "Категория доставки"
+        other: "Категории доставки"
+  ext_shipping_calculator: Калькулятор
+  ext_shipping_cost: Стоимость
+  ext_shipping_editing_shipping_category: "Редактировать категорию доставки"
+  ext_shipping_editing_shipping_method: "Редактировать способ доставки"
+  ext_shipping_mark_shipped: "Отметить как доставленный"
+  ext_shipping_method: Способ
+  ext_shipping_new_shipping_category: "Новая категория доставки"
+  ext_shipping_new_shipping_method: "Новый способ доставки"
+  ext_shipping_shipment_number: "Доставка #"
+  ext_shipping_shipping_categories: "Категории доставки"
+  ext_shipping_shipping_categories_description: "Настройка категорий доставки - укажите, какие продукты могут быть доставлены какими способами"
+  ext_shipping_shipping_methods: "Способы доставки"
+  ext_shipping_shipping_methods_description: "Управление методами доставки"
+  ext_shipping_tracking: Отслеживание
+  select_preferred_shipping_option: "Выберите предпочитаемый способ доставки"

data/vendor/extensions/shipping/db/sample/shipping_methods.yml

@@ -9,4 +9,8 @@ ups_two_day:
 ups_one_day:
   name: UPS One Day
   zone: available_shipping
-  shipping_calculator: Spree::FlatRateShipping::Calculator
+  shipping_calculator: Spree::FlatRateShipping::Calculator
+one_option:
+  name: Only one option
+  zone: one_ship_option
+  shipping_calculator: Spree::FlatRateShipping::Calculator

data/vendor/extensions/shipping/db/sample/zone_members.yml

@@ -5,4 +5,12 @@ usa_member:
 canada_member:
   parent: available_shipping
   member_id: 35
-  member_type: Country
+  member_type: Country
+uk_one_ship_opt:
+  parent: one_ship_option
+  member_id: 213
+  member_type: Country
+uae_one_ship_opt:
+  parent: one_ship_option
+  member_id: 212                # UAE, just cos it's close to US/UK in the list
+  member_type: Country

data/vendor/extensions/shipping/db/sample/zones.yml

@@ -1,3 +1,6 @@
 available_shipping:
   name: North America
-  description: USA + Canada
+  description: USA + Canada
+one_ship_option:
+  name: Zone with one shipping option 
+  description: Zone with one shipping option 

data/vendor/extensions/shipping/lib/spree/shipping_calculator.rb

@@ -1,22 +1,6 @@
 module Spree #:nodoc:
   module ShippingCalculator
 
-    # modify the transitions in core - go to shipping first (before creditcard)
-    fsm = Order.state_machines['state']
-    fsm.states << "shipment"
-    fsm.events['next'].transitions.delete_if { |t| t.options[:to] == "creditcard" && t.options[:from] == "in_progress" }
-    fsm.events['next'].transition(:to => 'shipment', :from => 'in_progress')
-    fsm.events['next'].transition(:to => 'shipping_method', :from => 'shipment')
-    fsm.events['next'].transition(:to => 'creditcard', :from => 'shipping_method')
-    # skip right to creditcard step if there are no shipping methods at all (ex. store sells only electronic downloads)
-    fsm.after_transition :to => 'shipment', :do => lambda { |order| order.update_attribute(:state, "creditcard") if ShippingMethod.all.empty? }
-    fsm.events['edit'].transition(:to => 'in_progress', :from => ['shipment', 'shipping_method'])
-    fsm.after_transition :to => 'shipping_method', :do => lambda {|order| order.update_attribute(:tax_amount, order.calculate_tax)}
-    fsm.after_transition :to => 'shipped', :do => :mark_shipped
-
-    fsm.events['ship'] = PluginAWeek::StateMachine::Event.new(fsm, "ship")
-    fsm.events['ship'].transition(:to => 'shipped', :from => 'paid')
-
     def mark_shipped
       inventory_units.each do |inventory_unit|
         inventory_unit.ship!

data/vendor/extensions/shipping/shipping_extension.rb

@@ -8,21 +8,6 @@ class ShippingExtension < Spree::Extension
 
   def activate
 
-    Order.class_eval do
-      has_many :shipments, :dependent => :destroy
-      include Spree::ShippingCalculator
-
-      # convenience method since many stores will not allow user to create multiple shipments
-      def shipment
-        shipments.last
-      end
-      
-      def ship_address
-        return nil if shipments.empty?
-        return shipment.address
-      end      
-    end 
-    
     Admin::ConfigurationsController.class_eval do
       before_filter :add_shipping_links, :only => :index
       def add_shipping_links

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

@@ -1,30 +1,36 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
-class MockCalculator
+class MockCalculator           
+  def available?(order)
+    true
+  end
   def calculate_shipping(order)
     2.5
   end
 end
 
+class MockUnavailableCalculator           
+  def available?(order)
+    false
+  end
+end
+
 describe ShippingMethod do
   before(:each) do
+    @calculator = MockCalculator.new
+    MockCalculator.stub!(:new).and_return(@calculator)
     @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)
+  describe "available?" do      
+    it "should return true if the calculator indicates method is supported" do
       @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)
+    it "should return false if the calculator indicates method is not supported"  do
+      @shipping_method = ShippingMethod.new(:zone => @zone, :shipping_calculator => "MockUnavailableCalculator")
       @shipping_method.available?(@order).should be_false
     end
   end

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

@@ -79,26 +79,12 @@ describe Order do
         @order.state.should == "creditcard"
       end
     end
-    describe "when there is only one shipping method" do
-      before :each do   
+    describe "when there is more then one shipping method" do
+      it "next! should transition to 'shipping_method'" do
         @order.state = "shipment"
-        @shipping_method = ShippingMethod.new(:shipping_calculator => "MockCalculator")
-        @order.stub!(:shipping_methods).and_return([@shipping_method]) 
-      end
-      it "next! should transition to 'creditcard'" do
-        @order.next!
-        @order.state.should == "creditcard"
-      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"
+        @order.state.should == "shipping_method"
       end
     end
   end

data/vendor/extensions/tax_calculator/config/locales/nb-NO.yml

@@ -0,0 +1,30 @@
+--- 
+nb-NO: 
+  activerecord: 
+    attributes: 
+      product: 
+        tax_category: "Momskategori"
+      tax_category: 
+        description: Beskrivelse
+        name: Navn
+      tax_rate: 
+        amount: Momsnivå
+    models: 
+      tax_category: 
+        one: "Momskategori"
+        other: "Momskategorier"
+      tax_rate: 
+        one: "Momsnivå"
+        other: "Momsnivå"
+  ext_tax_calculator_action: Aksjon
+  ext_tax_calculator_amount: Beløp
+  ext_tax_calculator_category: Kategori
+  ext_tax_calculator_create: Opprett
+  ext_tax_calculator_delete: Slett
+  ext_tax_calculator_edit: Endre
+  ext_tax_calculator_editing_tax_rate: "Endre momsnivå"
+  ext_tax_calculator_new_tax_rate: "Nytt momsnivå"
+  ext_tax_calculator_tax_rates: "Momsnivå"
+  ext_tax_calculator_tax_rates_description: "Konfigurer momsnivå."
+  ext_tax_calculator_tax_type: "Momstype"
+  ext_tax_calculator_zone: Sone

data/vendor/extensions/tax_calculator/spec/models/{order_spec.rb → order_tax_calc_spec.rb}

@@ -7,11 +7,11 @@ describe Order do
   end
 
   describe "with address state" do
-    before(:each) {@order.state = 'address'}
+    before(:each) {@order.state = 'shipment'}
     describe "next" do
       it "should transition to credit_card_payment state" do
         @order.next
-        @order.state.should == "creditcard_payment"
+        @order.state.should == "shipping_method"
       end
       it "should calculate the tax during the transition" do
         @order.should_receive(:calculate_tax)

data/vendor/gems/{active_presenter-0.0.4 → active_presenter-0.0.6}/.specification

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: active_presenter
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.6
 platform: ruby
 authors: 
 - James Golick & Daniel Haran
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-01 00:00:00 -04:00
+date: 2009-01-22 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -40,8 +40,6 @@ post_install_message:
 rdoc_options: []
 
 require_paths: 
-- bin
-- bin
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
@@ -58,7 +56,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: active_presenter
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: ActivePresenter is the presenter library you already know! (...if you know ActiveRecord)

data/vendor/gems/{active_presenter-0.0.4 → active_presenter-0.0.6}/README

@@ -25,9 +25,9 @@ Or get the source from github:
 Creating a presenter is as simple as subclassing ActivePresenter::Base. Use the presents method to indicate which models the presenter should present.
 
   class SignupPresenter < ActivePresenter::Base
-    presents User, Account
+    presents :user, :account
   end
-
+ 
 === Instantiation
 
 Then, you can instantiate the presenter using either, or both of two forms. 
@@ -66,6 +66,12 @@ Both of these methods are compatible with error_messages_for. It just depends wh
 
 You can save your presenter the same way you'd save an ActiveRecord object. Both #save, and #save! behave the same way they do on a normal AR model.
 
+=== Callbacks
+
+Callbacks work exactly like ActiveRecord callbacks. before_save, and after_save are available.
+
+Note that if any of your after_save callbacks return false, the rest of them will not be run. This is consistent with AR behavior.
+
 == Credits
 
 ActivePresenter was created, and is maintained by {Daniel Haran}[http://danielharan.com] and {James Golick}[http://jamesgolick.com] on the train ride to {RubyFringe}[http://rubyfringe.com] from Montreal.
@@ -73,3 +79,4 @@ ActivePresenter was created, and is maintained by {Daniel Haran}[http://danielha
 == License
 
 ActivePresenter is available under the {MIT License}[http://en.wikipedia.org/wiki/MIT_License]
+

data/vendor/gems/{active_presenter-0.0.4 → active_presenter-0.0.6}/lib/active_presenter/base.rb

@@ -2,6 +2,9 @@ module ActivePresenter
   # Base class for presenters. See README for usage.
   #
   class Base
+    include ActiveSupport::Callbacks
+    define_callbacks :before_save, :after_save
+    
     class_inheritable_accessor :presented
     self.presented = {}
     
@@ -9,19 +12,25 @@ module ActivePresenter
     # i.e.
     #
     #   class SignupPresenter < ActivePresenter::Base
-    #     presents User, Account
+    #     presents :user, :account
     #   end
     #
     #
     def self.presents(*types)
-      attr_accessor *types
+      #attr_accessor *types
       
       types.each do |t|
         define_method("#{t}_errors") do
           send(t).errors
         end
-        
-        presented[t] = t.to_s.tableize.classify.constantize
+        if t.is_a? Hash             
+          key = t.keys.first
+          presented[key] = t[key]
+          attr_accessor key
+        else
+          presented[t] = t.to_s.tableize.classify.constantize
+          attr_accessor t
+        end
       end
     end
     
@@ -56,7 +65,7 @@ module ActivePresenter
       
       self.attributes = args
     end
-    
+
     # Set the attributes of the presentable instances using the type_attribute form (i.e. user_login => 'james')
     #
     def attributes=(attrs)
@@ -101,12 +110,14 @@ module ActivePresenter
       saved = false
       
       ActiveRecord::Base.transaction do
-        if valid?
+        if valid? && run_callbacks_with_halt(:before_save)
           saved = presented_instances.map { |i| i.save(false) }.all?
           raise ActiveRecord::Rollback unless saved # TODO: Does this happen implicitly?
         end
       end
       
+      run_callbacks_with_halt(:after_save) if saved
+      
       saved
     end
     
@@ -115,10 +126,14 @@ module ActivePresenter
     # Returns true on success, will raise otherwise.
     # 
     def save!
+      raise ActiveRecord::RecordNotSaved unless run_callbacks_with_halt(:before_save)
+      
       ActiveRecord::Base.transaction do
         valid? # collect errors before potential exception raise
         presented_instances.each { |i| i.save! }
       end
+      
+      run_callbacks_with_halt(:after_save)
     end
     
     # Update attributes, and save the presentables
@@ -130,6 +145,15 @@ module ActivePresenter
       save
     end
     
+    # We define #id and #new_record? to play nice with form_for(@presenter) in Rails
+    def id # :nodoc:
+      nil
+    end
+
+    def new_record?
+      true
+    end
+    
     protected
       def presented_instances
         presented.keys.map { |key| send(key) }
@@ -141,7 +165,7 @@ module ActivePresenter
       end
       
       def presentable_for(method_name)
-        presented.keys.detect do |type|
+        presented.keys.sort_by { |k| k.to_s.size }.reverse.detect do |type|
           method_name.to_s.starts_with?(attribute_prefix(type))
         end
       end
@@ -161,14 +185,20 @@ module ActivePresenter
       
       def merge_errors(presented_inst, type)
         presented_inst.errors.each do |att,msg|
-          errors.add(attribute_prefix(type)+att, msg.to_s)
+          errors.add(attribute_prefix(type)+att, msg)
         end
       end
       
       def attribute_protected?(name)
+        return false # HACK - We're not using any sensitive objects in presenter and the multiple Address models in one presenter was breaking
         presentable    = presentable_for(name)
+        return false unless presentable
         flat_attribute = {flatten_attribute_name(name, presentable) => ''} #remove_att... normally takes a hash, so we use a ''
         presentable.to_s.tableize.classify.constantize.new.send(:remove_attributes_protected_from_mass_assignment, flat_attribute).empty?
       end
+      
+      def run_callbacks_with_halt(callback)
+        run_callbacks(callback) { |result, object| result == false }
+      end
   end
 end