informant 0.7.1 → 0.7.2

data/CHANGELOG.rdoc

@@ -2,6 +2,11 @@
 
 Per-release changes to Informant.
 
+== 0.7.2 (2010 Apr 11)
+
+* Fix Ruby 1.9 compatibility.
+* Allow customization of each HABTM check box.
+
 == 0.7.1 (2010 Jun 1)
 
 * Add compatibility with Rails 3 and rails_xss plugin.

data/Rakefile

@@ -1,21 +1,5 @@
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name        = "informant"
-    gem.summary     = %Q{A full-featured form builder for Rails.}
-    gem.description = %Q{Informant is a full-featured form builder for Ruby on Rails which promotes a simple syntax that keeps your views clean. Everything about a field (label, description, error display, etc) is encapsulated in a single method call.}
-    gem.email       = "alex@alexreisner.com"
-    gem.homepage    = "http://github.com/alexreisner/informant"
-    gem.authors     = ["Alex Reisner"]
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
-end
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
@@ -24,21 +8,6 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/*_test.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
-end
-
-task :test => :check_dependencies
-
 task :default => :test
 
 require 'rake/rdoctask'
@@ -50,8 +19,7 @@ Rake::RDocTask.new do |rdoc|
   end
 
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "Informant #{version}"
-  rdoc.rdoc_files.include('README*')
+  rdoc.title = "informant #{version}"
+  rdoc.rdoc_files.include('*.rdoc')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
-

data/VERSION

@@ -1 +1 @@
-0.7.1
+0.7.2

data/lib/informant.rb

@@ -40,11 +40,11 @@ module Informant
   # Displays fields in a <div>, label on one line, field below it.
   #
   class Standard < ActionView::Helpers::FormBuilder
-  
+
     # Declare some options as custom (don't pass to built-in form helpers).
     @@custom_field_options = [:label, :required, :description, :decoration]
     @@custom_label_options = [:required, :colon, :label_for]
-    
+
     @@custom_options = @@custom_field_options + @@custom_label_options
 
     # Run already-defined helpers through our "shell".
@@ -54,20 +54,20 @@ module Informant
     helpers.each do |h|
       define_method h do |field, *args|
         options = args.detect { |a| a.is_a?(Hash) } || {}
-        case h 
-        when 'check_box':
+        case h
+        when 'check_box'
           template = "check_box_field"
           options[:colon] = false
-        when 'radio_button':
+        when 'radio_button'
           template = "radio_button_choice"
           options[:colon] = false
         else
           template = "default_field"
         end
-        build_shell(field, options, template) { super }
+        build_shell(field, options, template) { super(field, *args) }
       end
     end
-    
+
     ##
     # Render a set of radio buttons. Takes a method name, an array of
     # choices (just like a +select+ field), and an Informant options hash.
@@ -79,7 +79,7 @@ module Informant
           :label_for => [object_name, method, c[1].to_s.downcase].join('_') }
       end
     end
-    
+
     ##
     # Render a set of check boxes for selecting HABTM-associated objects.
     # Takes a method name (eg, category_ids), an array of
@@ -87,17 +87,17 @@ module Informant
     # In the default template the check boxes are enclosed in a <div> with
     # CSS class <tt>habtm_check_boxes</tt> which can be styled thusly to
     # achieve a scrolling list:
-    # 
+    #
     #   .habtm_check_boxes {
     #     overflow: auto;
     #     height: 150px;
     #   }
-    # 
+    #
     # A hidden field is included which eliminates the need to handle the
     # no-boxes-checked case in the controller, for example:
-    # 
+    #
     #   <input type="hidden" name="article[categories][]" value="" />
-    # 
+    #
     # This ensures that un-checking all boxes will work as expected.
     # Unfortunately the check_box template is not applied to each check box
     # (because the standard method of querying the @object for the field's
@@ -113,17 +113,17 @@ module Informant
       build_shell(method, options, "habtm_check_boxes_field") do
         choices.map do |c|
           field_id = "#{base_id}_#{c[1].to_s.downcase}"
-          @template.content_tag(:div, :class => "field") do
-            @template.check_box_tag(
-              "#{base_name}[]", "1",
-              @object.send(method).include?(c[1]),
-              :id => field_id
-            ) + @template.label_tag(field_id, c[0])
-          end
+          habtm_single_check_box_template(
+            :name => "#{base_name}[]",
+            :id => field_id,
+            :value => c[1],
+            :checked => @object.send(method).include?(c[1]),
+            :label => @template.label_tag(field_id, c[0])
+          )
         end
       end
     end
-    
+
     ##
     # Standard Rails date selector.
     #
@@ -132,9 +132,9 @@ module Informant
       options[:start_year]    ||= 1801
       options[:end_year]      ||= Time.now.year
       options[:label_for]       = "#{object_name}_#{method}_1i"
-		  build_shell(method, options) { super }
+      build_shell(method, options) { super }
     end
-    
+
     ##
     # This differs from the Rails-default date_select in that it
     # submits three distinct fields for storage in three separate attributes.
@@ -148,16 +148,16 @@ module Informant
       options[:end_year]      ||= Time.now.year
       options[:prefix]          = object_name # for date helpers
       options[:label_for]       = "#{object_name}_#{method}_y"
-		  build_shell(method, options) do
+      build_shell(method, options) do
         [['y', 'year'], ['m', 'month'], ['d', 'day']].map{ |p|
           i,j = p
           value = @object.send(method.to_s + '_' + i)
           options[:field_name] = method.to_s + '_' + i
           eval("@template.select_#{j}(#{value.inspect}, options)")
         }.join(' ')
-		  end
+      end
     end
-    
+
     ##
     # Year select field. Takes options <tt>:start_year</tt> and
     # <tt>:end_year</tt>, and <tt>:step</tt>.
@@ -167,7 +167,7 @@ module Informant
       options[:last]  = options[:end_year] || Date.today.year
       integer_select(method, options)
     end
-    
+
     ##
     # Integer select field.
     # Takes options <tt>:first</tt>, <tt>:last</tt>, and <tt>:step</tt>.
@@ -179,9 +179,9 @@ module Informant
         choices << n if i % options[:step] == 0
         i += 1
       end
-		  select method, choices, options
+      select method, choices, options
     end
-    
+
     ##
     # Submit button with smart default text (if +value+ is nil uses "Create"
     # for new record or "Update" for old record).
@@ -203,13 +203,13 @@ module Informant
       options.delete :colon
       options.delete :label_for
       options.delete :required
-      
+
       text = @template.send(:h, text.blank?? method.to_s.humanize : text.to_s)
       text << ':'.html_safe if colon
       text << @template.content_tag(:span, "*", :class => "required") if required
       super
     end
-    
+
     ##
     # Render a field set (HTML <fieldset>). Takes the legend (optional), an
     # options hash, and a block in which fields are rendered.
@@ -220,8 +220,8 @@ module Informant
         @template.capture(&block)
       end
     end
-    
-    
+
+
     private # ---------------------------------------------------------------
 
     ##
@@ -231,14 +231,14 @@ module Informant
 
       # Build new options hash for custom label options.
       label_options = options.reject{ |i,j| !@@custom_label_options.include? i }
-      
+
       # Build new options hash for custom field options.
       field_options = options.reject{ |i,j| !@@custom_field_options.include? i }
 
       # Remove custom options from options hash so things like
       # <tt>include_blank</tt> aren't added as HTML attributes.
       options.reject!{ |i,j| @@custom_options.include? i }
-      
+
       locals = {
         :element     => yield,
         :label       => label(method, field_options[:label], label_options),
@@ -249,30 +249,30 @@ module Informant
       }
       send("#{template}_template", locals).html_safe
     end
-    
+
     ##
     # Render default field template.
     #
     def default_field_template(l = {})
       <<-END
       <div id="#{l[:div_id]}" class="field">
-	      #{l[:label]}<br />
+        #{l[:label]}<br />
         #{l[:element]}#{l[:decoration]}
         #{"<p class=\"field_description\">#{l[:description]}</p>" unless l[:description].blank?}
-	    </div>
-	    END
+      </div>
+      END
     end
-  
+
     ##
     # Render check box field template.
     #
     def check_box_field_template(l = {})
       <<-END
       <div id="#{l[:div_id]}" class="field">
-	      #{l[:element]} #{l[:label]} #{l[:decoration]}<br />
-	      #{"<p class=\"field_description\">#{l[:description]}</p>" unless l[:description].blank?}
-	    </div>
-	    END
+        #{l[:element]} #{l[:label]} #{l[:decoration]}<br />
+        #{"<p class=\"field_description\">#{l[:description]}</p>" unless l[:description].blank?}
+      </div>
+      END
     end
 
     ##
@@ -283,7 +283,7 @@ module Informant
     def radio_button_choice_template(l = {})
       <<-END
       #{l[:element]} #{l[:label]}
-	    END
+      END
     end
 
     ##
@@ -299,11 +299,20 @@ module Informant
     def habtm_check_boxes_field_template(l = {})
       <<-END
       <div id="#{l[:div_id]}" class="field">
-	      #{l[:label]}<br />
-        <div class="habtm_check_boxes">#{l[:element]}</div>#{l[:decoration]}
+        #{l[:label]}<br />
+        <div class="habtm_check_boxes">#{l[:element].join}</div>#{l[:decoration]}
         #{"<p class=\"field_description\">#{l[:description]}</p>" unless l[:description].blank?}
-	    </div>
-	    END
+      </div>
+      END
+    end
+
+    ##
+    # Render a single check box in a HABTM set.
+    #
+    def habtm_single_check_box_template(l = {})
+      <<-END
+        <div class="habtm_single_check_box"><input type="checkbox" name="#{l[:name]}" id="#{l[:id]}" value="#{l[:value]}" #{'checked="checked"' if l[:checked]}} /> #{l[:label]}</div>
+      END
     end
 
     ##
@@ -312,16 +321,16 @@ module Informant
     def submit_button_template(l = {})
       <<-END
       <div class="button">#{l[:element]}</div>
-	    END
+      END
     end
   end
 
-  
+
   ##
   # Displays fields with no surrounding HTML containers.
   #
   class Simple < Standard
-    
+
     private # ---------------------------------------------------------------
 
     ##
@@ -330,7 +339,7 @@ module Informant
     def default_field_template(l = {})
       "#{l[:element]}#{l[:decoration]}"
     end
-    
+
     ##
     # Render check box field template.
     #
@@ -345,14 +354,14 @@ module Informant
       l[:element]
     end
   end
-  
-  
+
+
   ##
   # Displays fields in table rows: label in first column, field (with
   # description and decoration) in second.
   #
   class Table < Standard
-    
+
     private # ---------------------------------------------------------------
 
     ##
@@ -361,13 +370,13 @@ module Informant
     def default_field_template(l = {})
       <<-END
       <tr id="#{l[:div_id]}" class="field">
-	      <td>#{l[:label]}</td>
+        <td>#{l[:label]}</td>
         <td>#{l[:element]}#{l[:decoration]}
         #{"<p class=\"field_description\">#{l[:description]}</p>" unless l[:description].blank?}</td>
-	    </tr>
-	    END
+      </tr>
+      END
     end
-    
+
     ##
     # Render check box field template.
     #
@@ -381,10 +390,10 @@ module Informant
     def submit_button_template(l = {})
       <<-END
       <tr id="#{l[:div_id]}" class="field">
-	      <td></td>
+        <td></td>
         <td class="button">#{l[:element]}</td>
-	    </tr>
-	    END
+      </tr>
+      END
     end
   end
 end

data/test/test_helper.rb

@@ -1,8 +1,9 @@
 require 'rubygems'
+require 'test/unit'
 #require 'active_support'
 #require 'active_support/test_case'
 require 'action_controller'
 #require 'action_view'
 #require 'action_view/test_case'
-require 'test_help'
+#require 'test_help'
 require 'informant'

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: informant
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 7
-  - 1
-  version: 0.7.1
+  prerelease: 
+  version: 0.7.2
 platform: ruby
 authors: 
 - Alex Reisner
@@ -14,19 +10,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-01 00:00:00 -04:00
+date: 2011-04-11 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
 description: Informant is a full-featured form builder for Ruby on Rails which promotes a simple syntax that keeps your views clean. Everything about a field (label, description, error display, etc) is encapsulated in a single method call.
-email: alex@alexreisner.com
+email: 
+- alex@alexreisner.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
 - .document
 - .gitignore
@@ -35,7 +31,6 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
-- informant.gemspec
 - lib/informant.rb
 - test/informant_test.rb
 - test/test_helper.rb
@@ -44,31 +39,28 @@ homepage: http://github.com/alexreisner/informant
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: A full-featured form builder for Rails.
-test_files: 
-- test/test_helper.rb
-- test/informant_test.rb
+summary: Form-building library for Rails.
+test_files: []
+

data/informant.gemspec

@@ -1,52 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{informant}
-  s.version = "0.7.1"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Alex Reisner"]
-  s.date = %q{2010-06-01}
-  s.description = %q{Informant is a full-featured form builder for Ruby on Rails which promotes a simple syntax that keeps your views clean. Everything about a field (label, description, error display, etc) is encapsulated in a single method call.}
-  s.email = %q{alex@alexreisner.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "CHANGELOG.rdoc",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "informant.gemspec",
-     "lib/informant.rb",
-     "test/informant_test.rb",
-     "test/test_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/alexreisner/informant}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{A full-featured form builder for Rails.}
-  s.test_files = [
-    "test/test_helper.rb",
-     "test/informant_test.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-    else
-    end
-  else
-  end
-end
-