hungryform-rails 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 352c2e9eab241d7cd69e2be42d84cda9961e8f10
-  data.tar.gz: 4c3b715e1c945e777710b4277f95a4350f1058a0
+  metadata.gz: 1360f77eb2ccee3eb12b09cd0014f1ee25df1f55
+  data.tar.gz: f8f8252375c4cd6f24b88832801717d9c1c9522e
 SHA512:
-  metadata.gz: f228d423f2b55ffdd7f8125516ee61d05f83d7cf37364d10ba17a603427b8c8afc598f6fea63bb19c2ed822452131e8898bcfea592e7ff4ece5ba32d43eb7d78
-  data.tar.gz: ab002ba6dd14ca41ef1cf1367ec0242f6d382fb121faf2a03b1576b60cbee95bb9affaa1a1ace3d0df6b52359c418c83afed93001ddceec65096e69d65cabbe8
+  metadata.gz: 5dfa2c3a39a452433b737528171134b1ea095a855abed53d6656e74dc7200d133ec1d95a6d8ac0bed3c057b865555ed96ebe69199c2b8a95ab64f36ac647e1c6
+  data.tar.gz: 594ebc2ebae6e554433984a3fc0738a6672b6cbbe21e98537aeee973731817aa91678bf5eba0c7b3d5db737589674319c085e76c3b9e047acc006ae2fd992ac8

data/app/views/hungryform/_checkbox_field.html.erb

@@ -1,12 +1,15 @@
-<%= content_tag :div, id: "#{field.name}_wrapper", class: field.wrapper_class, 'data-dependency' => field.dependency_json do
+<%= content_tag :div, id: "#{field.name}_wrapper", class: field.wrapper_class, 'data-dependency' => field.dependency_json do -%>
 
-  concat label_tag field.name, field.label << ("*" if field.required?).to_s
-  concat hidden_field_tag field.name, 0
-  concat check_box_tag field.name, 1, field.checked?, field.input_attributes
-  unless field.error.empty?
-    concat content_tag :span, field.error, class: 'error' 
-  end
-  
-end %>
+  <div class="checkbox">
+    <%= label_tag '' do %>
+      <%= hidden_field_tag field.name, 0 %>
+      <%= check_box_tag field.name, 1, field.checked?, field.input_attributes %>
+      <%= field.label << ("*" if field.required?).to_s %>
+    <% end -%>
+  </div>
 
-<%= field.attributes.inspect %>
+  <% unless field.error.empty? -%>
+    <%= content_tag :span, field.error, class: 'error' %>
+  <% end -%>
+  
+<% end -%>

data/app/views/hungryform/_form.html.erb

@@ -1,11 +1,47 @@
 <%= hidden_field_tag :form_action %>
 
-<h1><%= form.current_page.label %></h1>
+<h1><%= form.current_page.title %></h1>
 
 <% form.current_page.elements.each do |el| %>
   <%= render partial: "#{views_prefix}/#{el.class.name.demodulize.underscore}", locals: { field: el, views_prefix: views_prefix } %>
 <% end %>
 
-<%= hungry_link_to_prev_page(form, "Prev", method: :post) if form.prev_page %>
-<%= hungry_link_to_next_page(form, "Next", method: :post) if form.next_page %>
-<%= hungry_link_to_submit(form, "Submit") if form.current_page == form.pages.last %>
+<%=
+  # Previous page button
+  if form.prev_page
+    hungry_link_to_prev_page(
+      form, 
+      "Prev", 
+      {
+        class: HungryForm.configuration.rails.prev_button_class,
+        method: :post
+      }
+    )
+  end  
+-%>
+<%= 
+  # Next Page Button
+  if form.next_page
+    hungry_link_to_next_page(
+      form, 
+      "Next", 
+      {
+        class: HungryForm.configuration.rails.next_button_class,
+        method: :post
+      }
+    ) 
+  end 
+-%>
+<%= 
+  # Submit button
+  if form.current_page == form.pages.last
+    hungry_link_to_submit(
+      form, 
+      "Submit", 
+      {
+        class: HungryForm.configuration.rails.submit_button_class,
+        method: :post
+      }
+    ) 
+  end 
+%>

data/app/views/hungryform/_group.html.erb

@@ -1,7 +1,7 @@
-<%= content_tag :div, id: "#{field.name}_wrapper", class: field.wrapper_class, 'data-dependency' => field.dependency_json do
+<%= content_tag :div, id: "#{field.name}_wrapper", class: field.wrapper_class, 'data-dependency' => field.dependency_json do -%>
 
-  field.elements.each do |el|
-    concat render partial: "#{views_prefix}/#{el.class.name.demodulize.underscore}", locals: { field: el, views_prefix: views_prefix }
-  end
+  <% field.elements.each do |el| -%>
+    <%= render partial: "#{views_prefix}/#{el.class.name.demodulize.underscore}", locals: { field: el, views_prefix: views_prefix } -%>
+  <% end -%>
   
-end %>
+<% end -%>

data/app/views/hungryform/_radio_group.html.erb

@@ -1,11 +1,18 @@
-<%= content_tag :div, id: "#{field.name}_wrapper", class: field.wrapper_class, 'data-dependency' => field.dependency_json do
+<%= content_tag :div, id: "#{field.name}_wrapper", class: field.wrapper_class, 'data-dependency' => field.dependency_json do -%>
 
-  concat label_tag field.name, field.label << ("*" if field.required?).to_s
-  field.options.each do |key, value|
-    concat radio_button_tag key, value, field.value == value, field.input_attributes
-  end
-  unless field.error.empty?
-    concat content_tag :span, field.error, class: 'error' 
-  end
+  <%= label_tag field.name, field.label << ("*" if field.required?).to_s %>
 
-end %>
+  <% field.options.each do |value, name| %>
+    <div class="radio">
+      <%= label_tag '' do %>
+        <%= radio_button_tag field.name, value, field.value == value, field.input_attributes %>
+        <%= name %>
+      <% end -%>
+    </div>
+  <% end -%>
+
+  <% unless field.error.empty? -%>
+    <%= content_tag :span, field.error, class: 'error' %>
+  <% end -%>
+
+<% end -%>

data/app/views/hungryform/_select_field.html.erb

@@ -1,9 +1,10 @@
-<%= content_tag :div, id: "#{field.name}_wrapper", class: field.wrapper_class, 'data-dependency' => field.dependency_json do
+<%= content_tag :div, id: "#{field.name}_wrapper", class: field.wrapper_class, 'data-dependency' => field.dependency_json do -%>
 
-  concat label_tag field.name, field.label << ("*" if field.required?).to_s
-  concat select_tag field.name, options_for_select(field.options.invert, field.value), field.input_attributes
-  unless field.error.empty?
-    concat content_tag :span, field.error, class: 'error' 
-  end
+  <%= label_tag field.name, field.label << ("*" if field.required?).to_s %>
+  <%= select_tag field.name, options_for_select(field.options.invert, field.value), field.input_attributes %>
+  
+  <% unless field.error.empty? -%>
+    <%= content_tag :span, field.error, class: 'error' %>
+  <% end -%>
 
-end %>
+<% end -%>

data/app/views/hungryform/_text_area.html.erb

@@ -1,9 +1,10 @@
-<%= content_tag :div, id: "#{field.name}_wrapper", class: field.wrapper_class, 'data-dependency' => field.dependency_json do
+<%= content_tag :div, id: "#{field.name}_wrapper", class: field.wrapper_class, 'data-dependency' => field.dependency_json do -%>
     
-  concat label_tag field.name, field.label << ("*" if field.required?).to_s
-  concat text_area_tag field.name, field.value, field.input_attributes
-  unless field.error.empty?
-    concat content_tag :span, field.error, class: 'error' 
-  end
+  <%= label_tag field.name, field.label << ("*" if field.required?).to_s %>
+  <%= text_area_tag field.name, field.value, field.input_attributes %>
+  
+  <% unless field.error.empty? -%>
+    <%= content_tag :span, field.error, class: 'error' %>
+  <% end -%>
     
-end %>
+<% end -%>

data/app/views/hungryform/_text_field.html.erb

@@ -1,9 +1,10 @@
-<%= content_tag :div, id: "#{field.name}_wrapper", class: field.wrapper_class, 'data-dependency' => field.dependency_json do
+<%= content_tag :div, id: "#{field.name}_wrapper", class: field.wrapper_class, 'data-dependency' => field.dependency_json do -%>
 
-  concat label_tag field.name, field.label << ("*" if field.required?).to_s
-  concat text_field_tag field.name, field.value, field.input_attributes
-  unless field.error.empty?
-    concat content_tag :span, field.error, class: 'error' 
-  end
+  <%= label_tag field.name, field.label << ("*" if field.required?).to_s %>
+  <%= text_field_tag field.name, field.value, field.input_attributes %>
   
-end %>
+  <% unless field.error.empty? -%>
+    <%= content_tag :span, field.error, class: 'error' %>
+  <%end -%>
+  
+<% end -%>

data/hungryform-rails.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.0.0'
   
-  spec.add_dependency 'hungryform',   '~> 0.0', '>= 0.0.10'
+  spec.add_dependency 'hungryform',   '~> 0.0', '>= 0.0.11'
   spec.add_dependency 'rails',        '>= 3.2.1'
 
   spec.add_development_dependency "rspec",       '~> 3.0'

data/lib/hungryform/rails/action_view.rb

@@ -7,8 +7,8 @@ module HungryForm
         options[:data][:rel] ||= form_rel(form)
         options[:class] = [options[:class], "hungryform"].compact.join(' ')
 
-        views_prefix = options.delete(:views_prefix) || HungryForm.configuration.rails.elements_templates
-
+        views_prefix = options.delete(:elements_templates) || HungryForm.configuration.rails.elements_templates
+        
         form_tag('', options) do
           render partial: "#{views_prefix}/form", locals: {
             form: form,
@@ -51,6 +51,7 @@ module HungryForm
 
        # Builds link_to params except for the link's name
       def link_params(form, options, action_options = {})
+        options = options.dup
         method = options.delete(:method) || 'get'
         params = clean_params(form, options.delete(:params))
 

data/lib/hungryform/rails/railtie.rb

@@ -4,14 +4,22 @@ module HungryForm
 
       module Configuration
         attr_accessor :rails
+
+        def self.extended(base)
+          base.rails = ActiveSupport::OrderedOptions.new
+
+          base.rails.elements_templates = 'hungryform'
+          base.rails.error_class = 'invalid'
+
+          [:next_button_class, :prev_button_class, :submit_button_class].each do |button|
+            base.rails.send(button, '')
+          end
+        end
       end
 
       initializer 'hungryform', before: :load_config_initializers do
         HungryForm::Elements::Base::Element.send :include, Renderable
-
         HungryForm.configuration.extend Configuration
-        HungryForm.configuration.rails = ActiveSupport::OrderedOptions.new
-        HungryForm.configuration.rails.elements_templates = 'hungryform'
       end
 
       initializer 'active_support' do

data/lib/hungryform/rails/renderable.rb

@@ -3,15 +3,18 @@ module HungryForm
     module Renderable
       def wrapper_class
         classes = []
-        classes << configuration[:wrapper_class] if configuration.key?(:wrapper_class)
         classes << attributes[:wrapper_class] if attributes[:wrapper_class]
         classes << 'hidden' unless visible?
-        classes << 'invalid' if self.is_a?(HungryForm::Elements::Base::ActiveElement) && self.error.present?
+
+        if self.is_a?(HungryForm::Elements::Base::ActiveElement) && self.error.present?
+          classes << HungryForm.configuration.rails.error_class || 'invalid'
+        end
+
         classes.join(' ') if classes.any?
       end
 
       def input_attributes
-        attributes.except(*[configuration[:input_attributes_except], :wrapper_class].flatten)
+        attributes.except(*[configuration[:input_attributes_except], :wrapper_class, :checked].flatten)
       end
     end
   end

data/lib/hungryform/rails/version.rb

@@ -1,5 +1,5 @@
 module HungryForm
   module Rails
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

data/spec/views/shared_examples/labeled_active_element.rb

@@ -0,0 +1,15 @@
+RSpec.shared_examples 'labeled active element' do
+  it 'has a label' do
+    render render_params
+    expect(rendered).to include '<label for="group_field_name">Field name</label>'
+  end
+
+  context 'when it is required' do
+    before(:each) { attributes[:required] = true }
+
+    it "has an asterisk" do
+      render render_params
+      expect(rendered).to include '<label for="group_field_name">Field name*</label>'
+    end
+  end
+end

data/spec/views/shared_examples/rendered_active_element.rb

@@ -1,9 +1,4 @@
 RSpec.shared_examples 'rendered active element' do
-  it 'has a label' do
-    render render_params
-    expect(rendered).to include '<label for="group_field_name">Field name</label>'
-  end
-
   context 'when it is required' do
     before(:each) { attributes[:required] = true }
 
@@ -13,11 +8,6 @@ RSpec.shared_examples 'rendered active element' do
       expect(rendered).to match /<div.*class="invalid"/
     end
 
-    it "has an asterisk in a label" do
-      render render_params
-      expect(rendered).to include '<label for="group_field_name">Field name*</label>'
-    end
-
     it "has an error message" do
       field.valid?
       render render_params

data/spec/views/text_field_spec.rb

@@ -14,6 +14,7 @@ describe 'rendering text field' do
 
   it_behaves_like 'it is wrapped in a div'
   it_behaves_like 'rendered active element'
+  it_behaves_like 'labeled active element'
 
   it 'has an input' do
     render render_params

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hungryform-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Andrey Bazhutkin
@@ -19,7 +19,7 @@ dependencies:
         version: '0.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.10
+        version: 0.0.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '0.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.10
+        version: 0.0.11
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -148,6 +148,7 @@ files:
 - spec/views/group_spec.rb
 - spec/views/html_spec.rb
 - spec/views/select_field_spec.rb
+- spec/views/shared_examples/labeled_active_element.rb
 - spec/views/shared_examples/rendered_active_element.rb
 - spec/views/shared_examples/wrapped.rb
 - spec/views/text_area_spec.rb
@@ -188,6 +189,7 @@ test_files:
 - spec/views/group_spec.rb
 - spec/views/html_spec.rb
 - spec/views/select_field_spec.rb
+- spec/views/shared_examples/labeled_active_element.rb
 - spec/views/shared_examples/rendered_active_element.rb
 - spec/views/shared_examples/wrapped.rb
 - spec/views/text_area_spec.rb