spree_core 3.0.3 → 3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf4b040c67cbc697e8ff23b19862515ad3ec40e5
-  data.tar.gz: 4338ea645e72ff94a0a52ffa3531319f4e64824c
+  metadata.gz: 825167ffd3b796e7bd880c79751eeb2631f9762e
+  data.tar.gz: 3dfd8c5d5a0301435c90967be33a2befc3950087
 SHA512:
-  metadata.gz: b68a89ef41087957b53b64bb1519040c52b9de295f6f4a0cee305f9e236bb2ecfdf474eb8f466eb0b6c80f525ebb76913db76bdddba44022e2d8732d48ba18a4
-  data.tar.gz: f223ee12cd500420b4c590d66918da99d69c0f1c46eaac008d18fa5164889aa2eeea266ff15867873291c6c54a78377ae1ad5befcaf321c2e2625e66089dcf44
+  metadata.gz: 9935e7fc716719657036cfb862d4a6ac5a705303c0029ca2828948ababadb82b97ea92d3a8e2580fc3a8c2df0a962b7920035ef7aec47bc81bd3bbc3d65b206b
+  data.tar.gz: 65ef7e2171aecf3e4a62c863601959e550bfad2d8c0e80ac7314469a13adc2dbdb079b6dc48ba02acf8e412da7aed44124c06d073dcfeeec67f0b79d071e13ef

data/app/models/concerns/spree/ransackable_attributes.rb

@@ -0,0 +1,19 @@
+module Spree::RansackableAttributes
+  extend ActiveSupport::Concern
+  included do
+    class_attribute :whitelisted_ransackable_associations
+    class_attribute :whitelisted_ransackable_attributes
+
+    class_attribute :default_ransackable_attributes
+    self.default_ransackable_attributes = %w[id name]
+
+    def self.ransackable_associations(*args)
+      self.whitelisted_ransackable_associations || []
+    end
+
+    def self.ransackable_attributes(*args)
+      self.default_ransackable_attributes | (self.whitelisted_ransackable_attributes || [])
+    end
+  end
+
+end

data/app/models/spree/address.rb

@@ -16,6 +16,9 @@ module Spree
     alias_attribute :first_name, :firstname
     alias_attribute :last_name, :lastname
 
+
+    self.whitelisted_ransackable_attributes = %w[firstname lastname company]
+
     def self.build_default
       country = Spree::Country.find(Spree::Config[:default_country_id]) rescue Spree::Country.first
       new(country: country)

data/app/models/spree/app_configuration.rb

@@ -31,7 +31,7 @@ module Spree
     preference :auto_capture, :boolean, default: false # automatically capture the credit card (as opposed to just authorize and capture later)
     preference :auto_capture_on_dispatch, :boolean, default: false # Captures payment for each shipment in Shipment#after_ship callback, and makes Shipment.ready when payment authorized.
     preference :binary_inventory_cache, :boolean, default: false # only invalidate product cache when a stock item changes whether it is in_stock
-    preference :check_for_spree_alerts, :boolean, default: true
+    preference :check_for_spree_alerts, :boolean, default: false
     preference :checkout_zone, :string, default: nil # replace with the name of a zone if you would like to limit the countries
     preference :company, :boolean, default: false # Request company field for billing and shipping addr
     preference :currency, :string, default: "USD"

data/app/models/spree/base.rb

@@ -1,6 +1,9 @@
 class Spree::Base < ActiveRecord::Base
   include Spree::Preferences::Preferable
   serialize :preferences, Hash
+
+  include Spree::RansackableAttributes
+
   after_initialize do
     self.preferences = default_preferences.merge(preferences) if has_attribute?(:preferences)
   end

data/app/models/spree/line_item.rb

@@ -35,6 +35,9 @@ module Spree
 
     attr_accessor :target_shipment
 
+    self.whitelisted_ransackable_associations = ['variant']
+    self.whitelisted_ransackable_attributes = ['variant_id']
+
     def copy_price
       if variant
         self.price = variant.price if price.nil?

data/app/models/spree/option_value.rb

@@ -9,6 +9,8 @@ module Spree
 
     after_touch :touch_all_variants
 
+    self.whitelisted_ransackable_attributes = ['presentation']
+
     def touch_all_variants
       variants.update_all(updated_at: Time.current)
     end

data/app/models/spree/order.rb

@@ -36,6 +36,9 @@ module Spree
       remove_transition from: :delivery, to: :confirm
     end
 
+    self.whitelisted_ransackable_associations = %w[shipments user promotions bill_address ship_address line_items]
+    self.whitelisted_ransackable_attributes =  %w[completed_at created_at email number state payment_state shipment_state total considered_risky]
+
     attr_reader :coupon_code
     attr_accessor :temporary_address, :temporary_credit_card
 

data/app/models/spree/price.rb

@@ -10,6 +10,8 @@ module Spree
     extend DisplayMoney
     money_methods :amount, :price
 
+    self.whitelisted_ransackable_attributes = ['amount']
+
     def money
       Spree::Money.new(amount || 0, { currency: currency })
     end

data/app/models/spree/product.rb

@@ -99,6 +99,9 @@ module Spree
 
     alias :options :product_option_types
 
+    self.whitelisted_ransackable_associations = %w[stores variants_including_master master variants]
+    self.whitelisted_ransackable_attributes = %w[slug]
+
     # the master variant is not a member of the variants array
     def has_variants?
       variants.any?

data/app/models/spree/product_property.rb

@@ -11,6 +11,8 @@ module Spree
 
     default_scope { order("#{self.table_name}.position") }
 
+    self.whitelisted_ransackable_attributes = ['value']
+
     # virtual attributes for use with AJAX completion stuff
     def property_name
       property.name if property

data/app/models/spree/promotion.rb

@@ -32,6 +32,8 @@ module Spree
 
     scope :applied, -> { joins("INNER JOIN #{order_join_table} ON #{order_join_table}.promotion_id = #{table_name}.id").uniq }
 
+    self.whitelisted_ransackable_attributes = ['code', 'path', 'promotion_category_id']
+
     def self.advertised
       where(advertise: true)
     end

data/app/models/spree/property.rb

@@ -11,6 +11,8 @@ module Spree
 
     after_touch :touch_all_products
 
+    self.whitelisted_ransackable_attributes = ['presentation']
+
     private
 
     def touch_all_products

data/app/models/spree/reimbursement.rb

@@ -83,9 +83,9 @@ module Spree
     end
 
     def calculated_total
-      # rounding down to handle edge cases for consecutive partial returns where rounding
-      # might cause us to try to reimburse more than was originally billed
-      return_items.to_a.sum(&:total).to_d.round(2, :down)
+      # rounding every return item individually to handle edge cases for consecutive partial
+      # returns where rounding might cause us to try to reimburse more than was originally billed
+      return_items.map { |ri| ri.total.to_d.round(2) }.sum
     end
 
     def paid_amount

data/app/models/spree/reimbursement_type/credit.rb

@@ -4,7 +4,7 @@ module Spree
 
     class << self
       def reimburse(reimbursement, return_items, simulate)
-        unpaid_amount = return_items.sum(&:total).round(2, :down)
+        unpaid_amount = return_items.map { |ri| ri.total.to_d.round(2) }.sum
         reimbursement_list, unpaid_amount = create_credits(reimbursement, unpaid_amount, simulate)
         reimbursement_list
       end

data/app/models/spree/reimbursement_type/original_payment.rb

@@ -3,7 +3,7 @@ class Spree::ReimbursementType::OriginalPayment < Spree::ReimbursementType
 
   class << self
     def reimburse(reimbursement, return_items, simulate)
-      unpaid_amount = return_items.sum(&:total).round(2, :down)
+      unpaid_amount = return_items.map { |ri| ri.total.to_d.round(2) }.sum
       payments = reimbursement.order.payments.completed
 
       refund_list, unpaid_amount = create_refunds(reimbursement, payments, unpaid_amount, simulate)

data/app/models/spree/return_authorization.rb

@@ -37,6 +37,8 @@ module Spree
     extend DisplayMoney
     money_methods :pre_tax_total
 
+    self.whitelisted_ransackable_attributes = ['memo']
+
     def pre_tax_total
       return_items.sum(:pre_tax_amount)
     end

data/app/models/spree/shipment.rb

@@ -85,6 +85,8 @@ module Spree
       end
     end
 
+    self.whitelisted_ransackable_attributes = ['number']
+
     extend DisplayMoney
     money_methods :cost, :discounted_cost, :final_price, :item_cost
     alias display_amount display_cost

data/app/models/spree/stock_item.rb

@@ -19,6 +19,8 @@ module Spree
     after_save :conditional_variant_touch, if: :changed?
     after_touch { variant.touch }
 
+    self.whitelisted_ransackable_attributes = ['count_on_hand', 'stock_location_id']
+
     def backordered_inventory_units
       Spree::InventoryUnit.backordered_for_stock_item(self)
     end

data/app/models/spree/stock_movement.rb

@@ -15,6 +15,8 @@ module Spree
 
     scope :recent, -> { order('created_at DESC') }
 
+    self.whitelisted_ransackable_attributes = ['quantity']
+
     def readonly?
       !new_record?
     end

data/app/models/spree/stock_transfer.rb

@@ -15,6 +15,8 @@ module Spree
     belongs_to :source_location, class_name: 'StockLocation'
     belongs_to :destination_location, class_name: 'StockLocation'
 
+    self.whitelisted_ransackable_attributes = %w[reference source_location_id destination_location_id closed_at created_at number]
+
     def to_param
       number
     end

data/app/models/spree/variant.rb

@@ -51,6 +51,9 @@ module Spree
       end
     end
 
+    self.whitelisted_ransackable_associations = %w[option_values product prices default_price]
+    self.whitelisted_ransackable_attributes = %w[weight sku]
+
     def self.active(currency = nil)
       joins(:prices).where(deleted_at: nil).where('spree_prices.currency' => currency || Spree::Config[:currency]).where('spree_prices.amount IS NOT NULL')
     end

data/app/models/spree/zone.rb

@@ -15,6 +15,8 @@ module Spree
     alias :members :zone_members
     accepts_nested_attributes_for :zone_members, allow_destroy: true, reject_if: proc { |a| a['zoneable_id'].blank? }
 
+    self.whitelisted_ransackable_attributes = ['description']
+
     def self.default_tax
       where(default_tax: true).first
     end

data/config/initializers/user_class_extensions.rb

@@ -16,6 +16,14 @@ Spree::Core::Engine.config.to_prepare do
       belongs_to :ship_address, class_name: 'Spree::Address'
       belongs_to :bill_address, class_name: 'Spree::Address'
 
+      def self.ransackable_associations(auth_object=nil)
+        %w[bill_address ship_address]
+      end
+
+      def self.ransackable_attributes(auth_object=nil)
+        %w[id email]
+      end
+
       # has_spree_role? simply needs to return true or false whether a user has a role or not.
       def has_spree_role?(role_in_question)
         spree_roles.where(name: role_in_question.to_s).any?

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    '3.0.3'
+    '3.0.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.4
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-28 00:00:00.000000000 Z
+date: 2015-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -393,6 +393,7 @@ files:
 - app/models/concerns/spree/display_money.rb
 - app/models/concerns/spree/named_type.rb
 - app/models/concerns/spree/number_generator.rb
+- app/models/concerns/spree/ransackable_attributes.rb
 - app/models/concerns/spree/user_address.rb
 - app/models/concerns/spree/user_api_authentication.rb
 - app/models/concerns/spree/user_payment_source.rb