markus 4.0.11 → 4.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61a7c81d7d3fa8cc762d85264060c00867f3ba14
-  data.tar.gz: b2aad643efe380b28666b614dc4eb25f0e8fe649
+  metadata.gz: 5c823580a0bb0791242cc3f0f649de84e0bff7b6
+  data.tar.gz: 385b569f68399d927c3e481bc6780c9ec6b39292
 SHA512:
-  metadata.gz: 8a35d5910a5570c831f275e7e8d59ec42eded484b5efae6e8fe0ee160edf5fdf71b92e8c80a1d216b4f553d27f9e3b887dc812b71ad75e4bbc3384b851cd231d
-  data.tar.gz: 73b80f9b9be6f43e442aeda89cf06951b24af39d871212856638925492295ea6e4d0872efe546da90700e2f8282869b26aea2af35a09ebe46ec4acf6744ff6c5
+  metadata.gz: 395829a6126f862295ab7f42e1daf3d118eff71468191931c79593b43d624420ede122909a4ab11f5297873fc2a1b9e0104e30b48b82582fab01c70717f3926e
+  data.tar.gz: 2b457501d71a7025e5f7e29eda5b448026652e5fed5fdd45bd9258b8818a70a254b2a1f185dcfa3aeccdc3a5c5f7fe30e6783a89b0bb3ed2bb551f8a8630ae14

data/lib/markus.rb

@@ -72,6 +72,24 @@ class MarkUS
   def element_!(name=nil, *args, &blk) #{{{
     __markus_method_missing name, *args, &blk
   end #}}}
+  def value_!(val) #{{{
+    case val
+      when String
+        content = "\"#{val.gsub(/"/,'\\\"')}\""
+      when Integer, Float
+        content = val
+      else
+        content = "null"
+    end
+    @__markus_level += 1
+    if self.class.__markus_indent
+      @__markus_buffer << "#{"  " * @__markus_level}#{content},"
+    else
+      @__markus_buffer << "#{content},"
+    end
+    @__markus_level -= 1
+    nil
+  end #}}}
   def template_!(name,*args) #{{{
     instance_exec *args, &self.class.__markus_templates[name]
   end #}}}

data/markus.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "markus"
-  s.version          = "4.0.11"
+  s.version          = "4.0.12"
   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_ 63
+      query_ 73
     end  
   end
 end

data/test/change_include_common.mt_

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

data/test/json.mt_

@@ -15,6 +15,7 @@ class TestJSON < MarkUS
             must_ do |array|
               bool_ do
                 should_ do |array|
+                  value_! "_score"
                   nested_ do
                     path_ "contact"
                     query_ do

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                {\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            }\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\": [{\"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\"}}}}]}}]}}}}"
   end
 
   def test_json_arguments

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: markus
 version: !ruby/object:Gem::Version
-  version: 4.0.11
+  version: 4.0.12
 platform: ruby
 authors:
 - Juergen eTM Mangler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-16 00:00:00.000000000 Z
+date: 2016-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest