padrino-helpers 0.12.3 → 0.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efe48decfbfb7a521da3666e93d1c6b94834de2a
-  data.tar.gz: ba1024635b475297a8367408c506e1e7e3850a94
+  metadata.gz: 58cb5f54d246c9e37cac9ff08017205030764ddb
+  data.tar.gz: e01706a5387dd6c6bacc26b3a6229b510f5cdfef
 SHA512:
-  metadata.gz: 9db32bf5d81c31e7c8305e5039308adff035ab8514d05a13934c4122107e643e017b400bcc958bc27d90fe434296fc42e15634dc247324a5ac7e1767a5215654
-  data.tar.gz: d728280dfec2211d4b78affa33d4a456477902126545fbb0c33065a624c1054f1d55a4f7e0200378d3cd12ab78b0133657e00f11b8a35500eda6e032f4a463c2
+  metadata.gz: 70f78741ff49c8509d01e166357712eb051010ac239d368aeabaa2f397331e20f804388adb07b90bc899e927799f9cd990bc45af96db4c97ad601e5fe60e60ca
+  data.tar.gz: 062b3a871e216dbf8908b479bd6f0748a5df92f4caf56eaa2b22f08ae5ee9b13bc2f1fc87fd14f11db8fe5f65e169890ebf318ca9d3b95152347bb5e7bc1a90e

data/lib/padrino-helpers/asset_tag_helpers.rb

@@ -69,7 +69,7 @@ module Padrino
       #   link_to('click me', '/dashboard', :class => 'linky')
       #   link_to('click me', '/dashboard', :remote => true)
       #   link_to('click me', '/dashboard', :method => :delete)
-      #   link_to('click me', :class => 'blocky') do; end
+      #   link_to('/dashboard', :class => 'blocky') do; end
       #
       # Note that you can pass :+if+ or :+unless+ conditions, but if you provide :current as
       # condition padrino return true/false if the request.path_info match the given url.
@@ -184,7 +184,7 @@ module Padrino
       #   favicon_tag 'favicon.png', :type => 'image/ico'
       #
       def favicon_tag(source, options={})
-        type = File.extname(source).gsub('.','')
+        type = File.extname(source).sub('.','')
         options = options.dup.reverse_merge!(:href => image_path(source), :rel => 'icon', :type => "image/#{type}")
         tag(:link, options)
       end

data/lib/padrino-helpers/form_builder/abstract_form_builder.rb

@@ -17,7 +17,7 @@ module Padrino
           fail "FormBuilder object must be present. If there's no object, use a symbol instead (i.e. :user)" unless object
           @options = options
           @namespace = options[:namespace]
-          @model_name = options[:as] || @object.class.to_s.underscore.gsub(/\//, '_')
+          @model_name = options[:as] || @object.class.to_s.underscore.tr('/', '_')
           nested = options[:nested]
           if @is_nested = nested && (nested_parent = nested[:parent]) && nested_parent.respond_to?(:object)
             @parent_form = nested_parent

data/lib/padrino-helpers/form_builder/deprecated_builder_methods.rb

@@ -25,14 +25,6 @@ module Padrino
           is_nested && object.respond_to?(:new_record?) && !object.new_record? && object.id
         end
 
-        ##
-        # Returns a new record of the type specified in the object
-        #
-        def build_object(object_or_symbol)
-          logger.warn "##{__method__} is deprecated"
-          object_or_symbol.is_a?(Symbol) ? @template.instance_variable_get("@#{object_or_symbol}") || object_class(object_or_symbol).new : object_or
-        end
-
         ##
         # Returns the object's models name.
         #
@@ -60,11 +52,6 @@ module Padrino
           !nested_form?
         end
 
-        def build_object(symbol)
-          logger.warn "##{__method__} is deprecated"
-          @template.instance_variable_get("@#{symbol}") || symbol.to_s.camelize.constantize.new
-        end
-
         def field_result
           logger.warn "##{__method__} is deprecated"
           result = []

data/lib/padrino-helpers/form_helpers.rb

@@ -397,7 +397,7 @@ module Padrino
       #   text_area_tag :username, :class => 'long', :value => "Demo?"
       #
       def text_area_tag(name, options={})
-        inner_html = "\n#{options.delete(:value)}"
+        inner_html = TagHelpers::NEWLINE + options.delete(:value).to_s
         options = { :name => name, :rows => "", :cols => "" }.update(options)
         content_tag(:textarea, inner_html, options)
       end
@@ -513,10 +513,11 @@ module Padrino
       ##
       # Constructs a submit button from the given options.
       #
-      # @param [String] caption (defaults to: +Submit+)
-      #   The caption for the submit button.
-      # @param [Hash] options
-      #   The html options for the input field.
+      # @overload submit_tag(options={})
+      #   @param [Hash]    options  The html options for the input field.
+      # @overload submit_tag(caption, options={})
+      #   @param [String]  caption  The caption for the submit button.
+      #   @param [Hash]    options  The html options for the input field.
       #
       # @return [String] The html submit button based on the +options+ specified.
       #
@@ -550,11 +551,11 @@ module Padrino
       ##
       # Creates a form containing a single button that submits to the URL.
       #
-      # @overload button_to(name, url, options={})
+      # @overload button_to(caption, url, options={})
       #   @param [String]  caption  The text caption.
       #   @param [String]  url      The url href.
       #   @param [Hash]    options  The html options.
-      # @overload button_to(name, options={}, &block)
+      # @overload button_to(url, options={}, &block)
       #   @param [String]  url      The url href.
       #   @param [Hash]    options  The html options.
       #   @param [Proc]    block    The button content.
@@ -579,6 +580,7 @@ module Padrino
       #   # </form>
       #
       def button_to(*args, &block)
+        warn 'Warning: method button_to with block will change behavior on Padrino 0.13.0 release and will wrap the content of the block with <button></button> tag.' if block_given?
         options   = args.extract_options!.dup
         name, url = *args
         options['data-remote'] = 'true' if options.delete(:remote)

data/lib/padrino-helpers/form_helpers/options.rb

@@ -85,7 +85,8 @@ module Padrino
 
         def extract_option_items!(options)
           if options[:collection]
-            collection, fields = options.delete(:collection), options.delete(:fields)
+            fields = options.delete(:fields)
+            collection = options.delete(:collection)
             collection.map{ |item| [ item.send(fields.first), item.send(fields.last) ] }
           else
             options.delete(:options) || []

data/lib/padrino-helpers/output_helpers.rb

@@ -62,7 +62,7 @@ module Padrino
         if handler = find_proper_handler
           handler.capture_from_template(*args, &block)
         else
-          block.call(*args)
+          yield(*args)
         end
       end
       alias :capture :capture_html

data/lib/padrino-helpers/output_helpers/abstract_handler.rb

@@ -30,7 +30,7 @@ module Padrino
         #
         def capture_from_template(*args, &block)
           self.output_buffer, _buf_was = ActiveSupport::SafeBuffer.new, self.output_buffer
-          raw = block.call(*args)
+          raw = yield(*args)
           captured = template.instance_variable_get(:@_out_buf)
           self.output_buffer = _buf_was
           engine_matches?(block) && !captured.empty? ? captured : raw.to_s

data/lib/padrino-helpers/output_helpers/haml_handler.rb

@@ -16,7 +16,7 @@ module Padrino
         # Captures the html from a block of template code for this handler.
         #
         def capture_from_template(*args, &block)
-          engine_matches?(block) ? template.capture_haml(*args, &block) : block.call(*args)
+          engine_matches?(block) ? template.capture_haml(*args, &block) : yield(*args)
         end
       end
       OutputHelpers.register(:haml, HamlHandler)

data/lib/padrino-helpers/render_helpers.rb

@@ -36,18 +36,18 @@ module Padrino
 
         path,_,name = template.to_s.rpartition(File::SEPARATOR)
         template_path = File.join(path,"_#{name}").to_sym
-        object_name = name.partition('.').first.to_sym
+        item_name = name.partition('.').first.to_sym
 
-        objects, counter = if options[:collection].respond_to?(:inject)
+        items, counter = if options[:collection].respond_to?(:inject)
           [options.delete(:collection), 0]
         else
           [[options.delete(:object)], nil]
         end
 
         locals = options[:locals]
-        objects.each_with_object(ActiveSupport::SafeBuffer.new) do |object,html|
-          locals[object_name] = object if object
-          locals["#{object_name}_counter".to_sym] = counter += 1 if counter
+        items.each_with_object(ActiveSupport::SafeBuffer.new) do |item,html|
+          locals[item_name] = item if item
+          locals["#{item_name}_counter".to_sym] = counter += 1 if counter
           content =
             if block_given?
               concat_content render(explicit_engine, template_path, options){ capture_html(&block) }

data/lib/padrino/rendering.rb

@@ -395,3 +395,13 @@ unless defined? Padrino::Rendering::SlimTemplate
     require 'padrino/rendering/slim_template'
   end
 end
+
+if Padrino::Rendering.engine_configurations.empty? && !defined?(Padrino::IGNORE_NO_RENDERING_ENGINE)
+  warn <<-EOT
+WARNING: no supported rendering engine found. To use Padrino::Helpers and 
+Padrino::Rendering properly you should include `gem 'erubis'`, `gem 'haml'` 
+or `gem 'slim'` in your Gemfile. If you are confident about using 
+Padrino::Helpers without Padrino::Rendering, please define constant 
+`Padrino::IGNORE_NO_RENDERING_ENGINE = true` before `require 'padrino-helpers'`.
+  EOT
+end

data/test/fixtures/render_app/app.rb

@@ -91,4 +91,20 @@ class RenderDemo < Padrino::Application
       content_tag :div, 'go block!'
     end
   end
+
+  helpers do
+    def dive_helper(ext)
+      # @current_engine, save = nil
+      form_result = form_tag '/' do
+        render "dive_inner_#{ext}"
+      end
+      # @current_engine = save
+      content_tag('div', form_result, :class => 'wrapper')
+    end
+  end
+
+  get '/double_dive_:ext' do
+    @ext = params[:ext]
+    render "dive_outer_#{@ext}"
+  end
 end

data/test/fixtures/render_app/views/dive_inner_erb.erb

@@ -0,0 +1,3 @@
+<div class=inner>
+<div class=core></div>
+</div>

data/test/fixtures/render_app/views/dive_inner_haml.haml

@@ -0,0 +1,2 @@
+.inner
+  .core

data/test/fixtures/render_app/views/dive_inner_slim.slim

@@ -0,0 +1,2 @@
+.inner
+  .core

data/test/fixtures/render_app/views/dive_outer_erb.erb

@@ -0,0 +1,3 @@
+<div class=outer>
+<%= dive_helper(@ext) %>
+</div>

data/test/fixtures/render_app/views/dive_outer_haml.haml

@@ -0,0 +1,2 @@
+.outer
+  = dive_helper(@ext)

data/test/fixtures/render_app/views/dive_outer_slim.slim

@@ -0,0 +1,2 @@
+.outer
+  = dive_helper(@ext)

data/test/helper.rb

@@ -30,8 +30,8 @@ class MiniTest::Spec
 
   # assert_has_tag(:h1, :content => "yellow") { "<h1>yellow</h1>" }
   # In this case, block is the html to evaluate
-  def assert_has_tag(name, attributes = {}, &block)
-    html = block && block.call
+  def assert_has_tag(name, attributes = {})
+    html = yield if block_given?
     assert html.html_safe?, 'html_safe? failed'
     matcher = HaveSelector.new(name, attributes)
     raise "Please specify a block!" if html.blank?
@@ -40,8 +40,8 @@ class MiniTest::Spec
 
   # assert_has_no_tag, tag(:h1, :content => "yellow") { "<h1>green</h1>" }
   # In this case, block is the html to evaluate
-  def assert_has_no_tag(name, attributes = {}, &block)
-    html = block && block.call
+  def assert_has_no_tag(name, attributes = {})
+    html = yield if block_given?
     attributes.merge!(:count => 0)
     matcher = HaveSelector.new(name, attributes)
     raise "Please specify a block!" if html.blank?

data/test/test_form_helpers.rb

@@ -499,9 +499,9 @@ describe "FormHelpers" do
     end
 
     it 'should insert newline to before of content' do
-      actual_html = text_area_tag(:about, :value => "\na test")
-      assert_has_tag(:textarea, :content => "\na test", :name => 'about') { actual_html }
-      assert_match(%r{<textarea[^>]*>\n\na test</textarea>}, actual_html)
+      actual_html = text_area_tag(:about, :value => "\na test&".html_safe)
+      assert_has_tag(:textarea, :content => "\na test&".html_safe, :name => 'about') { actual_html }
+      assert_match(%r{<textarea[^>]*>\n\na test&</textarea>}, actual_html)
     end
 
     it 'should display text area in erb' do

data/test/test_render_helpers.rb

@@ -212,4 +212,14 @@ describe "RenderHelpers" do
       assert_have_selector 'b', :content => 'c'
     end
   end
+
+  describe 'rendering with helpers that use render' do
+    %W{erb haml slim}.each do |engine|
+      it "should work with #{engine}" do
+        skip
+        visit "/double_dive_#{engine}"
+        assert_have_selector '.outer .wrapper form .inner .core'
+      end
+    end
+  end
 end

data/test/test_rendering.rb

@@ -691,4 +691,14 @@ describe "Rendering" do
       end
     end
   end
+
+  describe 'sinatra template helpers' do
+    it "should respect default_content_type option defined by sinatra" do
+      mock_app do
+        get(:index){ builder "xml.foo" }
+      end
+      get '/'
+      assert_equal "application/xml;charset=utf-8", response['Content-Type']
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-helpers
 version: !ruby/object:Gem::Version
-  version: 0.12.3
+  version: 0.12.4
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-13 00:00:00.000000000 Z
+date: 2014-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino-support
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.3
+        version: 0.12.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.3
+        version: 0.12.4
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -181,6 +181,12 @@ files:
 - test/fixtures/render_app/views/current_engines/_erb.erb
 - test/fixtures/render_app/views/current_engines/_haml.haml
 - test/fixtures/render_app/views/current_engines/_slim.slim
+- test/fixtures/render_app/views/dive_inner_erb.erb
+- test/fixtures/render_app/views/dive_inner_haml.haml
+- test/fixtures/render_app/views/dive_inner_slim.slim
+- test/fixtures/render_app/views/dive_outer_erb.erb
+- test/fixtures/render_app/views/dive_outer_haml.haml
+- test/fixtures/render_app/views/dive_outer_slim.slim
 - test/fixtures/render_app/views/double_capture_erb.erb
 - test/fixtures/render_app/views/double_capture_haml.haml
 - test/fixtures/render_app/views/double_capture_slim.slim
@@ -299,6 +305,12 @@ test_files:
 - test/fixtures/render_app/views/current_engines/_erb.erb
 - test/fixtures/render_app/views/current_engines/_haml.haml
 - test/fixtures/render_app/views/current_engines/_slim.slim
+- test/fixtures/render_app/views/dive_inner_erb.erb
+- test/fixtures/render_app/views/dive_inner_haml.haml
+- test/fixtures/render_app/views/dive_inner_slim.slim
+- test/fixtures/render_app/views/dive_outer_erb.erb
+- test/fixtures/render_app/views/dive_outer_haml.haml
+- test/fixtures/render_app/views/dive_outer_slim.slim
 - test/fixtures/render_app/views/double_capture_erb.erb
 - test/fixtures/render_app/views/double_capture_haml.haml
 - test/fixtures/render_app/views/double_capture_slim.slim