jquery-ui-form 0.1.0 → 0.1.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jquery-ui-form (0.1.0)
+    jquery-ui-form (0.1.1)
       jquery-ui-form
 
 GEM

data/README.textile

@@ -0,0 +1,103 @@
+h1. jQuery-UI-formbuilder
+
+jQuery-UI-formbuilder is a Ruby on Rails FormBuilder DSL powered by jQuery-UI.
+A lot of inspiration comes from https://github.com/justinfrench/formtastic.
+  
+h2. Prerequisites
+  * HAML
+  * SASS
+  * jQuery theme recomended - http://jqueryui.com/themeroller/
+
+h2. Input Types
+  * boolean - check box
+  ** checked_value => "1"
+  ** unchecked_value => "0"
+  * check_boxes - list of checkboxes
+  ** buttonset => true|false
+  ** collection => Array | relation
+  * date - text field with jQuery calendar
+  * email - email field
+  * file - file field
+  * hidden - hidden field
+  * number - number field
+  ** min => in
+  ** max => int
+  ** step => int
+  * password - password field
+  * phone - phone field
+  * radio - radio button
+  ** collection => Array | relation
+  * range - range field
+  ** min => in
+  ** max => int
+  ** step => int
+  * search - search field
+  * select - select field
+  ** collection => Array | relation
+  * string - text field
+  * text - text area
+  * url - url field
+  
+h2. Common Options
+  * label => Input label
+  * as => input type
+  * required => true | false
+  * hint => "Text" (output as placeholder)
+  * collection => ["Value"] | [["ID","Value"]] | object_relation
+  ** label_method => Method to get label from collection
+  ** value_method => Method to get label from collection
+  
+h2. Sample
+  <pre>
+    = jquery_form_for :sample do |f|
+      =f.input :sample_id, :as => :hidden
+      =f.fieldset "Person" do
+        =f.row do
+          =f.input :full_name, :hint => "First name, Last name", :required => true
+          =f.input :funny, :as => :boolean, :hint => "Is this person funny?"
+          =f.input :date_of_birth, :as => :date, "data-calendar" => {:dateFormat => "dd.mm.yy"}
+        =f.row do
+          =f.input :email, :as => :email, :hint => "Can I send You an email?"
+          =f.input :phone, :as => :phone, :hint => "(xx)-xxx-xxx-xx"
+          =f.input :mobile, :as => :phone, :hint => "(xx)-xxx-xxx-xx"
+          =f.input :age, :as => :number, :min => 18, :max => 99, :step => 1, :hint => "What is your age"
+          =f.input :homepage, :as => :url, :hint => "Your website"
+        =f.row do
+          =f.input :photo, :as => :file, :hint => "Upload Your picture"
+          =f.input :pet, :as => :select, :collection => ["Cat","Dog","Hamster"]
+          =f.input :stars, :as => :range
+          =f.input :sex, :as => :radio, :collection => [["M", "Male"],["F","Female"]], :value => "M"
+        =f.input :skills_simple, :as => :check_boxes, :collection => ["Ruby","PHP", "Perl", "Java", ".NET", "OjectiveC"], :values => ["Ruby",".NET"]
+        =f.input :skills, :as => :check_boxes, :buttonset => true, :collection => ["Ruby","PHP", "Perl", "Java", ".NET", "OjectiveC"], :values => ["Ruby",".NET"]
+        =f.input :friends, :as => :check_boxes, :buttonset => true, :collection => [[1,"Carl"],[2,"Mary"], [3,"John"], [4,"James"], [5,"Anete"], [6,"Jane"]], :values => [5,2], :hint => "Who are Your friends?"
+      =f.fieldset "Misc" do
+        =f.input :search_history, :as => :search, :hint => "Search Your history"
+      =f.buttons do
+        =f.submit
+        =f.cancel :icon => "trash"
+    
+  </pre>
+  
+h2. TODO
+
+* Date field dateFormat from rails
+* autocomplete tag
+* Tabs
+* Write documentation and samples
+* input[range] to jQuery slider?
+* confirmation to dialog
+
+h2. Contributing to jquery-ui-formbuilder
+ 
+* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
+* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
+* Fork the project
+* Start a feature/bugfix branch
+* Commit and push until you are happy with your contribution
+* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
+* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
+
+h2. Copyright
+
+Copyright (c) 2011 Aivars Akots, released under the MIT license.
+

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/jquery-ui-form.gemspec

@@ -5,24 +5,23 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jquery-ui-form}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aivars Akots"]
-  s.date = %q{2011-04-19}
+  s.date = %q{2011-04-20}
   s.description = %q{longer description of your gem}
   s.email = %q{aivars.akots@gmail.com}
   s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.rdoc"
+    "README.textile"
   ]
   s.files = [
     ".document",
     ".rvmrc",
     "Gemfile",
     "Gemfile.lock",
-    "LICENSE.txt",
-    "README.rdoc",
+    "MIT.txt",
+    "README.textile",
     "Rakefile",
     "VERSION",
     "jquery-ui-form.gemspec",

data/lib/generators/templates/jquery-ui-form.js

@@ -11,7 +11,7 @@ $(function(){
   });
   $(".ui-radio-input fieldset.to-buttonset").buttonset();
   $(".ui-check_boxes-input fieldset.to-buttonset").buttonset();
-  $("input[type='date'].ui-date-input" ).each(function(){
+  $("input[type='date'].ui-date-input, input[type='text'].ui-date-input" ).each(function(){
     var options = {};
     if($(this).attr('data-calendar') != "") {
       options = $.parseJSON($(this).attr('data-calendar'));

data/lib/generators/templates/jquery-ui-form.rb

@@ -1,5 +1,5 @@
 JqueryUiForm::FormBuilder.use_i18n = false
 JqueryUiForm::FormBuilder.required_string = proc{"<abbr>*</abbr>"}
 JqueryUiForm::FormBuilder.html5_inputs = true
-JqueryUiForm::FormBuilder.placeholder_elements = %w(date email file number password phone search string text url)
+JqueryUiForm::FormBuilder.placeholder_elements = %w(date email password phone search string text url)
 JqueryUiForm::FormBuilder.use_autofocus = true

data/lib/generators/templates/jquery-ui-form.sass

@@ -77,14 +77,20 @@
     position: absolute
     top: 5px
     left: 129px
-    font-size: 80%
-    opacity: .45
-    filter: Alpha(Opacity = 45)
+    font-size: 100%
+    opacity: .40
+    filter: Alpha(Opacity = 40)
   .ui-check_boxes-input .ui-input-hint, .ui-radio-input .ui-input-hint
     top: 27px
     left: 21px
+  .ui-check_boxes-input .ui-buttonset .ui-input-hint
+    position: relative
+    top: -4px
   .ui-boolean-input .ui-input-hint
     left: 139px
+  .ui-file-input .ui-input-hint
+    position: relative
+    left: 126px
   label
     width: 120px
     float: left

data/lib/jquery_ui_form/helpers/input_helper.rb

@@ -103,10 +103,7 @@ module JqueryUiForm
           when :text
             return :text
           end
-
-          # Try look for hints in options hash. Quite common senario: Enum keys stored as string in the database.
           return :select    if column.type == :string && options.key?(:collection)
-          # Try 3: Assume the input name will be the same as the column type (e.g. string_input).
           return column.type
         else
           if @object

data/lib/jquery_ui_form/inputs/check_boxes_input.rb

@@ -5,7 +5,7 @@ module JqueryUiForm
       def check_boxes_input(method, options = {})
         # radio_button(method, tag_value, options)
         legend, options = label_text(method, options)
-        current_values = current_values_from_association(method)
+        current_values = options.delete(:values) || current_values_from_association(method)
         collection = options.delete(:collection) || collection_from_association(method)
         label_options = options.delete(:html_label) || {}
         
@@ -25,7 +25,7 @@ module JqueryUiForm
           collection.each do |row|
             label_text = label_from_association(row,label_method)
             value_text = value_from_association(row,value_method)
-            checked = current_values.include?(value_text.to_s)
+            checked = current_values.include?(value_text)
             if buttonset
               template.concat(template.check_box_tag("#{@object_name}[#{method}][]", value_text, checked, options.merge(:id => name_to_id("#{@object_name}_#{method}_#{value_text}"))))
               template.concat(label(name_to_id("#{method}_#{value_text}"), label_text, label_options))
@@ -40,23 +40,34 @@ module JqueryUiForm
       end
       
       def label_from_association(row, label_method)
-        return row[0] unless row.respond_to?(label_method)
-        return row[0] if row.is_a?(Array)
-        row.send(label_method)
+        return row[1] if row.is_a?(Array)
+        return row if row.is_a?(String)
+        if row.respond_to?(label_method)
+          row.send(label_method)
+        else
+          row
+        end
+        
       end
       
       def value_from_association(row, value_method)
-        return row[1] unless row.respond_to?(value_method)
-        return row[1] if row.is_a?(Array)
-        row.send(value_method)
+        return row[0] if row.is_a?(Array)
+        return row if row.is_a?(String)
+        if row.respond_to?(value_method)
+          row.send(value_method)
+        else
+          row
+        end
       end
       
       def current_values_from_association(method)
+        return [] unless @object || @object.respond_to?(method)
         return [] unless @object.send(method).is_a?(Array)
         @object.send(method).map{|row| row.id.to_s}
       end
       
       def collection_from_association(method)
+        return [] unless @object || @object.respond_to?(method)
         return [] unless @object.send(method).is_a?(Array)
         if target = @object.send(method).first
           target.class.all

data/lib/jquery_ui_form/inputs/radio_input.rb

@@ -15,13 +15,19 @@ module JqueryUiForm
           template.concat(inline_hint(options.delete(:hint)))
           template.concat(inline_error(method))
           collection.each do |row|
+            id, value = (row.is_a?(Array) ? row : [row, row])
+            if @object
+              checked = @object.send(method) == id
+            else
+              checked = options[:value] == id
+            end
             if buttonset
-              template.concat(radio_button(method, row[1], options.merge(:checked => @object.send(method) == row[1])))
-              template.concat(label(name_to_id("#{method}_#{row[1]}"), row[0], label_options))
+              template.concat(radio_button(method, id, options.merge(:checked => checked)))
+              template.concat(label(name_to_id("#{method}_#{id}"), value, label_options))
             else
               template.concat(column do
-                template.concat(label(name_to_id("#{method}_#{row[1]}"), row[0], label_options))
-                template.concat(radio_button(method, row[1], options.merge(:checked => @object.send(method) == row[1])))
+                template.concat(label(name_to_id("#{method}_#{id}"), value, label_options))
+                template.concat(radio_button(method, id, options.merge(:checked => checked)))
               end)
             end
           end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jquery-ui-form
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Aivars Akots
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-19 00:00:00 +03:00
+date: 2011-04-20 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -145,15 +145,14 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- LICENSE.txt
-- README.rdoc
+- README.textile
 files: 
 - .document
 - .rvmrc
 - Gemfile
 - Gemfile.lock
-- LICENSE.txt
-- README.rdoc
+- MIT.txt
+- README.textile
 - Rakefile
 - VERSION
 - jquery-ui-form.gemspec

data/README.rdoc

@@ -1,25 +0,0 @@
-= jquery-ui-formbuilder
-
-Description goes here.
-== TODO
-* autocomplete tag
-* Implenent tabs
-* Write documentation and samples
-* input[range] to jQuery slider?
-* confirmation to dialog
-
-== Contributing to jquery-ui-formbuilder
- 
-* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
-* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
-* Fork the project
-* Start a feature/bugfix branch
-* Commit and push until you are happy with your contribution
-* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
-* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
-
-== Copyright
-
-Copyright (c) 2011 Aivars Akots. See LICENSE.txt for
-further details.
-