collate 0.1.16 → 0.1.17

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 536bf3ebe80fe656cc65593173358e2321c152a0
4
- data.tar.gz: 2aa813459a1b5d3cb278abba9ad91ed13dc23399
3
+ metadata.gz: 44e8f46f9070b6599a59afd06528a07306da9431
4
+ data.tar.gz: 4d9cfc3f281497202b542a28106a119ca2d50231
5
5
  SHA512:
6
- metadata.gz: 2b34c1c606cf740b84bd95609a4b7720357cb97ae361be5676a51112e075e80eed5a16af2d91b8962f3b257895476e4710a3e87762ad5b9b6af58d2e4fb35120
7
- data.tar.gz: 4ea5e69952c40537076b55d7be6b677526bfcd52e032da799e5ad3907e34f1fc99ea1a22014b98620c26132f3841adfe052426576130ee392042d81cef91b007
6
+ metadata.gz: 9c997b7e34816077eba1b117c2482efc99421169ed6fa48be45043bf25e15282d3fd319bdc4370a3d95a3d5cb065fc05943c0199b5ce89e5f2a7227bfb83d5cc
7
+ data.tar.gz: da754e8551ef46e8d767ddd622416e0671e4591740440f19ba56619716507515211ba713a3f00e4c901ca10cfdf4a9ff58b680f2b821604102949e17321f6a23
@@ -240,7 +240,11 @@ module Collate
240
240
  when :downcase
241
241
  f.downcase
242
242
  when :string_part
243
- "%#{f}%"
243
+ if vt.is_a? Symbol
244
+ "%#{f}%"
245
+ else
246
+ sprintf vt[1], f
247
+ end
244
248
  when :to_json
245
249
  "{\"#{vt[1]}\": \"#{f}\"}"
246
250
  else
@@ -30,10 +30,6 @@ module Collate
30
30
  self.field_transformations ||= []
31
31
  self.value_transformations ||= []
32
32
 
33
- self.param_key ||= generate_param_key
34
-
35
- self.html_id ||= param_key.gsub('{','').gsub('}','').gsub('.','_')
36
-
37
33
  field_parts = self.field.to_s.partition('.')
38
34
  table_name = field_parts[0]
39
35
  field_selector = field_parts[2]
@@ -110,21 +106,24 @@ module Collate
110
106
  end
111
107
  end
112
108
 
109
+ self.param_key ||= generate_param_key
113
110
 
111
+ self.html_id ||= param_key.gsub('{','').gsub('}','').gsub('.','_')
114
112
  end
115
113
 
116
114
  def generate_param_key
117
115
  key = ""
118
- field_transformations.each do |ft|
116
+ self.field_transformations.each do |ft|
119
117
  transformation = ft
120
118
  transformation = ft[0] if !transformation.is_a? Symbol
121
119
  key += FIELD_TRANSFORMATIONS.index(transformation).to_s
122
120
  end
123
121
  key += OPERATORS.index(operator).to_s
124
- value_transformations.each do |vt|
122
+ self.value_transformations.each do |vt|
125
123
  transformation = vt
126
124
  transformation = vt[0] if !transformation.is_a? Symbol
127
125
  key += VALUE_TRANSFORMATIONS.index(transformation).to_s
126
+ key += vt[1] if !vt.is_a? Symbol
128
127
  end
129
128
 
130
129
  "{#{key}}#{field.to_s.gsub('[','').gsub(']','').gsub('"','').gsub(',','').gsub(' ','_')}"
@@ -1,3 +1,3 @@
1
1
  module Collate
2
- VERSION = "0.1.16"
2
+ VERSION = "0.1.17"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: collate
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.16
4
+ version: 0.1.17
5
5
  platform: ruby
6
6
  authors:
7
7
  - Nicholas Page
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: exe
11
11
  cert_chain: []
12
- date: 2017-05-12 00:00:00.000000000 Z
12
+ date: 2017-05-15 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: bundler