informant 0.7.0 → 0.7.1

data/CHANGELOG.rdoc

@@ -2,6 +2,10 @@
 
 Per-release changes to Informant.
 
+== 0.7.1 (2010 Jun 1)
+
+* Add compatibility with Rails 3 and rails_xss plugin.
+
 == 0.7.0 (2009 Oct 8)
 
-First release.
+* First release.

data/README.rdoc

@@ -1,21 +1,29 @@
 = Informant
 
-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. Examples and general information are below; please read the {API documentation}[http://rdoc.info/projects/alexreisner/informant] for more complete/detailed information.
+Informant is a full-featured form builder for Ruby on Rails (works with Rails 3) 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. Examples and general information are below; please read the {API documentation}[http://rdoc.info/projects/alexreisner/informant] for more complete/detailed information.
 
 
 == 1. Install
 
+=== a. Rails 3
+
 Install either as a plugin:
 
-  script/plugin install git://github.com/alexreisner/informant.git
+  rails plugin install git://github.com/alexreisner/informant.git
 
 or as a gem:
 
   # add to config/environment.rb:
-  config.gem "informant", :source => "http://gemcutter.org/"
+  config.gem "informant"
   
   # at command prompt:
-  sudo rake gems:install
+  bundle install
+
+=== b. Rails 2
+
+As a plugin:
+
+  script/plugin install git://github.com/alexreisner/informant.git -r rails_2
 
 
 == 2. Configure

data/Rakefile

@@ -10,7 +10,6 @@ begin
     gem.email       = "alex@alexreisner.com"
     gem.homepage    = "http://github.com/alexreisner/informant"
     gem.authors     = ["Alex Reisner"]
-    gem.add_development_dependency "thoughtbot-shoulda"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.7.1

data/informant.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# 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.0"
+  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{2009-10-08}
+  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 = [
@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/alexreisner/informant}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{A full-featured form builder for Rails.}
   s.test_files = [
     "test/test_helper.rb",
@@ -44,11 +44,9 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
     else
-      s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
     end
   else
-    s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
   end
 end
+

data/lib/informant.rb

@@ -113,11 +113,13 @@ module Informant
       build_shell(method, options, "habtm_check_boxes_field") do
         choices.map do |c|
           field_id = "#{base_id}_#{c[1].to_s.downcase}"
-          "<div class=\"field\">" + @template.check_box_tag(
-            "#{base_name}[]", "1",
-            @object.send(method).include?(c[1]),
-            :id => field_id
-          ) + @template.label_tag(field_id, c[0]) + "</div>\n"
+          @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
         end
       end
     end
@@ -202,9 +204,9 @@ module Informant
       options.delete :label_for
       options.delete :required
       
-      text = text.blank?? method.to_s.humanize : text.to_s
-      text += ':' if colon
-      text += ' <span class="required">*</span>' if 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
     
@@ -213,11 +215,10 @@ module Informant
     # options hash, and a block in which fields are rendered.
     #
     def field_set(legend = nil, options = nil, &block)
-      content = @template.capture(&block)
-      @template.concat(@template.tag(:fieldset, options, true))
-      @template.concat(@template.content_tag(:legend, legend)) unless legend.blank?
-      @template.concat(content)
-      @template.concat("</fieldset>")
+      @template.content_tag(:fieldset, options) do
+        (legend.blank?? "" : @template.content_tag(:legend, legend)) +
+        @template.capture(&block)
+      end
     end
     
     
@@ -242,12 +243,11 @@ module Informant
         :element     => yield,
         :label       => label(method, field_options[:label], label_options),
         :description => field_options[:description],
-        :error       => error_message_on(method, options),
         :div_id      => "#{@object_name}_#{method}_field",
         :required    => field_options[:required],
         :decoration  => field_options[:decoration] || nil
       }
-      send "#{template}_template", locals
+      send("#{template}_template", locals).html_safe
     end
     
     ##

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: informant
 version: !ruby/object:Gem::Version 
-  version: 0.7.0
+  prerelease: false
+  segments: 
+  - 0
+  - 7
+  - 1
+  version: 0.7.1
 platform: ruby
 authors: 
 - Alex Reisner
@@ -9,19 +14,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-08 00:00:00 -04:00
+date: 2010-06-01 00:00:00 -04:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: thoughtbot-shoulda
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
+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
 executables: []
@@ -56,18 +52,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A full-featured form builder for Rails.