formtastic 1.1.0 → 1.2.0.beta

data/lib/formtastic/i18n.rb

@@ -1,6 +1,8 @@
+# encoding: utf-8
+
 module Formtastic
   module I18n
-    
+
     DEFAULT_SCOPE = [:formtastic].freeze
     DEFAULT_VALUES = {
         :required       => 'required',
@@ -17,9 +19,9 @@ module Formtastic
         '%{nested_model}.%{attribute}',
         '%{attribute}'
       ]
-      
+
     class << self
-      
+
       def translate(*args)
         key = args.shift.to_sym
         options = args.extract_options!
@@ -28,8 +30,8 @@ module Formtastic
         ::I18n.translate(key, *(args << options))
       end
       alias :t :translate
-      
+
     end
-    
+
   end
-end
+end

data/lib/formtastic/layout_helper.rb

@@ -1,10 +1,12 @@
+# encoding: utf-8
+
 module Formtastic
   module LayoutHelper
-    
+
     def formtastic_stylesheet_link_tag
-      stylesheet_link_tag("formtastic") + 
+      stylesheet_link_tag("formtastic") +
       stylesheet_link_tag("formtastic_changes")
     end
-  
+
   end
-end
+end

data/lib/formtastic/railtie.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'formtastic'
 require 'formtastic/layout_helper'
 require 'rails'
@@ -9,4 +11,4 @@ module Formtastic
       ActionView::Base.send(:include, Formtastic::LayoutHelper)
     end
   end
-end
+end

data/lib/formtastic/util.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 # Adapted from the rails3 compatibility shim in Haml 2.2
 module Formtastic
   module Util

data/lib/generators/formtastic/form/form_generator.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+# encoding: utf-8
 module Formtastic
   class FormGenerator < Rails::Generators::NamedBase
     desc "Generates formtastic form code based on an existing model. By default the " <<
@@ -17,18 +17,16 @@ module Formtastic
     class_option :controller, :type => :string, :default => false, :group => :formtastic,
                  :desc => 'Generate for custom controller/view path - in case model and controller namespace is different, i.e. "admin/posts"'
 
-    def self.source_root
-     # Set source directory for the templates to the rails2 generator template directory
-     @source_root ||= File.expand_path(File.join('..', '..', '..', '..', 'generators', 'form', 'templates'), File.dirname(__FILE__))
-    end
+    source_root File.expand_path('../../../templates', __FILE__)
 
     def create_or_show
       @attributes = self.columns if @attributes.empty?
+
       if options[:partial]
         empty_directory "app/views/#{controller_path}"
-        template "view__form.html.#{template_type}", "app/views/#{controller_path}/_form.html.#{template_type}"
+        template "_form.html.#{template_type}", "app/views/#{controller_path}/_form.html.#{template_type}"
       else
-        template = File.read("#{self.class.source_root}/view__form.html.#{template_type}")
+        template = File.read("#{self.class.source_root}/_form.html.#{template_type}")
         erb = ERB.new(template, nil, '-')
         generated_code = erb.result(binding).strip rescue nil
 

data/lib/generators/formtastic/install/install_generator.rb

@@ -1,16 +1,9 @@
-# coding: utf-8
+# encoding: utf-8
 module Formtastic
   class InstallGenerator < Rails::Generators::Base
     desc "Copies formtastic.css and formtastic_changes.css to public/stylesheets/ and a config initializer to config/initializers/formtastic_config.rb"
 
-    def self.source_root
-      # Set source directory for the templates to the rails2 generator template directory
-      @source_root ||= File.expand_path(File.join('..', '..', '..', '..', 'generators', 'formtastic', 'templates'), File.dirname(__FILE__))
-    end
-    
-    def self.banner
-      "rails generate formtastic:install [options]"
-    end
+    source_root File.expand_path('../../../templates', __FILE__)
 
     def copy_files
       empty_directory 'config/initializers'

data/lib/generators/templates/_form.html.erb

@@ -0,0 +1,5 @@
+<%% f.inputs do %>
+<% attributes.each do |attribute| -%>
+  <%%= f.input :<%= attribute.name %> %>
+<% end -%>
+<%% end %>

data/lib/generators/templates/_form.html.haml

@@ -0,0 +1,4 @@
+- f.inputs do
+<% attributes.each do |attribute| -%>
+  = f.input :<%= attribute.name %>
+<% end -%>

data/{generators/formtastic → lib/generators}/templates/formtastic.css

@@ -38,7 +38,7 @@ form.formtastic fieldset.buttons li { float:left; padding-right:0.5em; }
 
 /* INPUT LIs
 --------------------------------------------------------------------------------------------------*/
-form.formtastic fieldset > ol > li { margin-bottom:1.5em; }
+form.formtastic fieldset > ol > li { padding:0.5em 0; margin-top:-0.5em; margin-bottom:1em; } /* padding and negative margin juggling is for Firefox */
 form.formtastic fieldset > ol > li { overflow:auto; } /* clearing contained floats */
 
 form.formtastic fieldset > ol > li.required { }
@@ -75,16 +75,29 @@ form.formtastic fieldset > ol > li ul.errors { color:#cc0000; margin:0.5em 0 0 2
 form.formtastic fieldset > ol > li ul.errors li { padding:0; border:none; display:list-item; }
 
 
-/* STRING & NUMERIC OVERRIDES
+/* STRING, NUMERIC, PASSWORD, EMAIL, URL, PHONE & SEARCH OVERRIDES
 --------------------------------------------------------------------------------------------------*/
-form.formtastic fieldset > ol > li.string input { max-width:74%; }
-form.formtastic fieldset > ol > li.password input { max-width: 13em; }
-form.formtastic fieldset > ol > li.numeric input { max-width:74%; }
+form.formtastic fieldset > ol > li.string input, 
+form.formtastic fieldset > ol > li.password input, 
+form.formtastic fieldset > ol > li.numeric input,
+form.formtastic fieldset > ol > li.email input,
+form.formtastic fieldset > ol > li.url input,
+form.formtastic fieldset > ol > li.phone input,
+form.formtastic fieldset > ol > li.search input { width:72%; }
+
+form.formtastic fieldset > ol > li.string input[size], 
+form.formtastic fieldset > ol > li.password input[size], 
+form.formtastic fieldset > ol > li.numeric input[size],
+form.formtastic fieldset > ol > li.email input[size],
+form.formtastic fieldset > ol > li.url input[size],
+form.formtastic fieldset > ol > li.phone input[size],
+form.formtastic fieldset > ol > li.search input[size] { width:auto; max-width:72%; }
 
 
 /* TEXTAREA OVERRIDES
 --------------------------------------------------------------------------------------------------*/
-form.formtastic fieldset > ol > li.text textarea { width:74%; }
+form.formtastic fieldset > ol > li.text textarea { width:72%; }
+form.formtastic fieldset > ol > li.text textarea[cols] { width:auto; max-width:72%; }
 
 
 /* HIDDEN OVERRIDES
@@ -100,8 +113,9 @@ form.formtastic fieldset > ol > li.boolean label input { margin:0 0.5em 0 0.2em;
 /* RADIO OVERRIDES
 --------------------------------------------------------------------------------------------------*/
 form.formtastic fieldset > ol > li.radio { }
-form.formtastic fieldset > ol > li.radio fieldset ol { margin-bottom:-0.6em; }
-form.formtastic fieldset > ol > li.radio fieldset ol li { margin:0.1em 0 0.5em 0; }
+form.formtastic fieldset > ol > li.radio fieldset { overflow:visible; }
+form.formtastic fieldset > ol > li.radio fieldset ol { margin-bottom:-0.5em; }
+form.formtastic fieldset > ol > li.radio fieldset ol li { margin:0.1em 0 0.5em 0; overflow:visible; }
 form.formtastic fieldset > ol > li.radio fieldset ol li label { float:none; width:100%; }
 form.formtastic fieldset > ol > li.radio fieldset ol li label input { margin-right:0.2em; }
 
@@ -109,13 +123,13 @@ form.formtastic fieldset > ol > li.radio fieldset ol li label input { margin-rig
 /* CHECK BOXES (COLLECTION) OVERRIDES
 --------------------------------------------------------------------------------------------------*/
 form.formtastic fieldset > ol > li.check_boxes { }
-form.formtastic fieldset > ol > li.check_boxes fieldset ol { margin-bottom:-0.6em; }
-form.formtastic fieldset > ol > li.check_boxes fieldset ol li { margin:0.1em 0 0.5em 0; }
+form.formtastic fieldset > ol > li.check_boxes fieldset { overflow:visible; }
+form.formtastic fieldset > ol > li.check_boxes fieldset ol { margin-bottom:-0.5em; }
+form.formtastic fieldset > ol > li.check_boxes fieldset ol li { margin:0.1em 0 0.5em 0; overflow:visible; }
 form.formtastic fieldset > ol > li.check_boxes fieldset ol li label { float:none; width:100%; }
 form.formtastic fieldset > ol > li.check_boxes fieldset ol li label input { margin-right:0.2em; }
 
 
-
 /* DATE & TIME OVERRIDES
 --------------------------------------------------------------------------------------------------*/
 form.formtastic fieldset > ol > li.date fieldset ol li,

data/{generators/formtastic → lib/generators}/templates/formtastic.rb

@@ -1,9 +1,14 @@
-# Set the default text field size when input is a string. Default is 50.
+# encoding: utf-8
+
+# Set the default text field size when input is a string. Default is nil.
 # Formtastic::SemanticFormBuilder.default_text_field_size = 50
 
 # Set the default text area height when input is a text. Default is 20.
 # Formtastic::SemanticFormBuilder.default_text_area_height = 5
 
+# Set the default text area width when input is a text. Default is 50.
+# Formtastic::SemanticFormBuilder.default_text_area_width = 10
+
 # Should all fields be considered "required" by default?
 # Rails 2 only, ignored by Rails 3 because it will never fall back to this default.
 # Defaults to true.
@@ -25,8 +30,14 @@
 # Formtastic::SemanticFormBuilder.optional_string = "(optional)"
 
 # Set the way inline errors will be displayed.
-# Defaults to :sentence, valid options are :sentence, :list and :none
+# Defaults to :sentence, valid options are :sentence, :list, :first and :none
 # Formtastic::SemanticFormBuilder.inline_errors = :sentence
+# Formtastic uses the following classes as default for hints, inline_errors and error list
+
+# If you override the class here, please ensure to override it in your formtastic_changes.css stylesheet as well
+# Formtastic::SemanticFormBuilder.default_hint_class = "inline-hints"
+# Formtastic::SemanticFormBuilder.default_inline_error_class = "inline-errors"
+# Formtastic::SemanticFormBuilder.default_error_list_class = "errors"
 
 # Set the method to call on label text to transform or format it for human-friendly
 # reading when formtastic is used without object. Defaults to :humanize.
@@ -45,6 +56,12 @@
 # customize it doing just as below:
 # Formtastic::SemanticFormBuilder.inline_order = [:input, :hints, :errors]
 
+# Additionally, you can customize the order for specific types of inputs.
+# This is configured on a type basis and if a type is not found it will
+# fall back to the default order as defined by #inline_order
+# Formtastic::SemanticFormBuilder.custom_inline_order[:checkbox] = [:errors, :hints, :input]
+# Formtastic::SemanticFormBuilder.custom_inline_order[:select] = [:hints, :input, :errors]
+
 # Specifies if labels/hints for input fields automatically be looked up using I18n.
 # Default value: false. Overridden for specific fields by setting value to true,
 # i.e. :label => true, or :hint => true (or opposite depending on initialized value)

metadata

@@ -1,12 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: formtastic
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 31098177
+  prerelease: true
   segments: 
   - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  - beta
+  version: 1.2.0.beta
 platform: ruby
 authors: 
 - Justin French
@@ -21,37 +23,43 @@ dependencies:
   name: activesupport
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 2
         - 3
-        - 0
-        version: 2.3.0
+        - 7
+        version: 2.3.7
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: actionpack
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 2
         - 3
-        - 0
-        version: 2.3.0
+        - 7
+        version: 2.3.7
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: i18n
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 0
         - 4
@@ -60,33 +68,53 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rspec-rails
+  name: rails
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
-        - 1
-        - 2
-        - 6
-        version: 1.2.6
+        - 3
+        - 0
+        - 0
+        version: 3.0.0
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rspec_tag_matchers
+  name: rspec-rails
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 0
+        - 0
+        version: 2.0.0
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rspec_tag_matchers
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 0
         - 0
         version: 1.0.0
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 description: A Rails form builder plugin/gem with semantically rich and accessible markup
 email: justin@indent.com.au
 executables: []
@@ -96,63 +124,24 @@ extensions: []
 extra_rdoc_files: 
 - README.textile
 files: 
-- MIT-LICENSE
-- README.textile
-- Rakefile
-- generators/form/USAGE
 - generators/form/form_generator.rb
-- generators/form/templates/view__form.html.erb
-- generators/form/templates/view__form.html.haml
+- generators/form/USAGE
 - generators/formtastic/formtastic_generator.rb
-- generators/formtastic/templates/formtastic.css
-- generators/formtastic/templates/formtastic.rb
-- generators/formtastic/templates/formtastic_changes.css
-- generators/formtastic_stylesheets/formtastic_stylesheets_generator.rb
-- init.rb
-- lib/formtastic.rb
 - lib/formtastic/i18n.rb
 - lib/formtastic/layout_helper.rb
 - lib/formtastic/railtie.rb
 - lib/formtastic/util.rb
+- lib/formtastic.rb
 - lib/generators/formtastic/form/form_generator.rb
 - lib/generators/formtastic/install/install_generator.rb
+- lib/generators/templates/_form.html.erb
+- lib/generators/templates/_form.html.haml
+- lib/generators/templates/formtastic.css
+- lib/generators/templates/formtastic.rb
+- lib/generators/templates/formtastic_changes.css
 - lib/locale/en.yml
-- rails/init.rb
-- spec/buttons_spec.rb
-- spec/commit_button_spec.rb
-- spec/custom_builder_spec.rb
-- spec/defaults_spec.rb
-- spec/error_proc_spec.rb
-- spec/errors_spec.rb
-- spec/form_helper_spec.rb
-- spec/helpers/layout_helper_spec.rb
-- spec/i18n_spec.rb
-- spec/include_blank_spec.rb
-- spec/input_spec.rb
-- spec/inputs/boolean_input_spec.rb
-- spec/inputs/check_boxes_input_spec.rb
-- spec/inputs/country_input_spec.rb
-- spec/inputs/date_input_spec.rb
-- spec/inputs/datetime_input_spec.rb
-- spec/inputs/file_input_spec.rb
-- spec/inputs/hidden_input_spec.rb
-- spec/inputs/numeric_input_spec.rb
-- spec/inputs/password_input_spec.rb
-- spec/inputs/radio_input_spec.rb
-- spec/inputs/select_input_spec.rb
-- spec/inputs/string_input_spec.rb
-- spec/inputs/text_input_spec.rb
-- spec/inputs/time_input_spec.rb
-- spec/inputs/time_zone_input_spec.rb
-- spec/inputs_spec.rb
-- spec/label_spec.rb
-- spec/semantic_errors_spec.rb
-- spec/semantic_fields_for_spec.rb
-- spec/spec.opts
-- spec/spec_helper.rb
-- spec/support/custom_macros.rb
-- spec/support/output_buffer.rb
-- spec/support/test_environment.rb
+- MIT-LICENSE
+- README.textile
 has_rdoc: true
 homepage: http://github.com/justinfrench/formtastic/tree/master
 licenses: []
@@ -163,58 +152,29 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A Rails form builder plugin/gem with semantically rich and accessible markup
-test_files: 
-- spec/buttons_spec.rb
-- spec/commit_button_spec.rb
-- spec/custom_builder_spec.rb
-- spec/defaults_spec.rb
-- spec/error_proc_spec.rb
-- spec/errors_spec.rb
-- spec/form_helper_spec.rb
-- spec/helpers/layout_helper_spec.rb
-- spec/i18n_spec.rb
-- spec/include_blank_spec.rb
-- spec/input_spec.rb
-- spec/inputs/boolean_input_spec.rb
-- spec/inputs/check_boxes_input_spec.rb
-- spec/inputs/country_input_spec.rb
-- spec/inputs/date_input_spec.rb
-- spec/inputs/datetime_input_spec.rb
-- spec/inputs/file_input_spec.rb
-- spec/inputs/hidden_input_spec.rb
-- spec/inputs/numeric_input_spec.rb
-- spec/inputs/password_input_spec.rb
-- spec/inputs/radio_input_spec.rb
-- spec/inputs/select_input_spec.rb
-- spec/inputs/string_input_spec.rb
-- spec/inputs/text_input_spec.rb
-- spec/inputs/time_input_spec.rb
-- spec/inputs/time_zone_input_spec.rb
-- spec/inputs_spec.rb
-- spec/label_spec.rb
-- spec/semantic_errors_spec.rb
-- spec/semantic_fields_for_spec.rb
-- spec/spec_helper.rb
-- spec/support/custom_macros.rb
-- spec/support/output_buffer.rb
-- spec/support/test_environment.rb
+test_files: []
+