visionmedia-dm-forms 0.0.2 → 0.0.3

data/lib/dm-forms/version.rb

@@ -1,9 +1,6 @@
 
 module DataMapper
   module Form
-    module VERSION #:nodoc:
-      MAJOR, MINOR, TINY = [0, 0, 2]
-      STRING = [MAJOR, MINOR, TINY].join '.'
-    end
+    VERSION = '0.0.3'
   end
 end

data/spec/functional/helpers_spec.rb

@@ -0,0 +1,186 @@
+
+def params
+  Hash.new { |h, k| k }
+end
+public :params
+
+describe DataMapper::Form::Helpers do
+  
+  include DataMapper::Form::Helpers
+  
+  describe "#new_form_context" do
+    it "should create a new context each time its called" do
+      a = new_form_context
+      b = new_form_context
+      a.should be_a(DataMapper::Form::Base)
+      b.should be_a(DataMapper::Form::Base)
+      a.should_not == b
+    end
+  end 
+  
+  describe "#form_context" do
+    it "should utilize the previous context or create a new one when not present" do
+      a = form_context
+      b = form_context
+      a.should be_a(DataMapper::Form::Base)
+      b.should be_a(DataMapper::Form::Base)
+      a.should == b
+    end
+  end
+  
+  %w( textfield submit file button hidden password radio checkbox ).each do |type|
+    describe "##{type}" do
+      it "should create an unbound #{type}" do
+        send(type, :name => 'foo').should have_tag("input[@type=#{type}]")
+      end
+    end
+  end
+  
+  %w( textfield radio checkbox ).each do |type|
+    describe "##{type}" do
+      it "should use origin #params method to grab the default value when present" do
+        send(type, :name => 'foo').should have_tag("input[@type=#{type}]") do |tag|
+          tag.attributes['value'].should == 'foo'
+        end
+      end
+    end
+  end
+  
+  describe "#textarea" do
+    it "should default its contents using origin #params" do
+      textarea(:name => 'comments').should have_tag('textarea[@name=comments]', 'comments')
+    end
+    
+    it "should allow contents to be passed as a first argument" do
+      def params; {} end
+      textarea('Whatever', :name => 'comments').should have_tag('textarea[@name=comments]', 'Whatever')
+    end
+  end
+  
+  describe "#form" do
+    it "should create a form, defaulting method to post" do
+      markup = form :action => '/login' do
+        textfield :name => 'name'
+        textfield :name => 'pass'
+        submit 'Login', :name => 'op'
+      end
+      markup.should have_tag('form[@action=/login]') do |form|
+        form.attributes['method'].should == 'post'
+        form.should have_tag('input[@name=name]')
+        form.should have_tag('input[@name=pass]')
+        form.should have_tag('input[@name=op]')
+      end
+    end
+    
+    it "should create a form with get method" do
+      markup = form :action => '/login', :method => :get do
+      end
+      markup.should have_tag('form[@method=get]')
+    end
+    
+    it "should use multipart encoding when multipart is set" do
+      markup = form :action => '/login', :multipart => true do
+      end
+      markup.should have_tag('form[@enctype=multipart/form-data]')
+    end
+    
+    it "should use multipart encoding a file field is present" do
+      markup = form :action => '/login' do
+        file :name => 'image'
+      end
+      markup.should have_tag('form[@enctype=multipart/form-data]')
+      markup.should_not have_tag('input[@type=hidden]')
+    end
+    
+    it "should create a hidden input with _method when anything but get or post" do
+      markup = form :method => :put do
+        file :name => 'image'
+      end
+      markup.should have_tag('form[@method=post]')
+      markup.should have_tag('input[@type=hidden]') do |input|
+        input.attributes['name'].should == '_method'
+        input.attributes['value'].should == 'put'
+      end
+    end
+    
+    it "should create a form using yeild syntax" do
+      markup = form :action => '/login' do |f|
+        f.textfield :name => 'name'
+        f.textfield :name => 'pass'
+        f.submit 'Login'
+      end
+      markup.should have_tag('form[@action=/login]') do |form|
+        form.should have_tag('input[@name=name]')
+        form.should have_tag('input[@name=pass]')
+        form.should have_tag('input[@name=submit]')
+      end
+    end
+  end
+  
+  describe "#fieldset" do
+    it "should create a fieldset with optional legend" do
+      markup = fieldset :legend => 'User Details' do
+        textfield :name => 'name'
+        textfield :name => 'email'
+      end
+      markup.should have_tag('fieldset') do |fieldset|
+        fieldset.should have_tag('legend', 'User Details')
+        fieldset.should have_tag('input[@name=name]')
+        fieldset.should have_tag('input[@name=email]')
+      end
+    end
+  end
+  
+  describe "#submit" do
+    it "should default value to Submit, and name to submit" do
+      submit.should have_tag('input[@name=submit]')
+      submit.should have_tag('input[@value=Submit]')
+    end
+    
+    it "should allow the first arg to be a value string" do
+      submit('Login').should have_tag('input[@value=Login]')
+    end
+  end
+  
+  describe "#select" do
+    before :each do
+      @days = {
+        1 => 'Mon',
+        2 => 'Tue',
+        3 => 'Wed',
+        4 => 'Thu',
+        5 => 'Fri',
+        6 => 'Sat',
+        7 => 'Sun',
+      }
+    end
+    
+    it "should populate options" do
+      select(:name => 'days', :options => @days).should have_tag('select[@name=days]') do |select|
+        @days.each do |value, contents|
+          select.should have_tag("option[@value=#{value}]", contents)
+        end
+      end
+    end
+    
+    it "should allow setting of the selected option" do
+      select(:name => 'days', :options => @days, :selected => 2).should have_tag('select[@name=days]') do |select|
+        select.should have_tag('option[@selected=selected]', 'Tue')
+      end      
+    end
+    
+    it "should allow a prompt option, defaulting it to selected" do
+      select(:name => 'days', :options => @days, :prompt => 'Select day').should have_tag('select[@name=days]') do |select|
+        select.should have_tag('option[@selected=selected]', 'Select day') 
+      end      
+    end
+    
+    it "should allow a prompt option, but allowing selection of other options" do
+      select(:name => 'days', :options => @days, :prompt => 'Select day', :selected => 7).should have_tag('select[@name=days]') do |select|
+        select.should have_tag('option[@selected=selected]', 'Sun')
+        select.should have_tag('option:not(selected)', 'Select day')
+      end      
+    end
+  end
+  
+end

data/spec/functional/mixins/descriptions_spec.rb

@@ -0,0 +1,19 @@
+
+describe DataMapper::Form::Descriptions do
+  
+  include DataMapper::Form::Helpers
+  DataMapper::Form::Base.send :include, DataMapper::Form::Descriptions
+  
+  it "should create elements like normal when descriptions are not utilized" do
+    markup = textfield :name => 'email'
+    markup.should have_tag('input[@type=textfield]')
+    markup.should_not have_tag('span[@class=description]')
+  end
+  
+  it "should create elements with descriptions" do
+    markup = textfield :name => 'email', :description => 'Please enter a valid email.'
+    markup.should have_tag('input[@type=textfield]')
+    markup.should have_tag('span[@class=description]')
+  end
+  
+end

data/spec/functional/mixins/labels_spec.rb

@@ -0,0 +1,19 @@
+
+describe DataMapper::Form::Labels do
+  
+  include DataMapper::Form::Helpers
+  DataMapper::Form::Base.send :include, DataMapper::Form::Labels
+  
+  it "should create elements like normal when labels are not utilized" do
+    markup = textfield :name => 'email'
+    markup.should have_tag('input[@type=textfield]')
+    markup.should_not have_tag('label')
+  end
+  
+  it "should create elements with labels" do
+    markup = textfield :name => 'email', :label => 'Email'
+    markup.should have_tag('input[@type=textfield]')
+    markup.should have_tag('label[@for=email]', 'Email')
+  end
+  
+end

data/spec/functional/mixins/wrappers_spec.rb

@@ -0,0 +1,21 @@
+
+describe DataMapper::Form::Wrappers do
+  
+  include DataMapper::Form::Helpers
+  DataMapper::Form::Base.send :include, DataMapper::Form::Wrappers
+  
+  it "should create wrappers around elements for styling" do
+    markup = textarea :name => 'comments'
+    markup.should have_tag('div[@class=form-textarea form-comments]') do |div|
+      div.should have_tag('textarea')
+    end
+  end
+    
+  it "should create wrappers around elements for styling, prioritizing :type for the class" do
+    markup = textfield :name => 'email'
+    markup.should have_tag('div[@class=form-textfield form-email]') do |div|
+      div.should have_tag('input[@type=textfield]')
+    end
+  end
+  
+end

data/spec/functional/tag_spec.rb

@@ -1,49 +1,41 @@
 
 describe DataMapper::Form::Tag do
   
-  Tag = DataMapper::Form::Tag
-
-  it "should generate classes" do
-    tag = Tag.new :input, :attributes => { :name => 'email', :type => :textfield }
-    tag.send(:classes).should == 'form-textfield form-email'    
-  end
-
-  it "should generate classes when no name is present" do
-    tag = Tag.new :input, :attributes => { :type => :textfield }
-    tag.send(:classes).should == 'form-textfield'    
-  end
+  include DataMapper::Form::Tag
   
-  it "should auto-assign boolean attributes" do
-    tag = Tag.new :input, :attributes => { :name => 'email', :type => :textfield, :disabled => true }
-    tag.render.should == %(<input disabled="disabled" type="textfield" class="form-textfield form-email" name="email"></input>\n)
-  end
+  describe "#tag" do
+    it "should create a simple tag" do
+      tag(:div).should have_tag('div')
+    end
     
-  it "should generate and merge classes" do
-    tag = Tag.new :input, :attributes => { :class => 'foo bar', :name => 'email', :type => :textfield }
-    tag.send(:classes).should == 'foo bar form-textfield form-email'
-  end
-  
-  it "should grab inner html for non self-closing tags" do
-    tag = Tag.new :textarea, :self_closing => false, :attributes => { :value => 'BOOYAH' }
-    tag.inner_html.should == 'BOOYAH'
-  end
-  
-  it "should allow descriptions and remove from attributes" do
-    tag = Tag.new :input, :attributes => { :description => 'testing one two three' }
-    tag.description.should == %(\n<p class="description">testing one two three</p>)  
-    tag.attributes.has_key?(:description).should be_false  
-  end
-  
-  it "should allow capturing of elements via block" do
-    tag = Tag.new :fieldset, :attributes => { :id => 'something' } do |f|
-      f.button :one
-      f.button :two
+    it "should create a tag with attributes" do
+      tag(:div, :id => 'foo').should have_tag('div#foo')
+    end
+
+    it "should create a tag with param contents" do
+      tag(:div, 'bar', :id => 'foo').should have_tag('div#foo', 'bar')
+    end
+    
+    it "should create a tag with block contents" do
+      tag :div, :id => 'foo' do
+        'bar'
+      end.
+      should have_tag('div#foo', 'bar')
     end
-    tag.render.should == <<-HTML.deindent
-      <fieldset id="something"><input type="button" class="form-button form-one" name="one" />
-      <input type="button" class="form-button form-two" name="two" />
-      </fieldset>
-    HTML
-  end
     
+    it "should mirror boolean attributes" do
+      tag(:option, :selected => true).should have_tag("option[@selected=selected]")
+      tag(:option, :selected => 'true').should have_tag("option[@selected=selected]")
+      tag(:option, :selected => '1').should have_tag("option[@selected=selected]")
+      tag(:option, :selected => 'selected').should have_tag("option[@selected=selected]")
+    end
+    
+    it "should negate boolean attributes" do
+      tag(:option, :selected => false).should have_tag("option:not([@selected=selected])")
+      tag(:option, :selected => '').should have_tag("option:not([@selected=selected])")
+      tag(:option, :selected => '0').should have_tag("option:not([@selected=selected])")
+      tag(:option, :selected => 'false').should have_tag("option:not([@selected=selected])")
+    end
+  end
+  
 end

data/spec/integration/datamapper_spec.rb

@@ -2,69 +2,97 @@
 require 'dm-core'
 require 'dm-validations'
 
-include DataMapper::Form::ModelElements
-
 DataMapper.setup :default, 'sqlite3::memory:'
 
 class User
   include DataMapper::Resource
-  property :id,    Serial
-  property :name,  String, :format => /^[\w]+$/
-  property :email, String, :format => :email_address
+  property :id,        Serial
+  property :name,      String, :format => /^[\w]+$/
+  property :email,     String, :format => :email_address
+  property :signature, Text,   :nullable => true, :lazy => false
+end
+
+class User::Role
+  include DataMapper::Resource
+  property :id,   Serial
+  property :name, String
 end
 
 DataMapper.auto_migrate!
 
-describe DataMapper::Form::ModelElements do
+describe DataMapper::Form::Helpers do
+  
+  include DataMapper::Form::Helpers
   
   before :each do
-    @user = User.new :name => 'invalid username', :email => 'is_valid@email.com'
+    @valid_user = User.new :name => 'foo bar', :email => 'is-valid@email.com', :signature => 'i like cookies'
+    @invalid_user = User.new :name => 'foobar',  :email => 'is-valid@email.com', :signature => 'i like cookies'
+    @admin_role = User::Role.new :name => 'admin'
+  end
+  
+  describe "#new_form_context" do
+    it "should generate a name used for prefixing form element names" do
+      new_form_context(@admin_role, self).name.should == 'role'
+    end
+  end
+  
+  describe "#form_for" do
+    it "should create a form in context to a model" do
+      markup = form_for @valid_user do
+        textfield :name, :id => 'username'
+        password :pass, :id => 'password'
+      end
+      markup.should have_tag('form') do |form|
+        form.should have_tag('input[@name=user[name]]') { |name| name.attributes['value'].should == 'foo bar' }
+        form.should have_tag('input[@name=user[pass]]')
+      end
+    end
   end
   
-  it "should create a list of errors when a model is invalid" do
-    errors_for(@user).should == <<-HTML.deindent
-      <ul class="messages error">
-      <li>Name has an invalid format</li>
-      </ul>
-    HTML
-    @user.email = 'invalid email@ something.com'
-    errors_for(@user).should == <<-HTML.deindent
-      <ul class="messages error">
-      <li>Name has an invalid format</li>
-      <li>Email has an invalid format</li>
-      </ul>
-    HTML
+  describe "#fields_for" do
+    it "should create a temporary context within a form" do
+      markup = form_for @valid_user do
+        textfield :name, :id => 'username'
+        fields_for @admin_role do
+          textfield :name, :id => 'role-name'
+        end
+        password :pass, :id => 'password'
+      end
+      markup.should have_tag('form') do |form|
+        form.should have_tag('input[@name=user[name]]') { |name| name.attributes['value'].should == 'foo bar' }
+        form.should have_tag('input[@name=user[pass]]')
+        form.should have_tag('input[@name=role[name]]')
+      end
+    end
   end
   
-  it "should create model specific forms with errors on elements" do
-    results = form_for @user do |f|
-      f.textfield :name
-      f.textfield :email
-      f.submit :op, :value => 'Save'
+  describe "#fieldset_for" do
+    it "should create a fieldset in context to a model" do
+      markup = form_for @valid_user do
+        textfield :name, :id => 'username'
+        fieldset_for @admin_role, :legend => 'Role' do
+          textfield :name, :id => 'role-name'
+        end
+        password :pass, :id => 'password'
+      end
+      markup.should have_tag('form') do |form|
+        form.should have_tag('input[@name=user[name]]') { |name| name.attributes['value'].should == 'foo bar' }
+        form.should have_tag('input[@name=user[pass]]') 
+        form.should have_tag('fieldset') do |fieldset|
+          fieldset.should have_tag('legend', 'Role')
+          fieldset.should have_tag('input[@name=role[name]]')
+        end
+      end
     end
-    results.should == <<-HTML.deindent
-      <form method="post" id="form-user"><input type="textfield" class="error form-textfield form-name" name="name" />
-      <input type="textfield" class="form-textfield form-email" name="email" />
-      <input type="submit" class="form-submit form-op" value="Save" name="op" />
-      </form>
-    HTML
   end
   
-  it "should use _method put for updating records" do
-    @user.name = 'tj'
-    @user.save
-    results = form_for @user, :action => '/register' do |f|
-      f.textfield :name
-      f.textfield :email
-      f.submit :op, :value => 'Save'
+  describe "#textarea" do
+    it "should default its contents using the models method" do
+      markup = fields_for @valid_user do
+        textarea :signature
+      end
+      markup.should have_tag('textarea[@name=user[signature]]', 'i like cookies')
     end
-    results.should == <<-HTML.deindent
-      <form method="post" action="/register" id="form-user"><input type="hidden" value="put" name="_method" />
-      <input type="textfield" class="form-textfield form-name" name="name" />
-      <input type="textfield" class="form-textfield form-email" name="email" />
-      <input type="submit" class="form-submit form-op" value="Save" name="op" />
-      </form>
-    HTML
   end
   
 end