meta_search 0.9.4 → 0.9.5

data/CHANGELOG

@@ -1,3 +1,8 @@
+Changes since 0.9.4 (2010-09-18):
+  * Rename check_boxes and collection_check_boxes to checks and
+    collection_checks. Alias to the old names if not already taken. This
+    is to avoid conflicts with SimpleForm.
+
 Changes since 0.9.3 (2010-09-08):
   * Minor documentation fixes.
   * Add sort_link helper to FormBuilder, to spare keystrokes if sort_links

data/VERSION

@@ -1 +1 @@
-0.9.4
+0.9.5

data/lib/meta_search/helpers/form_builder.rb

@@ -6,6 +6,14 @@ module MetaSearch
   module Helpers
     module FormBuilder
 
+      def self.included(base)
+        # Only take on the check_boxes method names if someone else (Hi, José!) hasn't grabbed them.
+        base.class_eval do
+          alias_method :check_boxes, :checks unless method_defined?(:check_boxes)
+          alias_method :collection_check_boxes, :collection_checks unless method_defined?(:collection_check_boxes)
+        end
+      end
+
       # Like other form_for field methods (text_field, hidden_field, password_field) etc,
       # but takes a list of hashes between the +method+ parameter and the trailing option hash,
       # if any, to specify a number of fields to create in multiparameter fashion.
@@ -70,7 +78,7 @@ module MetaSearch
       #
       #   <h4>How many heads?</h4>
       #   <ul>
-      #     <% f.check_boxes :number_of_heads_in,
+      #     <% f.checks :number_of_heads_in,
       #        [['One', 1], ['Two', 2], ['Three', 3]], :class => 'checkboxy' do |check| %>
       #        <li>
       #          <%= check.box %>
@@ -83,10 +91,10 @@ module MetaSearch
       #
       # <b>Grouping:</b>
       #
-      # Chain <tt>in_groups_of(<num>, false)</tt> on check_boxes like so:
+      # Chain <tt>in_groups_of(<num>, false)</tt> on checks like so:
       #   <h4>How many heads?</h4>
       #   <p>
-      #     <% f.check_boxes(:number_of_heads_in,
+      #     <% f.checks(:number_of_heads_in,
       #        [['One', 1], ['Two', 2], ['Three', 3]],
       #        :class => 'checkboxy').in_groups_of(2, false) do |checks| %>
       #       <% checks.each do |check| %>
@@ -96,23 +104,23 @@ module MetaSearch
       #       <br />
       #     <% end %>
       #   </p>
-      def check_boxes(method, choices = [], options = {}, &block)
+      def checks(method, choices = [], options = {}, &block)
         unless choices.first.respond_to?(:first) && choices.first.respond_to?(:last)
           raise ArgumentError, 'invalid choice array specified'
         end
-        collection_check_boxes(method, choices, :last, :first, options, &block)
+        collection_checks(method, choices, :last, :first, options, &block)
       end
 
-      # Just like +check_boxes+, but this time you can pass in a collection, value, and text method,
+      # Just like +checks+, but this time you can pass in a collection, value, and text method,
       # as with collection_select.
       #
       # Example:
       #
-      #   <% f.collection_check_boxes :head_sizes_in, HeadSize.all,
+      #   <% f.collection_checks :head_sizes_in, HeadSize.all,
       #       :id, :name, :class => 'headcheck' do |check| %>
       #     <%= check.box %> <%= check.label %>
       #   <% end %>
-      def collection_check_boxes(method, collection, value_method, text_method, options = {}, &block)
+      def collection_checks(method, collection, value_method, text_method, options = {}, &block)
         check_boxes = []
         collection.each do |choice|
           text = choice.send(text_method)

data/meta_search.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{meta_search}
-  s.version = "0.9.4"
+  s.version = "0.9.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ernie Miller"]
-  s.date = %q{2010-09-18}
+  s.date = %q{2010-09-28}
   s.description = %q{
       Allows simple search forms to be created against an AR3 model
       and its associations, has useful view helpers for sort links

data/test/test_view_helpers.rb

@@ -75,7 +75,7 @@ class TestViewHelpers < ActionView::TestCase
     end
   end
 
-  context "A form using check_boxes with three choices" do
+  context "A form using checks with three choices" do
     setup do
       @s = Company.search
       form_for @s do |f|
@@ -84,7 +84,7 @@ class TestViewHelpers < ActionView::TestCase
     end
 
     should "return an array of check boxes without a block" do
-      assert @f.check_boxes(:id_in, [['One', 1], ['Two', 2], ['Three', 3]]).all?{|c| c.is_a?(MetaSearch::Check)}
+      assert @f.checks(:id_in, [['One', 1], ['Two', 2], ['Three', 3]]).all?{|c| c.is_a?(MetaSearch::Check)}
     end
 
     should "generate the expected HTML with a block" do
@@ -104,7 +104,7 @@ class TestViewHelpers < ActionView::TestCase
       EXPECTED
       assert_dom_equal expected,
         render(:to => :string, :inline => <<-ERB)
-<%= @f.check_boxes(:id_in, [['One', 1], ['Two', 2], ['Three', 3]]) do |c| -%>
+<%= @f.checks(:id_in, [['One', 1], ['Two', 2], ['Three', 3]]) do |c| -%>
 <p>
   <%= c.label %>
   <%= c.box %>
@@ -114,7 +114,7 @@ class TestViewHelpers < ActionView::TestCase
     end
   end
 
-  context "A form using check_boxes with three choices and a previous selection" do
+  context "A form using checks with three choices and a previous selection" do
     setup do
       @s = Company.search
       @s.id_in = [1, 3]
@@ -124,7 +124,7 @@ class TestViewHelpers < ActionView::TestCase
     end
 
     should "return an array of check boxes without a block" do
-      assert @f.check_boxes(:id_in, [['One', 1], ['Two', 2], ['Three', 3]]).all?{|c| c.is_a?(MetaSearch::Check)}
+      assert @f.checks(:id_in, [['One', 1], ['Two', 2], ['Three', 3]]).all?{|c| c.is_a?(MetaSearch::Check)}
     end
 
     should "generate the expected HTML with a block" do
@@ -144,7 +144,7 @@ class TestViewHelpers < ActionView::TestCase
       EXPECTED
       assert_dom_equal expected,
                        render(:to => :string, :inline => <<-ERB)
-<%= @f.check_boxes(:id_in, [['One', 1], ['Two', 2], ['Three', 3]]) do |c| -%>
+<%= @f.checks(:id_in, [['One', 1], ['Two', 2], ['Three', 3]]) do |c| -%>
 <p>
   <%= c.label %>
   <%= c.box %>
@@ -154,7 +154,7 @@ class TestViewHelpers < ActionView::TestCase
     end
   end
 
-  context "A form using collection_check_boxes with companies" do
+  context "A form using collection_checks with companies" do
     setup do
       @s = Company.search
       form_for @s do |f|
@@ -163,11 +163,11 @@ class TestViewHelpers < ActionView::TestCase
     end
 
     should "return an array of check boxes without a block" do
-     assert @f.collection_check_boxes(:id_in, Company.all, :id, :name).all?{|c| c.is_a?(MetaSearch::Check)}
+     assert @f.collection_checks(:id_in, Company.all, :id, :name).all?{|c| c.is_a?(MetaSearch::Check)}
     end
 
     should "generate the expected HTML with a block" do
-      @f.collection_check_boxes(:id_in, Company.all, :id, :name) do |c|
+      @f.collection_checks(:id_in, Company.all, :id, :name) do |c|
         concat render :to => :string, :inline => "<p><%= c.label %> <%= c.box %></p>", :locals => {:c => c}
       end
       assert_dom_equal output_buffer,

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 4
-  version: 0.9.4
+  - 5
+  version: 0.9.5
 platform: ruby
 authors: 
 - Ernie Miller
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-18 00:00:00 -04:00
+date: 2010-09-28 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency