erector-rails4 0.1.3 → 0.2.0

data/lib/erector/output.rb

@@ -28,9 +28,7 @@ module Erector
     end
 
     def <<(s)
-      # raise s.inspect unless s.is_a? String
-      #
-      s = s.to_s unless s.is_a? String
+      s = s.to_s
       append_indentation
       if @max_length && s.length + @current_line_length > @max_length
         leading_spaces = s =~ /^( +)/ ? $1.size : 0
@@ -68,7 +66,7 @@ module Erector
     end
 
     def to_s
-      RawString.new(buffer.kind_of?(String) ? buffer : buffer.join)
+      (buffer.kind_of?(String) ? buffer : buffer.join).html_safe
     end
 
     def to_a

data/lib/erector/promise.rb

@@ -52,12 +52,12 @@ module Erector
 
       @output.newline if !@self_closing and @newliney and !@output.at_line_start?
 
-      @output << RawString.new( "<#{@tag_name}#{Promise.format_attributes(@attributes)}")
+      @output << "<#{@tag_name}#{Promise.format_attributes(@attributes)}".html_safe
       if @self_closing
-        @output << RawString.new( " />")
+        @output << " />".html_safe
         @output.newline if @newliney
       else
-        @output << RawString.new( ">")
+        @output << ">".html_safe
         @output.indent
       end
     end
@@ -76,7 +76,7 @@ module Erector
       return if @self_closing
 
       @output.undent
-      @output<< RawString.new("</#{@tag_name}>")
+      @output << "</#{@tag_name}>".html_safe
       if @newliney
         @output.newline
       end

data/lib/erector/rails.rb

@@ -36,12 +36,17 @@ module Erector
         widget_class_variable_name = $1 if widget_class_variable_name =~ %r{.*/(.*?)$}
 
         local_assigns.reject do |name, value|
-          name == :object || name == widget_class_variable_name.to_sym
+          name == :object || (name == widget_class_variable_name.to_sym && value.nil?)
         end
       end
 
       def render(widget, view, local_assigns = {}, is_partial = false, options = {})
         widget = widget.new(assigns_for(widget, view, local_assigns, is_partial)) if widget.is_a?(Class)
+
+        if options[:pathname]
+          widget.instance_variable_set(:@virtual_path, options[:pathname])
+        end
+
         view.with_output_buffer do
           # Set parent and helpers to the view and use Rails's output buffer.
           widget.to_html(options.merge(:helpers => view,

data/lib/erector/rails/autoload_monkeypatch.rb

@@ -1,7 +1,7 @@
 module ActiveSupport
   module Dependencies
 
-    def search_for_file(path_suffix)
+    def self.search_for_file(path_suffix)
       path_suffix = path_suffix.sub(/(\.rb)?$/, ".rb")
       underscored_path_suffix = path_suffix.gsub(/\/([\w\.]*$)/, '/_\1')
 

data/lib/erector/rails/railtie.rb

@@ -1,13 +1,20 @@
 module Erector
   class Railtie < ::Rails::Railtie
-    # config.generators.template_engine :rb
+    initializer 'erector.autoload', before: :set_autoload_paths do |app|
+      app.config.autoload_paths << "#{::Rails.root}/app"
+    end
 
-    # TODO: automatically add app directory to app.config.autoload_paths,
-    # so that Views::Foo::Bar autoloads, and 'require "views/foo/bar.html"'
-    # works. For now, you must add the following to config/application.rb:
-    #
-    #     config.autoload_paths += %W(#{config.root}/app)
-    #
-    # (Maybe ::Rails.configuration.autoload_paths will work?)
+    initializer 'erector.dependency_tracker' do
+      ActiveSupport.on_load(:action_view) do
+        ActiveSupport.on_load(:after_initialize) do
+          begin
+            require 'action_view/dependency_tracker'
+            ActionView::DependencyTracker.register_tracker :rb, ActionView::DependencyTracker::ERBTracker
+          rescue LoadError
+            # likely this version of Rails doesn't support dependency tracking
+          end
+        end
+      end
+    end
   end
 end

data/lib/erector/rails/template_handler.rb

@@ -3,10 +3,11 @@ module Erector
     class TemplateHandler
       def call(template)
         require_dependency template.identifier
+        pathname = "#{template.identifier =~ %r(views/(.*)) && $1}"
         widget_class_name = "views/#{template.identifier =~ %r(views/([^.]*)(\..*)?\.rb) && $1}".camelize
         is_partial = File.basename(template.identifier) =~ /^_/
         <<-SRC
-        Erector::Rails.render(#{widget_class_name}, self, local_assigns, #{!!is_partial})
+        Erector::Rails.render(#{widget_class_name}, self, local_assigns, #{!!is_partial}, pathname: "#{pathname}")
         SRC
       end
     end

data/lib/erector/text.rb

@@ -1,5 +1,3 @@
-require "erector/raw_string"
-
 module Erector
   module Text
     # Emits text to the output buffer, e.g.
@@ -20,7 +18,7 @@ module Erector
     # will be emitted to the output stream in turn. You can specify a delimiter
     # by using an options hash with as the final argument, using +:join+ as the key,
     # e.g.
-    # 
+    #
     #   text "my", "dog", "smells", :join => " "
     #   => "my dog smells"
     #
@@ -73,16 +71,14 @@ module Erector
 
     # Returns text which will *not* be HTML-escaped.
     def raw(value)
-      RawString.new(value.to_s)
+      value.html_safe if value
     end
 
     # Emits text which will *not* be HTML-escaped. Same effect as text(raw(s))
-    def text!(value)
+    def rawtext(value)
       text raw(value)
     end
 
-    alias rawtext text!
-
     # Returns a copy of value with spaces replaced by non-breaking space characters.
     # With no arguments, return a single non-breaking space.
     # The output uses the escaping format ' ' since that works
@@ -99,7 +95,7 @@ module Erector
       if content.respond_to?(:html_safe?) && content.html_safe?
         content
       else
-        raw(CGI.escapeHTML(content.to_s))
+        raw(CGI::escapeHTML(content.to_s))
       end
     end
 

data/lib/erector/version.rb

@@ -1,3 +1,3 @@
 module Erector
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

data/lib/erector/widget.rb

@@ -5,6 +5,7 @@ require "erector/text"
 require "erector/tag"
 require "erector/html_widget"
 require "erector/needs"
+require "erector/caching"
 
 module Erector
 
@@ -51,7 +52,6 @@ module Erector
   # * Attributes
   # * Text
   # * Needs
-  # * Caching
   # * Externals
   # * AfterInitialize
   #
@@ -71,6 +71,7 @@ module Erector
 
     include HTML
     include Convenience
+    include Caching
     include Erector::JQuery
     include Erector::Sass if Object.const_defined?(:Sass)
 
@@ -80,15 +81,5 @@ module Erector
       _emit(options).to_s
     end
 
-    # alias for #to_html
-    # @deprecated Please use {#to_html} instead
-    def to_s(*args)
-      unless defined? @@already_warned_to_s
-        $stderr.puts "Erector::Widget#to_s is deprecated. Please use #to_html instead. Called from #{caller.first}"
-        @@already_warned_to_s = true
-      end
-      to_html(*args)
-    end
-
   end
 end

data/lib/erector/xml_widget.rb

@@ -9,24 +9,21 @@ module Erector
   class XMLWidget < AbstractWidget
     include Needs
 
-    def self.tag_named tag_name, checked = []
+    def self.inherited(subclass)
+      super
+      subclass.add_tags(@tags) if @tags
+    end
+
+    def self.tag_named(tag_name)
+      @tags && @tags[tag_name]
+    end
+
+    def self.add_tags(tags)
       @tags ||= {}
-      @tags[tag_name] || begin
-        tag = nil
-        checked << self
-        taggy_ancestors = (ancestors - checked).select{|k| k.respond_to? :tag_named}
-        taggy_ancestors.each do |k|
-          tag = k.tag_named(tag_name, checked)
-          if tag
-            @tags[tag_name] = tag
-            break
-          end
-        end
-        tag
-      end
+      @tags = @tags.merge(tags)
     end
 
-    def self.tag *args
+    def self.tag(*args)
       tag = Tag.new(*args)
       @tags ||= {}
       @tags[tag.name] = tag
@@ -65,9 +62,8 @@ module Erector
       @tags.values.select{|tag| !tag.self_closing?}.map{|tag| tag.name}
     end
 
-    def newliney?(tag_name)
-      tag = self.class.tag_named tag_name
-      if tag
+    def self.newliney?(tag_name)
+      if (tag = self.tag_named(tag_name))
         tag.newliney?
       else
         true

data/script/bootstrap

@@ -0,0 +1,30 @@
+#! /bin/bash
+
+## Make sure we're in the project root
+cd $(dirname "$0")/..
+
+## Check dependencies
+printf "Checking dependencies... "
+
+deps=(
+  ruby
+  bundler
+  git
+)
+
+for i in "${deps[@]}"
+do
+  :
+  if [ ! $(which $i) ]; then
+    printf "\nDependency check failed, file not in PATH: $i\n"
+    exit 1
+  fi
+done
+
+printf "OK\n"
+
+## Bundle
+printf "Bundling...\n"
+bundle install
+
+printf "\nSuccess!\n\n"

data/script/cibuild

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+bundle exec rspec

data/script/performance

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+bundle exec rspec -t performance

data/script/release

@@ -0,0 +1,38 @@
+#!/bin/sh
+# Tag and push a release.
+
+set -e
+
+# Make sure we're in the project root.
+
+cd $(dirname "$0")/..
+
+# Build a new gem archive.
+
+rm -rf erector-rails4-*.gem
+gem build -q erector-rails4.gemspec
+
+# Make sure we're on the master branch.
+
+(git branch | grep -q '* master') || {
+  echo "Only release from the master branch."
+  exit 1
+}
+
+# Figure out what version we're releasing.
+
+tag=v`ls erector-rails4-*.gem | sed 's/^erector-rails4-\(.*\)\.gem$/\1/'`
+
+# Make sure we haven't released this version before.
+
+git fetch -t origin
+
+(git tag -l | grep -q "$tag") && {
+  echo "Whoops, there's already a '${tag}' tag."
+  exit 1
+}
+
+# Tag it and bag it.
+
+gem push erector-rails4-*.gem && git tag "$tag" &&
+  git push origin master && git push origin "$tag"

data/spec/dummy/app/views/test/_partial_with_rails_helpers.rb

@@ -0,0 +1,7 @@
+class Views::Test::PartialWithRailsHelpers < Erector::Widget
+  def content
+    form_tag 'foobar' do
+      submit_tag
+    end
+  end
+end

data/spec/dummy/app/views/test/_user.rb

@@ -0,0 +1,7 @@
+class Views::Test::User < Erector::Widget
+  needs :user
+
+  def content
+    text @user
+  end
+end

data/spec/dummy/app/views/test/_virtual_path_partial.rb

@@ -0,0 +1,5 @@
+class Views::Test::VirtualPathPartial < Erector::Widget
+  def content
+    text @virtual_path
+  end
+end

data/spec/dummy/app/views/test/erb_from_erector.html.rb

@@ -1,5 +1,5 @@
 class Views::Test::ErbFromErector < Erector::Widget
   def content
-    text! parent.render(:partial => 'erb')
+    rawtext parent.render(:partial => 'erb')
   end
 end

data/spec/dummy/app/views/test/erector_with_helpers_from_erb.html.erb

@@ -0,0 +1 @@
+<%= render :partial => 'partial_with_rails_helpers' %>

data/spec/dummy/app/views/test/render_partial.html.rb

@@ -1,5 +1,5 @@
 class Views::Test::RenderPartial < Erector::Widget
   def content
-    text! parent.render(:partial => 'erector')
+    rawtext parent.render(:partial => 'erector')
   end
 end

data/spec/dummy/app/views/test/render_virtual_path.rb

@@ -0,0 +1,7 @@
+class Views::Test::RenderVirtualPath < Erector::Widget
+  def content
+    text @virtual_path
+    text ','
+    render 'virtual_path_partial'
+  end
+end

data/spec/dummy/app/views/test/users.rb

@@ -0,0 +1,9 @@
+class Views::Test::Users < Erector::Widget
+
+  def content
+    ["Foo", "Bar"].each do |x|
+      render 'user', user: x
+    end
+  end
+
+end

data/spec/dummy/app/views/test_caching/_foos.rb

@@ -0,0 +1,7 @@
+class Views::TestCaching::Foos < Erector::Widget
+
+  def content
+    text 'foos'
+  end
+
+end

data/spec/dummy/app/views/test_caching/_partial.rb

@@ -0,0 +1,9 @@
+class Views::TestCaching::Partial < Erector::Widget
+
+  def content
+    cache 'partial_key' do
+      text DateTime.current
+    end
+  end
+
+end

data/spec/dummy/app/views/test_caching/cache_helper.rb

@@ -0,0 +1,9 @@
+class Views::TestCaching::CacheHelper < Erector::Widget
+
+  def content
+    cache 'cache_helper_key' do
+      text DateTime.current
+    end
+  end
+
+end

data/spec/dummy/app/views/test_caching/cache_helper_with_explicit_dependencies.rb

@@ -0,0 +1,7 @@
+class Views::TestCaching::CacheHelperWithExplicitDependencies < Erector::Widget
+
+  def content
+    # Template Dependency: test_caching/foos
+  end
+
+end

data/spec/dummy/app/views/test_caching/cache_helper_with_implicit_dependencies.rb

@@ -0,0 +1,7 @@
+class Views::TestCaching::CacheHelperWithImplicitDependencies < Erector::Widget
+
+  def content
+    render 'foos'
+  end
+
+end