sequel-crushyform 0.0.8 → 0.1.0

data/README.md

@@ -140,6 +140,7 @@ TYPES OF FIELD
 - :datetime is in the format YYYY-MM-DD HH:MM:SS because it is accepted by sequel setters as-is
 - :parent is a dropdown list to chose from
 - :attachment is for attachments (who guessed?).
+- :select could be used for fields like String or Fixnum but giving a limited number of options
 
 MORE ABOUT DATE/TIME FIELDS
 ---------------------------
@@ -228,6 +229,57 @@ Crushyform turns a multi-line text in a one liner if it is the label column.
 
 You get the idea.
 
+MORE ABOUT SELECT FIELDS
+========================
+
+This basically the kind of field you want when you have a text field but people are limited to a dropdown list of options.
+Parent field could be in that category in fact. That is a Fixnum, but limited to available foreign keys.
+Another example would be a list like your Favourite editor in a list:
+
+- Emacs
+- Vi
+- Ed
+- Sam
+- Other
+
+To achieve that, you can set something like that:
+
+    class Profile < ::Sequel::Model
+		  plugin :schema
+		  set_schema do
+		    primary_key :id
+		    String :fave_editor, :crushyform=>{ :type=>:select, :select_options=>['Emacs', 'Vi', 'Ed', 'Sam', 'Other'] }
+		  end
+		end
+		
+This will create an appropriate dropdown instead of textfield. But the value is also what people see.
+Maybe you want to display the name of an editor, but what you want to record is a score from 0 to 10.
+This is not necessarily an integer as the purpose is just to show you how you make a dropdown with values different from what is displayed:
+
+    class Profile < ::Sequel::Model
+		  plugin :schema
+		  set_schema do
+		    primary_key :id
+		    Fixnum :how_much_you_worth, :crushyform=>{ :type=>:select, :select_options=>[['Emacs',5], ['Vi',5], ['Ed',10], ['Sam',9], ['Other', 0]] }
+		  end
+		end
+		
+You simply put a key/value Array instead of the bare value. Pretty straight forward.
+And you can also provide the name of an instance method instead as you might want an Array with dynamic content:
+
+    class Profile < ::Sequel::Model
+		  plugin :schema
+		  set_schema do
+		    primary_key :id
+		    String :hero, :crushyform=>{ :type=>:select, :select_options=> :draw_me_a_list }
+		  end
+		  def draw_me_a_list
+		    # Produce an Array dynamically
+			end
+		end
+		
+That's all.
+
 CRUSHYFORM SCHEMA
 =================
 
@@ -305,6 +357,7 @@ CHANGE LOG
 0.0.6 Human name for classes and label for new records
 0.0.7 Fix `Model#to_label`
 0.0.8 Fix bug with apostrophe in text fields
+0.1.0 Add `:select` type and make `:parent` type overridable through `set_schema`
 
 COPYRIGHT
 =========

data/lib/sequel_crushyform.rb

@@ -1,7 +1,7 @@
 module ::Sequel::Plugins::Crushyform
   
   module ClassMethods
-    def crushyform_version; [0,0,8]; end
+    def crushyform_version; [0,1,0]; end
     # Schema
     def crushyform_schema
       @crushyform_schema ||= default_crushyform_schema
@@ -15,8 +15,8 @@ module ::Sequel::Plugins::Crushyform
           {:type=>v[:type]}
         end
       end
-      @schema.columns.each{|c|out[c[:name]]=out[c[:name]].update(c[:crushyform]) if c.has_key?(:crushyform)} if respond_to?(:schema)
       association_reflections.each{|k,v|out[v[:key]]={:type=>:parent} if v[:type]==:many_to_one}
+      @schema.columns.each{|c|out[c[:name]]=out[c[:name]].update(c[:crushyform]) if c.has_key?(:crushyform)} if respond_to?(:schema)
       out
     end
     # Types
@@ -61,6 +61,18 @@ module ::Sequel::Plugins::Crushyform
         end,
         :attachment => proc do |m,c,o|
           "%s<input type='file' name='%s' id='%s' class='%s' />%s\n" % [m.to_thumb(c), o[:input_name], m.crushyid_for(c), o[:input_class], o[:required]]
+        end,
+        :select => proc do |m,c,o|
+          out = "<select name='%s' id='%s' class='%s'>\n" % [o[:input_name], m.crushyid_for(c), o[:input_class]]
+          o[:select_options] = m.__send__(o[:select_options]) unless o[:select_options].kind_of?(Array)
+          if o[:select_options].kind_of?(Array)
+            o[:select_options].each do |op|
+              key,val = op.kind_of?(Array) ? [op[0],op[1]] : [op,op]
+              selected = 'selected' if val==o[:input_value]
+              out << "<option value='%s' %s>%s</option>\n" % [val,selected,key]
+            end
+          end
+          out << "</select>%s\n" % [o[:required]]
         end
       }
     end

data/sequel-crushyform.gemspec

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

@@ -1,6 +1,6 @@
 require 'rubygems'
 require 'bacon'
-Bacon.summary_on_exit
+#Bacon.summary_on_exit
 
 F = ::File
 D = ::Dir
@@ -19,9 +19,11 @@ class Haiku < ::Sequel::Model
     text :body
     Boolean :published
     foreign_key :author_id, :authors
