tongo 0.0.1 → 0.0.2

data/Gemfile.lock

@@ -5,6 +5,7 @@ PATH
       nokogiri
       temple
       tilt
+      tongo
 
 GEM
   remote: http://rubygems.org/
@@ -22,12 +23,12 @@ GEM
       rspec-core (~> 2.5.0)
       rspec-expectations (~> 2.5.0)
       rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.1)
+    rspec-core (2.5.2)
     rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.5.0)
-    temple (0.1.8)
-    tilt (1.2.2)
+    temple (0.2.0)
+    tilt (1.3)
 
 PLATFORMS
   ruby

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/tongo/engine.rb

@@ -1,7 +1,9 @@
 module Tongo
   class Engine < Temple::Engine
     use Tongo::Parser
-    use Temple::Filters::MultiFlattener
+    filter :MultiFlattener
+    filter :StaticMerger
+    filter :DynamicInliner
     use Tongo::Generator
   end
 end

data/lib/tongo/generator.rb

@@ -4,7 +4,7 @@ module Tongo
     TOKENIZER     = /(\%\{.+?\})/
     INTERPOLATION = /\%\{(.+?)\}/
     
-    def compile(exp)
+    def call(exp)
       "\"#{compile!(exp)}\""
     end
     

data/lib/tongo/parser.rb

@@ -1,6 +1,8 @@
 module Tongo
   class Parser
-    def compile(src)
+    attr_reader :ns
+    
+    def call(src)
       src = "<root xmlns:#{@ns}=\"http://blog.codecaster.es\">#{src}</root>"
       doc = Nokogiri::XML::DocumentFragment.parse(src)
       traverse_children(doc.children)
@@ -28,10 +30,6 @@ module Tongo
       end
     end
     
-    def ns
-      @ns
-    end
-    
     def nested_node(e)
       (is_tongo?(e) ? tongo(e, true) : html(e)) << traverse_children(e)
     end

data/lib/tongo/template.rb

@@ -1,7 +1,3 @@
 module Tongo
-  class Template < Temple::Template
-    engine Tongo::Engine
-  end
-end
-
-Tilt.register 'tng', Tongo::Template
+  Template = Temple::Templates::Tilt(Tongo::Engine, :register_as => 'tng')
+end

data/spec/unit/tongo_parser_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe Tongo::Parser do
   def compiled(src)
-    Tongo::Parser.new.compile(src)
+    Tongo::Parser.new.call(src)
   end
   
   it { compiled("Plain text").should      == [:multi, [:text, "Plain text"]] }
@@ -27,5 +27,5 @@ describe Tongo::Parser do
 end
 
 describe Tongo::Parser, "with a custom namespace" do
-  it { Tongo::Parser.new(:ns => 'pop').compile('<pop:custom />').should == [:multi, [:empty, 'custom', {}]] }
+  it { Tongo::Parser.new(:ns => 'pop').call('<pop:custom />').should == [:multi, [:empty, 'custom', {}]] }
 end

data/tongo.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tongo}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rodrigo Alvarez"]
-  s.date = %q{2011-03-18}
+  s.date = %q{2011-05-08}
   s.description = %q{}
   s.email = %q{papipo@gmail.com}
   s.extra_rdoc_files = [
@@ -66,6 +66,10 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.0.pre6"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.5.0.pre6"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_runtime_dependency(%q<temple>, [">= 0"])
       s.add_runtime_dependency(%q<tilt>, [">= 0"])
       s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
@@ -79,6 +83,10 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.0.pre6"])
       s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<bundler>, [">= 0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.5.0.pre6"])
+      s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<temple>, [">= 0"])
       s.add_dependency(%q<tilt>, [">= 0"])
       s.add_dependency(%q<nokogiri>, [">= 0"])
@@ -93,6 +101,10 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.0.pre6"])
     s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<bundler>, [">= 0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.5.0.pre6"])
+    s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<temple>, [">= 0"])
     s.add_dependency(%q<tilt>, [">= 0"])
     s.add_dependency(%q<nokogiri>, [">= 0"])

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tongo
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Rodrigo Alvarez
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-18 00:00:00 +01:00
+date: 2011-05-08 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -154,7 +154,7 @@ dependencies:
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  type: :runtime
+  type: :development
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -164,11 +164,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: temple
+  name: rspec
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  type: :runtime
+  type: :development
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -178,12 +178,72 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: tilt
+  name: bundler
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  type: :runtime
+  type: :development
   requirement: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 1923832021
+        segments: 
+        - 1
+        - 5
+        - 0
+        - pre
+        - 6
+        version: 1.5.0.pre6
+  name: jeweler
+  version_requirements: *id012
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  requirement: &id013 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: rcov
+  version_requirements: *id013
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :runtime
+  requirement: &id014 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: temple
+  version_requirements: *id014
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :runtime
+  requirement: &id015 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: tilt
+  version_requirements: *id015
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :runtime
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -193,7 +253,7 @@ dependencies:
         - 0
         version: "0"
   name: nokogiri
-  version_requirements: *id012
+  version_requirements: *id016
 description: ""
 email: papipo@gmail.com
 executables: []