piggybak_variants 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21f091a2e1ce6be384810b86e9d320f0d6789aca
-  data.tar.gz: cf94b7a11ed463e3d5199319ce3c91e9bb85eb38
+  metadata.gz: 974b650d16ee057bba72c9366c5d4b7942f1efc1
+  data.tar.gz: bf3f13b6c8fadce6fe36c9848feccfd01ba2f6ac
 SHA512:
-  metadata.gz: ef38a0103338568ca28187fd5d585f7059b86cb82a7e2e372caec305c92d313abd2bc7344222b626e1a0b525fae567f9ae098b88d03e0e77c24231bec5fb2626
-  data.tar.gz: 029fdff18768f7254eff52decfc0546f44206bdb1cd3b0345d82d83b2f3b64e385cf88599a2c58f3d8c488edb125b6ec820865750e068ba06fee412b558e086a
+  metadata.gz: 9e6191beaa9c9b397c01bc4ac02c34e6af43f985404e4f74d5f09b219acc7b366a47419e0c136a4026f4717a58ba08a1b1cbf1839549f8ecc47619441d368dbd
+  data.tar.gz: a7ce4b1db46fbc2fa48542266bede6e8a7f818c3602e69772668829ff5e64eb3d4e10df2c3d107005665914d6a1da5af3f03387b2be1ec0f826afd85b89dd00a

data/app/helpers/piggybak_variants_helper.rb

@@ -4,7 +4,7 @@ module PiggybakVariantsHelper
   end
 
   def options_for_klass(klass)
-    options = ::PiggybakVariants::OptionConfiguration.find_all_by_klass(klass).collect { |oc| oc.option }
+    options = ::PiggybakVariants::OptionConfiguration.where(klass: klass).collect { |oc| oc.option }
   end
 
   def variant_map(object)

data/app/models/piggybak_variants/option.rb

@@ -1,9 +1,9 @@
 module PiggybakVariants
   class Option < ActiveRecord::Base
-    has_many :option_values, :dependent => :destroy, order: 'position ASC'
+    has_many :option_values, -> { order(:position) }, :dependent => :destroy
     has_many :option_configurations, :dependent => :destroy
 
-    default_scope :order => "position ASC"
+    default_scope { order('position ASC') }
 
     accepts_nested_attributes_for :option_values, :allow_destroy => true
 

data/app/models/piggybak_variants/variant.rb

@@ -2,9 +2,9 @@ module PiggybakVariants
   class Variant < ActiveRecord::Base
     acts_as_sellable
     belongs_to :item, :polymorphic => true
-    has_and_belongs_to_many :option_values
+    has_and_belongs_to_many :option_values, :class_name => "::PiggybakVariants::OptionValue"
 
-    scope :available, joins(:piggybak_sellable).where(["piggybak_sellables.active = ? AND (piggybak_sellables.quantity > 0 OR piggybak_sellables.unlimited_inventory = ?)",true,true]) 
+    scope :available, -> { joins(:piggybak_sellable).where(["piggybak_sellables.active = ? AND (piggybak_sellables.quantity > 0 OR piggybak_sellables.unlimited_inventory = ?)",true,true]) } 
     validate :option_value_validation
     validate :require_item
 
@@ -20,7 +20,7 @@ module PiggybakVariants
       # TODO: Add verification to prevent duplicate option value sets
 
       klass = self.item.class
-      options = ::PiggybakVariants::OptionConfiguration.find_all_by_klass(klass).collect { |oc| oc.option }
+      options = ::PiggybakVariants::OptionConfiguration.where(klass: klass).collect { |oc| oc.option }
       error = false
       options.each do |option|
         matching_option_values = self.option_values.select { |ov| ov.option == option }.size

data/lib/piggybak_variants/version.rb

@@ -1,3 +1,3 @@
 module PiggybakVariants
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: piggybak_variants
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Tim Case, Steph Skardal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-27 00:00:00.000000000 Z
+date: 2014-04-07 00:00:00.000000000 Z
 dependencies: []
 description: Advanced variant support for Piggybak.
 email: