sequel-crushyform 0.0.2 → 0.0.3

data/README.md

@@ -299,6 +299,7 @@ CHANGE LOG
 
 0.0.1 First version
 0.0.2 Use HTML5 attribute `required`
+0.0.3 Fix a bug on the default value for label :name
 
 COPYRIGHT
 =========

data/lib/sequel_crushyform.rb

@@ -1,7 +1,7 @@
 module ::Sequel::Plugins::Crushyform
   
   module ClassMethods
-    def crushyform_version; [0,0,1]; end
+    def crushyform_version; [0,0,3]; end
     # Schema
     def crushyform_schema
       @crushyform_schema ||= default_crushyform_schema
@@ -99,12 +99,13 @@ module ::Sequel::Plugins::Crushyform
   
   module InstanceMethods
     def crushyform(columns=model.crushyform_schema.keys, action=nil, meth='POST')
+      columns.delete(:id)
       fields = columns.inject(""){|out,c|out+crushyfield(c.to_sym)}
       action.nil? ? fields : "<form action='%s' method='%s' enctype='multipart/form-data'>%s</form>\n" % [action, meth, fields]
     end
     # crushyfield is crushyinput but with label+error
     def crushyfield(col, o={})
-      field_name = o[:name] || col.to_s.sub(/_id$/, '').tr('_', ' ').capitalize
+      field_name = o[:name] || model.crushyform_schema[col][:name] || col.to_s.sub(/_id$/, '').tr('_', ' ').capitalize
       error_list = errors.on(col).map{|e|" - #{e}"} if !errors.on(col).nil?
       "<p class='crushyfield %s'><label for='%s'>%s</label><span class='crushyfield-error-list'>%s</span><br />\n%s</p>\n" % [error_list&&'crushyfield-error', crushyid_for(col), field_name, error_list, crushyinput(col, o)]
     end

data/sequel-crushyform.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s| 
   s.name = 'sequel-crushyform'
-  s.version = "0.0.2"
+  s.version = "0.0.3"
   s.platform = Gem::Platform::RUBY
   s.summary = "A Sequel plugin that helps building forms"
   s.description = "A Sequel plugin that helps building forms. It basically does them for you so that you can forget about the boring part. The kind of thing which is good to have in your toolbox for building a CMS."

data/test/spec_crushyform.rb

@@ -15,7 +15,7 @@ class Haiku < ::Sequel::Model
   plugin :schema
   set_schema do
     primary_key :id
-    String :title, :crushyform=>{:type=>:custom}
+    String :title, :crushyform=>{:type=>:custom, :name=>'Nice Title'}
     text :body
     Boolean :published
     foreign_key :author_id, :authors
@@ -126,7 +126,7 @@ describe 'Crushyform when schema plugin is used' do
   should 'use schema declaration for building the default crushyform_schema' do
     Haiku.default_crushyform_schema.should=={
       :id         => {:type=>:integer},
-      :title      => {:type=>:custom},
+      :title      => {:type=>:custom,:name=>'Nice Title'},
       :body       => {:type=>:text},
       :published  => {:type=>:boolean},
       :author_id  => {:type=>:parent}
@@ -323,6 +323,7 @@ describe 'Crushyfield types' do
     ShippingAddress.new.crushyfield(:address_body).should.match(/<label for='#{Regexp.escape ShippingAddress.new.crushyid_for(:address_body)}'>Address body<\/label>/)
     ShippingAddress.first.crushyfield(:address_body).should.match(/<label for='#{Regexp.escape ShippingAddress.first.crushyid_for(:address_body)}'>Address body<\/label>/)
     ShippingAddress.new.crushyfield(:address_body,{:name=>'Address Lines'}).should.match(/<label for='#{Regexp.escape ShippingAddress.new.crushyid_for(:address_body)}'>Address Lines<\/label>/)
+    Haiku.new.crushyfield(:title).should.match(/<label for='#{Regexp.escape Haiku.new.crushyid_for(:title)}'>Nice Title<\/label>/)
   end
   
   should 'have errors reported for fields' do
@@ -359,9 +360,10 @@ describe 'Crushyform' do
   should 'use crushyform_schema keys by default for the list of field to put in the form' do
     form = Haiku.new.crushyform
     form.should.not==''
-    Haiku.crushyform_schema.keys.each do |k|
+    (Haiku.crushyform_schema.keys - [:id]).each do |k|
       form.should.match(/#{Haiku.new.crushyid_for(k)}/)
     end
+    form.should.not.match(/#{Haiku.new.crushyid_for(:id)}/)
   end
   
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sequel-crushyform
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Mickael Riga
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-13 00:00:00 +01:00
+date: 2011-07-15 00:00:00 +01:00
 default_executable: 
 dependencies: []