piggybak 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9cdf2d5cc0e37659ae8f4feced76d5962cc06951
-  data.tar.gz: 4588a015c22ef9592f318cfe73eed056e408661f
+  metadata.gz: 4470f4fbdba7afd56c0a7e3613540222c9e86c2a
+  data.tar.gz: da084dbabde7d4edaa8c435399961701ccf8a21e
 SHA512:
-  metadata.gz: 0922ce19a2e5ee163b94d88b832b8cc859a28d1dbb1fade281a2884ef05a447a786d0878c1e7b974a7b8c41b448ea367f6db4ce324f0c2070e9bd91b876f76ab
-  data.tar.gz: 12962e94a387f5153892f27a3ab72acbde68ad548ae4c4d90750557345b6e5ad4baeba6030295db95a7f549e2d2a50c1541f3672a109a4415d4bf6016598a2c8
+  metadata.gz: 1b07bb758a5d9ecf2f8021ec00d26e747df8dead296a6b8a12506a9f275e1e19794f5f51765ae241f39109a1e152102f6e117b49e3c4f3be36fe9223b5b9d677
+  data.tar.gz: 16f9e4f36cd536d3a0847a1c6a9ce73c7ec892fb366828921e6e4b14e59d8d7de24682c1a5f051592b5ce2f250db0b638ebf84af262afea6717f7c3573b0db16

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    piggybak (0.7.0)
+    piggybak (0.7.1)
       activemerchant
       countries
       rack-ssl-enforcer

data/README.md

@@ -11,7 +11,7 @@ Modular / mountable ecommerce gem. Features:
 
 * Fully defined backend RailsAdmin interface for adding orders on the backend
 
-* Piggybak 0.7.0 is compatible with Rails 4, and earlier versions compatible with Rails 3.
+* Piggybak 0.7.1 is compatible with Rails 4.1, 0.7.0 is compatible with Rails 4, and earlier version compatible with Rails 3.
 
 
 Announcements

data/app/controllers/piggybak/orders_controller.rb

@@ -74,7 +74,7 @@ module Piggybak
         return
       end
 
-      @order = Piggybak::Order.find(session[:last_order])
+      @order = Piggybak::Order.where(id: session[:last_order]).first
     end
 
     def list
@@ -82,7 +82,7 @@ module Piggybak
     end
 
     def download
-      @order = Piggybak::Order.find(params[:id])
+      @order = Piggybak::Order.where(id: params[:id]).first
 
       if can?(:download, @order)
         render :layout => false
@@ -92,7 +92,7 @@ module Piggybak
     end
 
     def email
-      order = Piggybak::Order.find(params[:id])
+      order = Piggybak::Order.where(id: params[:id]).first
 
       if can?(:email, order)
         Piggybak::Notifier.order_notification(order).deliver
@@ -104,7 +104,7 @@ module Piggybak
     end
 
     def cancel
-      order = Piggybak::Order.find(params[:id])
+      order = Piggybak::Order.where(id: params[:id]).first
 
       if can?(:cancel, order)
         order.recorded_changer = current_user.id

data/app/models/piggybak/address.rb

@@ -19,7 +19,7 @@ module Piggybak
     attr_accessor :is_shipping
     
     def set_default_country
-      self.country ||= Country.find_by_abbr(Piggybak.config.default_country)
+      self.country ||= Country.where(abbr: Piggybak.config.default_country).first
     end
 
     def admin_label

data/app/models/piggybak/cart.rb

@@ -12,7 +12,7 @@ module Piggybak
       self.errors = []
       cookie ||= ''
       cookie.split(';').each do |item|
-        item_sellable = Piggybak::Sellable.find_by_id(item.split(':')[0])
+        item_sellable = Piggybak::Sellable.where(id: item.split(':')[0]).first
         if item_sellable.present?
           self.sellables << { :sellable => item_sellable, :quantity => (item.split(':')[1]).to_i }
         end

data/app/models/piggybak/line_item.rb

@@ -9,7 +9,7 @@ module Piggybak
     validates :quantity, presence: true
     validates_numericality_of :quantity, :only_integer => true, :greater_than_or_equal_to => 0
 
-    default_scope :order => 'created_at ASC'
+    default_scope { order('created_at ASC') }
 
     after_create :decrease_inventory, :if => Proc.new { |line_item| line_item.line_item_type == 'sellable' && !line_item.sellable.unlimited_inventory }
     after_destroy :increase_inventory, :if => Proc.new { |line_item| line_item.line_item_type == 'sellable' && !line_item.sellable.unlimited_inventory }
@@ -46,7 +46,7 @@ module Piggybak
         return
       end
 
-      sellable = Piggybak::Sellable.find(self.sellable_id)
+      sellable = Piggybak::Sellable.where(id: self.sellable_id).first
 
       return if sellable.nil?
 
@@ -85,7 +85,7 @@ module Piggybak
     def preprocess_payment
       if self.new_record?
         self.build_payment if self.payment.nil?
-        self.payment.payment_method_id ||= Piggybak::PaymentMethod.find_by_active(true).id
+        self.payment.payment_method_id ||= Piggybak::PaymentMethod.where(active: true).first.id
         self.description = "Payment"
         self.price = 0
       end
@@ -140,7 +140,7 @@ module Piggybak
 
     def update_inventory
       if self.sellable_id != self.sellable_id_was
-        old_sellable = Sellable.find(self.sellable_id_was)
+        old_sellable = Sellable.where(id: self.sellable_id_was).first
         old_sellable.update_inventory(self.quantity_was)
         self.sellable.update_inventory(-1*self.quantity)
       else

data/app/models/piggybak/order.rb

@@ -30,7 +30,7 @@ module Piggybak
     after_save :record_order_note
     after_save :deliver_order_confirmation, :if => Proc.new { |order| !order.confirmation_sent }
 
-    default_scope :order => 'created_at DESC'
+    default_scope { order('created_at ASC') }
 
     def deliver_order_confirmation
       Piggybak::Notifier.order_notification(self).deliver

data/app/models/piggybak/order_note.rb

@@ -5,7 +5,7 @@ module Piggybak
 
     belongs_to :order
     belongs_to :user
-    default_scope :order => 'created_at ASC'
+    default_scope { order('created_at ASC') }
 
     def details
       "<b>#{created_at.strftime("%m-%d-%Y %H:%M")}</b> by #{user ? user.email : 'N/A'}:<br />#{note}"

data/app/models/piggybak/payment_method.rb

@@ -26,7 +26,7 @@ module Piggybak
       end
     end
     validates_each :active do |record, attr, value|
-      if value && PaymentMethod.find_all_by_active(true).select { |p| p != record }.size > 0
+      if value && PaymentMethod.where(active: true).select { |p| p != record }.size > 0
         record.errors.add attr, "You may only have one active payment method."
       end
     end

data/app/models/piggybak/shipping_method.rb

@@ -27,13 +27,13 @@ module Piggybak
     end
 
     def self.available_methods(cart)
-      active_methods = ShippingMethod.find_all_by_active(true)
+      active_methods = ShippingMethod.where(active: true)
 
       active_methods.select { |method| method.klass.constantize.available?(method, cart) }
     end
 
     def self.lookup_methods(cart)
-      active_methods = ShippingMethod.find_all_by_active(true)
+      active_methods = ShippingMethod.where(active: true)
 
       methods = active_methods.inject([]) do |arr, method|
         klass = method.klass.constantize

data/app/models/piggybak/tax_calculator/percent.rb

@@ -6,7 +6,7 @@ module Piggybak
       id = method.metadata.detect { |t| t.key == "state_id" }.value
 
       if object.is_a?(Cart) && object.extra_data.has_key?(:state_id) && object.extra_data[:state_id] != ''
-        state = State.find(object.extra_data[:state_id])
+        state = State.where(id: object.extra_data[:state_id]).first
         return state.id == id.to_i if state
       elsif object.is_a?(Order) && object.billing_address && object.billing_address.state 
         return object.billing_address.state.id == id.to_i

data/lib/piggybak/version.rb

@@ -1,3 +1,3 @@
 module Piggybak
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: piggybak
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Steph Skardal
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-31 00:00:00.000000000 Z
+date: 2014-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: countries