simple_bootstrap_form 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ec18e4dcc4888081e0d602db082eedff9afced8
-  data.tar.gz: 44da0c8960e49510e754f7b4d7f955d4ad5c3070
+  metadata.gz: 65f90240ab99e3a0b46b324b5df95ba49a5dee02
+  data.tar.gz: f7ad48aa51d56145cd4087c0aa51bfd5517a30e9
 SHA512:
-  metadata.gz: a06e26323f3f4eb7c0e2874c804ac335454228dc209a9641b11923834ca83e7a584d2d09465cf49401253be32b0f0de993e35c49b1c819fb3bc1d065262656c3
-  data.tar.gz: 22ab8c478c9c90450ef14bc66093b55ad67ebc25fbc7d26d68fc4dc682a98ccdd4e152b09797da2acf791073b2b1fe0193e0e230a34814dbf3de59088ce32687
+  metadata.gz: 491c8983cc4ce4884e3899adec4c6b11d71003e4205bfada2f5b4c2d27e0894049aa1649c9fd5c0ea564dc4d40178f7f03f8ab0b22ad144c97c726347b4c8865
+  data.tar.gz: 9e6474ea9135856d500457a1bd9d2239a5389b0c6d5221fdaf12021a3c44793ac3465893fb80afaabf8047683b562ac3c3c0a00e2fe9b965e20ace4b4f72658d

data/.ruby-version

@@ -1 +1 @@
-ruby-2.1.0
+ruby-2.1.5

data/README.md

@@ -180,6 +180,12 @@ Generates (spaces added for clarity):
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
 
+## Releasing
+
+Update lib/simple_bootstrap_form/version.rb, commit & push
+rake build
+rake release
+
 ## TODO
 
 * Vertical Form

data/lib/simple_bootstrap_form/field_factory.rb

@@ -46,7 +46,9 @@ module SimpleBootstrapForm
     end
 
     def attr_column_type(attr)
-      @builder.object.try(:column_for_attribute, attr).try(:type) || :string
+      ActiveSupport::Deprecation.silence do
+        @builder.object.try(:column_for_attribute, attr).try(:type) || :string
+      end
     end
 
     def string_field_class_prefix_based_on_column_name(attr)

data/lib/simple_bootstrap_form/version.rb

@@ -1,3 +1,3 @@
 module SimpleBootstrapForm
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/simple_bootstrap_form.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec-rails", ">= 3.0.0.beta1"
+  spec.add_development_dependency "rspec-rails", ">= 3.0.0"
   spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "nokogiri" # used by has_element matcher
   spec.add_runtime_dependency "rails", ">= 4"

data/spec/dummy/config/environments/production.rb

@@ -20,7 +20,7 @@ Dummy::Application.configure do
   # config.action_dispatch.rack_cache = true
 
   # Disable Rails's static asset server (Apache or nginx will already do this).
-  config.serve_static_assets = false
+  config.serve_static_files = false
 
   # Compress JavaScripts and CSS.
   config.assets.js_compressor = :uglifier

data/spec/dummy/config/environments/test.rb

@@ -13,7 +13,7 @@ Dummy::Application.configure do
   config.eager_load = false
 
   # Configure static asset server for tests with Cache-Control for performance.
-  config.serve_static_assets  = true
+  config.serve_static_files  = true
   config.static_cache_control = "public, max-age=3600"
 
   # Show full error reports and disable caching.

data/spec/have_element_spec.rb

@@ -30,7 +30,7 @@ describe "have_element RSpec matcher" do
     it "should have an appropriate error message for should" do
       matcher = have_element("input").with_only_classes('bar')
       expect(matcher.matches? subject).to eq false
-      expect(matcher.failure_message_for_should).to eq(
+      expect(matcher.failure_message).to eq(
         %Q{expected #{subject} to have classes "bar" but it has classes "bar baz"}
       )
     end
@@ -38,7 +38,7 @@ describe "have_element RSpec matcher" do
     it "should have an appropriate error message for should not" do
       matcher = have_element("input").with_only_classes('bar baz')
       expect(matcher.matches? subject).to eq true
-      expect(matcher.failure_message_for_should_not).to eq(
+      expect(matcher.failure_message_when_negated).to eq(
         %Q{expected #{subject} not to have classes "bar baz" but it has classes "bar baz"}
       )
     end
@@ -62,7 +62,7 @@ describe "have_element RSpec matcher" do
                                      .with_placeholder('Attr One')
 
       expect(matcher.matches? subject).to eq false
-      expect(matcher.failure_message_for_should).to eq(
+      expect(matcher.failure_message).to eq(
         %Q{expected #{subject} to have classes "bad class list" but it has classes "bar baz"}
       )
     end
@@ -91,7 +91,7 @@ describe "have_element RSpec matcher" do
       it "should have an appropriate error message for should" do
         matcher = have_element("div").with_id('foo').with_content('Bad Content')
         expect(matcher.matches? subject).to eq false
-        expect(matcher.failure_message_for_should).to eq(
+        expect(matcher.failure_message).to eq(
           %Q{expected #{inspected_subject} to } +
           %Q{have content "Bad Content" but it has content "Some Content"}
         )
@@ -100,7 +100,7 @@ describe "have_element RSpec matcher" do
       it "should have an appropriate error message for should not" do
         matcher = have_element("div").with_id('foo').with_content('Some Content')
         expect(matcher.matches? subject).to eq true
-        expect(matcher.failure_message_for_should_not).to eq(
+        expect(matcher.failure_message_when_negated).to eq(
           %Q{expected #{inspected_subject} not to } +
           %Q{have content "Some Content" but it has content "Some Content"}
         )
@@ -111,7 +111,7 @@ describe "have_element RSpec matcher" do
                                      .with_only_classes('bar')
                                      .with_content('Bad Content')
         expect(matcher.matches? subject).to eq false
-        expect(matcher.failure_message_for_should).to eq(
+        expect(matcher.failure_message).to eq(
           %Q{expected #{inspected_subject} to } +
           %Q{have classes "bar" but it has classes "c1 c2"} +
           %Q{ and have content "Bad Content" but it has content "Some Content"}

data/spec/horizontal_form/fields/base_field_spec.rb

@@ -51,7 +51,7 @@ describe SimpleBootstrapForm::HorizontalForm::Fields::BaseField do
         <div class="form-group custom-group-class">
           <label class="col-xs-4 control-label" for="model1_attr1">Custom Label</label>
           <div class="col-xs-6">
-            <input class="form-control" id="model1_attr1" name="model1[attr1]" placeholder="Custom Placeholder" type="text" />
+            <input placeholder="Custom Placeholder" class="form-control" type="text" name="model1[attr1]" id="model1_attr1" />
           </div>
         </div>
       HTML

data/spec/horizontal_form/fields/select_field_spec.rb

@@ -40,7 +40,7 @@ describe SimpleBootstrapForm::HorizontalForm::Fields::SelectField do
         <div class="form-group model1_attr1_group">
           <label class="col-sm-3 control-label" for="model1_attr1">Attr1</label>
           <div class="col-sm-6">
-            <select class="form-control" id="model1_attr1" name="model1[attr1]">
+            <select class="form-control" name="model1[attr1]" id="model1_attr1">
               <option value="1">1</option>
               <option value="3">3</option>
               <option selected="selected" value="5">5</option>

data/spec/simple_bootstrap_form_spec.rb

@@ -351,78 +351,65 @@ describe SimpleBootstrapForm, type: :helper do
         Model3.new
       end
 
-      let(:horizontal_form_output) {
-        # Original copy from getbootstrap.com
-        #<form class="form-horizontal" role="form">
-        #  <div class="form-group">
-        #    <label for="inputEmail3" class="col-sm-2 control-label">Email</label>
-        #    <div class="col-sm-10">
-        #      <input type="email" class="form-control" id="inputEmail3" placeholder="Email">
-        #    </div>
-        #  </div>
-        #  <div class="form-group">
-        #    <label for="inputPassword3" class="col-sm-2 control-label">Password</label>
-        #    <div class="col-sm-10">
-        #      <input type="password" class="form-control" id="inputPassword3" placeholder="Password">
-        #    </div>
-        #  </div>
-        #  <div class="form-group">
-        #    <div class="col-sm-offset-2 col-sm-10">
-        #      <div class="checkbox">
-        #        <label>
-        #          <input type="checkbox"> Remember me
-        #        </label>
-        #      </div>
-        #    </div>
-        #  </div>
-        #  <div class="form-group">
-        #    <div class="col-sm-offset-2 col-sm-10">
-        #      <button type="submit" class="btn btn-default">Sign in</button>
-        #    </div>
-        #  </div>
-        #</form>
-
-        # Railsified version
-        # <form>
-        #   add accept-charset, action, id, method, model-specific class
-        # <label>
-        #   changed for= to model_field
-        # <input>
-        #   reorder input attributes to match Rails' order
-        #   add name=
-  <<-HORIZONTAL_FORM
-<form accept-charset="UTF-8" action="/foo" class="new_model3 form-horizontal" id="new_model3" method="post" role="form">
-  <div style=\"margin:0;padding:0;display:inline\">
-    <input name="utf8" type="hidden" value="&#x2713;" />
-  </div>
-  <div class="form-group">
-    <label class="col-sm-2 control-label" for="model3_inputEmail3">Email</label>
-    <div class="col-sm-10">
-      <input class="form-control" id="model3_inputEmail3" name="model3[inputEmail3]" placeholder="Email" type="email" />
-    </div>
-  </div>
-  <div class="form-group">
-    <label class="col-sm-2 control-label" for="model3_inputPassword3">Password</label>
-    <div class="col-sm-10">
-      <input class="form-control" id="model3_inputPassword3" name="model3[inputPassword3]" placeholder="Password" type="password" />
-    </div>
-  </div>
-  <div class="form-group">
-    <div class="col-sm-offset-2 col-sm-10">
-      <div class="checkbox">
-        <label>
-          <input type="checkbox"> Remember me
-        </label>
-      </div>
-    </div>
-  </div>
-  <div class="form-group">
-    <div class="col-sm-offset-2 col-sm-10">
-      <button type="submit" class="btn btn-default">Sign in</button>
-    </div>
-  </div>
-</form>
-        HORIZONTAL_FORM
+      # Original copy from getbootstrap.com
+      #<form class="form-horizontal" role="form">
+      #  <div class="form-group">
+      #    <label for="inputEmail3" class="col-sm-2 control-label">Email</label>
+      #    <div class="col-sm-10">
+      #      <input type="email" class="form-control" id="inputEmail3" placeholder="Email">
+      #    </div>
+      #  </div>
+      #  <div class="form-group">
+      #    <label for="inputPassword3" class="col-sm-2 control-label">Password</label>
+      #    <div class="col-sm-10">
+      #      <input type="password" class="form-control" id="inputPassword3" placeholder="Password">
+      #    </div>
+      #  </div>
+      #  <div class="form-group">
+      #    <div class="col-sm-offset-2 col-sm-10">
+      #      <div class="checkbox">
+      #        <label>
+      #          <input type="checkbox"> Remember me
+      #        </label>
+      #      </div>
+      #    </div>
+      #  </div>
+      #  <div class="form-group">
+      #    <div class="col-sm-offset-2 col-sm-10">
+      #      <button type="submit" class="btn btn-default">Sign in</button>
+      #    </div>
+      #  </div>
+      #</form>
+
+      # The snippets below have been "Railsified" as follows:
+      # <form>
+      #   add accept-charset, action, id, method, model-specific class
+      # <label>
+      #   changed for= to model_field
+      # <input>
+      #   reorder input attributes to match Rails' order
+      #   add name=
+
+      let(:email_field_markup) {
+        outdent <<-HTML
+          <div class="form-group">
+            <label class="col-sm-2 control-label" for="model3_inputEmail3">Email</label>
+            <div class="col-sm-10">
+              <input placeholder="Email" class="form-control" type="email" name="model3[inputEmail3]" id="model3_inputEmail3" />
+            </div>
+          </div>
+        HTML
+      }
+
+      let(:password_field_markup) {
+        outdent <<-HTML
+          <div class="form-group">
+            <label class="col-sm-2 control-label" for="model3_inputPassword3">Password</label>
+            <div class="col-sm-10">
+              <input placeholder="Password" class="form-control" type="password" name="model3[inputPassword3]" id="model3_inputPassword3" />
+            </div>
+          </div>
+        HTML
       }
 
       subject {
@@ -438,8 +425,21 @@ describe SimpleBootstrapForm, type: :helper do
         end
       }
 
-      it "should generate the correct output" do
-        #expect(pretty_html subject).to eq horizontal_form_output
+      it "should generate the correct form tag" do
+        expect(subject.to_s).to have_element('form')
+                                .with_id('new_model3')
+                                .with_only_classes('form-horizontal new_model3')
+                                .with_attr_value(:action, '/foo')
+      end
+
+      it "should generate the correct email field" do
+        markup = Nokogiri::XML(subject.to_s).css('.form-group').first
+        expect(pretty_html markup.to_s).to eq email_field_markup
+      end
+
+      it "should generate the correct password field" do
+        markup = Nokogiri::XML(subject.to_s).css('.form-group')[1]
+        expect(pretty_html markup.to_s).to eq password_field_markup
       end
     end
   end

data/spec/spec_helper.rb

@@ -2,7 +2,6 @@
 ENV["RAILS_ENV"] ||= 'test'
 require File.expand_path("../dummy/config/environment", __FILE__)
 require 'rspec/rails'
-require 'rspec/autorun'
 
 # Requires supporting ruby files with custom matchers and macros, etc, in
 # spec/support/ and its subdirectories. Files matching `spec/**/*_spec.rb` are

data/spec/support/have_element.rb

@@ -1,19 +1,13 @@
 require 'nokogiri'
 
 RSpec::Matchers.define :have_element do |selector|
-  match_for_should do |markup|
+  match do |markup|
     @selector = selector
     @markup = markup
     element_is_present && classes_match && content_matches
   end
 
-  #match_for_should_not do |markup|
-  #  @selector = selector
-  #  @markup = markup
-  #  !element_is_present || !classes_match || !content_matches
-  #end
-
-  failure_message_for_should do |markup|
+  failure_message do |markup|
     if the_element.nil?
       "expected to find an element matching #{actual_selector} in #{markup}"
     else
@@ -25,7 +19,7 @@ RSpec::Matchers.define :have_element do |selector|
     end
   end
 
-  failure_message_for_should_not do |markup|
+  failure_message_when_negated do |markup|
     if checking_classes? || checking_content?
       if the_element.nil?
         # If we have post tag-retrieval checks, it is an error not to find the tag

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_bootstrap_form
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Sam Pierson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-04 00:00:00.000000000 Z
+date: 2014-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta1
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta1
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -198,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Bootstrap 3 Form Helper