padrino_bootstrap_forms 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b34692a2c6f71d099f09129543f70dabf3a82b5d
-  data.tar.gz: 68dd540269edf65eba6482fd1488da974b51b3f7
+  metadata.gz: e470d257213e55fe046c0f593d32ffc47c365c6c
+  data.tar.gz: 01e639d7c893578c6eba6cd93ea825612d87aae4
 SHA512:
-  metadata.gz: cd868d61e6e50ecdd5020b37cf7baec0c1c8550b5adb417acbd4814232a9956b705c8f14b10c3a676f1d40a43f54eb3b5bc0bd261cf2f98d967b37b0fe0e1ef3
-  data.tar.gz: acd0d96e401dfda7d247f731c9351bd0d099f5fe5b73f256557fa51fcce13d78d338db0fe9ef702d3e3c8870240f5cc66a8e50fb4518322a556a36e47a12a4df
+  metadata.gz: f1f015b6fff9881310e27023eff46958160e7a6b8acf1235706d2751c227f2ed6434e9d129e8e937f585e4a7cc71541acc3af9c884594f06e8a0cd97b4283871
+  data.tar.gz: 23062a73b044aa1e48e3da6ca52649816a324e8ec7627fbc63a49087021d700e6737193abb08fec9da5a51b0c7ba2f4233667e1b716e72bcc13d3ada19bcfd9f

data/Changes

@@ -1,3 +1,8 @@
+v0.1.0  2013-07-20
+--------------------
+Changes:
+* Only support Padrino >= 0.11
+
 v0.0.2  2013-07-14
 --------------------
 Bug Fixes:

data/README.markdown

@@ -7,6 +7,11 @@ Padrino Bootstrap Forms is a port of [Seth Vargo's Bootstrap Forms for Rails](ht
 
 Bootstrap Forms is a nice generator that makes working with [Bootstrap (by Twitter)](http://twitter.github.com/bootstrap) even easier on Padrino.
 
+Padrio Version
+------------------------
+If your Padrino version is < 0.11 you must use version 0.0.2 of this gem.
+
+
 Differences Between This & The Rails Version
 ------------------------
 

data/lib/bootstrap_forms/form_builder.rb

@@ -18,7 +18,7 @@ module BootstrapForms
           label_field << input_div do
             super(name, objectify_options(@field_options))
           end
-        end
+        end.html_safe
       end
     end
 
@@ -38,7 +38,7 @@ module BootstrapForms
             label(@name, options)
           end
         end
-      end
+      end.html_safe
     end
 
     def radio_buttons(name, values = {}, opts = {})
@@ -52,13 +52,13 @@ module BootstrapForms
 
         options = { :caption => html, :class => 'radio', :for => nil }
         label("#{name}_#{value}", options)
-      end.join('')
+      end.join('').html_safe
 
       control_group_div do
         # Prevent "for" attribute for a non existant id
         @field_options[:id] = nil
         label_field << input_div { buttons }
-      end
+      end.html_safe
     end
 
     def collection_check_boxes(attribute, records, record_id, record_name, *args)
@@ -75,13 +75,13 @@ module BootstrapForms
         checkbox = check_box_tag("#{object_model_name}[#{attribute}][]", options)
         checkbox << record.send(record_name)
         content_tag(:label, checkbox, :class => ['checkbox', ('inline' if @field_options[:inline])].compact.join(' '))
-      end.join('')
+      end.join('').html_safe
 
       control_group_div do
         # Prevent "for" attribute for a non existant id
         @field_options[:id] = nil
         label_field << input_div { boxes }
-      end
+      end.html_safe
     end
 
     def collection_radio_buttons(attribute, records, record_id, record_name, *args)
@@ -95,13 +95,13 @@ module BootstrapForms
         radio = radio_button(attribute, options)
         radio << record.send(record_name)
         content_tag(:label, radio, :class => ['radio', ('inline' if @field_options[:inline])].compact.join(' '))
-      end.join('')
+      end.join('').html_safe
 
       control_group_div do
         # Prevent "for" attribute for a non existant id
         @field_options[:id] = nil
         label_field << input_div { buttons }
-      end
+      end.html_safe
     end
 
     def uneditable_input(name, *args)
@@ -128,7 +128,7 @@ module BootstrapForms
 
     def actions(&block)
       content = block_given? ? capture_html(&block) : [submit, cancel].join(' ')
-      content_tag(:div, content, :class => 'form-actions')
+      content_tag(:div, content, :class => 'form-actions').html_safe
     end
   end
 end

data/lib/bootstrap_forms/helpers/form_tag_helper.rb

@@ -12,10 +12,10 @@ module BootstrapForms
           @field_options[:id] ||= name
 
           control_group_div do
-            label_field + input_div do
+            label_field << input_div do
               send(method_name.to_sym, name, objectify_options(@field_options))
             end
-          end
+          end.html_safe
         end
       end
 
@@ -39,7 +39,7 @@ module BootstrapForms
 
             content_tag(:span,  escape_html(options[:value]), objectify_options(options.except(:value)))
           end
-        end
+        end.html_safe
       end
 
       def bootstrap_button_tag(*args)
@@ -48,7 +48,7 @@ module BootstrapForms
 
         name = args.shift || 'Submit'
         # button_tag() renders <input type="button">
-        content_tag(:button, name, options)
+        content_tag(:button, name, options).html_safe
       end
 
       def bootstrap_submit_tag(*args)
@@ -56,7 +56,7 @@ module BootstrapForms
         options[:class] ||= 'btn btn-primary'
 
         name = args.shift || 'Submit'
-        submit_tag(name, options)
+        submit_tag(name, options).html_safe
       end
 
       def bootstrap_cancel_tag(*args)
@@ -65,7 +65,7 @@ module BootstrapForms
         options[:back] ||= 'javascript:history.go(-1)'
 
         name = args.shift || 'Cancel'
-        link_to(name, options[:back], options.except(:back))
+        link_to(name, options[:back], options.except(:back)).html_safe
       end
 
       def bootstrap_actions(&block)
@@ -75,7 +75,7 @@ module BootstrapForms
         if block_given?
           content_tag(:div, :class => 'form-actions', &block)
         else
-          content = [bootstrap_submit_tag, bootstrap_cancel_tag].join(' ')
+          content = [bootstrap_submit_tag, bootstrap_cancel_tag].join(' ').html_safe
           content_tag(:div, content, :class => 'form-actions')
         end
       end

data/lib/bootstrap_forms/helpers/wrappers.rb

@@ -33,7 +33,7 @@ module BootstrapForms
         end
       end
 
-      def input_div(include_messages = true, &block) 
+      def input_div(include_messages = true, &block)
         if @field_options[:append] || @field_options[:prepend]
           klasses = []
           klasses << 'input-prepend' if @field_options[:prepend]
@@ -67,7 +67,7 @@ module BootstrapForms
 
       %w(help_block help_inline bootstrap_error success warning info append prepend).each do |method_name|
         define_method(method_name) do |*args|
-          # Hack to avoid clashing with Padrino's error method 
+          # Hack to avoid clashing with Padrino's error method
           method_name = "error" if method_name == "bootstrap_error"
           return '' unless value = @field_options[method_name.to_sym]
           case method_name
@@ -83,11 +83,11 @@ module BootstrapForms
       end
 
       def messages
-        [help_inline, bootstrap_error, success, warning, info, help_block].join('')
+        [help_inline, bootstrap_error, success, warning, info, help_block].join('').html_safe
       end
 
       def addon(&block)
-        [prepend, block[], append].join('')
+        [prepend, block[], append].join('').html_safe
       end
 
       def objectify_options(options)

data/padrino_bootstrap_forms.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "padrino_bootstrap_forms"
-  s.version     = "0.0.2"
+  s.version     = "0.1.0"
   s.authors     = ["Seth Vargo", "Skye Shaw"]
   s.email	= "skye.shaw@gmail.com"
   s.homepage    = "https://github.com/sshaw/padrino_bootstrap_forms"
@@ -14,11 +14,12 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "padrino", "~> 0.10.6"
-  s.add_dependency "activesupport", "~> 3.0"
+  s.license       = "MIT"
+  s.add_dependency "padrino", "~> 0.11"
+  s.add_dependency "activesupport", "~> 3.1"
   s.add_development_dependency "rake"
-  s.add_development_dependency "slim", "~> 1.3.6"
-  s.add_development_dependency "haml", "~> 3.1"
+  s.add_development_dependency "slim"
+  s.add_development_dependency "haml", "~> 4.0"
   s.add_development_dependency "rack-test", "~> 0.6.1"
   s.add_development_dependency "rspec", "~> 2.9"
 end

data/spec/bootstrap_forms_spec.rb

@@ -1,10 +1,6 @@
 require "spec_helper"
 
 describe BootstrapForms do
-  def app
-    Padrino.application
-  end
-
   context "using erb" do
     let(:format) { :erb }
     include_examples "form tag helpers"

data/spec/spec_helper.rb

@@ -72,7 +72,7 @@ module SpecHelper
             addons_css << "input-append" 
           end
 
-          field = content_tag(:div, addons, :class => addons_css.join(" "))
+          field = content_tag(:div, addons.html_safe, :class => addons_css.join(" "))
         end
         
         nodes << field
@@ -89,7 +89,7 @@ module SpecHelper
           nodes << content_tag(:span, options[:help_block], :class => "help-block") 
         end
 
-        nodes.join("")
+        nodes.join("").html_safe
       end
     end
 

data/spec/support/form_tag_helpers.rb

@@ -52,7 +52,6 @@ shared_examples "form tag helpers" do
     end
 
     it "renders using content from the provided block" do
-      pending "Test case fails, but correct HTML is rendered" if format == :slim
       req(format, "bootstrap_actions_with_block").should eq %|<div class="form-actions"><a class="btn cancel" href="javascript:history.go(-1)">No!</a></div>|
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino_bootstrap_forms
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Seth Vargo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-14 00:00:00.000000000 Z
+date: 2013-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino
@@ -17,28 +17,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.10.6
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.10.6
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -57,30 +57,30 @@ dependencies:
   name: slim
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -983,7 +983,8 @@ files:
 - spec/support/form_builder.rb
 - spec/support/form_tag_helpers.rb
 homepage: https://github.com/sshaw/padrino_bootstrap_forms
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []