params_tree 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e7f87359606f69ad3c55ca37f086197e97bf1e9
-  data.tar.gz: c570dedad54afe614d4ab327391ce665439b03ef
+  metadata.gz: 9d1fb07e6cc744cf96803ce1ba363ac3c4485164
+  data.tar.gz: d6119e76ad4517a75e8277ac2b106b82f341d4fa
 SHA512:
-  metadata.gz: e56d7e420a7d91e23a26373ce3e933c2be1a59b5c34e1648726f367c19345d6515f4c5db9f012c20d4b055309cbc6b7b747e83fc749832ecb2a0d5e16d27992a
-  data.tar.gz: 4c65764a9c33bad10190168190d6141be233cdd89994c0d37cbdb2f6de7f88648d05ca8b6234fb3cbc9107b4261d84b0e12f1e41db7edc5bc31edc0a46db7ea4
+  metadata.gz: 2d278166a7dd8e93d00d56c0b149503815af91fa537cbbfa047596ea5ea723b2895ca1f8edb4c374220a7f375c47fc66101f7ff282fd12ba44e37695a6f58ef5
+  data.tar.gz: 18df965abec73d71fc1c7e4a85ab218c5aef1be1a76f10a998b279300656f3e469082a93cef7bb9087cc90dc447a9269f7e43d79297ce002a3fa752cfc5bbd73

data/README.md

@@ -62,6 +62,8 @@ Or install it yourself as:
 
 ## Contributing
 
+Use `rake generate` to get a `.rb` parser, but avoid committing it.
+
 1. Fork it ( https://github.com/razum2um/params_tree/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)

data/lib/params_tree.rb

@@ -2,5 +2,5 @@ require "params_tree/version"
 require "params_tree/parser"
 
 module ParamsTree
-  # Your code goes here...
+  DEFAULT = 'default'.freeze
 end

data/lib/params_tree/parser.rb

@@ -324,11 +324,16 @@ when 11 then
     end
 
     def inject_key
-      @hash[key] = {}
+      if @hash.key?(key)
+        @hash[key][ParamsTree::DEFAULT] = {}
+      else
+        @hash[key] = {}
+      end
     end
 
     def push
-      @hash_stack.push @hash; @hash = @hash[key]
+      @hash_stack.push(@hash)
+      @hash = @hash[key]
     end
 
     def pop

data/lib/params_tree/parser.rl

@@ -69,11 +69,16 @@ module ParamsTree
     end
 
     def inject_key
-      @hash[key] = {}
+      if @hash.key?(key)
+        @hash[key][ParamsTree::DEFAULT] = {}
+      else
+        @hash[key] = {}
+      end
     end
 
     def push
-      @hash_stack.push @hash; @hash = @hash[key]
+      @hash_stack.push(@hash)
+      @hash = @hash[key]
     end
 
     def pop

data/lib/params_tree/version.rb

@@ -1,3 +1,3 @@
 module ParamsTree
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/test/parser_test.rb

@@ -31,6 +31,12 @@ class ParserTest < Minitest::Test
     assert_equal _("default(user(id)), some"), { "default" => { 'user' => { 'id' => {} }, "some" => {} } }
   end
 
+  def test_mentioning_is_default
+    expected = { "options" => { "default" => {}, "redemptionLocations" => { "ordering" => {} } } }
+    assert_equal expected, _("options, options(redemptionLocations(ordering))"), expected
+    assert_equal expected, _("options(default, redemptionLocations(ordering))")
+  end
+
   def test_complicated
     assert_equal _("default(id,user(group(division(name)),name)),post(id,title),comment(id,author,text(title,body))"), {
       "default" => {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: params_tree
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Vlad Bokov
@@ -30,7 +30,7 @@ cert_chain:
   vzKbYclpJ7gENr/xiTjGqA/Md3zJMzmsFrzUXt4RVmo5SaCyZjC6gFfhSr+PODc7
   ZaSbckvH/+m4boAsg0JkGGFcS3j5fgNmdwgA1A==
   -----END CERTIFICATE-----
-date: 2014-05-22 00:00:00.000000000 Z
+date: 2014-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler