collate 0.1.16 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 536bf3ebe80fe656cc65593173358e2321c152a0
-  data.tar.gz: 2aa813459a1b5d3cb278abba9ad91ed13dc23399
+  metadata.gz: 44e8f46f9070b6599a59afd06528a07306da9431
+  data.tar.gz: 4d9cfc3f281497202b542a28106a119ca2d50231
 SHA512:
-  metadata.gz: 2b34c1c606cf740b84bd95609a4b7720357cb97ae361be5676a51112e075e80eed5a16af2d91b8962f3b257895476e4710a3e87762ad5b9b6af58d2e4fb35120
-  data.tar.gz: 4ea5e69952c40537076b55d7be6b677526bfcd52e032da799e5ad3907e34f1fc99ea1a22014b98620c26132f3841adfe052426576130ee392042d81cef91b007
+  metadata.gz: 9c997b7e34816077eba1b117c2482efc99421169ed6fa48be45043bf25e15282d3fd319bdc4370a3d95a3d5cb065fc05943c0199b5ce89e5f2a7227bfb83d5cc
+  data.tar.gz: da754e8551ef46e8d767ddd622416e0671e4591740440f19ba56619716507515211ba713a3f00e4c901ca10cfdf4a9ff58b680f2b821604102949e17321f6a23

data/lib/collate/active_record_extension.rb

@@ -240,7 +240,11 @@ module Collate
           when :downcase
             f.downcase
           when :string_part
-            "%#{f}%"
+            if vt.is_a? Symbol
+              "%#{f}%"
+            else
+              sprintf vt[1], f
+            end
           when :to_json
             "{\"#{vt[1]}\": \"#{f}\"}"
           else

data/lib/collate/filter.rb

@@ -30,10 +30,6 @@ module Collate
       self.field_transformations ||= []
       self.value_transformations ||= []
 
-      self.param_key ||= generate_param_key
-
-      self.html_id ||= param_key.gsub('{','').gsub('}','').gsub('.','_')
-
       field_parts = self.field.to_s.partition('.')
       table_name = field_parts[0]
       field_selector = field_parts[2]
@@ -110,21 +106,24 @@ module Collate
         end
       end
 
+      self.param_key ||= generate_param_key
 
+      self.html_id ||= param_key.gsub('{','').gsub('}','').gsub('.','_')
     end
 
     def generate_param_key
       key = ""
-      field_transformations.each do |ft|
+      self.field_transformations.each do |ft|
         transformation = ft
         transformation = ft[0] if !transformation.is_a? Symbol
         key += FIELD_TRANSFORMATIONS.index(transformation).to_s
       end
       key += OPERATORS.index(operator).to_s
-      value_transformations.each do |vt|
+      self.value_transformations.each do |vt|
         transformation = vt
         transformation = vt[0] if !transformation.is_a? Symbol
         key += VALUE_TRANSFORMATIONS.index(transformation).to_s
+        key += vt[1] if !vt.is_a? Symbol
       end
 
       "{#{key}}#{field.to_s.gsub('[','').gsub(']','').gsub('"','').gsub(',','').gsub(' ','_')}"

data/lib/collate/version.rb

@@ -1,3 +1,3 @@
 module Collate
-  VERSION = "0.1.16"
+  VERSION = "0.1.17"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: collate
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.17
 platform: ruby
 authors:
 - Nicholas Page
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-12 00:00:00.000000000 Z
+date: 2017-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler