markus 4.0.21 → 4.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea4adcca87609a129ec8f549126c4bb574a1dd80
-  data.tar.gz: 88bd916b5bd011a44bb1f4672049c8df17eed99e
+  metadata.gz: dee04aede3edc32afbedc10263a769a036afcc68
+  data.tar.gz: 1afc04487fb16bfdb6eed7c5b8882e2b3d175f6f
 SHA512:
-  metadata.gz: 41384886916245694f24ca41a786dae14794688121e24340bf55ef515761688e68e626d4149ef97e6541375eec7d25ab105be364297d17d7783503264ae7480e
-  data.tar.gz: 671a0f7c75f5e65e81788fb9d0914d831727fa872e8e99790462a9cc36d799bd6be4fc8a325a03ed396f1f2fb291907b7d47ee01c802e60bc227e200bcc704b1
+  metadata.gz: 34d915766aa59dbb95631f08b7f8d7cdafac11f582d37f950eb4a4f4a98b94b92d7aa904a2d2c5b9c3757b6f4be7baa382a476f34fcb29b0d7a7454b8b2592b1
+  data.tar.gz: 0a7c2e2c1afe56aef4fb33baa0856acc3e78973fc10e58ff6481f64323cdfd86fb0b4a1f6f5ee1f279de93639681d0226b42baeb84497182fec8d18dd2c35bab

data/lib/markus.rb

@@ -185,9 +185,8 @@ class MarkUS
     @__markus_level += 1
     mpsic = @__markus_parent
 
-    if mpsic == :a
+    if mpsic == :a && !tname.nil?
       @__markus_buffer << __markus_indent + "{"
-      @__markus_level += 1
     end  
 
     if [content, attrs, blk].compact.length > 1
@@ -224,9 +223,8 @@ class MarkUS
       end  
     end
 
-    if mpsic == :a
+    if mpsic == :a && !tname.nil?
       @__markus_buffer.last.chomp!(',')
-      @__markus_level -= 1
       @__markus_buffer << __markus_indent + "},"
     end
 

data/markus.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "markus"
-  s.version          = "4.0.21"
+  s.version          = "4.0.22"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3"
   s.summary          = "MarkUS - Markup UnderScore. Quick n' dirty templating in the spirit of markaby."

data/test/change.mt_

@@ -3,7 +3,7 @@ class TestJsonChange < MarkUS
 
   template :main do
     element_! do
-      query_ 76
+      query_ 90
     end  
   end
 end

data/test/change_include_common.mt_

@@ -2,6 +2,6 @@ class ChangeIncludeCommon < MarkUS
   reload
 
   template :test do
-    query_ 118
+    query_ 132
   end
 end

data/test/json.mt_

@@ -27,19 +27,24 @@ class TestJSON < MarkUS
 
                   nested_ do
                     path_ "contact"
-                    query_ do 
+                    query_ do
                       term_ do
                         element_! "contact.durchwahl", "aaa"
                       end
                     end
                   end
-  
+
+                  element_! do
+                    weight_ 1
+                    filter_ {}
+                  end
+
                 end
               end
             end
-          end       
+          end
         end
       end
-    end    
+    end
   end
 end

data/test/tc_basic_json.rb

@@ -8,13 +8,13 @@ class TestBasicJSON <  Minitest::Test
   def test_json
     s = TestJSON.new
     s.__markus_indent = true
-    assert s.json_!(:main) == "\"from\": 1,\n\"size\": 6,\n\"query\": {\n  \"filtered\": {\n    \"filter\": {\n      \"bool\": {\n        \"must\": [\n          {\n            \"bool\": {\n              \"should\": [\n                \"_score\",\n                {\n                  \"nested\": {\n                    \"path\": \"contact\",\n                    \"query\": {\n                      \"term\": {\n                        \"contact.durchwahl\": 1\n                      }\n                    }\n                  }\n                },\n                {\n                  \"nested\": {\n                    \"path\": \"contact\",\n                    \"query\": {\n                      \"term\": {\n                        \"contact.durchwahl\": \"aaa\"\n                      }\n                    }\n                  }\n                }\n              ]\n            }\n          }\n        ]\n      }\n    }\n  }\n}"
+    assert s.json_!(:main) == "\"from\": 1,\n\"size\": 6,\n\"query\": {\n  \"filtered\": {\n    \"filter\": {\n      \"bool\": {\n        \"must\": [\n          {\n            \"bool\": {\n              \"should\": [\n                \"_score\",\n                {\n                  \"nested\": {\n                    \"path\": \"contact\",\n                    \"query\": {\n                      \"term\": {\n                        \"contact.durchwahl\": 1\n                      }\n                    }\n                  }\n                },\n                {\n                  \"nested\": {\n                    \"path\": \"contact\",\n                    \"query\": {\n                      \"term\": {\n                        \"contact.durchwahl\": \"aaa\"\n                      }\n                    }\n                  }\n                },\n                {\n                  \"weight\": 1,\n                  \"filter\": {}\n                }\n              ]\n            }\n          }\n        ]\n      }\n    }\n  }\n}"
   end
 
   def test_json_noindent
     s = TestJSON.new
     s.__markus_indent = false
-    assert s.json_!(:main) == "\"from\": 1,\"size\": 6,\"query\": {\"filtered\": {\"filter\": {\"bool\": {\"must\": [{\"bool\": {\"should\": [\"_score\",{\"nested\": {\"path\": \"contact\",\"query\": {\"term\": {\"contact.durchwahl\": 1}}}},{\"nested\": {\"path\": \"contact\",\"query\": {\"term\": {\"contact.durchwahl\": \"aaa\"}}}}]}}]}}}}"
+    assert s.json_!(:main) == "\"from\": 1,\"size\": 6,\"query\": {\"filtered\": {\"filter\": {\"bool\": {\"must\": [{\"bool\": {\"should\": [\"_score\",{\"nested\": {\"path\": \"contact\",\"query\": {\"term\": {\"contact.durchwahl\": 1}}}},{\"nested\": {\"path\": \"contact\",\"query\": {\"term\": {\"contact.durchwahl\": \"aaa\"}}}},{\"weight\": 1,\"filter\": {}}]}}]}}}}"
   end
 
   def test_json_arguments

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: markus
 version: !ruby/object:Gem::Version
-  version: 4.0.21
+  version: 4.0.22
 platform: ruby
 authors:
 - Juergen eTM Mangler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-08 00:00:00.000000000 Z
+date: 2016-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest