personify 1.1.1 → 1.1.2

data/Rakefile

@@ -12,6 +12,7 @@ begin
     gem.authors = ["Flurin Egger"]
     gem.add_dependency "treetop", "~> 1.4.0"
     gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
+    gem.add_development_dependency "rdoc", ">= 0"    
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new
@@ -21,8 +22,8 @@ end
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
+  test.libs + ['lib', 'test']
+  test.pattern = 'test/*_test.rb'
   test.verbose = true
 end
 
@@ -43,8 +44,8 @@ task :test => :check_dependencies
 
 task :default => :test
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
+require 'rdoc/task'
+RDoc::Task.new() do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
   rdoc.rdoc_dir = 'rdoc'

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.1.2

data/lib/personify/context.rb

@@ -8,11 +8,11 @@ module Personify
       end
       
       def context_method(method_name)
-        self.allowed_context_methods << method_name.to_s if self.instance_methods.include?(method_name.to_s)
+        self.allowed_context_methods << method_name.to_sym if self.instance_methods.include?(method_name.to_s) || self.instance_methods.include?(method_name.to_sym)
       end
-      
+
       def allow_method?(method_name)
-        self.allowed_context_methods.include?(method_name.to_s)
+        self.allowed_context_methods.include?(method_name.to_sym)
       end
     end
 

data/test/context_test.rb

@@ -30,6 +30,20 @@ class ContextTest < Test::Unit::TestCase
       end
     end
     
+    should "have the context methods in the #allowed_methods" do
+      assert @c.allowed_context_methods.include?(:true)
+      assert @c.allowed_context_methods.include?(:block)
+      assert !@c.allowed_context_methods.include?(:do_not_call)
+    end
+    
+    should "respond true to #allow_method? of context method" do
+      assert @c.allow_method?(:true)
+      assert @c.allow_method?("true")
+      assert @c.allow_method?(:block)
+      assert @c.allow_method?("block")
+      assert !@c.allow_method?(:do_not_call)
+      assert !@c.allow_method?("do_not_call")
+    end
     
     should "allow setting of local_assigns" do
       @i = @c.new
@@ -85,10 +99,10 @@ class ContextTest < Test::Unit::TestCase
         assert_equal "[IF(\"out\")]", parse("[IF(\"out\")]").eval(@context)
       end
       
-      should "return nil with more than 2 arguments" do
-        assert_equal "[IF(\"out\", \"2\", \"3\")]", parse("[IF(\"out\", \"2\", \"3\")]").eval(@context)
-        assert_equal "test", parse("[IF(\"out\", \"2\", \"3\") | \"test\"]").eval(@context)        
-        assert_equal "[IF(\"out\",\"2\") DO]3[END]", parse("[IF(\"out\",\"2\") DO]3[END]").eval(@context)
+      should "discard any argument after the 2nd" do
+        assert_equal "2", parse("[IF(\"out\", \"2\", \"3\")]").eval(@context)
+        assert_equal "2", parse("[IF(\"out\", \"2\", \"3\") | \"test\"]").eval(@context)        
+        assert_equal "2", parse("[IF(\"out\",\"2\") DO]3[END]").eval(@context)
       end
       
       should "return second argument if first argument is not empty" do

data/test/parser_test.rb

@@ -207,7 +207,7 @@ class ParserTest < Test::Unit::TestCase
           assert_equal "alt", parse("[TEST_PARAM(FALSE) DO]value[END | \"alt\"]").eval(@context)      
         end
         
-        should "eval substitution within block parameter" do
+        should_eventually "eval substitution within block parameter" do
           assert_equal "value", parse("[TEST() DO][KEY][END]").eval(@context)
           assert_equal "bla value bla", parse("[TEST() DO]bla [KEY] bla[END]").eval(@context)
         end

metadata

@@ -1,64 +1,58 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: personify
-version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: false
-  segments: 
-  - 1
-  - 1
-  - 1
-  version: 1.1.1
+version: !ruby/object:Gem::Version
+  version: 1.1.2
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Flurin Egger
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-22 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-10-14 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: treetop
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70184090092600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 4
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.4.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *70184090092600
+- !ruby/object:Gem::Dependency
   name: thoughtbot-shoulda
+  requirement: &70184090085340 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70184090085340
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &70184090082680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-description: Personfify is meant for use in environments where templates just need to be personalized.
+  prerelease: false
+  version_requirements: *70184090082680
+description: Personfify is meant for use in environments where templates just need
+  to be personalized.
 email: flurin@digitpaint.nl
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.md
-files: 
-- .gitignore
+files:
 - .rvmrc
 - LICENSE
 - README.md
@@ -76,42 +70,28 @@ files:
 - test/parse_runner.rb
 - test/parser_test.rb
 - test/test_helper.rb
-has_rdoc: true
 homepage: http://github.com/digitpaint/personify
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: A personalisation template language
-test_files: 
-- test/context_test.rb
-- test/parse_runner.rb
-- test/parser_test.rb
-- test/test_helper.rb
+test_files: []

data/.gitignore

@@ -1,2 +0,0 @@
-.DS_Store
-personify.gemspec