liquor 0.9.3 → 0.9.4

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.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/lib/liquor/stdlib/builtin_functions.rb +16 -3
  3. data/lib/liquor/version.rb +1 -1
  4. data/spec/builtins_spec.rb +1 -0
  5. metadata +28 -28
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 6ef7fa085b465a0646c8be617a2613d9e356d88a
4
- data.tar.gz: d56329e733409b09c995753153a7f7554a204e56
3
+ metadata.gz: dacc35e01493e5bc4d0aa69629450accc671d9b4
4
+ data.tar.gz: ca5b99b8cf52417a767f499a76725ba459bf85a9
5
5
  SHA512:
6
- metadata.gz: f6053357a0eda36facb65118faa915a9e39968bc600b867cc326c5af3c361ca875e6bc9ac46a90c9bb6bc016650d04ae33ff79a8b3effe0d392e7d20ab8f2cc2
7
- data.tar.gz: bd3996c257bdeb3dab80e77b463322e6681a7ac73258c7e1f3245a2c1e78b3fac6a3bdfbb3ee9cdeb8aa305ece2924e9a5c37ec8477597242cbc88f789139a4a
6
+ metadata.gz: 78535449b81a601dd6c0699f4f00a471bbada7ab6b0ea68be950a3e14bec33824fe3f9d1f075e57fa517875727c58486214237943463eb9d4c7b802db60756a8
7
+ data.tar.gz: 443c4fba66a47056414296c036200d294dd73bfb289f65ebb8db59e3e079e26dc6d2ecbb02a43f1d1385c654321f63a66543518b34e45cf14d1faf4f73fe0143
data/lib/liquor/stdlib/builtin_functions.rb CHANGED
@@ -232,11 +232,24 @@ module Liquor
232
232
  end
233
233
  end
234
234
 
235
- # DEPRECATED
236
235
  function "includes",
237
- unnamed_arg: :tuple,
236
+ unnamed_arg: [:tuple, :external],
238
237
  mandatory_named_args: { element: :any } do |arg, kw|
239
- arg.include?(kw[:element])
238
+ if arg.respond_to? :include?
239
+ arg.include?(kw[:element])
240
+ else
241
+ raise Liquor::TypeError.new("includes() requires an external that exports include? method")
242
+ end
243
+ end
244
+
245
+ function "index_of",
246
+ unnamed_arg: [:tuple, :external],
247
+ mandatory_named_args: { element: :any } do |arg, kw|
248
+ if arg.respond_to? :index
249
+ arg.index(kw[:element])
250
+ else
251
+ raise Liquor::TypeError.new("includes() requires an external that exports index method")
252
+ end
240
253
  end
241
254
 
242
255
  #
data/lib/liquor/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Liquor
2
- VERSION = "0.9.3"
2
+ VERSION = "0.9.4"
3
3
  end
data/spec/builtins_spec.rb CHANGED
@@ -197,6 +197,7 @@ describe Liquor do
197
197
  exec(%!{{ '12 Jun' | strftime format: '%d' }}!).should == "12"
198
198
  exec(%!{{ to_number("12") + 10 }}!).should == "22"
199
199
  exec(%!{% if includes([ 1, 2, 3 ] element: 2) then: %}yes{% end if %}!).should == "yes"
200
+ exec(%!{{ index_of([1, 2, 3] element: 2) }}!).should == "1"
200
201
  exec(%!{{ [ 1, 2, 3 ] | reverse | join }}!).should == "3 2 1"
201
202
  exec(%!{{ [ 1, null, 3 ] | compact | join }}!).should == "1 3"
202
203
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: liquor
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.9.3
4
+ version: 0.9.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Peter Zotov
@@ -10,146 +10,146 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2013-12-24 00:00:00.000000000 Z
13
+ date: 2014-03-05 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: rake
17
17
  requirement: !ruby/object:Gem::Requirement
18
18
  requirements:
19
- - - '>='
19
+ - - ">="
20
20
  - !ruby/object:Gem::Version
21
21
  version: '0'
22
22
  type: :development
23
23
  prerelease: false
24
24
  version_requirements: !ruby/object:Gem::Requirement
25
25
  requirements:
26
- - - '>='
26
+ - - ">="
27
27
  - !ruby/object:Gem::Version
28
28
  version: '0'
29
29
  - !ruby/object:Gem::Dependency
30
30
  name: racc
31
31
  requirement: !ruby/object:Gem::Requirement
32
32
  requirements:
33
- - - '>='
33
+ - - ">="
34
34
  - !ruby/object:Gem::Version
35
35
  version: '0'
36
36
  type: :development
37
37
  prerelease: false
38
38
  version_requirements: !ruby/object:Gem::Requirement
39
39
  requirements:
40
- - - '>='
40
+ - - ">="
41
41
  - !ruby/object:Gem::Version
42
42
  version: '0'
43
43
  - !ruby/object:Gem::Dependency
44
44
  name: kramdown
45
45
  requirement: !ruby/object:Gem::Requirement
46
46
  requirements:
47
- - - '>='
47
+ - - ">="
48
48
  - !ruby/object:Gem::Version
49
49
  version: '0'
50
50
  type: :development
51
51
  prerelease: false
52
52
  version_requirements: !ruby/object:Gem::Requirement
53
53
  requirements:
54
- - - '>='
54
+ - - ">="
55
55
  - !ruby/object:Gem::Version
56
56
  version: '0'
57
57
  - !ruby/object:Gem::Dependency
58
58
  name: rspec
59
59
  requirement: !ruby/object:Gem::Requirement
60
60
  requirements:
61
- - - '>='
61
+ - - ">="
62
62
  - !ruby/object:Gem::Version
63
63
  version: '0'
64
64
  type: :development
65
65
  prerelease: false
66
66
  version_requirements: !ruby/object:Gem::Requirement
67
67
  requirements:
68
- - - '>='
68
+ - - ">="
69
69
  - !ruby/object:Gem::Version
70
70
  version: '0'
71
71
  - !ruby/object:Gem::Dependency
72
72
  name: simplecov
73
73
  requirement: !ruby/object:Gem::Requirement
74
74
  requirements:
75
- - - '>='
75
+ - - ">="
76
76
  - !ruby/object:Gem::Version
77
77
  version: '0'
78
78
  type: :development
79
79
  prerelease: false
80
80
  version_requirements: !ruby/object:Gem::Requirement
81
81
  requirements:
82
- - - '>='
82
+ - - ">="
83
83
  - !ruby/object:Gem::Version
84
84
  version: '0'
85
85
  - !ruby/object:Gem::Dependency
86
86
  name: guard-rspec
87
87
  requirement: !ruby/object:Gem::Requirement
88
88
  requirements:
89
- - - '>='
89
+ - - ">="
90
90
  - !ruby/object:Gem::Version
91
91
  version: '0'
92
92
  type: :development
93
93
  prerelease: false
94
94
  version_requirements: !ruby/object:Gem::Requirement
95
95
  requirements:
96
- - - '>='
96
+ - - ">="
97
97
  - !ruby/object:Gem::Version
98
98
  version: '0'
99
99
  - !ruby/object:Gem::Dependency
100
100
  name: rails
101
101
  requirement: !ruby/object:Gem::Requirement
102
102
  requirements:
103
- - - '>='
103
+ - - ">="
104
104
  - !ruby/object:Gem::Version
105
105
  version: '0'
106
106
  type: :development
107
107
  prerelease: false
108
108
  version_requirements: !ruby/object:Gem::Requirement
109
109
  requirements:
110
- - - '>='
110
+ - - ">="
111
111
  - !ruby/object:Gem::Version
112
112
  version: '0'
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: nokogiri
115
115
  requirement: !ruby/object:Gem::Requirement
116
116
  requirements:
117
- - - '>='
117
+ - - ">="
118
118
  - !ruby/object:Gem::Version
119
119
  version: '0'
120
120
  type: :development
121
121
  prerelease: false
122
122
  version_requirements: !ruby/object:Gem::Requirement
123
123
  requirements:
124
- - - '>='
124
+ - - ">="
125
125
  - !ruby/object:Gem::Version
126
126
  version: '0'
127
127
  - !ruby/object:Gem::Dependency
128
128
  name: htmlentities
129
129
  requirement: !ruby/object:Gem::Requirement
130
130
  requirements:
131
- - - '>='
131
+ - - ">="
132
132
  - !ruby/object:Gem::Version
133
133
  version: '0'
134
134
  type: :development
135
135
  prerelease: false
136
136
  version_requirements: !ruby/object:Gem::Requirement
137
137
  requirements:
138
- - - '>='
138
+ - - ">="
139
139
  - !ruby/object:Gem::Version
140
140
  version: '0'
141
141
  - !ruby/object:Gem::Dependency
142
142
  name: sqlite3
143
143
  requirement: !ruby/object:Gem::Requirement
144
144
  requirements:
145
- - - '>='
145
+ - - ">="
146
146
  - !ruby/object:Gem::Version
147
147
  version: '0'
148
148
  type: :development
149
149
  prerelease: false
150
150
  version_requirements: !ruby/object:Gem::Requirement
151
151
  requirements:
152
- - - '>='
152
+ - - ">="
153
153
  - !ruby/object:Gem::Version
154
154
  version: '0'
155
155
  description: Liquor is a template system based on well-defined, strongly dynamically
@@ -162,9 +162,9 @@ executables: []
162
162
  extensions: []
163
163
  extra_rdoc_files: []
164
164
  files:
165
- - .gitignore
166
- - .rspec
167
- - .travis.yml
165
+ - ".gitignore"
166
+ - ".rspec"
167
+ - ".travis.yml"
168
168
  - Gemfile
169
169
  - Guardfile
170
170
  - MIT-LICENSE
@@ -228,17 +228,17 @@ require_paths:
228
228
  - lib
229
229
  required_ruby_version: !ruby/object:Gem::Requirement
230
230
  requirements:
231
- - - '>='
231
+ - - ">="
232
232
  - !ruby/object:Gem::Version
233
233
  version: '1.9'
234
234
  required_rubygems_version: !ruby/object:Gem::Requirement
235
235
  requirements:
236
- - - '>='
236
+ - - ">="
237
237
  - !ruby/object:Gem::Version
238
238
  version: '0'
239
239
  requirements: []
240
240
  rubyforge_project:
241
- rubygems_version: 2.0.14
241
+ rubygems_version: 2.2.2
242
242
  signing_key:
243
243
  specification_version: 4
244
244
  summary: Liquor is a template system based on well-defined, strongly dynamically typed