feat(inputs): adds semantic classes on inputs and actions

abe33 · Jan 19, 2014 · 19ae750 · 19ae750
1 parent 88a2129
commit 19ae750
Show file tree

Hide file tree

Showing 13 changed files with 60 additions and 38 deletions.
diff --git a/app/views/awesome_form/default_theme/actions/_default.html.haml b/app/views/awesome_form/default_theme/actions/_default.html.haml
@@ -1,2 +1,8 @@
+:ruby
+  attrs = {
+    type: action,
+    name: name,
+    class: "#{builder.model_name} #{action}",
+  }
 
-%button{ type: action, name: name }= builder.action_label(action)
+%button.action{attrs}= builder.action_label(action)
diff --git a/app/views/awesome_form/default_theme/inputs/_association.html.haml b/app/views/awesome_form/default_theme/inputs/_association.html.haml
@@ -2,10 +2,11 @@
   attrs = {
     name: builder.association_name(attribute_name),
     id: builder.input_id(attribute_name),
-    multiple: multiple
+    class: "#{builder.model_name} #{attribute_name} #{input_html.delete(:class)}",
+    multiple: multiple,
   }
 
-%select{attrs}
+%select.input{attrs}
   - if defined?(include_blank) && include_blank
     %option{value: ''}
 

diff --git a/app/views/awesome_form/default_theme/inputs/_boolean.html.haml b/app/views/awesome_form/default_theme/inputs/_boolean.html.haml
@@ -3,11 +3,10 @@
     name: builder.input_name(attribute_name),
     id: builder.input_id(attribute_name),
     type: :checkbox,
+    class: "#{builder.model_name} #{attribute_name} #{input_html.delete(:class)}",
     value: '1',
     checked: object.try(attribute_name),
   }
-  if defined? input_html
-    attrs.merge! builder.filter_attributes_for(:input, input_html)
-  end
+  attrs.merge! builder.filter_attributes_for(:input, input_html)
 
-%input{attrs}
+%input.input{attrs}
diff --git a/app/views/awesome_form/default_theme/inputs/_check_boxes.html.haml b/app/views/awesome_form/default_theme/inputs/_check_boxes.html.haml
@@ -7,13 +7,12 @@
       name: builder.collection_name(attribute_name),
       id: id,
       type: :checkbox,
+      class: "#{builder.model_name} #{attribute_name} #{input_html.delete(:class)}",
       value: value,
       checked: selected.include?(value),
     }
-    if defined? input_html
-      attrs.merge! builder.filter_attributes_for(:input, input_html)
-    end
+    attrs.merge! builder.filter_attributes_for(:input, input_html)
 
   %p
-    %input{attrs}
+    %input.input{attrs}
     %label{for: id}= label || value.to_s.humanize
diff --git a/app/views/awesome_form/default_theme/inputs/_default.html.haml b/app/views/awesome_form/default_theme/inputs/_default.html.haml
@@ -2,11 +2,10 @@
   attrs = {
     name: builder.input_name(attribute_name),
     id: builder.input_id(attribute_name),
+    class: "#{builder.model_name} #{attribute_name} #{input_html.delete(:class)}",
     type: type == :string ? :text : type,
     value: object.try(attribute_name),
   }
-  if defined? input_html
-    attrs.merge! builder.filter_attributes_for(:input, input_html)
-  end
+  attrs.merge! builder.filter_attributes_for(:input, input_html)
 
-%input{attrs}
+%input.input{attrs}
diff --git a/app/views/awesome_form/default_theme/inputs/_radios.html.haml b/app/views/awesome_form/default_theme/inputs/_radios.html.haml
@@ -7,13 +7,12 @@
       name: builder.input_name(attribute_name),
       id: id,
       type: :radio,
+      class: "#{builder.model_name} #{attribute_name} #{input_html.delete(:class)}",
       value: value,
       checked: selected.include?(value),
     }
-    if defined? input_html
-      attrs.merge! builder.filter_attributes_for(:input, input_html)
-    end
+    attrs.merge! builder.filter_attributes_for(:input, input_html)
 
   %p
-    %input{attrs}
+    %input.input{attrs}
     %label{for: id}= label || value.to_s.humanize
diff --git a/app/views/awesome_form/default_theme/inputs/_select.html.haml b/app/views/awesome_form/default_theme/inputs/_select.html.haml
@@ -5,13 +5,12 @@
   attrs = {
     name: multiple ? builder.collection_name(attribute_name) : builder.input_name(attribute_name),
     id: builder.input_id(attribute_name),
+    class: "#{builder.model_name} #{attribute_name} #{input_html.delete(:class)}",
     multiple: multiple
   }
-  if defined? input_html
-    attrs.merge! builder.filter_attributes_for(:select, input_html)
-  end
+  attrs.merge! builder.filter_attributes_for(:select, input_html)
 
-%select{attrs}
+%select.input{attrs}
   - if defined?(include_blank) && include_blank
     %option{value: ''}
 

diff --git a/app/views/awesome_form/default_theme/inputs/_text.html.haml b/app/views/awesome_form/default_theme/inputs/_text.html.haml
@@ -1,10 +1,9 @@
 :ruby
   attrs = {
     name: builder.input_name(attribute_name),
+    class: "#{builder.model_name} #{attribute_name} #{input_html.delete(:class)}",
     id: builder.input_id(attribute_name),
   }
-  if defined? input_html
-    attrs.merge! builder.filter_attributes_for(:textarea, input_html)
-  end
+  attrs.merge! builder.filter_attributes_for(:textarea, input_html)
 
-%textarea{attrs}= object.try(attribute_name)
+%textarea.input{attrs}= object.try(attribute_name)
diff --git a/lib/awesome_form/form_builder.rb b/lib/awesome_form/form_builder.rb
@@ -39,12 +39,16 @@ def filter_attributes_for(html, options)
       end
     end
 
-  protected
-
     def model_name
-      object.class.name.underscore.pluralize
+      object.class.name.underscore
+    end
+
+    def resource_name
+      model_name.pluralize
     end
 
+  protected
+
     def filter_arguments(*args)
       options = {}
 

diff --git a/lib/awesome_form/methods/actions.rb b/lib/awesome_form/methods/actions.rb
@@ -47,8 +47,8 @@ def partial_paths_for_action(action_options)
         action = action_options[:action]
 
         [
-          "awesome_form/actions/#{model_name}/#{action}",
-          "awesome_form/#{theme}/actions/#{model_name}/#{action}",
+          "awesome_form/actions/#{resource_name}/#{action}",
+          "awesome_form/#{theme}/actions/#{resource_name}/#{action}",
 
           "awesome_form/actions/#{action}",
           "awesome_form/#{theme}/actions/#{action}",
@@ -65,8 +65,8 @@ def partial_paths_for_action_wrapper(action_options)
         action = action_options[:action]
 
         [
-          "awesome_form/wrappers/#{model_name}/#{action}",
-          "awesome_form/#{theme}/wrappers/#{model_name}/#{action}",
+          "awesome_form/wrappers/#{resource_name}/#{action}",
+          "awesome_form/#{theme}/wrappers/#{resource_name}/#{action}",
 
           "awesome_form/wrappers/#{action}",
           "awesome_form/#{theme}/wrappers/#{action}",

diff --git a/lib/awesome_form/methods/inputs.rb b/lib/awesome_form/methods/inputs.rb
@@ -24,6 +24,9 @@ def options_for_input(attribute, options)
         }
         .merge(type_options)
         .merge(options)
+        .reverse_merge({
+          input_html: {}
+        })
       end
 
       def default_inputs_content(options)
@@ -44,8 +47,8 @@ def partial_paths_for_input(input_options, scope=:inputs)
         theme = AwesomeForm.theme
 
         [
-          "awesome_form/#{scope}/#{model_name}/#{input_options[:attribute_name]}",
-          "awesome_form/#{theme}/#{scope}/#{model_name}/#{input_options[:attribute_name]}",
+          "awesome_form/#{scope}/#{resource_name}/#{input_options[:attribute_name]}",
+          "awesome_form/#{theme}/#{scope}/#{resource_name}/#{input_options[:attribute_name]}",
 
           "awesome_form/#{scope}/#{input_options[:type]}",
           "awesome_form/#{theme}/#{scope}/#{input_options[:type]}",

diff --git a/lib/awesome_form/methods/labels.rb b/lib/awesome_form/methods/labels.rb
@@ -3,11 +3,11 @@ module Methods
     module Labels
 
       def input_label(attribute_name)
-        I18n.t("awesome_form.labels.#{model_name}.#{attribute_name}", default: attribute_name.to_s.humanize)
+        I18n.t("awesome_form.labels.#{resource_name}.#{attribute_name}", default: attribute_name.to_s.humanize)
       end
 
       def action_label(action)
-        I18n.t("awesome_form.actions.#{model_name}.#{action}", {
+        I18n.t("awesome_form.actions.#{resource_name}.#{action}", {
           default: I18n.t("awesome_form.actions.#{action}", {
             default: action.to_s.humanize
           })

diff --git a/spec/features/classes_spec.rb b/spec/features/classes_spec.rb
@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+feature 'semantic classes' do
+  scenario 'on a form' do
+    visit '/users/new'
+
+    match_content_of(page, '
+      form
+        input.input.user.email
+
+        button.action.user.submit
+    ')
+  end
+end