dry_haml_handlebars 0.0.6 → 0.0.7

data/lib/dry_haml_handlebars/controller_helpers/action_controller.rb

@@ -0,0 +1,81 @@
+module DryHamlHandlebars
+  module ControllerHelpers
+    module ActionController
+    
+      def render_extra_content_for(*args)
+        options = args.extract_options!
+        args.each do |identifier|
+          name, path = get_content_for_name_and_path(identifier, options)
+          DryHamlHandlebars.content_cache.add_item(name, path)
+        end
+        
+      end
+        
+      private
+      
+      def get_content_for_name_and_path(identifier, options)
+        
+        case identifier
+        when Symbol
+          
+          name = identifier
+          
+          possible_folders = [
+            Rails.root.join( *%w[app views] << params[:controller] ).to_s,
+            Rails.root.join( *%w[app views application] ).to_s
+          ]
+          
+          if folders = options[:prepend_search_folders]
+            possible_folders = folders + possible_folders
+          end
+          
+          if folders = options[:append_search_folders]
+            possible_folders += folders
+          end
+          
+          possible_filenames = [
+            "#{params[:action]}_#{name}.html.haml",
+            "#{name}.html.haml",
+            "#{params[:action]}_content_for_#{name}.html.haml",
+            "content_for_#{name}.html.haml"
+          ]
+          
+          possible_paths = []
+          
+          possible_folders.each do |folder|
+            possible_filenames.each do |fname|
+              possible_paths << File.join( folder, fname )
+            end
+          end
+          
+          path = possible_paths.find { |p| File.exist?(p) }
+          raise "couldn't find any of the following expected files:\n#{possible_paths.join("\n")}" if path.nil?
+          
+        when Array
+          
+          path = Rails.root.join( *%w[app views] << "#{identifier.last}.html.haml" ).to_s
+          name = identifier.first.to_sym
+        
+        when String
+          
+          path = Rails.root.join( *%w[app views] << "#{identifier}.html.haml" ).to_s
+          name_match = identifier.match(/.*content_for_(?<name>\w*)/)
+          if name_match
+            name = name_match[:name].to_sym
+          else
+            name = identifier
+          end
+          
+        else
+          raise ArgumentError, "expected identifier to be a Array, Symbol or String, but got #{identifier}"
+        end
+        
+        raise "the file #{path} does not exist" unless File.exist?(path)
+  
+        return name, path
+      
+      end
+
+    end
+  end
+end

data/lib/dry_haml_handlebars/version.rb

@@ -1,3 +1,3 @@
 module DryHamlHandlebars
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/dry_haml_handlebars/view_helpers/action_view.rb

@@ -0,0 +1,46 @@
+module DryHamlHandlebars
+  module ViewHelpers
+    module ActionView
+      
+      # WARNING: content_for is ignored in caches. So you shouldn't use it
+      # for elements that will be fragment cached.
+      def handlebars_content_for(name, content = nil, flush = false)
+        
+        if content
+          flush ? @view_flow.set(name, content) : @view_flow.append(name, content)
+          nil
+        else
+          @view_flow.get(name)
+        end
+        
+      end
+      
+      def handlebars_render(*args, &block)
+        
+        #we simply wrap render so that we can detect that 'handlebars_render' was the calling function
+        #we do this by adding a local variable :handlebars_partial => true
+        
+        if args.first.is_a?(Hash)
+          
+          options = args.first
+          options[:locals] ||= {}
+          options[:locals].merge!(:__handlebars_partial => true)
+          
+        elsif args.last.is_a?(Hash)
+          
+          locals = args.last
+          locals[:__handlebars_partial] = true
+        
+        else
+  
+          args << {:__handlebars_partial => true}
+  
+        end
+        
+        render(*args, &block)
+        
+      end
+      
+    end
+  end
+end

data/lib/dry_haml_handlebars.rb

@@ -7,11 +7,6 @@ require "dry_haml_handlebars/register"
 require "haml-rails"
 require "rabl"
 require "gon"
-require 'action_view'
-require 'action_controller'
-require_relative "action_view/base"
-require_relative "action_view/helpers/capture_helper"
-require_relative "action_controller/base"
 
 module DryHamlHandlebars
   
@@ -28,6 +23,20 @@ module DryHamlHandlebars
       DryHamlHandlebars.prepare_handlebars
     end
     
+    initializer "dry_haml_handlebars.configure" do |app|
+
+      ActiveSupport.on_load :action_view do
+        require 'dry_haml_handlebars/view_helpers/action_view'
+        include DryHamlHandlebars::ViewHelpers::ActionView
+      end
+      
+      ActiveSupport.on_load :action_controller do
+        require 'dry_haml_handlebars/controller_helpers/action_controller'
+        include DryHamlHandlebars::ControllerHelpers::ActionController
+      end
+      
+    end
+    
   end
   
   class ContentCache

metadata

@@ -2,7 +2,7 @@
 name: dry_haml_handlebars
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Jonathan Chambers
@@ -96,13 +96,12 @@ files:
 - README.md
 - Rakefile
 - dry_haml_handlebars.gemspec
-- lib/action_controller/base.rb
-- lib/action_view/base.rb
-- lib/action_view/helpers/capture_helper.rb
 - lib/dry_haml_handlebars.rb
+- lib/dry_haml_handlebars/controller_helpers/action_controller.rb
 - lib/dry_haml_handlebars/handler.rb
 - lib/dry_haml_handlebars/register.rb
 - lib/dry_haml_handlebars/version.rb
+- lib/dry_haml_handlebars/view_helpers/action_view.rb
 - vendor/assets/javascripts/underscore.js
 homepage: https://github.com/jmchambers/dry_haml_handlebars
 licenses: 

data/lib/action_controller/base.rb

@@ -1,80 +0,0 @@
-module ActionController
-  class Base
-    
-    def render_extra_content_for(*args)
-      options = args.extract_options!
-      args.each do |identifier|
-        name, path = get_content_for_name_and_path(identifier, options)
-        DryHamlHandlebars.content_cache.add_item(name, path)
-      end
-      
-    end
-      
-    private
-    
-    def get_content_for_name_and_path(identifier, options)
-      
-      case identifier
-      when Symbol
-        
-        name = identifier
-        
-        possible_folders = [
-          Rails.root.join( *%w[app views] << params[:controller] ).to_s,
-          Rails.root.join( *%w[app views application] ).to_s
-        ]
-        
-        if folders = options[:prepend_search_folders]
-          possible_folders = folders + possible_folders
-        end
-        
-        if folders = options[:append_search_folders]
-          possible_folders += folders
-        end
-        
-        possible_filenames = [
-          "#{params[:action]}_#{name}.html.haml",
-          "#{name}.html.haml",
-          "#{params[:action]}_content_for_#{name}.html.haml",
-          "content_for_#{name}.html.haml"
-        ]
-        
-        possible_paths = []
-        
-        possible_folders.each do |folder|
-          possible_filenames.each do |fname|
-            possible_paths << File.join( folder, fname )
-          end
-        end
-        
-        path = possible_paths.find { |p| File.exist?(p) }
-        raise "couldn't find any of the following expected files:\n#{possible_paths.join("\n")}" if path.nil?
-        
-      when Array
-        
-        path = Rails.root.join( *%w[app views] << "#{identifier.last}.html.haml" ).to_s
-        name = identifier.first.to_sym
-      
-      when String
-        
-        path = Rails.root.join( *%w[app views] << "#{identifier}.html.haml" ).to_s
-        name_match = identifier.match(/.*content_for_(?<name>\w*)/)
-        if name_match
-          name = name_match[:name].to_sym
-        else
-          name = identifier
-        end
-        
-      else
-        raise ArgumentError, "expected identifier to be a Array, Symbol or String, but got #{identifier}"
-      end
-      
-      raise "the file #{path} does not exist" unless File.exist?(path)
-
-      return name, path
-    
-    end
-
-    
-  end
-end

data/lib/action_view/base.rb

@@ -1,31 +0,0 @@
-module ActionView
-  class Base
-
-    def handlebars_render(*args, &block)
-      
-      #we simply wrap render so that we can detect that 'handlebars_render' was the calling function
-      #we do this by adding a local variable :handlebars_partial => true
-      
-      if args.first.is_a?(Hash)
-        
-        options = args.first
-        options[:locals] ||= {}
-        options[:locals].merge!(:__handlebars_partial => true)
-        
-      elsif args.last.is_a?(Hash)
-        
-        locals = args.last
-        locals[:__handlebars_partial] = true
-      
-      else
-
-        args << {:__handlebars_partial => true}
-
-      end
-      
-      render(*args, &block)
-      
-    end
-
-  end
-end

data/lib/action_view/helpers/capture_helper.rb

@@ -1,22 +0,0 @@
-include ActionView::Helpers
-
-module ActionView
-  module Helpers
-    module CaptureHelper
-      
-      # WARNING: content_for is ignored in caches. So you shouldn't use it
-      # for elements that will be fragment cached.
-      def handlebars_content_for(name, content = nil, flush = false)
-        
-        if content
-          flush ? @view_flow.set(name, content) : @view_flow.append(name, content)
-          nil
-        else
-          @view_flow.get(name)
-        end
-        
-      end
-      
-    end
-  end
-end