personify 1.1.0 → 1.1.1

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.1.1

data/lib/personify/parser/personify_node_classes.rb

@@ -74,8 +74,8 @@ module PersonifyLanguage
       ne = next_expression.eval(env)
       
       case operator.text_value
-        when "&&" : fe && ne
-        when "||" : fe || ne
+        when "&&" then fe && ne
+        when "||" then fe || ne
       end
     end    
   end
@@ -89,7 +89,11 @@ module PersonifyLanguage
       end
       
       if fn && fn.respond_to?(:call)
-        fn.call(*self.function_parameters(env))
+        params = self.function_parameters(env)
+        if fn.arity >= 0
+          params = params[0,fn.arity]
+        end
+        fn.call(*params)
       else
         fn
       end

data/lib/personify.rb

@@ -1,8 +1,17 @@
 require 'treetop'
-require File.dirname(__FILE__) + '/personify/parser/personify_node_classes'
-require File.dirname(__FILE__) + '/personify/parser/personify'
-require File.dirname(__FILE__) + '/personify/template'
-require File.dirname(__FILE__) + '/personify/context'
+
+unless Kernel.respond_to?(:require_relative)
+  module Kernel
+    def require_relative(path)
+      require File.join(File.dirname(caller[0]), path.to_str)
+    end
+  end
+end
+
+require_relative 'personify/parser/personify_node_classes'
+require_relative 'personify/parser/personify'
+require_relative 'personify/template'
+require_relative 'personify/context'
 
 module Personify
 end

data/test/context_test.rb

@@ -1,7 +1,9 @@
-require File.dirname(__FILE__) + '/test_helper'
-require 'treetop'
+# coding: utf-8
+require File.join(File.expand_path(File.dirname(__FILE__)), "test_helper") 
 Treetop.load  File.dirname(__FILE__) + "/../lib/personify/parser/personify"
-# require File.dirname(__FILE__) + "/../personify"
+
+# Use this if you want to test the generated parser
+# require_relative  "../personify"
 
 class ContextTest < Test::Unit::TestCase
   include ParserTestHelper

data/test/parser_test.rb

@@ -1,7 +1,9 @@
-require File.dirname(__FILE__) + '/test_helper'
-require 'treetop'
+# coding: utf-8
+require File.join(File.expand_path(File.dirname(__FILE__)), "test_helper") 
 Treetop.load File.dirname(__FILE__) + "/../lib/personify/parser/personify"
-# require File.dirname(__FILE__) + "/../personify"
+
+# Use this if you want to test the generated parser
+# require_relative  "../personify"
 
 class ParserTest < Test::Unit::TestCase
   include ParserTestHelper
@@ -130,7 +132,8 @@ class ParserTest < Test::Unit::TestCase
         end
         should "eval substitution with non endpoint key" do
           # Will just call to_s
-          assert_equal "l3v", parse("[L1.L2]").eval({"l1" => {"l2" => {"l3" => "v"}}})
+          p = {"l3" => "v"}
+          assert_equal p.to_s, parse("[L1.L2]").eval({"l1" => {"l2" => p}})
         end
       end
       
@@ -151,7 +154,7 @@ class ParserTest < Test::Unit::TestCase
           assert_equal "v1+v2v3", parse("[FUNC(\"v1\",\"v2\",\"v3\")]").eval("func" => Proc.new{|v1,*v2| v1 + "+" + v2.join })
         end
         should "eval with too much parameters" do
-          assert_equal "p1p2", parse("[FUNC(\"p1\",\"p2\")]").eval("func" => Proc.new{|v1| v1 })
+          assert_equal "p1", parse("[FUNC(\"p1\",\"p2\")]").eval("func" => Proc.new{|v1| v1 })
         end
         should "eval with no parameters" do 
           assert_equal "val", parse("[FUNC()]").eval("func" => Proc.new{ "val" })

data/test/test_helper.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
+require 'treetop'
 require 'shoulda'
-require File.dirname(__FILE__) + "/../lib/personify"
+require File.join(File.expand_path(File.dirname(__FILE__)), "../lib/personify") 
 
 require 'test/unit'
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: personify
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Flurin Egger
@@ -71,7 +71,6 @@ files:
 - lib/personify/parser/personify.treetop
 - lib/personify/parser/personify_node_classes.rb
 - lib/personify/template.rb
-- script/generate_parser.rb
 - test/context_test.rb
 - test/fixtures/multiple_tags.txt
 - test/parse_runner.rb

data/script/generate_parser.rb

@@ -1,6 +0,0 @@
-require File.dirname(__FILE__) + "/../vendor/treetop/lib/treetop"
-
-target_dir = File.dirname(__FILE__) + "/../lib/parser/"
-
-compiler = Treetop::Compiler::GrammarCompiler.new
-compiler.compile(File.join(target_dir,"personify.treetop"), File.join(target_dir,"personify.rb"))