spree_core 1.0.4 → 1.0.6

data/app/models/spree/product_property.rb

@@ -6,6 +6,8 @@ module Spree
     validates :property, :presence => true
     validates_length_of :value, :maximum => 255
 
+    attr_accessible :property_name, :value
+
     # virtual attributes for use with AJAX completion stuff
     def property_name
       property.name if property

data/app/models/spree/property.rb

@@ -7,6 +7,8 @@ module Spree
 
     after_destroy :recalculate_product_group_products
 
+    attr_accessible :name, :presentation
+
     validates :name, :presentation, :presence => true
 
     scope :sorted, lambda { order(:name) }

data/app/models/spree/prototype.rb

@@ -2,6 +2,10 @@ module Spree
   class Prototype < ActiveRecord::Base
     has_and_belongs_to_many :properties, :join_table => 'spree_properties_prototypes'
     has_and_belongs_to_many :option_types, :join_table => 'spree_option_types_prototypes'
+
+    attr_accessible :name
+
     validates :name, :presence => true
+
   end
 end

data/app/models/spree/return_authorization.rb

@@ -9,6 +9,8 @@ module Spree
     validates :amount, :numericality => true
     validate :must_have_shipped_units
 
+    attr_accessible :amount, :reason
+
     state_machine :initial => 'authorized' do
       after_transition :to => 'received', :do => :process_return
 

data/app/models/spree/role.rb

@@ -1,5 +1,7 @@
 module Spree
   class Role < ActiveRecord::Base
+    attr_accessible :name
+
     has_and_belongs_to_many :users, :join_table => 'spree_roles_users'
   end
 end

data/app/models/spree/shipment.rb

@@ -13,6 +13,10 @@ module Spree
     after_save :ensure_correct_adjustment, :update_order
 
     attr_accessor :special_instructions
+
+    attr_accessible :order, :shipping_method, :special_instructions,
+                    :shipping_method_id, :tracking, :address, :inventory_units
+
     accepts_nested_attributes_for :address
     accepts_nested_attributes_for :inventory_units
 

data/app/models/spree/shipping_category.rb

@@ -3,5 +3,7 @@ module Spree
     validates :name, :presence => true
     has_many :products
     has_many :shipping_methods
+
+    attr_accessible :name
   end
 end

data/app/models/spree/shipping_method.rb

@@ -6,6 +6,9 @@ module Spree
     validates :name, :calculator, :zone, :presence => true
     belongs_to :shipping_category
 
+    attr_accessible :name, :zone_id, :display_on, :shipping_category_id,
+                    :match_none, :match_one, :match_all, :calculator_type
+
     calculated_adjustments
 
     def available?(order, display_on=nil)

data/app/models/spree/state.rb

@@ -7,6 +7,8 @@ module Spree
 
     validates :country, :name, :presence => true
 
+    attr_accessible :name, :abbr
+
     def self.find_all_by_name_or_abbr(name_or_abbr)
       where("name = ? OR abbr = ?", name_or_abbr, name_or_abbr)
     end

data/app/models/spree/tax_category.rb

@@ -4,6 +4,8 @@ module Spree
 
     has_many :tax_rates, :dependent => :destroy
 
+    attr_accessible :name, :description, :is_default
+
     before_save :set_default_category
 
     default_scope where(:deleted_at => nil)

data/app/models/spree/tax_rate.rb

@@ -20,6 +20,8 @@ module Spree
     calculated_adjustments
     scope :by_zone, lambda { |zone| where(:zone_id => zone) }
 
+    attr_accessible :amount, :tax_category_id, :calculator, :zone_id, :included_in_price, :calculator_type
+
     # Gets the array of TaxRates appropriate for the specified order
     def self.match(order)
       return [] unless order.tax_zone

data/app/models/spree/taxon.rb

@@ -6,6 +6,8 @@ module Spree
     has_and_belongs_to_many :products, :join_table => 'spree_products_taxons'
     before_create :set_permalink
 
+    attr_accessible :name, :parent_id, :position, :icon, :description, :permalink, :taxonomy_id
+
     validates :name, :presence => true
     has_attached_file :icon,
       :styles => { :mini => '32x32>', :normal => '128x128>' },

data/app/models/spree/taxonomy.rb

@@ -2,6 +2,8 @@ module Spree
   class Taxonomy < ActiveRecord::Base
     validates :name, :presence => true
 
+    attr_accessible :name
+
     has_many :taxons
     has_one :root, :conditions => { :parent_id => nil }, :class_name => 'Spree::Taxon'
 

data/app/models/spree/tracker.rb

@@ -1,5 +1,7 @@
 module Spree
   class Tracker < ActiveRecord::Base
+    attr_accessible :analytics_id, :environment, :active
+
     def self.current
       first(:conditions => { :active => true, :environment => Rails.env })
     end

data/app/models/spree/user.rb

@@ -2,6 +2,7 @@
 module Spree
   class User < ActiveRecord::Base
     include Core::UserBanners
+    attr_accessible :email, :password, :password_confirmation
 
     has_many :orders
 

data/app/models/spree/variant.rb

@@ -3,6 +3,11 @@ module Spree
     belongs_to :product
     delegate_belongs_to :product, :name, :description, :permalink, :available_on, :tax_category_id, :shipping_category_id, :meta_description, :meta_keywords, :tax_category
 
+    attr_accessible :name, :presentation, :cost_price,
+                    :position, :on_hand, :option_value_ids,
+                    :product_id, :option_values_attributes, :price,
+                    :weight, :height, :width, :depth, :sku
+
     has_many :inventory_units
     has_many :line_items
     has_and_belongs_to_many :option_values, :join_table => 'spree_option_values_variants'

data/app/models/spree/zone.rb

@@ -11,6 +11,8 @@ module Spree
     alias :members :zone_members
     accepts_nested_attributes_for :zone_members, :allow_destroy => true, :reject_if => proc { |a| a['zoneable_id'].blank? }
 
+    attr_accessible :name, :description, :default_tax, :kind, :zone_members, :zone_members_attributes
+
     # WARNING during tets class method .global is declared to indicate global Zone to use with tests
 
     #attr_accessor :type

data/app/models/spree/zone_member.rb

@@ -3,6 +3,8 @@ module Spree
     belongs_to :zone
     belongs_to :zoneable, :polymorphic => true
 
+    attr_accessible :zone, :zone_id, :zoneable, :zoneable_id, :zoneable_type
+
     def name
       return nil if zoneable.nil?
       zoneable.name

data/app/views/spree/admin/mail_methods/_form.html.erb

@@ -5,7 +5,7 @@
       <p>
         <%= f.label :environment, t(:environment) %><br />
         <%= f.collection_select(:environment,
-                                Spree::Configuration.configurations.keys.sort,
+                                Rails.configuration.database_configuration.keys.sort,
                                 :to_s, :titleize,
                                 {}, {:id => 'gtwy-env'}) %>
       </p>

data/app/views/spree/admin/payment_methods/_form.html.erb

@@ -10,7 +10,7 @@
   <tr data-hook="environment">
     <td><%= label_tag nil, t(:environment) %></td>
     <td>
-      <%= collection_select(:payment_method, :environment, Spree::Configuration.configurations.keys, :to_s, :titleize, {}, {:id => 'gtwy-env'}) %>
+      <%= collection_select(:payment_method, :environment, Rails.configuration.database_configuration.keys.sort, :to_s, :titleize, {}, {:id => 'gtwy-env'}) %>
     </td>
   </tr>
   <tr data-hook="display">

data/app/views/spree/admin/shared/_head.html.erb

@@ -5,9 +5,9 @@
 
 <%= javascript_tag do %>
   ajax_urls = <%== {
-    :product_search_json       => spree.admin_products_url(:format => 'json'),
-    :product_search_basic_json => spree.admin_products_url(:format => 'json', :json_format => 'basic', :limit => 10),
-    :user_search_basic_json    => spree.admin_users_url(:format => 'json', :json_format => 'basic', :limit => 10)
+    :product_search_json       => spree.admin_products_path(:format => 'json'),
+    :product_search_basic_json => spree.admin_products_path(:format => 'json', :json_format => 'basic', :limit => 10),
+    :user_search_json          => spree.admin_users_path(:format => 'json', :limit => 10)
   }.to_json %>;
 
   strings = <%==

data/app/views/spree/admin/tax_rates/index.html.erb

@@ -22,7 +22,7 @@
     <% @tax_rates.each do |tax_rate|%>
     <tr id="<%= dom_id tax_rate %>" data-hook="rate_row">
       <td><%=tax_rate.zone.name %></td>
-      <td><%=tax_rate.tax_category.name %></td>
+      <td><%= tax_rate.tax_category ? tax_rate.tax_category.name : "N/A" %></td>
       <td><%=tax_rate.amount %></td>
       <td><%=tax_rate.included_in_price %></td>
       <td><%=tax_rate.calculator.to_s %></td>

data/app/views/spree/admin/trackers/_form.html.erb

@@ -6,7 +6,7 @@
   <tr data-hook="environment">
     <td><%= label_tag nil, t(:environment) %></td>
     <td>
-      <%= collection_select(:tracker, :environment, Spree::Configuration.configurations.keys, :to_s, :titleize, {}, {:id => 'tracker-env'}) %>
+      <%= collection_select(:tracker, :environment, Rails.configuration.database_configuration.keys.sort, :to_s, :titleize, {}, {:id => 'tracker-env'}) %>
     </td>
   </tr>
   <tr data-hook="active">

data/config/locales/en.yml

@@ -627,6 +627,7 @@ en:
   order_total: "Order Total"
   order_total_message: "The total amount charged to your card will be"
   order_updated: "Order Updated"
+  or_over_price: "Over %{price}"
   other_payment_options: Other Payment Options
   out_of_stock: "Out of Stock"
   over_paid: "Over Paid"
@@ -934,6 +935,8 @@ en:
   special_instructions: "Special Instructions"
   spree:
     date: Date
+    date_picker:
+      format: 'yy/mm/dd'
     time: Time
   spree_gateway_error_flash_for_checkout: "There was a problem with your payment information. Please check your information and try again."
   spree_inventory_error_flash_for_insufficient_quantity: "An item in your cart has become unavailable."
@@ -1008,6 +1011,7 @@ en:
   unable_to_connect_to_gateway: "Unable to connect to gateway."
   unable_to_save_order: "Unable to Save Order"
   under_paid: "Under Paid"
+  under_price: "Under %{price}"
   unrecognized_card_type: Unrecognized card type
   update: Update
   update_password: "Update my password and log me in"

data/config/routes.rb

@@ -11,9 +11,9 @@ Spree::Core::Engine.routes.draw do
   resources :states, :only => :index
 
   # non-restful checkout stuff
-  match '/checkout/update/:state', :to => 'checkout#update', :as => :update_checkout
-  match '/checkout/:state', :to => 'checkout#edit', :as => :checkout_state
-  match '/checkout', :to => 'checkout#edit', :state => 'address', :as => :checkout
+  match '/checkout/update/:state', :to => 'checkout#update', :as => :update_checkout, :via => :put
+  match '/checkout/:state', :to => 'checkout#edit', :as => :checkout_state, :via => :get
+  match '/checkout', :to => 'checkout#edit', :state => 'address', :as => :checkout, :via => :get
 
   resources :orders do
     post :populate, :on => :collection

data/db/migrate/20120523061241_convert_sales_tax_to_default_tax.rb

@@ -0,0 +1,9 @@
+class ConvertSalesTaxToDefaultTax < ActiveRecord::Migration
+  def up
+    execute "UPDATE spree_calculators SET type='Spree::Calculator::DefaultTax' WHERE type='Spree::Calculator::SalesTax'"
+  end
+
+  def down
+    execute "UPDATE spree_calculators SET type='Spree::Calculator::SalesTax' WHERE type='Spree::Calculator::DefaultTax'"
+ end
+end

data/lib/spree/core/calculated_adjustments.rb

@@ -5,6 +5,7 @@ module Spree
         def calculated_adjustments
           has_one   :calculator, :as => :calculable, :dependent => :destroy
           accepts_nested_attributes_for :calculator
+          attr_accessible :calculator_attributes
           validates :calculator, :presence => true
 
           def self.calculators
@@ -31,11 +32,11 @@ module Spree
         def create_adjustment(label, target, calculable, mandatory=false)
           amount = compute_amount(calculable)
           return if amount == 0 && !mandatory
-          target.adjustments.create(:amount => amount,
-                                    :source => calculable,
-                                    :originator => self,
-                                    :label => label,
-                                    :mandatory => mandatory)
+          target.adjustments.create({:amount => amount,
+                                     :source => calculable,
+                                     :originator => self,
+                                     :label => label,
+                                     :mandatory => mandatory}, :without_protection => true)
         end
 
         # Updates the amount of the adjustment using our Calculator and calling the +compute+ method with the +calculable+

data/lib/spree/core/ssl_requirement.rb

@@ -94,10 +94,10 @@ module SslRequirement
     def ensure_proper_protocol
       return true if ssl_allowed?
       if ssl_required? && !request.ssl? && ssl_supported?
-        redirect_to "https://" + request.host + request.fullpath
+        redirect_to "https://" + request.host + request.fullpath.sub("//", "/")
         flash.keep
       elsif request.ssl? && !ssl_required?
-        redirect_to "http://" + request.host + request.fullpath
+        redirect_to "http://" + request.host + request.fullpath.sub("//", "/")
         flash.keep
       end
 

data/lib/spree/core/testing_support/fixtures.rb

@@ -0,0 +1,4 @@
+require 'active_record/fixtures'
+
+fixtures_dir = File.expand_path('../../../../../db/default', __FILE__)
+ActiveRecord::Fixtures.create_fixtures(fixtures_dir, ['spree/countries', 'spree/zones', 'spree/zone_members', 'spree/states', 'spree/roles'])

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "1.0.4"
+    "1.0.6"
   end
 end

data/lib/spree/product_filters.rb

@@ -61,15 +61,20 @@ module Spree
     Spree::Product.scope :price_range_any,
       lambda {|*opts|
         conds = opts.map {|o| Spree::ProductFilters.price_filter[:conds][o]}.reject {|c| c.nil?}
-        Spree::Product.scoped(:joins => :master).conditions_any(conds)
+        scope = conds.shift
+        conds.each do |new_scope|
+          scope = scope.or(new_scope)
+        end
+        Spree::Product.scoped(:joins => :master).where(scope)
       }
 
     def ProductFilters.price_filter
-      conds = [ [ "Under #{format_price(10)}",                 "price             <= 10" ],
-                [ "#{format_price(10)} - #{format_price(15)}", "price between 10 and 15" ],
-                [ "#{format_price(15)} - #{format_price(18)}", "price between 15 and 18" ],
-                [ "#{format_price(18)} - #{format_price(20)}", "price between 18 and 20" ],
-                [ "#{format_price(20)} or over",               "price             >= 20" ] ]
+      v = Spree::Variant.arel_table
+      conds = [ [ I18n.t(:under_price, :price => format_price(10))   , v[:price].lteq(10)],
+                [ "#{format_price(10)} - #{format_price(15)}"        , v[:price].in(10..15)],
+                [ "#{format_price(15)} - #{format_price(18)}"        , v[:price].in(15..18)],
+                [ "#{format_price(18)} - #{format_price(20)}"        , v[:price].in(18..20)],
+                [ I18n.t(:or_over_price, :price => format_price(20)) , v[:price].gteq(20)]]
       { :name   => I18n.t(:price_range),
         :scope  => :price_range_any,
         :conds  => Hash[*conds.flatten],
@@ -95,7 +100,11 @@ module Spree
       Spree::Product.scope :brand_any,
         lambda {|*opts|
           conds = opts.map {|o| ProductFilters.brand_filter[:conds][o]}.reject {|c| c.nil?}
-          Spree::Product.with_property("brand").conditions_any(conds)
+          scope = conds.shift
+          conds.each do |new_scope|
+            scope = scope.or(new_scope)
+          end
+          Spree::Product.with_property("brand").where(scope)
         }
 
       def ProductFilters.brand_filter

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-28 00:00:00.000000000 Z
+date: 2012-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
-  requirement: &70302537108460 !ruby/object:Gem::Requirement
+  requirement: &70340307658100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 0.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70302537108460
+  version_requirements: *70340307658100
 - !ruby/object:Gem::Dependency
   name: nested_set
-  requirement: &70302537107400 !ruby/object:Gem::Requirement
+  requirement: &70340307652340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.8
   type: :runtime
   prerelease: false
-  version_requirements: *70302537107400
+  version_requirements: *70340307652340
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70302537106340 !ruby/object:Gem::Requirement
+  requirement: &70340307669060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +46,10 @@ dependencies:
         version: 1.0.19
   type: :runtime
   prerelease: false
-  version_requirements: *70302537106340
+  version_requirements: *70340307669060
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70302537104500 !ruby/object:Gem::Requirement
+  requirement: &70340315380700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -57,10 +57,10 @@ dependencies:
         version: 1.6.8
   type: :runtime
   prerelease: false
-  version_requirements: *70302537104500
+  version_requirements: *70340315380700
 - !ruby/object:Gem::Dependency
   name: state_machine
-  requirement: &70302537124460 !ruby/object:Gem::Requirement
+  requirement: &70340315376160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -68,10 +68,10 @@ dependencies:
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70302537124460
+  version_requirements: *70340315376160
 - !ruby/object:Gem::Dependency
   name: ffaker
-  requirement: &70302537123780 !ruby/object:Gem::Requirement
+  requirement: &70340315435560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -79,10 +79,10 @@ dependencies:
         version: 1.12.0
   type: :runtime
   prerelease: false
-  version_requirements: *70302537123780
+  version_requirements: *70340315435560
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70302537123120 !ruby/object:Gem::Requirement
+  requirement: &70340315451480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -90,10 +90,10 @@ dependencies:
         version: 2.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *70302537123120
+  version_requirements: *70340315451480
 - !ruby/object:Gem::Dependency
   name: meta_search
-  requirement: &70302537122500 !ruby/object:Gem::Requirement
+  requirement: &70340315459840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -101,10 +101,10 @@ dependencies:
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70302537122500
+  version_requirements: *70340315459840
 - !ruby/object:Gem::Dependency
   name: activemerchant
-  requirement: &70302537121860 !ruby/object:Gem::Requirement
+  requirement: &70340315454400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -112,24 +112,21 @@ dependencies:
         version: 1.20.1
   type: :runtime
   prerelease: false
-  version_requirements: *70302537121860
+  version_requirements: *70340315454400
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70302537121300 !ruby/object:Gem::Requirement
+  requirement: &70340315476380 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.1.1
-    - - <=
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.4
+        version: 3.1.6
   type: :runtime
   prerelease: false
-  version_requirements: *70302537121300
+  version_requirements: *70340315476380
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &70302537119740 !ruby/object:Gem::Requirement
+  requirement: &70340315493040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -137,29 +134,29 @@ dependencies:
         version: 0.13.0
   type: :runtime
   prerelease: false
-  version_requirements: *70302537119740
+  version_requirements: *70340315493040
 - !ruby/object:Gem::Dependency
   name: deface
-  requirement: &70302537118780 !ruby/object:Gem::Requirement
+  requirement: &70340315504320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *70302537118780
+  version_requirements: *70340315504320
 - !ruby/object:Gem::Dependency
   name: stringex
-  requirement: &70302537117760 !ruby/object:Gem::Requirement
+  requirement: &70340315497840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *70302537117760
+  version_requirements: *70340315497840
 description: Required dependency for Spree
 email: sean@spreecommerce.com
 executables: []
@@ -758,6 +755,7 @@ files:
 - lib/spree/core/testing_support/factories/variant_factory.rb
 - lib/spree/core/testing_support/factories/zone_factory.rb
 - lib/spree/core/testing_support/factories.rb
+- lib/spree/core/testing_support/fixtures.rb
 - lib/spree/core/theme_support/hook_listener.rb
 - lib/spree/core/theme_support.rb
 - lib/spree/core/url_helpers.rb
@@ -872,6 +870,7 @@ files:
 - db/migrate/20120105195817_add_match_rules_to_shipping_methods.rb
 - db/migrate/20120119024710_new_preferences.rb
 - db/migrate/20120203153759_add_deleted_at_to_tax_category.rb
+- db/migrate/20120523061241_convert_sales_tax_to_default_tax.rb
 - db/sample/users.rb
 - db/seeds.rb
 - vendor/assets/images/datepicker/cal.gif
@@ -973,7 +972,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -350126003318038634
+      hash: 468942711593894145
 requirements:
 - none
 rubyforge_project: spree_core