padrino-helpers 0.13.0.beta3 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04bc4991e6d578ff63ba8e869485e744e3383578
-  data.tar.gz: 17bd91f2a5fec04199e4985ca3b7b90d7e285399
+  metadata.gz: 151e75de2e213c7b7e67545cc17fc8272921078f
+  data.tar.gz: 613800341c4c854f60f8435f1ed2aa85b1e82430
 SHA512:
-  metadata.gz: 246cb04ce86e264275303dcc5d7f62a9b27e95dce324ce40341620b262ad8660089d24fd12c2c4057ceb60811db21eb6c6877171e4910c040566230b56ad2648
-  data.tar.gz: 7556f2f8fe3cd8a6b7fabab699401d91691032074f382536f682ff11ff72bc7486a79fa7cd01e39cd39b2377abb1ea239236d03518f042c4f22e3bf1d297f67a
+  metadata.gz: 2a490471869b20f05dae5f3438f6ead1cf63041cf795afc767013891b5d1d3d62b80e95409a82f29efe342d29d88e8e869bee3de1b9aff20a06dbc83de3de3b3
+  data.tar.gz: b97a7765a8ef80e94d0c67a978ff804e13cdf4e82454fcb77a192edfe2c7279bbbe5592974982c695b25c4d353f54ee4c6e4c14f982a225397657a92561b5357

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

@@ -45,7 +45,9 @@ module Padrino
         #
         def option_is_selected?(value, caption, selected_values)
           Array(selected_values).any? do |selected|
-            [value.to_s, caption.to_s].include?(selected.to_s)
+            value ?
+              value.to_s == selected.to_s :
+              caption.to_s == selected.to_s
           end
         end
 
@@ -90,7 +92,7 @@ module Padrino
             collection.map{ |item| [ item.send(fields.first), item.send(fields.last) ] }
           else
             options.delete(:options) || []
-          end        
+          end
         end
       end
     end

data/lib/padrino/rendering.rb

@@ -202,7 +202,7 @@ module Padrino
         # This means that no engine was explicitly defined
         data, engine = resolve_template(engine, options) if data.nil?
 
-        ensure_rendering_engine(engine) || (options[:layout] ||= false)
+        ensure_rendering_engine(engine) || (options[:layout] ||= @layout || false)
 
         # Cleanup the template.
         @current_engine, engine_was = engine, @current_engine

data/test/fixtures/render_app/app.rb

@@ -94,7 +94,7 @@ class RenderDemo < Padrino::Application
 
   helpers do
     def dive_helper(ext)
-      # @current_engine, save = nil
+      # @current_engine, save = nil, @current_engine
       form_result = form_tag '/' do
         render "dive_inner_#{ext}"
       end

data/test/helper.rb

@@ -44,7 +44,7 @@ class MiniTest::Spec
     path  = "/views/#{name}"
     path += ".#{options.delete(:locale)}" if options[:locale].present?
     path += ".#{options[:format]}" if options[:format].present?
-    path += ".erb" unless options[:format].to_s =~ /erb|slim|haml|rss|atom|builder/
+    path += ".erb" unless options[:format].to_s =~ /erb|slim|haml|rss|atom|builder|liquid/
     path += ".builder" if options[:format].to_s =~ /rss|atom/
     file  = File.dirname(__FILE__) + path
     File.open(file, 'w') { |io| io.write content }

data/test/test_form_helpers.rb

@@ -773,6 +773,20 @@ describe "FormHelpers" do
       assert_has_tag('select option', :content => 'Black', :value => 'black1') { actual_html }
     end
 
+    it 'should display selected options first based on values not content' do
+      options = [['First', 'one'], ['one', 'two'], ['three', 'three']]
+      actual_html = select_tag(:number, :options => options, :selected => 'one')
+      assert_has_tag('select option', :selected => 'selected', :count => 1) { actual_html }
+      assert_has_tag('select option', :content => 'First', :value => 'one', :selected => 'selected') { actual_html }
+    end
+
+    it 'should display selected options falling back to checking content' do
+      options = [['one'], ['two'], ['three', 'three']]
+      actual_html = select_tag(:number, :options => options, :selected => 'one').gsub!(/value="(one|two)"/, '').html_safe
+      assert_has_tag('select option', :selected => 'selected', :count => 1) { actual_html }
+      assert_has_tag('select option', :content => 'one', :selected => 'selected') { actual_html }
+    end
+
     it 'should display options with values and accept disabled options' do
       options = [['Green', 'green1', {:disabled => true}], ['Blue', 'blue1'], ['Black', "black1"]]
       actual_html = select_tag(:favorite_color, :options => options)
@@ -785,7 +799,7 @@ describe "FormHelpers" do
 
     it 'should display option with values and multiple selected' do
       options = [['Green', 'green1'], ['Blue', 'blue1'], ['Black', "black1"]]
-      actual_html = select_tag(:favorite_color, :options => options, :selected => ['green1', 'Black'])
+      actual_html = select_tag(:favorite_color, :options => options, :selected => ['green1', 'black1'])
       assert_has_tag(:select, :name => 'favorite_color') { actual_html }
       assert_has_tag('select option', :selected => 'selected', :count => 2) { actual_html }
       assert_has_tag('select option', :content => 'Green', :value => 'green1', :selected => 'selected') { actual_html }

data/test/test_rendering.rb

@@ -1,5 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/helper')
 require 'slim'
+require 'liquid'
 
 describe "Rendering" do
   def setup
@@ -87,6 +88,26 @@ describe "Rendering" do
       assert_equal "js file", body
     end
 
+    it 'should set and restore layout in controllers' do
+      create_layout :boo, "boo is a <%= yield %>"
+      create_layout :moo, "moo is a <%= yield %>"
+      create_view :foo, "liquid file", :format => :liquid
+      mock_app do
+        layout :boo
+        controller :moo do
+          layout :moo
+          get('/liquid') { render :foo }
+        end
+        controller :boo do
+          get('/liquid') { render :foo }
+        end
+      end
+      get "/moo/liquid"
+      assert_equal "moo is a liquid file", body
+      get "/boo/liquid"
+      assert_equal "boo is a liquid file", body
+    end
+
     it 'should use correct layout for each format' do
       create_layout :application, "this is an <%= yield %>"
       create_layout :application, "document start <%= yield %> end", :format => :xml

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-helpers
 version: !ruby/object:Gem::Version
-  version: 0.13.0.beta3
+  version: 0.13.0
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-02 00:00:00.000000000 Z
+date: 2015-10-11 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.13.0.beta3
+        version: 0.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.0.beta3
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -234,12 +234,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: 1.3.6
 requirements: []
 rubyforge_project: padrino-helpers
-rubygems_version: 2.0.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Helpers for padrino