+    foreign_key :season_id, :crushyform=>{:type=>:string}
   end
   create_table unless table_exists?
   many_to_one :author
+  many_to_one :season
   one_to_many :reviews
   def validate
     errors[:title] << "is not good"
@@ -53,6 +55,16 @@ class Review < ::Sequel::Model
   many_to_one :haiku
 end
 
+class Season < ::Sequel::Model
+  plugin :schema
+  set_schema do
+    primary_key :id
+    String :name
+  end
+  create_table unless table_exists?
+  one_to_many :haikus
+end
+
 class TestDateTime < ::Sequel::Model
   plugin :schema
   set_schema do
@@ -78,6 +90,21 @@ class ShippingAddress < ::Sequel::Model
 end
 ShippingAddress.create(:address_body=>"3 Mulholland Drive\n\rFlat C", :postcode=>'90210', :city=>'Richville')
 
+class Profile < ::Sequel::Model
+  plugin :schema
+  set_schema do
+    primary_key :id
+    String :fave_lang, :crushyform=>{:type=>:select,:select_options=>['ruby', 'forth', 'asm']}
+    String :fave_os, :crushyform=>{:type=>:select,:select_options=>[['GNU/Linux','sucker'], ['FreeBSD','saner'], ['Mac OSX','wanker'], ['Windows','loser']]}
+    String :fave_editor, :crushyform=>{:type=>:select,:select_options=>:editor_list}
+    String :fave_error, :crushyform=>{:type=>:select,:select_options=>:error_list}
+    Fixnum :fave_number, :crushyform=>{:type=>:select,:select_options=>[0,1,2,3,4,5,6,7,8,9]}
+  end
+  create_table unless table_exists?
+  def editor_list; ['emacs','vi','ed','sam']; end
+end
+Profile.create(:fave_lang=>'forth', :fave_os=>'saner', :fave_editor=>'ed', :fave_number=>3)
+
 require 'stash_magic'
 class Attached < ::Sequel::Model
   plugin :schema
@@ -141,7 +168,8 @@ describe 'Crushyform when schema plugin is used' do
       :title      => {:type=>:custom,:name=>'Nice Title'},
       :body       => {:type=>:text},
       :published  => {:type=>:boolean},
-      :author_id  => {:type=>:parent}
+      :author_id  => {:type=>:parent},
+      :season_id  => {:type=>:string}
     }
   end
   
@@ -337,7 +365,7 @@ describe 'Crushyfield types' do
   should 'build parent field with a wrapped version of parent_model#to_dropdown' do
     Haiku.new.crushyinput(:author_id).should.match(/^<select.*>#{Regexp.escape Author.to_dropdown}<\/select>$/)
   end
-  
+
   should 'display a preview with an attachment field whenever it is possible' do
     a = Attached.new.set(:filename=>'/book.png')
     a.crushyinput(:filename).should.match(/^#{Regexp.escape a.to_thumb(:filename)}<input type='file'.*\/>\n$/)
@@ -362,6 +390,41 @@ describe 'Crushyfield types' do
     Haiku.new.crushyfield(:title).should.match(/^<p class='crushyfield '/)
   end
   
+  describe 'Select' do
+    should 'Create a select dropdown out of an array' do
+      s = Profile[1].crushyfield(:fave_lang)
+      s.should.match(/<select name='model\[fave_lang\]' id='1-Profile-fave_lang' class=''>/)
+      s.scan(/<option/).size.should==3
+      s.scan(/selected/).size.should==1
+      s.should.match(/<option value='forth' selected>forth<\/option>/)
+      s.should.match(/ruby.*forth.*asm/m)
+    end
+    should 'Accept an array of key/value pairs' do
+      s = Profile[1].crushyfield(:fave_os)
+      s.should.match(/<select name='model\[fave_os\]' id='1-Profile-fave_os' class=''>/)
+      s.scan(/<option/).size.should==4
+      s.scan(/selected/).size.should==1
+      s.should.match(/<option value='saner' selected>FreeBSD<\/option>/)
+      s.should.match(/sucker.*saner.*wanker.*loser/m)
+    end
+    should 'Accept the name of an instance method that generates the Array' do
+      s = Profile[1].crushyfield(:fave_editor)
+      s.should.match(/<select name='model\[fave_editor\]' id='1-Profile-fave_editor' class=''>/)
+      s.scan(/<option/).size.should==4
+      s.scan(/selected/).size.should==1
+      s.should.match(/<option value='ed' selected>ed<\/option>/)
+    end
+    should 'Raise if the method is not an instance method' do
+      lambda{ Profile[1].crushyfield(:fave_error) }.should.raise(NoMethodError)
+    end
+    should 'Accept Fixnum columns and place selected correctly' do
+      s = Profile[1].crushyfield(:fave_number)
+      s.scan(/<option/).size.should==10
+      s.scan(/selected/).size.should==1
+      s.should.match(/<option value='3' selected>3<\/option>/)
+    end
+  end
+  
 end
 
 describe 'Crushyform' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sequel-crushyform
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 27
   prerelease: 
   segments: 
   - 0
+  - 1
   - 0
-  - 8
-  version: 0.0.8
+  version: 0.1.0
 platform: ruby
 authors: 
 - Mickael Riga
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-11 00:00:00 +01:00
+date: 2011-08-22 00:00:00 +01:00
 default_executable: 
 dependencies: []