sequel-crushyform 0.0.4 → 0.0.5

data/README.md

@@ -60,15 +60,15 @@ Options give the action URL and method.
 
 Now say you want to have all the default options, but you want a wrapping form tag, you can do that:
 
-    BlogPost.new.crushyform( model.crushyform_schema.keys, "/new_blog" ) # Returns a nice form (a crushy form to be precise)
+    BlogPost.new.crushyform( BlogPost.crushyform_schema.keys, "/new_blog" ) # Returns a nice form (a crushy form to be precise)
 
-You have to put the default value `model.crushyform_schema.keys` because in the order of priority, the list of columns is more important
+You have to put the default value `Model.crushyform_schema.keys` because in the order of priority, the list of columns is more important
 
 This is due to the fact that in a real case scenario we are more likely to use the version without a wrapping form tag.
 Mainly because we want to add some other hidden inputs like a destination, a method override in order to generate a PUT request or a pseudo XHR value.
 
 Another reason might be that you want to add other fields to the tag. 
-The default tag is pretty basic and is always considered multipart/form-data for simplicity.
+The default tag is pretty basic.
 
 CSS CLASSES
 ===========
@@ -301,6 +301,7 @@ CHANGE LOG
 0.0.2 Use HTML5 attribute `required`
 0.0.3 Fix a bug on the default value for label :name
 0.0.4 Fix type `:none`
+0.0.5 Crushyform method guesses the enctype
 
 COPYRIGHT
 =========

data/lib/sequel_crushyform.rb

@@ -1,7 +1,7 @@
 module ::Sequel::Plugins::Crushyform
   
   module ClassMethods
-    def crushyform_version; [0,0,4]; end
+    def crushyform_version; [0,0,5]; end
     # Schema
     def crushyform_schema
       @crushyform_schema ||= default_crushyform_schema
@@ -101,7 +101,8 @@ module ::Sequel::Plugins::Crushyform
     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]
+      enctype = fields.match(/type='file'/) ? "enctype='multipart/form-data'" : ''
+      action.nil? ? fields : "<form action='%s' method='%s' %s>%s</form>\n" % [action, meth, enctype, fields]
     end
     # crushyfield is crushyinput but with label+error
     def crushyfield(col, o={})

data/sequel-crushyform.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s| 
   s.name = 'sequel-crushyform'
-  s.version = "0.0.4"
+  s.version = "0.0.5"
   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

@@ -92,6 +92,16 @@ class Attached < ::Sequel::Model
   ::StashMagic.with_public_root ROOT+'/test'
 end
 
+class Pic < ::Sequel::Model
+  plugin :schema
+  set_schema do
+    primary_key :id
+    String :name
+    String :image, :crushyform=>{:type=>:attachment}
+  end
+  create_table unless table_exists?
+end
+
 # ========
 # = Test =
 # ========
@@ -368,6 +378,11 @@ describe 'Crushyform' do
     form.should.not.match(/#{Haiku.new.crushyid_for(:id)}/)
   end
   
+  should 'make forms with enctype automated' do
+    Haiku.new.crushyform(Haiku.crushyform_schema.keys, '/url').should.not.match(/enctype='multipart\/form-data'/)
+    Pic.new.crushyform(Pic.crushyform_schema.keys, '/url').should.match(/enctype='multipart\/form-data'/)
+  end
+  
 end
 
 ::FileUtils.rm_rf(ROOT+'/test/stash') if F.exists?(ROOT+'/test/stash')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sequel-crushyform
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Mickael Riga
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-19 00:00:00 +01:00
+date: 2011-08-04 00:00:00 +01:00
 default_executable: 
 dependencies: []