solidus_core 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50bd29de10c7232c6a5dce938b456b7e50b272f0
-  data.tar.gz: b0def8e0cf515c431e8ce61d81b1cb19d5853d76
+  metadata.gz: e4c9d8f7e575ee2b1f7282a63b107a3526650269
+  data.tar.gz: ecaa9e9bb8ec49d159675e49f2bbea138fbfe0de
 SHA512:
-  metadata.gz: 30a7433f3c995f231a8ecfca3196b6798229242c5684563deed7aa3ca8b942ead7307802c448da218168089e82d0d9fd87b307a947f9e428c1be0e8d62f12e8f
-  data.tar.gz: e99212264483a442793e58b83010a2e8169a21af85ae8f90d02233e35991206ee11517fa77299e3d43690aff0ce810f2cc26cdc39fd1034afe30721c8e9bd461
+  metadata.gz: badb4d1790e571121a237cb462bc9fae924a0793e6d16cdd169d3cb427dcb4f725a2c610602de02a678af6fcd5d2fa4632635abbf50af741a6c54263b70ea838
+  data.tar.gz: 7165bf3a4b9ab49278310e03711d555b7434f5afa15311eba73afce655e3b6d3b3eba7076443a0af98f2aac2ee3192647b240d362326bfa4bcd3cbd8aaef8b77

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/concerns/spree/user_methods.rb

@@ -25,6 +25,14 @@ module Spree
 
       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
     end
 
     # has_spree_role? simply needs to return true or false whether a user has a role or not.

data/app/models/spree/address.rb

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

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
     if has_attribute?(:preferences)
       self.preferences = default_preferences.merge(preferences)

data/app/models/spree/line_item.rb

@@ -37,6 +37,9 @@ module Spree
 
     attr_accessor :target_shipment
 
+    self.whitelisted_ransackable_associations = ['variant']
+    self.whitelisted_ransackable_attributes = ['variant_id']
+
     # Sets this line item's price, cost price, and currency from this line
     # item's variant if they are nil and a variant is present.
     def copy_price

data/app/models/spree/option_value.rb

@@ -12,6 +12,8 @@ module Spree
     after_save :touch
     after_touch :touch_all_variants
 
+    self.whitelisted_ransackable_attributes = ['presentation']
+
     # Updates the updated_at column on all the variants associated with this
     # option value.
     def touch_all_variants

data/app/models/spree/order.rb

@@ -28,6 +28,9 @@ module Spree
       go_to_state :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]
+
     attr_reader :coupon_code
     attr_accessor :temporary_address, :temporary_credit_card
 

data/app/models/spree/permission_sets/order_management.rb

@@ -2,6 +2,7 @@ module Spree
   module PermissionSets
     class OrderManagement < PermissionSets::Base
       def activate!
+        can :display, Spree::ReimbursementType
         can :manage, Spree::Order
         can :manage, Spree::Payment
         can :manage, Spree::Shipment
@@ -9,6 +10,7 @@ module Spree
         can :manage, Spree::LineItem
         can :manage, Spree::ReturnAuthorization
         can :manage, Spree::CustomerReturn
+        can :manage, Spree::OrderCancellations
       end
     end
   end

data/app/models/spree/price.rb

@@ -11,6 +11,8 @@ module Spree
     extend DisplayMoney
     money_methods :amount, :price
 
+    self.whitelisted_ransackable_attributes = ['amount']
+
     # @return [Spree::Money] this price as a Spree::Money object
     def money
       Spree::Money.new(amount || 0, { currency: currency })

data/app/models/spree/product.rb

@@ -86,6 +86,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]
+
     # @return [Boolean] true if there are any variants
     def has_variants?
       variants.any?

data/app/models/spree/product_property.rb

@@ -9,6 +9,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

@@ -41,6 +41,9 @@ module Spree
     end
     scope :applied, -> { joins(:order_promotions).uniq }
 
+    self.whitelisted_ransackable_associations = ['codes']
+    self.whitelisted_ransackable_attributes = ['path', 'promotion_category_id']
+
     # temporary code. remove after the column is dropped from the db.
     def columns
       super.reject { |column| column.name == "code" }

data/app/models/spree/promotion_code.rb

@@ -1,4 +1,4 @@
-class Spree::PromotionCode < ActiveRecord::Base
+class Spree::PromotionCode < Spree::Base
   belongs_to :promotion, inverse_of: :codes
   has_many :adjustments
 
@@ -7,6 +7,8 @@ class Spree::PromotionCode < ActiveRecord::Base
 
   before_save :downcase_value
 
+  self.whitelisted_ransackable_attributes = ['value']
+
   # Whether the promotion code has exceeded its usage restrictions
   #
   # @return true or false

data/app/models/spree/return_authorization.rb

@@ -38,6 +38,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

@@ -72,6 +72,8 @@ module Spree
       end
     end
 
+    self.whitelisted_ransackable_attributes = ['number']
+
     def can_transition_from_pending_to_shipped?
       !requires_shipment?
     end

data/app/models/spree/stock_item.rb

@@ -15,6 +15,8 @@ module Spree
     after_save :conditional_variant_touch, if: :changed?
     after_touch { variant.touch }
 
+    self.whitelisted_ransackable_attributes = ['count_on_hand', 'stock_location_id']
+
     # @return [Array<Spree::InventoryUnit>] the backordered inventory units
     #   associated with this stock item
     def backordered_inventory_units

data/app/models/spree/stock_movement.rb

@@ -10,6 +10,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

@@ -7,9 +7,9 @@ module Spree
     has_many :stock_movements, :as => :originator
     has_many :transfer_items, inverse_of: :stock_transfer
 
-    belongs_to :created_by, :class_name => Spree.user_class.to_s
-    belongs_to :finalized_by, :class_name => Spree.user_class.to_s
-    belongs_to :closed_by, :class_name => Spree.user_class.to_s
+    belongs_to :created_by, :class_name => Spree::UserClassHandle.new
+    belongs_to :finalized_by, :class_name => Spree::UserClassHandle.new
+    belongs_to :closed_by, :class_name => Spree::UserClassHandle.new
     belongs_to :source_location, :class_name => 'Spree::StockLocation'
     belongs_to :destination_location, :class_name => 'Spree::StockLocation'
 
@@ -20,6 +20,8 @@ module Spree
 
     before_destroy :ensure_not_finalized
 
+    self.whitelisted_ransackable_attributes = %w[source_location_id destination_location_id closed_at created_at number]
+
     def to_param
       number
     end

data/app/models/spree/variant.rb

@@ -66,6 +66,9 @@ module Spree
 
     scope :in_stock, -> { joins(:stock_items).where('count_on_hand > ? OR track_inventory = ?', 0, false) }
 
+    self.whitelisted_ransackable_associations = %w[option_values product prices default_price]
+    self.whitelisted_ransackable_attributes = %w[weight sku]
+
     # Returns variants that are not deleted and have a price in the given
     # currency.
     #

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? }
 
+    self.whitelisted_ransackable_attributes = ['description']
+
     def self.default_tax
       where(default_tax: true).first
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-11 00:00:00.000000000 Z
+date: 2015-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -382,6 +382,7 @@ files:
 - app/models/concerns/spree/default_price.rb
 - app/models/concerns/spree/display_money.rb
 - app/models/concerns/spree/named_type.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_methods.rb