petroglyph 0.0.2 → 0.0.3

data/lib/padrino/petroglyph.rb

@@ -0,0 +1,4 @@
+require 'padrino-core'
+Padrino.after_load do
+  require 'petroglyph/template'
+end

data/lib/petroglyph/railtie.rb

@@ -3,8 +3,8 @@ module Petroglyph
 
     initializer "petroglyph.initialize" do |app|
       ActiveSupport.on_load(:action_view) do
-        Petroglyph.register!
+        require 'rails/3.x/petroglyph'
       end
     end
   end
-end
+end

data/lib/petroglyph/scope.rb

@@ -76,8 +76,8 @@ module Petroglyph
 
     def partial(name, locals = {})
       data = Petroglyph.partial(name, file)
-      scope = Scope.new(@context, locals)
-      scope.instance_eval(data)
+      scope = Scope.new(@context, locals, file)
+      scope.instance_eval(data.to_s)
       merge scope.value
     end
 
@@ -85,7 +85,7 @@ module Petroglyph
       if @locals and @locals.has_key?(method)
         @locals[method]
       elsif @context.respond_to?(method)
-        @context.send(method)
+        @context.send(method, *args)
       else
         super
       end

data/lib/petroglyph/version.rb

@@ -1,3 +1,3 @@
 module Petroglyph
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/petroglyph.rb

@@ -2,13 +2,9 @@ require 'json'
 
 require 'petroglyph/scope'
 require 'petroglyph/engine'
-require 'petroglyph/railtie' if defined?(Rails) && Rails.version =~ /^3/
 
 module Petroglyph
   class << self
-    def register!
-      require 'petroglyph/template'
-    end    
     def partial(filename, template_filename)
       basedir = File.dirname(template_filename)
       [basedir, "#{basedir}/partials"].each do |dir|
@@ -20,9 +16,12 @@ module Petroglyph
   end
 end
 
-if defined?(Padrino)
-  require 'padrino-core'
-  Padrino.after_load { Petroglyph.register! }
+if defined? Padrino
+  require 'padrino/petroglyph'
+elsif defined? Sinatra
+  require 'sinatra/petroglyph'
 elsif defined?(Rails) && Rails.version =~ /^2/
-  Petroglyph.register!
+  require 'rails/2.x/petroglyph'
+elsif defined?(Rails) && Rails.version =~ /^3/
+  require 'petroglyph/railtie'
 end

data/lib/rails/2.x/petroglyph.rb

@@ -0,0 +1,24 @@
+if defined?(Tilt)
+  require 'tilt/petroglyph'
+end
+
+# Rails 2.X Template
+if defined?(Rails) && Rails.version =~ /^2/
+  require 'action_view/base'
+  require 'action_view/template'
+
+  module ActionView
+    module TemplateHandlers
+      class PetroglyphHandler < TemplateHandler
+        include Compilable
+
+        def compile(template) %{
+          ::Petroglyph::Engine.new(#{template.source.inspect}).
+            render(self, assigns.merge(local_assigns), '#{template.filename}')
+        } end
+      end
+    end
+  end
+
+  ActionView::Template.register_template_handler :pg, ActionView::TemplateHandlers::PetroglyphHandler
+end

data/lib/rails/3.x/petroglyph.rb

@@ -0,0 +1,26 @@
+if defined?(Tilt)
+  require 'tilt/petroglyph'
+end
+
+# Rails 3.X Template
+if defined?(Rails) && Rails.version =~ /^3/
+  module ActionView
+    module Template::Handlers
+      class Petroglyph
+
+        def call(template)
+          source = if template.source.empty?
+            File.read(template.identifier)
+          else
+            template.source
+          end
+
+          %{ ::Petroglyph::Engine.new(#{source.inspect}).
+              render(self, assigns.merge(local_assigns), '#{template.identifier}') }
+        end
+      end
+    end
+  end
+
+  ActionView::Template.register_template_handler :pg, ActionView::Template::Handlers::Petroglyph.new
+end

data/lib/sinatra/petroglyph.rb

@@ -1,9 +1,8 @@
 require 'tilt/petroglyph'
 
-if defined?(Sinatra)
-  module Sinatra::Templates
-    def pg(template, options={}, locals={})
-      render :pg, template, options, locals
-    end
+module Sinatra::Templates
+  def pg(template, options={}, locals={})
+    options.merge!(:default_content_type => :json)
+    render :pg, template, options, locals
   end
 end

data/spec/fixtures/views/partials/nested_partial.pg

@@ -0,0 +1 @@
+ partial :the_partial, :thing => 'stuff'

data/spec/scope_spec.rb

@@ -246,5 +246,15 @@ describe Petroglyph::Scope do
       scope.value.should eq({:partial => {:thing => 'stuff'}})
     end
 
+    it "finds nested partials" do
+      scope = Petroglyph::Scope.new
+      scope.file = "spec/fixtures/views/some_template.pg"
+
+      scope.node :partial do
+        partial :nested_partial
+      end
+
+      scope.value.should eq({:partial => {:thing => 'stuff'}})
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: petroglyph
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-18 00:00:00.000000000Z
+date: 2012-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &70204971169420 !ruby/object:Gem::Requirement
+  requirement: &70117439374320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70204971169420
+  version_requirements: *70117439374320
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70204971169000 !ruby/object:Gem::Requirement
+  requirement: &70117439367780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70204971169000
+  version_requirements: *70117439367780
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70204971168580 !ruby/object:Gem::Requirement
+  requirement: &70117439367160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70204971168580
+  version_requirements: *70117439367160
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70204971168160 !ruby/object:Gem::Requirement
+  requirement: &70117439366500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70204971168160
+  version_requirements: *70117439366500
 description: A simple, terse, and unsurprising ruby dsl to create json views.
 email:
 - katrina.owen@gmail.com
@@ -68,18 +68,21 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- lib/padrino/petroglyph.rb
 - lib/petroglyph.rb
 - lib/petroglyph/engine.rb
 - lib/petroglyph/railtie.rb
 - lib/petroglyph/scope.rb
-- lib/petroglyph/template.rb
 - lib/petroglyph/version.rb
+- lib/rails/2.x/petroglyph.rb
+- lib/rails/3.x/petroglyph.rb
 - lib/sinatra/petroglyph.rb
 - lib/tilt/petroglyph.rb
 - petroglyph.gemspec
 - spec/engine_spec.rb
 - spec/fixtures/views/helper.pg
 - spec/fixtures/views/index.pg
+- spec/fixtures/views/partials/nested_partial.pg
 - spec/fixtures/views/partials/sub_partial.pg
 - spec/fixtures/views/post.pg
 - spec/fixtures/views/syntax.pg

data/lib/petroglyph/template.rb

@@ -1,64 +0,0 @@
-# TILT Template
-if defined?(Tilt)
-  class PetroglyphTemplate < Tilt::Template
-    def initialize_engine
-      return if defined?(::Petroglyph)
-      require_template_library 'petroglyph'
-    end
-
-    def prepare
-      options = @options.merge(:source_location => file)
-      @engine = ::Petroglyph::Engine.new(data, options)
-    end
-
-    def evaluate(scope, locals, &block)
-      @engine.render(scope, locals, &block)
-    end
-  end
-
-  Tilt.register 'pg', PetroglyphTemplate
-end
-
-# Rails 2.X Template
-if defined?(Rails) && Rails.version =~ /^2/
-  require 'action_view/base'
-  require 'action_view/template'
-
-  module ActionView
-    module TemplateHandlers
-      class PetroglyphHandler < TemplateHandler
-        include Compilable
-
-        def compile(template) %{
-          ::Petroglyph::Engine.new(#{template.source.inspect}).
-            render(self, assigns.merge(local_assigns), '#{template.filename}')
-        } end
-      end
-    end
-  end
-
-  ActionView::Template.register_template_handler :pg, ActionView::TemplateHandlers::PetroglyphHandler
-end
-
-# Rails 3.X Template
-if defined?(Rails) && Rails.version =~ /^3/
-  module ActionView
-    module Template::Handlers
-      class Petroglyph
-
-        def call(template)
-          source = if template.source.empty?
-            File.read(template.identifier)
-          else
-            template.source
-          end
-
-          %{ ::Petroglyph::Engine.new(#{source.inspect}).
-              render(self, assigns.merge(local_assigns), '#{template.identifier}') }
-        end
-      end
-    end
-  end
-
-  ActionView::Template.register_template_handler :pg, ActionView::Template::Handlers::Petroglyph.new
-end