hobber 0.6.4 → 0.6.5

data/Gemfile

@@ -1,6 +1,9 @@
 source 'https://rubygems.org'
 
 group :development do
+  # NOTICE: rdiscount and haml only for integration test
+  gem 'rdiscount'
+  gem 'haml'
   gem 'pry'
   gem 'rspec'
   gem 'ruby-debug19'

data/lib/hobber/renderable_object.rb

@@ -1,23 +1,24 @@
-require 'tilt'
-require 'yaml'
-require 'active_support/core_ext/hash/indifferent_access'
-
+require 'hobber/renderer/tilt'
+require 'hobber/tmpl_var_extractor/yaml'
 
 module Hobber
-  class ProblemParsingYaml < RuntimeError; end
   class RenderError < RuntimeError; end
+
   class RenderableObject
-    attr_reader :path, :data
+    attr_reader :path, :tmpl_content, :renderer
+
+    def initialize(path, a_renderer=nil, a_tmpl_var_extractor=nil)
+      @path         = path
+      @tmpl_content = block_given? ? yield(self) : File.open(@path, 'r:UTF-8') { |f| f.read }
 
-    def initialize(path)
-      @path = path 
-      @data = yield(self) if block_given?
+      @renderer           = a_renderer           || Renderer::Tilt.new
+      @tmpl_var_extractor = a_tmpl_var_extractor || TmplVarExtractor::Yaml.new(@tmpl_content, @path)
     end
 
-    def render(vars={}, context=Object.new, &block)
-      _render_template_chain(@path, data, context, vars, &block)
+    def render(vars={}, ctx=Object.new, &block)
+      @renderer.render(path, tmpl_content, ctx, tmpl_vars.merge(vars), &block)
     end
-    
+
     def to_a
       [self]
     end
@@ -30,48 +31,12 @@ module Hobber
       tmpl_vars.fetch(*a)
     end
 
-    def data
-      @data ||= File.read(@path)
+    def tmpl_content
+      @tmpl_var_extractor.tmpl_content
     end
 
     def tmpl_vars
-      @tmpl_vars ||= _extract_tmpl_vars
-    end
-    def _extract_tmpl_vars
-      @tmpl_vars = {}
-      if data.match(/\s*---.*---/m)
-        ignore, yaml_buffer, template_data = data.split(/---/,3)
-        @data = template_data
-        @tmpl_vars = YAML.parse(yaml_buffer).to_ruby
-      end
-      HashWithIndifferentAccess.new(@tmpl_vars)
-    rescue Psych::SyntaxError => e
-      raise ProblemParsingYaml.new([e.message, "while trying to extract tmpl_vars from [#{path}]"] * " -- ")
-    end
-
-    private
-
-    def _render_template_chain(path, data, context, vars, &block)
-      # termination condition, if tilt template class
-      # is  
-      tilt_template_class = Tilt[path]
-      unless tilt_template_class
-        return data
-      end
-
-      template = tilt_template_class.new(@path) { |t| data }
-
-      # remove extention
-      path = path.gsub(/\.\w+$/,'')
-      data = template.render(context, vars, &block)
-
-      # iterate again to next available template 
-      # engine
-      _render_template_chain(path, data, context, vars, &block)
-    rescue => e
-      render_error = RenderError.new("#{self.class}: While rendering #{path} with #{tilt_template_class}: #{e.message}")
-      render_error.set_backtrace(e.backtrace)
-      raise render_error 
+      @tmpl_var_extractor.tmpl_vars
     end
   end
 end

data/lib/hobber/renderer/tilt.rb

@@ -0,0 +1,30 @@
+require 'tilt'
+
+module Hobber
+  module Renderer
+    class Tilt
+      def render(path, data, context, vars, &block)
+        # termination condition, if tilt template class
+        # is  
+        tilt_template_class = ::Tilt[path]
+        unless tilt_template_class
+          return data
+        end
+
+        template = tilt_template_class.new(path) { |t| data }
+
+        # remove extention
+        path = path.gsub(/\.\w+$/,'')
+        data = template.render(context, vars, &block)
+
+        # iterate again to next available template 
+        # engine
+        render(path, data, context, vars, &block)
+      rescue => e
+        render_error = RenderError.new("#{self.class}: While rendering #{path} with #{tilt_template_class}: #{e.message}")
+        render_error.set_backtrace(e.backtrace)
+        raise render_error 
+      end
+    end
+  end
+end

data/lib/hobber/tmpl_var_extractor/yaml.rb

@@ -0,0 +1,36 @@
+require 'yaml'
+require 'active_support/core_ext/hash/indifferent_access'
+
+module Hobber
+  class ProblemParsingYaml < RuntimeError; end
+  module TmplVarExtractor
+    class Yaml
+      attr_reader :combined_content, :tmpl_content, :tmpl_vars
+
+      def initialize(combined_content, path=nil)
+        @combined_content = combined_content
+        @path = path
+
+        @tmpl_content = combined_content
+        @tmpl_vars = {}
+        extract
+      end
+
+      def extract
+        @tmpl_vars = {}
+        if @combined_content.match(/\s*---.*---/m)
+          ignore, yaml_buffer, tmpl_content = @combined_content.split(/---/,3)
+          @tmpl_content = tmpl_content
+          @tmpl_vars = YAML.parse(yaml_buffer).to_ruby
+          @tmpl_vars = HashWithIndifferentAccess.new(@tmpl_vars)
+        end
+      # rescue Psych::SyntaxError => e
+      rescue => e
+        debugger
+        error = ProblemParsingYaml.new(["#{e.message} (#{e.class})", "while trying to extract tmpl_vars from [#{@path}]"] * " -- ")
+        error.set_backtrace(e.backtrace)
+        raise error
+      end
+    end
+  end
+end

data/lib/hobber/version.rb

@@ -1,3 +1,3 @@
 module Hobber
-  VERSION = "0.6.4"
+  VERSION = "0.6.5"
 end

data/spec/lib/hobber/render_action_spec.rb

@@ -6,7 +6,7 @@ module Hobber
     subject {described_class.new([])}
     context "#layout" do
       it "adds a layout" do
-        robject = RenderableObject.new('a_path')
+        robject = RenderableObject.new('a_path') { '' }
         subject.layout robject
       end
       it "raises when adding something other than RenderableObject" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hobber
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-29 00:00:00.000000000Z
+date: 2012-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &70258422315100 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70258422315100
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70258422314680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70258422314680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: active_support
-  requirement: &70258422314260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70258422314260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &70258422313840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +69,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70258422313840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Minimal implementation ..
 email:
 - boy.maas@gmail.com
@@ -74,6 +94,8 @@ files:
 - lib/hobber/renderable_object.rb
 - lib/hobber/rendered_object.rb
 - lib/hobber/rendered_object_saver.rb
+- lib/hobber/renderer/tilt.rb
+- lib/hobber/tmpl_var_extractor/yaml.rb
 - lib/hobber/version.rb
 - spec/integration_spec.rb
 - spec/lib/hobber/render_action_spec.rb
@@ -112,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Minimal implementation ..