foundation_rails_helper 0.5.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b91634e14b82386a58ec5123c79bbf9a7cc00e2c
-  data.tar.gz: f668d1586441afb62f4308352eeb81cc8e1a1526
+  metadata.gz: 8778cbf569b219f1dc900b76ccc9dbce91f14352
+  data.tar.gz: 2f04eeda4780f7ea097fc6489b522089c3828799
 SHA512:
-  metadata.gz: d2d484df58203229b48594064fdf2ca2977924620e4c6c36bc8a9a4fb3b1ec3721a3b295f1599242fd872f94d6712408c130d407a744b6395b371729179bba7b
-  data.tar.gz: e50a0e0e2ff994a6d3f11b73af3655c9bc4ae8f85518c9b1d43ddcc92f5d619636215cdc157d46f8256d4333424a83ff84a4f05aef6097249edb7009440d8578
+  metadata.gz: 95f6960132fbfc01eba7fc1490897c3d67bbf9ea6fb678ef8ac478bc9a75421be821bb98d1f4e224ac5d3ec8bda5ae912d7bc596033c23b67126d37f7279d150
+  data.tar.gz: 44739788edf92dd99efdf494081aee4a5930d367e79750a987d9d336b8552351de84d464ea11470eb9fb1a620d0d95f7b65c7f0b2a74ed2cc78c0258403100c8

data/.gitignore

@@ -16,3 +16,4 @@ test/tmp
 test/version_tmp
 tmp
 .rbenv-gemsets
+vendor/bundle/*

data/.travis.yml

@@ -1,2 +1,4 @@
 rvm:
   - 1.9.3
+  - 2.1.0
+  - 2.2.0

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## Version 1.0.0
+
+* Released Feb 03rd 2015
+* Added configuration option to set button class in an initializer
+* Updated to be compatible with Foundation 5.2.2
+* Bugfixes
+
 ## Version 0.5.0
 
 * Released Oct 10th 2014

data/CONTRIBUTING.md

@@ -0,0 +1,40 @@
+# Contributing
+
+### We love pull requests. Here's a quick guide.
+
+Fork, then clone the repo:
+```
+git clone git@github.com:your-username/foundation_rails_helper.git
+```
+
+Set up your machine:
+```
+git checkout -b your-branch-name
+bundle
+```
+
+Make sure the tests pass:
+```
+rake
+```
+
+Make your change. Add tests for your change. Make the tests pass:
+```
+rake
+```
+
+Push to your fork and [submit a pull request][pr].
+```
+git push origin your-branch-name
+```
+
+[pr]: https://github.com/sgruhier/foundation_rails_helper/compare/
+
+At this point you're waiting on us. We like to at least comment on pull requests within three business days (and, typically, one business day). We may suggest some changes or improvements or alternatives.
+
+Some things that will increase the chance that your pull request is accepted:
+
+* Write tests.
+* Write a [good commit message][commit].
+
+[commit]: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Sébastien Gruhier
+Copyright (c) 2015 Sébastien Gruhier
 
 MIT License
 
@@ -19,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,21 +1,21 @@
-# FoundationRailsHelper [![Build Status](https://secure.travis-ci.org/sgruhier/foundation_rails_helper.png)](http://travis-ci.org/sgruhier/foundation_rails_helper)
+# Foundation Rails Helper [![Build Status](https://secure.travis-ci.org/sgruhier/foundation_rails_helper.png)](http://travis-ci.org/sgruhier/foundation_rails_helper)
 
-Gem for Rails 4.1.x applications that use the excellent Zurb Foundation framework.
+Gem for Rails 4.1+ applications that use the excellent Zurb Foundation framework.
 
 * [Zurb Foundation](https://github.com/zurb/foundation)
 * [Zurb Foundation Rails](https://github.com/zurb/foundation-rails)
 
 So far it includes:
 
-* A custom FormBuilder that generates a form using the Foundation framework. It replaces the current `form_for` so you don't have to change your Rails code. Error messages are properly displayed.
+* A custom FormBuilder that generates a form using the Foundation framework classes. It replaces the current `form_for`, so there is no need to change your Rails code. Error messages are properly displayed.
 
 * A `display_flash_messages` helper method that uses Zurb Foundation Alerts UI.
 
 #### Compatibility
 
-* Only Rails 4.1 and Foundation 4 and 5 are fully supported
-* Some features may work with Foundation 3 and older, but results may vary, and markup which exists only for those versions will be gradually removed
-* Legacy branches exist for Rails 3 and 4.0 (see the rails3 and rails4.0 branches). These are not actively supported, and fixes are not retroactively applied, but pull requests are welcomed.
+* Only Rails 4.1/4.2 and Foundation 5 are fully supported
+* Some features may work with Foundation 4 and older, but results may vary, and markup which exists only for those versions will be gradually removed
+* Legacy branches exist for Rails 3 and 4.0 (see the rails3 and rails4.0 branches). These are not actively supported, and fixes are not retroactively applied, but pull requests are welcome.
 
 
 ## Screenshots
@@ -25,7 +25,7 @@ A classic devise sign up view will look like this:
 
 ```erb
 <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
-  <%= f.email_field :email %>
+  <%= f.email_field :email, label: 'E-mail' %>
   <%= f.password_field :password %>
   <%= f.password_field :password_confirmation %>
 
@@ -34,19 +34,27 @@ A classic devise sign up view will look like this:
 ```
 
 <table>
-  <tr>
-    <th>Form</th>
-    <th>Form with errors</th>
-  </tr>
-  <tr>
-    <td valign='top'> <img src="http://dl.dropbox.com/u/517768/sign-up.png"/></td>
-    <td valign='top'> <img src="http://dl.dropbox.com/u/517768/sign-up-with-errors.png"/></td>
-  </tr>
+  <thead>
+    <tr>
+      <th>Form</th>
+      <th>Form with errors</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td valign='top'>
+        <img src="https://cloud.githubusercontent.com/assets/1400414/5994195/d9b467ce-aa1e-11e4-914c-f696724b53ed.png"/>
+      </td>
+      <td valign='top'>
+        <img src="https://cloud.githubusercontent.com/assets/1400414/5994196/dbf4bc0a-aa1e-11e4-8c18-b7d3b1b370dc.png"/>
+      </td>
+    </tr>
+  </tbody>
 </table>
 
 ### Flash messages
 
-![Flash-message](http://dl.dropbox.com/u/517768/flash.png "Flash-message")
+![Flash-message](https://cloud.githubusercontent.com/assets/393167/5845238/563dc094-a1b2-11e4-8548-2dd2950a60be.png "Flash-message")
 
 ## Installation
 
@@ -65,19 +73,13 @@ $ bundle
 
 ### Flash Messages
 
-To get access to `display_flash_messages` in your views, add
-
-```ruby
-include FoundationRailsHelper::FlashHelper
-```
-
-to `app/helpers/application_helper.rb`
+To use the built in flash helper, add `<%= display_flash_messages %>` to your layout file (eg. *app/views/layouts/application.html.erb*).
 
 ## Usage
 
 ### form_for
 
-Form_for wraps the standard rails form_for helper and adds a 'nice' class by default.
+Form_for wraps the standard rails form_for helper.
 
 ```erb
 <%= form_for @user do |f| %>
@@ -88,15 +90,9 @@ Form_for wraps the standard rails form_for helper and adds a 'nice' class by def
 generates:
 
 ```html
-<form accept-charset="UTF-8" action="/users" class="nice" id="new_user" method="post">
-  ...
-```
-
-Override the default class like so:
-
-```erb
-<%= form_for(@user, html: {class: 'mean'}) do |f| %>
+<form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
   ...
+</form>
 ```
 
 ### text_field and Field Helpers
@@ -111,19 +107,7 @@ generates:
 
 ```html
 <label for="user_email">Name</label>
-<input class="medium input-text" id="user_name" name="user[name]" type="text">
-```
-
-The 'input-text' class will always be added to the input element, but the 'medium' class can be replaced.
-
-```ruby
-f.text_field :name, class: 'large'
-```
-
-generates:
-
-```html
-<input class="large input-text" ... >
+<input id="user_name" name="user[name]" type="text">
 ```
 
 Prevent the generation of a label:
@@ -177,31 +161,33 @@ f.email_field :email
 generates:
 
 ```html
-<label class=" error" for="user_email">Email</label>
-<input class="medium input-text error" id="user_email" name="user[email]" type="email" value="">
-<small class="error medium input-text error">can't be blank</small>
+<label class="error" for="user_email">Email</label>
+<input class="error" id="user_email" name="user[email]" type="email" value="">
+<small class="error">can't be blank</small>
 ```
 
 The class attribute of the 'small' element will mirror the class attribute of the 'input' element.
 
 If the `html_safe_errors: true` option is specified on a field, then any HTML you may have embedded in a custom error string will be displayed with the html_safe option.
 
-## TODO
+## Configuration
+Add an initializer file to your Rails app: *config/initializers/foundation_rails_helper.rb*.  See below for current options.
 
-* Handle more UI components
-* Make something for ajax forms
+### Submit Button Class
+To use a different class for the [submit button](https://github.com/sgruhier/foundation_rails_helper#submit-button) used in `form_for`, add a config named **button_class**.  Please note, the button class can still be overridden by an options hash.
+```ruby
+FoundationRailsHelper.configure do |config|
+  # Default: 'small radius success button'
+  config.button_class = 'large secondary button'
+end
+```
 
 ## Contributing
 
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Added some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create a new Pull Request
+See the [CONTRIBUTING](CONTRIBUTING.md) file.
 
 ## Copyright
 
-Sébastien Gruhier (http://xilinus.com, http://v2.maptimize.com) - MIT LICENSE - 2012
+Sébastien Gruhier (http://xilinus.com, http://v2.maptimize.com) - MIT LICENSE - 2015
 
 [![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/sgruhier/foundation_rails_helper/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
-

data/foundation_rails_helper.gemspec

@@ -22,6 +22,6 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'activesupport', '~> 4.1', '>= 4.1.1'
   gem.add_dependency 'tzinfo',        '~> 1.2', '>= 1.2.2'
 
-  gem.add_development_dependency 'rspec-rails', '~> 2.8', '>= 2.8.1'
+  gem.add_development_dependency 'rspec-rails', '~> 3.1', '>= 3.1.0'
   gem.add_development_dependency 'capybara',    '~> 2.4', '>= 2.4.3'
 end

data/lib/foundation_rails_helper.rb

@@ -1,7 +1,8 @@
 require "foundation_rails_helper/version"
+require "foundation_rails_helper/configuration"
 require "foundation_rails_helper/form_builder"
 require "foundation_rails_helper/flash_helper"
 require "foundation_rails_helper/action_view_extension"
 ActiveSupport.on_load(:action_view) do
   include FoundationRailsHelper::FlashHelper
-end
+end

data/lib/foundation_rails_helper/action_view_extension.rb

@@ -4,7 +4,6 @@ module ActionView
       def form_for_with_foundation(record, options = {}, &block)
         options[:builder] ||= FoundationRailsHelper::FormBuilder
         options[:html] ||= {}
-        options[:html][:class] ||= 'nice'
         options[:auto_labels] = true unless options.has_key? :auto_labels
         form_for_without_foundation(record, options, &block)
       end
@@ -12,7 +11,6 @@ module ActionView
       def fields_for_with_foundation(record_name, record_object = nil, options = {}, &block)
         options[:builder] ||= FoundationRailsHelper::FormBuilder
         options[:html] ||= {}
-        options[:html][:class] ||= 'nice'
         options[:html][:attached_labels] = options[:attached_labels]
         options[:auto_labels] = true unless options.has_key? :auto_labels
         fields_for_without_foundation(record_name, record_object, options, &block)

data/lib/foundation_rails_helper/configuration.rb

@@ -0,0 +1,25 @@
+module FoundationRailsHelper
+  class << self
+    attr_writer :configuration
+  end
+
+  def self.configuration
+    @configuration ||= Configuration.new
+  end
+
+  def self.reset
+    @configuration = Configuration.new
+  end
+
+  def self.configure
+    yield(configuration)
+  end
+
+  class Configuration
+    attr_accessor :button_class
+
+    def initialize
+      @button_class = 'small radius success button'
+    end
+  end
+end

data/lib/foundation_rails_helper/flash_helper.rb

@@ -9,14 +9,15 @@ module FoundationRailsHelper
     DEFAULT_KEY_MATCHING = {
       :alert     => :alert,
       :notice    => :success,
-      :info      => :standard,
+      :info      => :info,
       :secondary => :secondary,
       :success   => :success,
-      :error     => :alert
+      :error     => :alert,
+      :warning   => :warning
     }
     def display_flash_messages(key_matching = {})
       key_matching = DEFAULT_KEY_MATCHING.merge(key_matching)
-      
+
       flash.inject "" do |message, (key, value)|
         message += content_tag :div, :data => { :alert => "" }, :class => "alert-box #{key_matching[key.to_sym] || :standard}" do
           (value + link_to("×".html_safe, "#", :class => :close)).html_safe

data/lib/foundation_rails_helper/form_builder.rb

@@ -21,7 +21,6 @@ module FoundationRailsHelper
       super(attribute, (text || "").html_safe, options)
     end
 
-
     def check_box(attribute, options = {}, checked_value = "1", unchecked_value = "0")
       custom_label(attribute, options[:label], options[:label_options]) do
         options.delete(:label)
@@ -31,10 +30,14 @@ module FoundationRailsHelper
     end
 
     def radio_button(attribute, tag_value, options = {})
-      options[:for] ||= "#{@object_name}_#{attribute}_#{tag_value}"
-      c = super(attribute, tag_value, options)
-      l = label(attribute, options.delete(:text), options)
-      l.gsub(/(for=\"\w*\"\>)/, "\\1#{c} ").html_safe
+      options[:label_options] ||= {}
+      label_options = options.delete(:label_options).merge!(value: tag_value)
+      unless options[:label] == false
+        l = label(attribute, options.delete(:label), label_options)
+      end
+      r = @template.radio_button(@object_name, attribute, tag_value, objectify_options(options))
+
+      "#{r}#{l}".html_safe
     end
 
     def password_field(attribute, options = {})
@@ -91,7 +94,7 @@ module FoundationRailsHelper
     end
 
     def submit(value=nil, options={})
-      options[:class] ||= "small radius success button"
+      options[:class] ||= FoundationRailsHelper.configuration.button_class
       super(value, options)
     end
 
@@ -137,8 +140,7 @@ module FoundationRailsHelper
       html = ''.html_safe
       html = custom_label(attribute, options[:label], options[:label_options]) if @options[:auto_labels] || options[:label]
       class_options = html_options || options
-      class_options[:class] ||= "medium"
-      class_options[:class] = "#{class_options[:class]} input-text"
+      class_options[:class] = class_options[:class].to_s
       class_options[:class] += " error" if has_error?(attribute)
       options.delete(:label)
       options.delete(:label_options)

data/lib/foundation_rails_helper/version.rb

@@ -1,3 +1,3 @@
 module FoundationRailsHelper
-  VERSION = "0.5.0"
+  VERSION = "1.0.0"
 end

data/spec/foundation_rails_helper/configuration_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+describe FoundationRailsHelper do
+
+  describe FoundationRailsHelper::Configuration do
+    describe "#button_class" do
+      it "default value is 'small radius success button'" do
+        config = FoundationRailsHelper::Configuration.new
+        expect(config.button_class).to eq('small radius success button')
+      end
+    end
+
+    describe "#button_class=" do
+      it "can set value" do
+        config = FoundationRailsHelper::Configuration.new
+        config.button_class = 'new-class'
+        expect(config.button_class).to eq('new-class')
+      end
+    end
+
+    describe ".reset" do
+      before :each do
+        FoundationRailsHelper.configure do |config|
+          config.button_class = 'new-class'
+        end
+      end
+
+      it "resets the configuration" do
+        FoundationRailsHelper.reset
+
+        config = FoundationRailsHelper.configuration
+        expect(config.button_class).to eq('small radius success button')
+      end
+    end
+  end
+
+end

data/spec/foundation_rails_helper/flash_helper_spec.rb

@@ -10,28 +10,28 @@ describe FoundationRailsHelper::FlashHelper do
 
   FoundationRailsHelper::FlashHelper::DEFAULT_KEY_MATCHING.each do |message_type, foundation_type|
     it "displays flash message with #{foundation_type} class for #{message_type} message" do
-      self.stub!(:flash).and_return({message_type => "Flash message"})
+      allow(self).to receive(:flash).and_return({message_type => "Flash message"})
       node = Capybara.string display_flash_messages
-      node.should have_css("div.alert-box.#{foundation_type}", :text => "Flash message")
-      node.should have_css("div.alert-box a.close", :text => "×")
+      expect(node).to have_css("div.alert-box.#{foundation_type}", :text => "Flash message")
+      expect(node).to have_css("div.alert-box a.close", :text => "×")
     end
   end
 
   it "displays flash message with overridden key matching" do
-    self.stub!(:flash).and_return({:notice => "Flash message"})
+    allow(self).to receive(:flash).and_return({:notice => "Flash message"})
     node = Capybara.string display_flash_messages({:notice => :alert})
-    node.should have_css("div.alert-box.alert")
+    expect(node).to have_css("div.alert-box.alert")
   end
 
   it "displays flash message with custom key matching" do
-    self.stub!(:flash).and_return({:custom_type => "Flash message"})
+    allow(self).to receive(:flash).and_return({:custom_type => "Flash message"})
     node = Capybara.string display_flash_messages({:custom_type => :custom_class})
-    node.should have_css("div.alert-box.custom_class")
+    expect(node).to have_css("div.alert-box.custom_class")
   end
 
   it "displays flash message with standard class if key doesn't match" do
-    self.stub!(:flash).and_return({:custom_type => "Flash message"})
+    allow(self).to receive(:flash).and_return({:custom_type => "Flash message"})
     node = Capybara.string display_flash_messages
-    node.should have_css("div.alert-box.standard")
+    expect(node).to have_css("div.alert-box.standard")
   end
-end
+end