snippr 0.15.22 → 0.15.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7285f9e6b5d7271ae0d46e93fc3b4fdb630e0af0
-  data.tar.gz: c7c3d8a708304c4184cdbb40321bb3a72aea8882
+  metadata.gz: 054173010859c69d009993fdcb3c2b3dba1c480e
+  data.tar.gz: 3aff7b7072677405dcd33849f675975daa1a4392
 SHA512:
-  metadata.gz: e3ff81c780ad5b2636f0620bd613ef2d242b2b782f04c55f64419bdbf8a06185f1bbc1908ae70eb2cf1b883874b7751935878d4c7f9fa76e621e189d33a44a3f
-  data.tar.gz: cb86a46ff9c499bd1be46960df280bb86b75da4827eec12afa6dfaacfe5be75530015bb28ccd45a3e27e854ed02cc5ca38a45e2580c4da00e82afbb67a0401e2
+  metadata.gz: bf7d237b5c1f753bf381b9b16b98981870a52af3e8512cfdf4003f37ba5f321c2863390e28862973104f27249b68067934d109fce5a0ed8a8c21243171e4b48b
+  data.tar.gz: a2f91dd07711ce6fc54172f9f2e7c713c200797addcfd564ae02911501adb9734f415188fdf6434cc674d1f73b4fde696f6fb6e4872c79ad5f7e0f35ec46c225

data/lib/snippr/processor/dynamics.rb

@@ -9,50 +9,57 @@ module Snippr
     class Dynamics
 
       def process(content, opts = {})
-        matches = []
-        # convert array of arrays to array of matchdata
-        content.scan(regex) { matches << $~ }
-
-        matches.each do |match_data|
-          replacement = match_data[:all]
-          placeholder = match_data[:placeholder].strip.to_sym
-          value = opts[placeholder]
-          if match_data[:method] && (value.respond_to?(match_data[:method]) || match_data[:respond_to_check] == "!")
-            params = (match_data[:parameters] || "").gsub(/[\t\r\n]/,"").split("\",\"")
-            replacement = value.send(match_data[:method], *params).to_s
-          elsif match_data[:method]
-            replacement = match_data[:all]
-          elsif value
+        opts.inject(content) do |c, pv|
+          placeholder, value = pv
+          c.gsub(regex(placeholder)) do |match|
             replacement = value.to_s
+            # remember values since gsub will reset all regex $ matches
+            default = $5
+            method = $3
+            safety = $6
+            if $3 && (value.respond_to?($3) || $2 == "!")
+              params = recursive_process(($4 || "").gsub(/[\t\r\n]/,""), opts).split("\",\"")
+              replacement = value.send(method, *params).to_s
+            elsif $3
+              replacement = match
+            end
+            replacement = default if replacement.empty? && default
+            replacement += safety.html_safe if safety
+            replacement
           end
-
-          # default set?
-          replacement = match_data[:default_when_empty].strip if replacement.empty? && match_data[:default_when_empty]
-          content.gsub!(match_data[:all], replacement)
         end
-        content
       end
 
       private
 
-      def regex
+      def regex(placeholder)
         %r{
-        (?<all>                           # group caputing all
-        \{                                # start of dynamic value
-        (?<respond_to_check>!?)           # use ! to call the method on an object even if :respond_to fails
-        (?<placeholder>.*?)               # variable holding value or object
-        (?:\.(?<method>.*?)               # about to call an method on the 'placeholder'
-        \(                                # non-optional bracket to merk method call
-        ["]?                              # optional opening double quote
-        (?<parameters>.*?)                # paramters for method call
-        ["]?                              # optional closing double quote
-        \))?                              # mandatory closing bracket and group end
-        (\|(?<default_when_empty>.*?))?   # optional default value when snippet content empty
-        \}                                # and thats it
-        )                                 # end all group
+        (              # $1: collect all but safety guard at the end
+        \{             # start of dynamic value
+        (!?)           # $2: use ! to call the method on an object even if :respond_to fails
+        #{placeholder} # variable holding value or object
+        (?:\.(.*?)     # $3: about to call an method on the 'placeholder'
+        \(             # non-optional bracket to merk method call
+        ["]?           # optional opening double quote
+        (.*?)          # $4: parameters for method call
+        ["]?           # optional closing double quote
+        \))?           # mandatory closing bracket and group end
+        (?:\|(.*?))?   # $5: optional default value when snippet content empty
+        \}             # and thats it
+        )              # end capture of variable area
+        ([^"]|$)       # $6: this allows he capture of method calls in method calls
         }xm
       end
 
+      def recursive_process(parameter_string, opts)
+        # simple check if there is something to do
+        if parameter_string.include?("{")
+          process(parameter_string, opts)
+        else
+          parameter_string
+        end
+      end
+
     end
 
   end

data/snippr.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = "snippr"
-  s.version     = '0.15.22'
+  s.version     = '0.15.23'
   s.date        = Time.now
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Daniel Harrington", "Thomas Jachmann", "Frank Schumacher"]

data/spec/snippr/processor/dynamics_spec.rb

@@ -43,8 +43,14 @@ describe Snippr::Processor::Dynamics do
     expect(subject.process(tpl, :var => Klass.new)).to eq("An instance METHOD WITH PARAMETER1 AND PARAMETER2")
   end
 
+  it "allows usage of snippr substitution inside method call parameters" do
+    pending 'fix it or use version 0.15.19'
+    tpl = 'An instance {var.method3("{var2.method()}","PARAMETER2")}'
+    expect(subject.process(tpl, :var => Klass.new, :var2 => Klass.new)).to eq('An instance METHOD WITH METHOD AND PARAMETER2')
+  end
+
   it "keeps the {snip} if calling a method but the method is not defined" do
-  expect(subject.process("An instance {var.method_not_exist()}", :var => Klass.new)).to eq("An instance {var.method_not_exist()}")
+    expect(subject.process("An instance {var.method_not_exist()}", :var => Klass.new)).to eq("An instance {var.method_not_exist()}")
   end
 
   it "calls a bang(!) method even if the receiver does not respond_to the method" do
@@ -52,16 +58,6 @@ describe Snippr::Processor::Dynamics do
     expect { subject.process(tpl, :var => Klass.new) }.to raise_error(NoMethodError)
   end
 
-  it "defaults the value if the content is empty" do
-    tpl = "{empty|default}"
-    expect(subject.process(tpl, empty: "")).to eq "default"
-  end
-
-  it "defaults the value if the content is present" do
-    tpl = "{var.method4()|default2}"
-    expect(subject.process(tpl, var: Klass.new )).to eq "default2"
-  end
-
   it "leaves the dynamic vslue untouched if no replacement and default exists" do
     tpl = <<-HEREDOC
       .clazz {
@@ -73,4 +69,31 @@ describe Snippr::Processor::Dynamics do
     expect(subject.process(tpl)).to eq "      .clazz {\n      }\n\n      .clazz {}\n      </style>\n"
   end
 
+  context "default handling" do
+    it "defaults the value if the content is empty" do
+      expect(subject.process("{empty|default}", empty: "")).to eq "default"
+    end
+
+    it "defaults the value if the method calls return value is empty" do
+      expect(subject.process("{var.method4()|default2}", var: Klass.new )).to eq "default2"
+    end
+  end
+
+  context "nested placeholders" do
+    it "allows nested placeholders when calling a method" do
+      tpl = 'An instance {var.method3("{var2}","PARAMETER2")}'
+      expect(subject.process(tpl, :var => Klass.new, :var2 => "VAR")).to eq("An instance METHOD WITH VAR AND PARAMETER2")
+    end
+
+    it "allows nested placeholders with method calls when calling a method" do
+      tpl = 'An instance {var.method3("{var2.method()}","PARAMETER2")}'
+      expect(subject.process(tpl, :var => Klass.new, :var2 => Klass.new)).to eq("An instance METHOD WITH METHOD AND PARAMETER2")
+    end
+
+    it "allows nested placeholders with method calls on the same object when calling a method" do
+      tpl = 'An instance {var.method2("{var.method2("{var.method3("A","B")}")}")}'
+      expect(subject.process(tpl, :var => Klass.new)).to eq("An instance METHOD WITH METHOD WITH METHOD WITH A AND B")
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: snippr
 version: !ruby/object:Gem::Version
-  version: 0.15.22
+  version: 0.15.23
 platform: ruby
 authors:
 - Daniel Harrington
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-04 00:00:00.000000000 Z
+date: 2014-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n