amountable 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70fd4bd67ff8f0f3c0a67ea5701fb035934c3a8f
-  data.tar.gz: 3a7f3ce3ff221dcbe13378f3ebe18958385e787d
+  metadata.gz: d7fb532f0098d76632e7fbc2f46ad8a79570f798
+  data.tar.gz: df59859c26e14e795e38243b4a097059fccdffff
 SHA512:
-  metadata.gz: b785e2e1a02a280a3e6125c4e3731b1281eb02760a17405f669e1d1669d089131a3c9e01cc084ffa2bc6673ca3721dcc5060c974e892aaad973d2deb2d3097a8
-  data.tar.gz: 3063523fcfa424dc576bdb2ad3cf7a2e2eca9378098cde60a06fbb150d40c8a6313ab7e4cd77f6a6c51e04ed9ecc8b1c0b3d2a38e9a849fc80fb51a3c96b32f3
+  metadata.gz: d1b982b2a5d90e3c28ad0905ba0154c6f2c625681a989180743cc88dd0853918186330b91afe4f05fe7c13eae7a58d7241a38e6e920053b46d4fb3737ca2563b
+  data.tar.gz: 54a8b7d3ff9df4312b1dae3a8bc71a8a1fc063aba18ac71f055255d1b834531644b9e377657dfae7274908dafc04eacbd5872146af46139a7e05fc9a5c59c8db

data/lib/amountable.rb

@@ -59,10 +59,12 @@ module Amountable
       class_attribute :amount_names
       class_attribute :amount_sets
       class_attribute :amounts_column_name
+      class_attribute :storage
       self.amount_sets = Hash.new { |h, k| h[k] = Set.new }
       self.amount_names = Set.new
       self.amounts_column_name = 'amounts'
-      case (options[:storage] || :table).to_sym
+      self.storage = (options[:storage] || :table).to_sym
+      case self.storage
       when :table
         has_many :amounts, class_name: 'Amountable::Amount', as: :amountable, dependent: :destroy, autosave: false
         include Amountable::TableMethods
@@ -105,6 +107,42 @@ module Amountable
       self.amount_names.include?(name.to_sym)
     end
 
+    def where(opts, *rest)
+      return super unless opts.is_a?(Hash)
+      if self.storage == :jsonb
+        where_json(opts, *rest)
+      else
+        super
+      end
+    end
+
+    def where_json(opts, *rest)
+      values = []
+      query = opts.inject([]) do |mem, (column, value)|
+        column = column.to_sym
+        if column.in?(self.amount_names) || column.in?(self.amount_sets.keys)
+          mem << "#{self.pg_json_field_access(column, :cents)} = '%s'"
+          mem << "#{self.pg_json_field_access(column, :currency)} = '%s'"
+          values << value.to_money.fractional
+          values << value.to_money.currency.iso_code
+          opts.delete(column)
+        end
+        mem
+      end
+      query = [query.join(' AND ')] + values
+      where(query, *rest).where(opts, *rest)
+    end
+
+    def pg_json_field_access(name, field = :cents)
+      name = name.to_sym
+      group = if name.in?(self.amount_names)
+        'amounts'
+      elsif name.in?(self.amount_sets.keys)
+        'sets'
+      end
+      "#{self.amounts_column_name}::json#>>'{#{group},#{name},#{field}}'"
+    end
+
   end
 end
 

data/lib/amountable/version.rb

@@ -1,5 +1,5 @@
 # Copyright 2015-2016, Instacart
 
 module Amountable
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amountable
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Emmanuel Turlay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-21 00:00:00.000000000 Z
+date: 2016-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord