formal 0.0.2 → 0.0.3

data/.rspec

@@ -0,0 +1 @@
+--color

data/README.md

@@ -38,6 +38,10 @@ f.text_area
 f.select
 f.email_field
 f.search_field
+f.telephone_field
+f.number_field
+f.file_field
+f.range_field
 ```
 
 __Example:__
@@ -58,7 +62,7 @@ Also provided is a helper for a label with a checkbox __inside__ it (which is
 also wrapped in a ```<dt>```). Use:
 
 ```ruby 
-f.checkbox_with_label :published
+f.check_box_with_label :published
 ```
 
 which returns:

data/Rakefile

@@ -1,2 +1,11 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+
+desc 'Default: run tests.'
+task :default => :spec
+
+desc 'Run formal tests.'
+RSpec::Core::RakeTask.new('spec') do |t|
+  t.pattern = FileList['spec/**/*_spec.rb']
+end

data/formal.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |gem|
   gem.email         = [""]
   gem.description   = %q{Helpful form builder used by Rocketeers}
   gem.summary       = %q{A form builder that wraps form fields the way we like it at Hashrocket}
-  gem.homepage      = ""
+  gem.homepage      = "http://github.com/mrmicahcooper/formal"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
@@ -14,4 +14,6 @@ Gem::Specification.new do |gem|
   gem.name          = "formal"
   gem.require_paths = ["lib"]
   gem.version       = Formal::VERSION
+
+  gem.add_development_dependency("rspec-rails")
 end

data/lib/formal/version.rb

@@ -1,3 +1,3 @@
 module Formal
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/formal.rb

@@ -5,7 +5,7 @@ module Formal
 
     ActionView::Base.field_error_proc = proc { |input, instance| input }
 
-    @@field_helper_methods = %w(label_tag text_field password_field text_area select email_field search_field)
+    @@field_helper_methods = %w(label_tag text_field password_field text_area select email_field search_field telephone_field number_field file_field range_field)
 
     def label(method, text = nil, options = {}, &block)
       text = text || method.to_s.humanize
@@ -23,7 +23,8 @@ module Formal
 
     @@field_helper_methods.each do |method_name|
       define_method method_name do |*args|
-        if object.errors.any?
+        method_name = args.first
+        if object.errors[method_name].present?
           @template.content_tag(:dd, super(*args), class: 'error')
         else
           @template.content_tag(:dd, super(*args))
@@ -36,6 +37,6 @@ module Formal
       box = [check_box(method, *args).html_safe, text].join(" ")
       label(method, box, *args)
     end
-
   end
+
 end

data/spec/formal_spec.rb

@@ -0,0 +1,50 @@
+require 'spec_helper'
+
+describe Formal do
+  include FormalSpecHelper
+
+  before do
+    @post = Post.new
+    @output = ''
+  end
+
+  it 'should yield the formal builder' do
+    form_for(@post, builder: Formal::Builder) do |f|
+      f.should be_kind_of(Formal::Builder)
+    end
+  end
+
+  it 'should wrap input inside dd tag' do
+    with_builder do |f|
+      f.text_field :body
+    end
+
+    expected = %q{<dd><input id="post_body" name="post[body]" size="30" type="text" /></dd>}
+    output.should include(expected)
+  end
+
+  it 'should wrap check box with label inside' do
+    with_builder do |f|
+      f.check_box_with_label :published
+    end
+    expected = %q{<dt><label for="post_published"><input name="post[published]" type="hidden" value="0" /><input id="post_published" name="post[published]" type="checkbox" value="1" /> published</label></dt>}
+    output.should include(expected)
+  end
+
+  context "with error" do
+    let(:invalid_post) { InvalidPost.new }
+
+    it 'should add error class ONLY to the erroneous dd tag' do
+      with_builder(invalid_post) { |f| f.text_field :body }
+      expected_error = %q{<dd class="error"><input id="invalid_post_body" name="invalid_post[body]" size="30" type="text" /></dd>}
+      output.should include(expected_error)
+    end
+
+    it "does not add the error class to non erroneous dd tags" do
+      with_builder(invalid_post) { |f| f.text_field :title }
+      expected_error = %q{<dd><input id="invalid_post_title" name="invalid_post[title]" size="30" type="text" /></dd>}
+      output.should include(expected_error)
+    end
+
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,56 @@
+require 'action_view'
+require 'active_model'
+
+require File.expand_path(File.join(File.dirname(__FILE__), '../lib/formal'))
+require 'formal'
+
+class Post < Struct.new(:body, :published)
+  extend  ActiveModel::Naming
+  include ActiveModel::Conversion
+
+  def persisted?
+    false
+  end
+
+  def errors
+    {}
+  end
+end
+
+class InvalidPost < Struct.new(:body, :title)
+  extend  ActiveModel::Naming
+  include ActiveModel::Conversion
+
+  def persisted?
+    false
+  end
+
+  def errors
+    { :body => ["can't be blank"] }
+  end
+end
+
+module FormalSpecHelper
+  include ActionView::Context if defined?(ActionView::Context)
+  include ActionController::RecordIdentifier
+  include ActionView::Helpers::FormHelper
+
+  def posts_path(*args)
+    "/posts"
+  end
+  alias :invalid_posts_path :posts_path
+
+  def protect_against_forgery?
+    false
+  end
+
+  def with_builder(model = Post.new)
+    @output = form_for(model, builder: Formal::Builder) do |f|
+      yield f
+    end
+  end
+
+  def output
+    @output
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: formal
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,8 +10,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-27 00:00:00.000000000 Z
-dependencies: []
+date: 2012-11-09 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Helpful form builder used by Rocketeers
 email:
 - ''
@@ -20,6 +36,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - Gemfile
 - LICENSE
 - README.md
@@ -27,7 +44,9 @@ files:
 - formal.gemspec
 - lib/formal.rb
 - lib/formal/version.rb
-homepage: ''
+- spec/formal_spec.rb
+- spec/spec_helper.rb
+homepage: http://github.com/mrmicahcooper/formal
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -51,4 +70,6 @@ rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A form builder that wraps form fields the way we like it at Hashrocket
-test_files: []
+test_files:
+- spec/formal_spec.rb
+- spec/spec_helper.rb