wlang 2.2.4 → 2.3.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (9) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +4 -0
  3. data/Gemfile +1 -1
  4. data/Gemfile.lock +2 -2
  5. data/lib/wlang/compiler/grammar.citrus +3 -3
  6. data/lib/wlang/version.rb +2 -2
  7. data/wlang.gemspec +1 -1
  8. data/wlang.noespec +2 -2
  9. metadata +12 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: f230ff37953bdc9a467388b12e12fe339a4294ac
4
- data.tar.gz: 778625050742dfe64c370b7bbea775fd707a6481
3
+ metadata.gz: 71039c878ff8645cc90bf2816c0eeca42beb706d
4
+ data.tar.gz: 95621510303a81919d9fe290b92247c7206828bd
5
5
  SHA512:
6
- metadata.gz: a8fdeee3c0404715a5c9f5bbcb46275dfdd2bc403a87d231add9295745a55dd8f076475beb373395b4da6fb8a37c94ff24d020981b931a4d5cc2bb409951cbeb
7
- data.tar.gz: 8db52e137e6a009dc57481b320e27a8b3f1910e716c0d52b23228f87bc6c04b7a076bbe545c47c66ff3f68d6351d44cbac02dab2b4db38804629b16ee25088d4
6
+ metadata.gz: 7a555793c51b2d25b26b4fe08ffd8758c28f937d942b25960883dca1e540bc9c4ca8bca745d0a9703cbcfed65971891d71a57206b352eb3a492fccee67182024
7
+ data.tar.gz: 99a375c1e46504dd7bfb2f161a3fbc384ffe7d8541302866fb341005ef7be0513df37cd9f2cd4c760f65658520e7c95afe6433773660d9b5db843b35ea827c06
data/CHANGELOG.md CHANGED
@@ -1,3 +1,7 @@
1
+ # 2.3.0 / 2014-08-04
2
+
3
+ * Allowed Citrus to 3.0
4
+
1
5
  # 2.2.4 / 2014-07-29
2
6
 
3
7
  * Birthday of 2.2.3 :-)
data/Gemfile CHANGED
@@ -1,7 +1,7 @@
1
1
  source 'http://rubygems.org'
2
2
 
3
3
  group :runtime do
4
- gem "citrus", "~> 2.4.1"
4
+ gem "citrus", "~> 3.0"
5
5
  gem "temple", "~> 0.6"
6
6
  gem "quickl", "~> 0.4.3"
7
7
  gem "path", "~> 1.3"
data/Gemfile.lock CHANGED
@@ -3,7 +3,7 @@ GEM
3
3
  specs:
4
4
  awesome_print (1.0.2)
5
5
  backports (2.8.2)
6
- citrus (2.4.1)
6
+ citrus (3.0.1)
7
7
  diff-lcs (1.1.3)
8
8
  path (1.3.1)
9
9
  quickl (0.4.3)
@@ -35,7 +35,7 @@ DEPENDENCIES
35
35
  awesome_print (~> 1.0.2)
36
36
  backports (~> 2.6)
37
37
  bundler (~> 1.0)
38
- citrus (~> 2.4.1)
38
+ citrus (~> 3.0)
39
39
  path (~> 1.3)
40
40
  quickl (~> 0.4.3)
41
41
  rack-test (~> 0.6)
data/lib/wlang/compiler/grammar.citrus CHANGED
@@ -2,7 +2,7 @@ grammar WLang::Grammar
2
2
 
3
3
  rule template
4
4
  (strconcat !.){
5
- [:template, [:fn, strconcat.value]]
5
+ [:template, [:fn, captures[:strconcat].first.value]]
6
6
  }
7
7
  end
8
8
 
@@ -37,7 +37,7 @@ grammar WLang::Grammar
37
37
 
38
38
  rule wlang
39
39
  (symbols functions){
40
- [:wlang, symbols.to_s] + functions.value
40
+ [:wlang, captures[:symbols].first.to_s] + captures[:functions].first.value
41
41
  }
42
42
  end
43
43
 
@@ -47,7 +47,7 @@ grammar WLang::Grammar
47
47
 
48
48
  rule function
49
49
  (fn_start strconcat fn_stop){
50
- strconcat.value
50
+ captures[:strconcat].first.value
51
51
  }
52
52
  end
53
53
 
data/lib/wlang/version.rb CHANGED
@@ -2,8 +2,8 @@ module WLang
2
2
  module Version
3
3
 
4
4
  MAJOR = 2
5
- MINOR = 2
6
- TINY = 4
5
+ MINOR = 3
6
+ TINY = 0
7
7
 
8
8
  def self.to_s
9
9
  [ MAJOR, MINOR, TINY ].join('.')
data/wlang.gemspec CHANGED
@@ -130,7 +130,7 @@ Gem::Specification.new do |s|
130
130
  s.add_development_dependency("rspec", "~> 2.10.0")
131
131
  s.add_development_dependency("sinatra", ">= 1.4")
132
132
  s.add_development_dependency("rack-test", "~> 0.6")
133
- s.add_dependency("citrus", "~> 2.4.1")
133
+ s.add_dependency("citrus", ">= 2.4", "< 4.0")
134
134
  s.add_dependency("temple", "~> 0.6")
135
135
  s.add_dependency("quickl", "~> 0.4.3")
136
136
  s.add_dependency("path", "~> 1.3")
data/wlang.noespec CHANGED
@@ -12,7 +12,7 @@ variables:
12
12
  upper:
13
13
  WLang
14
14
  version:
15
- 2.2.4
15
+ 2.3.0
16
16
  summary: |-
17
17
  WLang is a powerful code generation and templating engine
18
18
  description: |-
@@ -31,7 +31,7 @@ variables:
31
31
  - http://blambeau.github.com/wlang
32
32
  - http://revision-zero.org/wlang
33
33
  dependencies:
34
- - {name: citrus, version: "~> 2.4.1", groups: [runtime]}
34
+ - {name: citrus, version: "~> 3.0", groups: [runtime]}
35
35
  - {name: temple, version: "~> 0.6", groups: [runtime]}
36
36
  - {name: quickl, version: "~> 0.4.3", groups: [runtime]}
37
37
  - {name: path, version: "~> 1.3", groups: [runtime]}
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: wlang
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.2.4
4
+ version: 2.3.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Bernard Lambeau
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2014-07-29 00:00:00.000000000 Z
12
+ date: 2014-08-04 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: awesome_print
@@ -113,16 +113,22 @@ dependencies:
113
113
  name: citrus
114
114
  requirement: !ruby/object:Gem::Requirement
115
115
  requirements:
116
- - - "~>"
116
+ - - ">="
117
+ - !ruby/object:Gem::Version
118
+ version: '2.4'
119
+ - - "<"
117
120
  - !ruby/object:Gem::Version
118
- version: 2.4.1
121
+ version: '4.0'
119
122
  type: :runtime
120
123
  prerelease: false
121
124
  version_requirements: !ruby/object:Gem::Requirement
122
125
  requirements:
123
- - - "~>"
126
+ - - ">="
127
+ - !ruby/object:Gem::Version
128
+ version: '2.4'
129
+ - - "<"
124
130
  - !ruby/object:Gem::Version
125
- version: 2.4.1
131
+ version: '4.0'
126
132
  - !ruby/object:Gem::Dependency
127
133
  name: temple
128
134
  requirement: !ruby/object:Gem::Requirement