effective_datatables 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6861407f8fce38a641e334d011a8904bfb507ca1
-  data.tar.gz: 755a765c5da61e125bf682056afa098911704a11
+  metadata.gz: 104ed4736f57500cb86aaa07631d96aa36b4df8d
+  data.tar.gz: 800891f688c2e363b19336e19896ba0fa5900ecb
 SHA512:
-  metadata.gz: a5636647282d639a8cf5d2099cadb741dec3270fefaf9ab9a63feea37e11d6cf934edc23682cafeac806a062285192a269d4e14528f79171ed77a29bc119f16d
-  data.tar.gz: b031ed0aab1f0788d3005560ac2b1d75737972674636a273b4446a4cd731dd57abbe40f19c1596f45341744fba83e4ab0abb44bdcb817c65f645cadbd5fafc4a
+  metadata.gz: 1b70a5c78893a581b4db8bc277196c37e19b5fe1d4ea2eb5025868aee2512e071b8cfb9ce1ef0f3ec4f8e2ffb1ba363eae7c6d24db6fd7291838c653b2076fb9
+  data.tar.gz: 066e62e1d2a348dfe780f59b2405284c7707a00985ed3db03166b542e8ddce4fe82110ea3feddc911241489f47411026c490271627c6cff7985b696e1a0484c7

data/app/models/effective/active_record_datatable_tool.rb

@@ -100,6 +100,11 @@ module Effective
         collection.where("#{column} = :term", term: term.to_i)
       when :year
         collection.where("EXTRACT(YEAR FROM #{column}) = :term", term: term.to_i)
+      when :price
+        price_in_cents = (term.gsub(/[^0-9|\.]/, '').to_f * 100.0).to_i
+        collection.where("#{column} = :term", term: price_in_cents)
+      when :currency
+        collection.where("#{column} = :term", term: term.gsub(/[^0-9|\.]/, '').to_f)
       else
         collection.where("#{column} = :term", term: term)
       end

data/app/models/effective/datatable.rb

@@ -2,7 +2,7 @@ module Effective
   class Datatable
     attr_accessor :total_records, :display_records, :view, :attributes
 
-    delegate :render, :link_to, :mail_to, :to => :@view
+    delegate :render, :link_to, :mail_to, :number_to_currency, :to => :@view
 
     include Effective::EffectiveDatatable::Dsl
     extend Effective::EffectiveDatatable::Dsl::ClassMethods

data/app/models/effective/effective_datatable/dsl.rb

@@ -46,8 +46,9 @@ module Effective
           filter: false,
           partial_local: :resource,
           partial_locals: { show_action: show, edit_action: edit, destroy_action: destroy }
-        }
-        opts[:partial] = '/effective/datatables/actions_column' unless (block_given? || proc.present?)
+        }.merge(options)
+
+        opts[:partial] ||= '/effective/datatables/actions_column' unless (block_given? || proc.present?)
 
         table_column(name, opts, proc, &block)
       end

data/app/models/effective/effective_datatable/rendering.rb

@@ -105,6 +105,13 @@ module Effective
               (obj.send(name).strftime(EffectiveDatatables.datetime_format) rescue nil)
             elsif opts[:type] == :date
               (obj.send(name).strftime(EffectiveDatatables.date_format) rescue nil)
+            elsif opts[:type] == :price
+              # This is price_to_currency from effective_form_inputs retyped...
+              price = ((obj.send(name) || 0) rescue 0)
+              raise 'column type: price expects an Integer representing the number of cents' unless price.kind_of?(Integer)
+              number_to_currency(price / 100.0)
+            elsif opts[:type] == :currency
+              number_to_currency(((obj.send(name) || 0) rescue 0))
             else
               obj.send(name) rescue (obj[opts[:array_index]] rescue nil)
             end

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '2.0.3'.freeze
+  VERSION = '2.0.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-05 00:00:00.000000000 Z
+date: 2015-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails