padrino-helpers 0.13.0 → 0.13.1.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 151e75de2e213c7b7e67545cc17fc8272921078f
-  data.tar.gz: 613800341c4c854f60f8435f1ed2aa85b1e82430
+  metadata.gz: d3fdcc6a81ec716ac04cd1d695ccf508e3582370
+  data.tar.gz: a27d8a7a4ac6fef846b9a9771648a84c11761948
 SHA512:
-  metadata.gz: 2a490471869b20f05dae5f3438f6ead1cf63041cf795afc767013891b5d1d3d62b80e95409a82f29efe342d29d88e8e869bee3de1b9aff20a06dbc83de3de3b3
-  data.tar.gz: b97a7765a8ef80e94d0c67a978ff804e13cdf4e82454fcb77a192edfe2c7279bbbe5592974982c695b25c4d353f54ee4c6e4c14f982a225397657a92561b5357
+  metadata.gz: a880544ead387a3d35c51d01ca87e557de0920fc26d54254cba74ce414c432d6dd15796aca907e5bb050cde172737cb9d54858eae7b45bdd6fd39b62288492eb
+  data.tar.gz: 3e20fcc06fad879fc834bcdcaf22b620e4768a42ce156c61d8298333631043314a18f4dec4a6886a1b7eafdd61c9fb572f082318272058d94b7e57a6792af727

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

@@ -57,9 +57,9 @@ module Padrino
         def options_for_select(option_items, state = {})
           return [] if option_items.blank?
           option_items.map do |caption, value, attributes|
-            html_attributes = { :value => value ||= caption }.merge(attributes||{})
-            html_attributes[:selected] ||= option_is_selected?(value, caption, state[:selected])
-            html_attributes[:disabled] ||= option_is_selected?(value, caption, state[:disabled])
+            html_attributes = { :value => value || caption }.merge(attributes||{})
+            html_attributes[:selected] ||= option_is_selected?(html_attributes[:value], caption, state[:selected])
+            html_attributes[:disabled] ||= option_is_selected?(html_attributes[:value], caption, state[:disabled])
             content_tag(:option, caption, html_attributes)
           end
         end

data/lib/padrino-helpers/tag_helpers.rb

@@ -226,7 +226,7 @@ module Padrino
       #   tag :img, :src => 'images/pony.jpg', :alt => 'My Little Pony'
       #   # => <img src="images/pony.jpg" alt="My Little Pony" />
       #
-      #   tag :img, :src => 'sinatra.jpg, :data => { :nsfw => false, :geo => [34.087, -118.407] }
+      #   tag :img, :src => 'sinatra.jpg', :data => { :nsfw => false, :geo => [34.087, -118.407] }
       #   # => <img src="sinatra.jpg" data-nsfw="false" data-geo="34.087 -118.407" />
       #
       def tag(name, options = nil, open = false)

data/lib/padrino/rendering.rb

@@ -343,7 +343,8 @@ module Padrino
       end
 
       def content_type_symbol(type)
-        if defined?(::Rack::Mime::MIME_TYPES) && type.kind_of?(String)
+        if defined?(::Rack::Mime::MIME_TYPES) && type.kind_of?(String) &&
+           ::Rack::Mime::MIME_TYPES.key(type)
           type = ::Rack::Mime::MIME_TYPES.key(type).sub(/\./,'').to_sym
         end
         CONTENT_TYPE_ALIASES[type] || type

data/test/test_form_helpers.rb

@@ -781,8 +781,8 @@ describe "FormHelpers" do
     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
+      options = [['one', nil, :value => nil], ['two', nil, :value => nil], ['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 => 'one', :selected => 'selected') { actual_html }
     end

data/test/test_rendering.rb

@@ -151,6 +151,18 @@ describe "Rendering" do
       assert_equal 'layout404 file', body
     end
 
+    it 'should work with set content type not contained in rack-types' do
+      create_view "index.md.erb", "Hello"
+      mock_app do
+        get("/") {
+          content_type "text/x-markdown; charset=UTF-8"
+          render "index.erb", { :layout => nil }
+        }
+      end
+      get "/"
+      assert_equal "Hello", body
+    end
+
     it 'should not use html file when DEFAULT_RENDERING_OPTIONS[:strict_format] == true' do
       create_layout :foo, "html file", :format => :html
 
@@ -677,7 +689,7 @@ describe "Rendering" do
       class Application < Sinatra::Base
         register Padrino::Rendering
         get '/' do
-          render :post, :views => File.dirname(__FILE__)+'/fixtures/apps/views/blog' 
+          render :post, :views => File.dirname(__FILE__)+'/fixtures/apps/views/blog'
         end
       end
       @app = Application.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-helpers
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.1.beta1
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-11 00:00:00.000000000 Z
+date: 2015-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino-support
@@ -19,46 +19,46 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.13.1.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.13.1.beta1
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.1
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.7
 description: Tag helpers, asset helpers, form helpers, form builders and many more
@@ -69,9 +69,9 @@ extensions: []
 extra_rdoc_files:
 - README.rdoc
 files:
-- .document
-- .gitignore
-- .yardopts
+- ".document"
+- ".gitignore"
+- ".yardopts"
 - LICENSE.txt
 - README.rdoc
 - Rakefile
@@ -224,19 +224,19 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">"
     - !ruby/object:Gem::Version
-      version: 1.3.6
+      version: 1.3.1
 requirements: []
 rubyforge_project: padrino-helpers
 rubygems_version: 2.4.8