marty 1.0.34 → 1.0.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 751328c7a7c786984962edb15f66a8aa2fa680ce
-  data.tar.gz: 08d5426a9b837d2f4da1f759c6e27c0a9f7c1c5a
+  metadata.gz: 3adb3fc7a00a1b5f8821771a2105ae9e2788d2af
+  data.tar.gz: 7e9faa47b3d14a1df9dab85c206031ec4dd0452f
 SHA512:
-  metadata.gz: af123dfccdbd3a075eb489979afa78ffd21bbcfd3615ddcc6b5f764be76d61394e1aab0d853f35f17c327effd9298f0c293c946962ea52fdec764e137dd57713
-  data.tar.gz: 40ab7f6dfa2987c2c580a3c5cd4dd0f6baee3b48eb3225572c4ce17dfa6d58df591fe74db745daf421b8e511eff2df0e1fbf47c865daa28114a24c382a2be66d
+  metadata.gz: 7ac9b7eb9d94c4fd78ab1869b6ebf8bde560a4d66f59a91e0c98c53a901b45ff3f745515a0e71dc7dc5839eb483b177e84fd82536b1b2d78b3dde3bb794c3f4f
+  data.tar.gz: 1f82684f46cea8a2ffc0a91dfe503c1d255c3c61c0cd44c6fa4d03c025c5373308cfd93bee258163630d6e77a0b1a7fde9be72a4c6e956b29037796d499dac7a

data/app/models/marty/script.rb

@@ -126,21 +126,26 @@ class Marty::Script < Marty::Base
 
   delorean_fn :eval_to_hash, sig: 5 do
     |dt, script, node, attrs, params|
-    tag = Marty::Tag.find_match(dt)
+    tag = Marty::Tag.find_match(dt) || raise("no tag found for #{dt}")
 
+    engine = Marty::ScriptSet.new(tag).get_engine(script)
     # IMPORTANT: engine evals (e.g. eval_to_hash) modify the
     # params. So, need to clone it.
-    params = params.clone
-
-    raise "no tag found for #{dt}" unless tag
-
-    engine = Marty::ScriptSet.new(tag).get_engine(script)
-    res = engine.eval_to_hash(node, attrs, params)
+    engine.eval_to_hash(node, attrs, params.clone)
 
     # FIXME: should sanitize res to make sure that no nodes are being
     # passed back.  It's likely that nodes which are not from the
     # current tag can caused problems.
-    res
+  end
+
+  delorean_fn :evaluate, sig: 5 do
+    |dt, script, node, attr, params|
+    tag = Marty::Tag.find_match(dt) || raise("no tag found for #{dt}")
+
+    engine = Marty::ScriptSet.new(tag).get_engine(script)
+    # IMPORTANT: engine evals (e.g. eval_to_hash) modify the
+    # params. So, need to clone it.
+    engine.evaluate(node, attr, params.clone)
   end
 
   delorean_fn :pretty_print, sig: 1 do

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = "1.0.34"
+  VERSION = "1.0.35"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 1.0.34
+  version: 1.0.35
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-26 00:00:00.000000000 Z
+date: 2017-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg