hobber 0.6.2 → 0.6.4

data/Gemfile

@@ -1,7 +1,5 @@
 source 'https://rubygems.org'
 
-gem "active_support"
-
 group :development do
   gem 'pry'
   gem 'rspec'

data/hobber.gemspec

@@ -16,7 +16,8 @@ Gem::Specification.new do |gem|
   gem.version       = Hobber::VERSION
   
   gem.add_dependency 'tilt'
-  gem.add_dependency 'rdiscount'
-  gem.add_dependency 'haml'
   gem.add_dependency 'thor'
+
+  gem.add_dependency "active_support"
+  gem.add_dependency "sprockets"
 end

data/lib/hobber/render_action.rb

@@ -3,33 +3,55 @@ require 'hobber/rendered_object'
 
 module Hobber
   class RenderAction
-    def initialize robjects, &block
+    attr_accessor :rewrite_paths
+    attr_accessor :rewrite_urls
+
+    def initialize robjects, binding=nil, &block
       @robjects         = robjects
       @tmpl_vars        = {}
       @layouts          = []
       @rewrite_paths    = []
-      @rewrite_urls    = []
+      @rewrite_urls     = []
       @target_extention = nil
+      @caller_binding   = binding || ( block && block.binding )
 
       if block
         block.arity <= 0 ? instance_eval(&block) : block.call(self)
       end
     end
 
-    def layout robject
-      raise ArgumentError.new('Expected RenderableObject as a layout') unless robject.is_a?(RenderableObject)
-      @layouts << robject
+    def layout *robjects
+      robjects.each do |robject|
+        raise ArgumentError.new('Expected RenderableObject as a layout') unless robject.is_a?(RenderableObject)
+      end
+      @layouts.concat  robjects
     end
 
-    def tmpl_vars vars
+    def tmpl_vars vars=[]
+      if vars.empty?
+        return @tmpl_vars
+      end
       @tmpl_vars.merge!(vars)
     end
 
-    def rewrite_path regexp, replacement
+    def _parse_rewrite_args *args
+      if args.count == 1 && args[0].is_a?(Hash)
+        regexp, replacement = args[0].keys.first, args[0].values.first 
+      elsif args.count == 2
+        regexp, replacement = args 
+      else
+        raise ArgumentError.new('[rewrite_path] Expected either [regexp => sub] or [regexp, replacement] as arguments')
+      end
+      return regexp, replacement
+    end
+
+    def rewrite_path *args
+      regexp, replacement = _parse_rewrite_args(*args)
       @rewrite_paths << [regexp, replacement]
     end
 
-    def rewrite_url regexp, replacement
+    def rewrite_url *args
+      regexp, replacement = _parse_rewrite_args(*args)
       @rewrite_urls << [regexp, replacement]
     end
 
@@ -43,31 +65,31 @@ module Hobber
     def perform
       @robjects.map do |ro|
         RenderedObject.new(
-          :data=>render_renderable_object(ro, @tmpl_vars, @layouts),
+          :data=>_render_renderable_object(ro, { :item => ro }.merge(@tmpl_vars), @layouts),
           :renderable_object=>ro,
           :layouts=> @layouts,
-          :path=>rewrite_paths(ro.path, @rewrite_paths),
-          :url=>rewrite_paths(ro.path, @rewrite_urls))
+          :path=>_rewrite_paths(ro.path, @rewrite_paths),
+          :url=>_rewrite_paths(ro.path, @rewrite_urls))
       end
     end
 
     protected
 
-    def render_renderable_object ro, tmpl_vars={}, layouts=[]
+    def _render_renderable_object ro, tmpl_vars={}, layouts=[]
         tmpl_vars.merge!(ro.tmpl_vars)
         tmpl_vars.merge!(:current_renderable_object => ro)
 
-        result = ro.render(tmpl_vars)
+        result = ro.render(tmpl_vars, @caller_binding)
 
         render_chain = layouts.reverse
         render_chain.each do |layout|
           tmpl_vars = layout.tmpl_vars.merge(tmpl_vars)
-          result = layout.render(tmpl_vars) { result }
+          result = layout.render(tmpl_vars, @caller_binding) { result }
         end
         result
     end
 
-    def rewrite_paths path, rewrites
+    def _rewrite_paths path, rewrites
       target_path = path.dup
       rewrites.each do |regexp, replacement|
         target_path.gsub!(regexp, replacement)

data/lib/hobber/renderable_object.rb

@@ -14,8 +14,7 @@ module Hobber
       @data = yield(self) if block_given?
     end
 
-    def render(vars={}, &block)
-      context = Object.new
+    def render(vars={}, context=Object.new, &block)
       _render_template_chain(@path, data, context, vars, &block)
     end
     
@@ -24,7 +23,11 @@ module Hobber
     end
 
     def [](key)
-      tmpl_vars.fetch(key)
+      tmpl_vars[key]
+    end
+
+    def fetch(*a)
+      tmpl_vars.fetch(*a)
     end
 
     def data

data/lib/hobber/version.rb

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

data/lib/hobber.rb

@@ -1,26 +1,48 @@
 require 'fileutils'
 require 'thor'
 require 'logger'
+require 'active_support/core_ext/hash/indifferent_access'
 
 require "hobber/version"
 require 'hobber/renderable_object'
 require 'hobber/rendered_object_saver'
 require 'hobber/render_action'
 
+require 'yaml'
+require 'sprockets'
+
 module Hobber
-  class Shell
-    include Thor::Shell
+  include Thor::Shell
+  include FileUtils
+
+  def assets
+    @assets ||= Sprockets::Environment.new
+  end
+
+  def load_yaml_config path
+    HashWithIndifferentAccess.new(YAML.load_file(path))
+  end
+
+  def default_tmpl_vars vars
+    @default_tmpl_vars ||= {}
+    @default_tmpl_vars.merge!(vars)
   end
 
-  def shell
-    @shell ||= Shell.new
+  def default_rewrite_path *args
+    @default_rewrite_paths ||= []
+    @default_rewrite_paths << args
+  end
+
+  def default_rewrite_url *args
+    @default_rewrite_urls ||= []
+    @default_rewrite_urls << args
   end
 
   def remove_output_dir dirname, options={}
     safe_mode = options.fetch(:safe, false)
 
     dirname = Pathname.new(dirname)
-    if safe_mode && shell.no?("Do you want to remove output dir [#{dirname.realpath}]? (y/yes/other=no)")
+    if safe_mode && no?("Do you want to remove output dir [#{dirname.realpath}]? (y/yes/other=no)")
       return
     end
     FileUtils.rm_r dirname.realpath
@@ -41,8 +63,18 @@ module Hobber
   end
 
   def render robjects, opts={}, &block
-    rv = RenderAction.new(robjects.to_a, &block).perform
-    robjects.is_a?(Array) ? rv : rv.first
+    render_action = RenderAction.new(robjects.to_a, block.binding, &block)
+    if render_action.rewrite_paths.empty?
+      @default_rewrite_paths && @default_rewrite_paths.map { |args| render_action.rewrite_path *args }
+    end
+    if render_action.rewrite_urls.empty?
+      @default_rewrite_urls && @default_rewrite_urls.map { |args| render_action.rewrite_url *args }
+    end
+    if @default_tmpl_vars
+      render_action.tmpl_vars @default_tmpl_vars.merge(render_action.tmpl_vars)
+    end
+    rendered_objects = render_action.perform
+    robjects.is_a?(Array) ? rendered_objects : rendered_objects.first
   end
 
   def save *args 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hobber
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-27 00:00:00.000000000Z
+date: 2012-06-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &70242806127920 !ruby/object:Gem::Requirement
+  requirement: &70258422315100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70242806127920
+  version_requirements: *70258422315100
 - !ruby/object:Gem::Dependency
-  name: rdiscount
-  requirement: &70242806127500 !ruby/object:Gem::Requirement
+  name: thor
+  requirement: &70258422314680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70242806127500
+  version_requirements: *70258422314680
 - !ruby/object:Gem::Dependency
-  name: haml
-  requirement: &70242806127080 !ruby/object:Gem::Requirement
+  name: active_support
+  requirement: &70258422314260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70242806127080
+  version_requirements: *70258422314260
 - !ruby/object:Gem::Dependency
-  name: thor
-  requirement: &70242806126660 !ruby/object:Gem::Requirement
+  name: sprockets
+  requirement: &70258422313840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70242806126660
+  version_requirements: *70258422313840
 description: Minimal implementation ..
 email:
 - boy.maas@gmail.com