erector-form_for 0.0.1 → 0.0.2

data/form_erector.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rack_csrf'
   s.add_development_dependency 'sequel'
   s.add_development_dependency 'sqlite3'
+  s.add_development_dependency 'sinatra-r18n'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/erector/form_for.rb

@@ -52,7 +52,7 @@ module Erector
       end
 
       def form_input field, attrs = {}
-        widget WrappedInput.new(@object, @object_name, field, attrs)
+        widget WrappedInput.new(@app, @object, @object_name, field, attrs)
       end
 
       private
@@ -77,15 +77,25 @@ module Erector
       EQUIVALENCIES = {:string => :text, :datetime_local => :'datetime-local', :phone => :tel, :fax => :tel}
       attr_reader :id
 
-      def initialize kind, object, object_name, column, opts
+      def initialize app, kind, object, object_name, column, opts
+        @type        = kind.to_sym 
+        @app         = app
+        @column      = column
+        @object_name = object_name
         opts[:name]  ||= object_name ? "#{object_name}[#{column}]" : column
         opts[:id]    ||= [object_name, column].compact.join('-').dasherize
         opts[:value] ||= Hash === object ? object[column] : object.send(column)
-        @type   = kind.to_sym 
-        @label  = opts.delete(:label) || column.to_s.titleize 
+        @label = opts.delete(:label) || default_label
         super opts
       end
 
+      def default_label
+        return @column.to_s.titleize unless @app.respond_to?(:t)
+        @app.t.form_for.labels[@object_name][@column] |
+          @app.t.models.user.attributes[@column] |
+          @column.to_s.titleize
+      end
+
       def content
         case @type
         when :boolean
@@ -132,7 +142,8 @@ module Erector
     class WrappedInput < Erector::Widget
       needs :as, :id => nil, :required => false
 
-      def initialize object, object_name, column, opts
+      def initialize app, object, object_name, column, opts
+        @app = app
         assigns = {}
 
         [:as, :required].each do |key|
@@ -170,7 +181,7 @@ module Erector
 
         case @as = @as.to_sym
         when :hidden, :string, :text, :boolean, :email, :color, :date, :datetime, :'datetime-local', :datetime_local, :email, :file, :image, :month, :number, :password, :range, :search, :tel, :phone, :fax, :time, :url, :week, :select, :radio
-          @widget = Input.new @as, object, object_name, column, opts.merge(:required => @required)
+          @widget = Input.new @app, @as, object, object_name, column, opts.merge(:required => @required)
         else
           raise ArgumentError, ":as => #{@as.inspect} is not a valid option"
         end

data/lib/erector/form_for/version.rb

@@ -1,3 +1,3 @@
 module FormErector
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/fixtures/es.yml

@@ -0,0 +1,13 @@
+models:
+    user:
+      attributes:
+        name: Nombre
+        bio: Biografía
+        confirmed: Confirmado
+
+form_for:
+  labels:
+    user:
+      bio: Biografía
+      confirmed: ¿Confirmado?
+    

data/spec/form_erector_spec.rb

@@ -388,5 +388,45 @@ describe 'form erector' do
       it { page.should have_xpath "//form/fieldset/ol/li/fieldset/ol/li/label", :text => 'Best' }
       it { page.should have_xpath "//form/fieldset/ol/li/fieldset/ol/li/label/input[@value='best' and @checked='checked']" }
     end
+
+    describe 'translations' do
+      describe 'by model attributes' do
+        before do
+          new_user.stub!(:bio).and_return('Lorem ipsum...')
+          app.instance_eval do
+            register Sinatra::R18n
+            set :default_locale, 'es'
+            set :translations, "#{File.dirname __FILE__}/fixtures"
+          end
+
+          app.user_form(new_user) do
+            fields do 
+              form_input :name 
+              form_input :bio
+              form_input :confirmed
+              form_input :any
+            end
+          end
+          get '/users/new'
+          puts last_response.body
+        end
+
+        it 'should use model attribute translations' do
+          page.should have_css "label[for=user-name]", :text => 'Nombre'
+        end
+
+        it 'should use form_for label translation' do
+          page.should have_css "label[for=user-bio]", :text => 'Biografía'
+        end
+
+        it 'should use form_for label translation overriding model attribute' do
+          page.should have_css "label[for=user-confirmed]", :text => '¿Confirmado?'
+        end
+
+        it 'should resort to titleize column' do
+          page.should have_css "label[for=user-any]", :text => 'Any'
+        end
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@ require 'rack/test'
 require 'rack/csrf'
 require 'sqlite3'
 require 'sequel'
+require 'sinatra/r18n'
 
 $:.unshift File.join(File.dirname( __FILE__), '..', 'lib') 
 require 'erector/form_for'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: erector-form_for
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-09-30 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erector
-  requirement: &70307239220860 !ruby/object:Gem::Requirement
+  requirement: &2165548480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70307239220860
+  version_requirements: *2165548480
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70307239220260 !ruby/object:Gem::Requirement
+  requirement: &2165548060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70307239220260
+  version_requirements: *2165548060
 - !ruby/object:Gem::Dependency
   name: sinatra-trails
-  requirement: &70307239219560 !ruby/object:Gem::Requirement
+  requirement: &2165547640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70307239219560
+  version_requirements: *2165547640
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70307239218940 !ruby/object:Gem::Requirement
+  requirement: &2165547220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70307239218940
+  version_requirements: *2165547220
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70307239218120 !ruby/object:Gem::Requirement
+  requirement: &2165546720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70307239218120
+  version_requirements: *2165546720
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70307239217480 !ruby/object:Gem::Requirement
+  requirement: &2165546300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70307239217480
+  version_requirements: *2165546300
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70307239201960 !ruby/object:Gem::Requirement
+  requirement: &2165545840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70307239201960
+  version_requirements: *2165545840
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70307239201400 !ruby/object:Gem::Requirement
+  requirement: &2165545420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70307239201400
+  version_requirements: *2165545420
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70307239200900 !ruby/object:Gem::Requirement
+  requirement: &2165545000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70307239200900
+  version_requirements: *2165545000
 - !ruby/object:Gem::Dependency
   name: rack_csrf
-  requirement: &70307239200360 !ruby/object:Gem::Requirement
+  requirement: &2165544580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70307239200360
+  version_requirements: *2165544580
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &70307239199860 !ruby/object:Gem::Requirement
+  requirement: &2165544160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70307239199860
+  version_requirements: *2165544160
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70307239199380 !ruby/object:Gem::Requirement
+  requirement: &2165543740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +142,18 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70307239199380
+  version_requirements: *2165543740
+- !ruby/object:Gem::Dependency
+  name: sinatra-r18n
+  requirement: &2165543320 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2165543320
 description: Form helper inspired by erector targeting html5
 email:
 - macarui@gmail.com
@@ -157,6 +168,7 @@ files:
 - form_erector.gemspec
 - lib/erector/form_for.rb
 - lib/erector/form_for/version.rb
+- spec/fixtures/es.yml
 - spec/form_erector_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/maca/erector-form_for
@@ -184,5 +196,6 @@ signing_key:
 specification_version: 3
 summary: Form helper inspired by erector targeting html5
 test_files:
+- spec/fixtures/es.yml
 - spec/form_erector_spec.rb
 - spec/spec_helper.rb