erector-rails4 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 698a798895f015322b464b08fa3fa1ee83921818
-  data.tar.gz: ab61ab0f8af649554dd0c3b70fbdabe565ef159f
+  metadata.gz: cf70db8bc4222c447f5b7d613fd029da5936df19
+  data.tar.gz: b584d63e1e6a78cb7ea1da565859e210a42735c3
 SHA512:
-  metadata.gz: 9848215dcb48b74b4a39de690d00ddcd5da95f2426c53252fd81390d0032cb460c01df0ec586a8bd5279e3cabdbd77ef35aa63735b36d3dafd091e2f16c3573a
-  data.tar.gz: ba35747f63989b18c9d248000a20b1e8195923089ac9fe15d4c7b4b71ec40448d1059441b6161c70c9e102bbb8050b92634f4f39b7891da4514f39f529cd7578
+  metadata.gz: 09e3d1a72dda9f47c330b52b929c3ba51b95b011929cd72a1b5e6eb2f84d36028842c77da94e48040346e8204e73752f9f273cca7ce137b1d3bd1ce58efb6722
+  data.tar.gz: 611d90b3a8949e4fca8ea50d887de30aae31bcb54d505aaab870e6a22b159624c31292854249ebb554cbe2349406c10b8881063ce2ff2f64f1e17cf9ef2992b3

data/.ruby-version

@@ -1 +1 @@
-2.0.0
+2.0.0-p353

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    erector-rails4 (0.0.1)
+    erector-rails4 (0.0.2)
       rails (>= 4.0)
       treetop (>= 1.2.3)
 

data/lib/erector/cache.rb

@@ -18,19 +18,7 @@ module Erector
     end
 
     def transform_key(args)
-      ['erector'] + args.reject { |x| x.nil? }.map { |x|
-        if x.is_a?(Hash)
-          transformed = {}
-
-          x.each do |k, v|
-            transformed[k] = v.respond_to?(:cache_key) ? v.cache_key : v
-          end
-
-          transformed
-        else
-          x
-        end
-      }
+      ActiveSupport::Cache.expand_cache_key(args.reject { |x| x.nil? }, 'erector')
     end
 
   end

data/lib/erector/inline.rb

@@ -2,7 +2,7 @@ module Erector
   def self.inline(*args, &block)
     InlineWidget.new(*args, &block)
   end
-  
+
   module Inline
     # Executes the widget's block (the one that was passed in the
     # constructor). Since "self" is pointing to the new widget, the block does
@@ -17,17 +17,6 @@ module Erector
       # note that instance_eval seems to pass in self as a parameter to the block
       instance_eval(&block) if block
     end
-    
-    private
-    # This is part of the sub-widget/parent feature (see #widget method).
-    def method_missing(name, *args, &block)
-      if parent && parent.respond_to?(name)
-        block ||= lambda {} # captures self HERE
-        parent.send(name, *args, &block)
-      else
-        super
-      end
-    end
   end
 
   class InlineWidget < Widget

data/lib/erector/rails.rb

@@ -43,16 +43,6 @@ module Erector
         end
       end
 
-      # Wrappers for rails helpers that produce markup. Erector needs to
-      # manually emit their result.
-      def def_simple_rails_helper(method_name)
-        module_eval <<-METHOD_DEF, __FILE__, __LINE__+1
-          def #{method_name}(*args, &block)
-            text helpers.#{method_name}(*args, &block)
-          end
-        METHOD_DEF
-      end
-
       def def_rails_form_helper(method_name, explicit_builder = nil)
         module_eval <<-METHOD_DEF, __FILE__, __LINE__+1
           def #{method_name}(*args, &block)
@@ -130,11 +120,17 @@ module Erector
       end
     end
 
-    # Delegate to non-markup producing helpers via method_missing,
-    # returning their result directly.
+    # Delegate to both Rails and custom helpers via method_missing, 
+    # and output return values that are html_safe
     def method_missing(name, *args, &block)
       if helpers.respond_to?(name)
-        helpers.send(name, *args, &block)
+        return_value = helpers.send(name, *args, &block)
+
+        if return_value.try(:html_safe?)
+          text return_value
+        else
+          return_value
+        end
       else
         super
       end
@@ -146,72 +142,6 @@ module Erector
       super || helpers.respond_to?(name)
     end
 
-    [
-      # UrlHelper
-      :link_to,
-      :button_to,
-      :link_to_unless_current,
-      :link_to_unless,
-      :link_to_if,
-      :mail_to,
-
-      # FormTagHelper
-      :form_tag,
-      :select_tag,
-      :text_field_tag,
-      :label_tag,
-      :hidden_field_tag,
-      :file_field_tag,
-      :password_field_tag,
-      :text_area_tag,
-      :check_box_tag,
-      :radio_button_tag,
-      :submit_tag,
-      :image_submit_tag,
-      :field_set_tag,
-
-      # FormHelper
-      :form_for,
-      :text_field,
-      :password_field,
-      :hidden_field,
-      :file_field,
-      :text_area,
-      :check_box,
-      :radio_button,
-
-      # AssetTagHelper
-      :auto_discovery_link_tag,
-      :javascript_include_tag,
-      :stylesheet_link_tag,
-      :favicon_link_tag,
-      :image_tag,
-
-      # ScriptaculousHelper
-      :sortable_element,
-      :sortable_element_js,
-      :text_field_with_auto_complete,
-      :draggable_element,
-      :drop_receiving_element,
-
-      # PrototypeHelper
-      :link_to_remote,
-      :button_to_remote,
-      :periodically_call_remote,
-      :form_remote_tag,
-      :submit_to_remote,
-      :update_page_tag,
-
-      # JavaScriptHelper
-      :javascript_tag,
-
-      # CsrfHelper
-      :csrf_meta_tag,
-      :csrf_meta_tags
-    ].each do |method_name|
-      def_simple_rails_helper(method_name)
-    end
-
     [:form_for, :fields_for].each do |method_name|
       def_rails_form_helper(method_name)
     end

data/lib/erector/version.rb

@@ -1,5 +1,3 @@
-# Erector view framework
 module Erector
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end
-

data/spec/dummy/app/helpers/application_helper.rb

@@ -1,7 +1,12 @@
 module ApplicationHelper
 
-  def user_role
+  def user_role_unsafe
     'admin'
   end
 
+  def user_role_safe
+  	'admin'.html_safe
+  end
+  
+
 end

data/spec/dummy/spec/rails_helpers_spec.rb

@@ -18,14 +18,46 @@ describe Erector::Rails do
     Erector::Rails.render(Erector.inline(&block), @controller.view_context)
   end
 
-  describe "a non-output helper" do
+  describe "a user-defined non-output helper" do
     it "does not render to the output buffer" do
       test_render do
-        if user_role == 'admin'
+        if user_role_unsafe == 'admin'
           text 'foo'
         end
       end.should == %{foo}
     end
+
+    it "renders with the text method" do
+      test_render do
+        text user_role_unsafe
+      end.should == %{admin}
+    end
+
+    it "can be combined with a built-in method" do
+      test_render do
+        link_to user_role_unsafe, user_role_unsafe
+      end.should == %{<a href="admin">admin</a>}
+    end
+  end
+
+  describe "a helper intended to output" do
+    it "renders when called" do
+      test_render do
+        user_role_safe
+      end.should == %{admin}
+    end
+
+    it "cannot be combined directly with a built-in method" do
+      test_render do
+        image_tag user_role_safe
+      end.should == %{admin<img src="" />}
+    end
+
+    it "can be combined with a built-in method by using capture" do
+      test_render do
+        image_tag capture {user_role_safe}
+      end.should == %{<img alt="Admin" src="/images/admin" />}
+    end
   end
 
   describe "#link_to" do
@@ -168,20 +200,6 @@ describe Erector::Rails do
     end
   end
 
-  if defined?(ActionView::Helpers::ScriptaculousHelper)
-    [:sortable_element,
-     :draggable_element,
-     :drop_receiving_element].each do |helper|
-      describe "##{helper}" do
-        it "renders helper js" do
-          test_render do
-            send(helper, "rails", :url => "/foo")
-          end.should =~ %r{<script type="text/javascript">.*</script>}m
-        end
-      end
-    end
-  end
-
   describe "#render" do
     it "renders text" do
       test_render do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: erector-rails4
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Alex Chaffee
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-19 00:00:00.000000000 Z
+date: 2013-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails