jsont 0.1.1 → 0.1.2

data/History.txt

@@ -1,3 +1,7 @@
+== 0.1.2 2008-11-27
+
+* Added Proc support for rules
+
 == 0.1.1 2008-11-27
 
 * Removed JSON dependency. You'll have to parse the rules and input before you send it in.

data/README.rdoc

@@ -8,12 +8,15 @@ Port of javascript JsonT transformation library. http://goessner.net/articles/js
 
 == FEATURES/PROBLEMS:
 
-Conforms to most of the JsonT spec minus the javascript function ability. Need something better there.
+Conforms to most of the JsonT spec minus the javascript function ability. (Have to use Proc's instead)
 
 == SYNOPSIS:
 
 Jsont.new({'self' => '<div>{$.test}</div>', 'test' => '<p>{$.x} {$.y}</p>'}).transform({'test' => {'x' => 1, 'y' => 2}})
- => <div><p>1 2</p></div>
+=> <div><p>1 2</p></div>
+
+Jsont.new({'self' => '<div>{$.test}</div>', 'test' => Proc.new{|t, opts| t['x']+t['y']}}).transform({'test' => {'x' => 1, 'y' => 2}})
+=> <div>3</div>
 
 == INSTALL:
 

data/Rakefile

@@ -8,10 +8,7 @@ $hoe = Hoe.new('jsont', Jsont::VERSION) do |p|
   p.changes              = p.paragraphs_of("History.txt", 0..1).join("\n\n")
   p.post_install_message = 'PostInstall.txt' # TODO remove if post-install message not required
   p.rubyforge_name       = p.name # TODO this is default value
-  p.extra_dev_deps = [
-    ['newgem', ">= #{::Newgem::VERSION}"],
-    ['json']
-  ]
+  p.extra_dev_deps = []
   
   p.clean_globs |= %w[**/.DS_Store tmp *.log]
   path = (p.rubyforge_name == p.name) ? p.rubyforge_name : "\#{p.rubyforge_name}/\#{p.name}"

data/lib/jsont.rb

@@ -2,7 +2,7 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 class Jsont
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
   
   def initialize(rules)
     @rules = rules
@@ -31,27 +31,31 @@ class Jsont
     end
     
     if (rule = @rules[target_path])
-      rule.gsub(/\{([a-z0-9\$\.]+)\}/i) do |match|
-        path = match[1,match.size - 2]
-        n = case path[0]
-        when ?$
-          target
-        else
-          @parent
-        end
-        path.gsub!(/^\$\.?/,'')
+      if rule.respond_to?(:call)
+        rule.call(target, :target_path => target_path)
+      else
+        rule.gsub(/\{([a-z0-9\$\.]+)\}/i) do |match|
+          path = match[1,match.size - 2]
+          n = case path[0]
+          when ?$
+            target
+          else
+            @parent
+          end
+          path.gsub!(/^\$\.?/,'')
 
-        if path.size > 0
-          path.split('.').each do |piece|
-            n = case piece
-            when /^[0-9]+$/
-              n[Integer(piece)]
-            else
-              n[piece]
+          if path.size > 0
+            path.split('.').each do |piece|
+              n = case piece
+              when /^[0-9]+$/
+                n[Integer(piece)]
+              else
+                n[piece]
+              end
             end
           end
+          n
         end
-        n
       end
     else
       target

data/test/test_jsont.rb

@@ -66,6 +66,13 @@ class TestJsont < Test::Unit::TestCase
     }), '<div id="topNav"><ul id="mainNav"><li class="dropdown research"><a class="navLabel" href="http://localhost/research/databases.php">Research</a>
 <ul class="clearfix"><li class="dropDownItem"><a href="http://localhost/research/databases.php">Databases</a></li><li class="dropDownItem"><a href="http://localhost/research/homework-help.php">Homework Help</a></li><li class="dropDownItem"><a href="http://localhost/research/government.php">Government</a></li><li class="dropDownItem"><a href="http://localhost/research/local-history.php">Local/Family History</a></li><li class="dropDownItem"><a href="http://localhost/research/teacher-resources.php">Teacher Resources</a></li><li class="dropDownItem"><a href="http://localhost/research/business.php">Business</a></li><li class="dropDownItem"><a href="http://localhost/research/investing.php">Investing</a></li><li class="dropDownItem"><a href="http://localhost/research/careers.php">Careers</a></li></ul></li></ul><ul id="subNav"><div class="research"><li><a class="" href="http://localhost/research/databases.php">Databases</a></li><li><a class="" href="http://localhost/research/homework-help.php">Homework Help</a></li><li><a class="" href="http://localhost/research/government.php">Government</a></li><li><a class="" href="http://localhost/research/local-history.php">Local/Family History</a></li><li><a class="" href="http://localhost/research/teacher-resources.php">Teacher Resources</a></li><li><a class="" href="http://localhost/research/business.php">Business</a></li><li><a class="" href="http://localhost/research/investing.php">Investing</a></li><li><a class="" href="http://localhost/research/careers.php">Careers</a></li></div></ul></div>')
     
+    assert_equal(
+      Jsont.new(
+        {'self' => '<div>{$.test}</div>',
+        'test' => Proc.new{|t, opts| t['x']+t['y']}}
+      ).transform(
+        {'test' => {'x' => 1, 'y' => 2}}
+      ), '<div>3</div>')
     
     
   end

metadata

@@ -56,30 +56,10 @@ test_files:
 - test/test_helper.rb
 - test/test_jsont.rb
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 require_paths: 
 - lib
 dependencies: 
-- !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements: 
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-    version: 
-  type: :development
-  version_requirement: 
-  name: newgem
-- !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements: 
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: !str 0
-    version: 
-  type: :development
-  version_requirement: 
-  name: json
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements: