sal-engine 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b96829266c56813153134128efe562fd8d0c0cf
-  data.tar.gz: 8789169e581cfa3bd04df9fc44d5cc4676dac48d
+  metadata.gz: d59a3227f27a5896f4e181fef39bb5cbe29e9c94
+  data.tar.gz: 070b3a7074c1f80f43f3a921dbd31beee7c20a25
 SHA512:
-  metadata.gz: 996a338bafd96bc0a2a68d248f5adeadd349692cbd1b230ff4946ccc21f8d85d8664c06959db2a903ce6f4b4bc7f3ef61bc3c67ce90c374ee8478b8e832cc541
-  data.tar.gz: 9af8344760b3f572e6252cdcddfbad630d4e3e6c5a7a6a3fdabc4784275127065d1129649b450412ffc6a52c83d1a85acf970c501a3e3af2f512ce9cdac859e3
+  metadata.gz: 1bfe9d408f89c9c1ca2019bbf72254ded063c3eff6c60b12d2e583fd552223ea50cf048c9bce79f399b6f9db92879d389863236caf3cf6cd432fe12c67745354
+  data.tar.gz: e2b3d29114526f9c927765ae8f7901749346bd539adf7068de3958e2a4cea5b52db6925ae4b604da9fb37acd508bc18d4ea882795f88df80e6759256470a8327

data/README.md

@@ -67,17 +67,47 @@ Parameters:
 - model: an active record model, or tableless
 - model2: you can provide more than one
 
+The string `Please correct the highlighted fields.` is localized as `errors_bar_message`
+into English, French, German, Italian, Portuguese and Spanish. You can override
+this in your app if you need to, editing your locale yml files.
+
 ## Error messages
 I like to put the error messages right after the field in the form.
-An initializer will patch ActionView::Base to wrap the field with the error message.
-Given a model with an error on, let's say, _title_, we'll get:
+sal provides an initializer that will patch ActionView::Base to wrap the field
+with the extra markup and the error message.
+
+Given a model with a field:
+```erb
+<%= text_field_tag :title %>
+```
+that renders this simple view:
+```html
+<input type="text" name="title">
+```
+
+Then it will add this extra HTML on an error:
 ```html
 <div class="has-error">
   <input type="text" name="title">
-  <span class="help-block">⤷ Title can't be blank.</span>
+  <span class="help-block">✖ can't be blank</span>
 </div>
 ```
 
+It plays nice with Bootstrap forms. You won't have to touch any CSS.
+- Plain text fields:
+```erb
+  <div class="form-group">
+    <%= f.label :password, 'Password' %>
+    <%= f.password_field :password, :class => 'form-control' %>
+  </div>
+```
+- Checkboxes. Use this code for proper margin and alignment:
+```erb
+  <div class="form-group checkbox">
+    <%= f.label :conditions, "#{f.check_box(:conditions)}I accept the terms and conditions".html_safe, :class => 'checkbox' %>
+  </div>
+```
+
 ## Generators
 Rails generators are very useful in the initial stages of development to create your admin interfaces.
 In particular:

data/app/helpers/sal/application_helper.rb

@@ -3,8 +3,15 @@ module Sal
     def errors_bar(*entities)
       entities = Array(entities)
 
-      if entities.detect { |entity| entity.errors.any? }
-        content_tag :div, t(:errors_bar_message), class: 'alert alert-danger'
+      messages = entities.map { |entity| entity.errors[:base].map &:capitalize }.flatten
+
+      # is there any non-base error?
+      if entities.detect { |entity| entity.errors.keys.detect { |error| error != :base } }
+        messages << t(:errors_bar_message)
+      end
+
+      if messages.any?
+        content_tag :div, messages.join("\n"), class: 'alert alert-danger'
       end
     end
 

data/lib/sal/version.rb

@@ -1,3 +1,3 @@
 module Sal
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/spec/helpers/application_helper_spec.rb

@@ -4,8 +4,12 @@ describe ApplicationHelper do
 
   describe '#errors_bar' do
 
-    let(:without) { double(errors: {}) }
-    let(:with) { double(errors: {base: 'error'}) }
+    # Mocking ActiveRecord error format:
+    # - errors are presented as arrays
+    # - no errors in a category returns an empty array
+    let(:without) { double(errors: {base: []}) }
+    let(:with) { double(errors: {base: ['base error']}) }
+    let(:with_non_base) { double(errors: {base: [], email: ['is invalid']}) }
     let(:text) { 'Please correct the highlighted fields.' }
 
     context 'no errors' do
@@ -16,9 +20,12 @@ describe ApplicationHelper do
 
     context 'errors' do
 
-      it { expect(helper.errors_bar(with)).to have_selector('div.alert.alert-danger', text: text) }
-      it { expect(helper.errors_bar(with, without)).to have_selector('div.alert.alert-danger', text: text) }
-      it { expect(helper.errors_bar(with, with)).to have_selector('div.alert.alert-danger', text: text) }
+      it { expect(helper.errors_bar(with)).to have_selector('div.alert.alert-danger', text: 'Base error') }
+      it { expect(helper.errors_bar(with, without)).to have_selector('div.alert.alert-danger', text: 'Base error') }
+      it { expect(helper.errors_bar(with, with_non_base)).to have_selector('div.alert.alert-danger', text: "Base error\n#{text}") }
+      it { expect(helper.errors_bar(with_non_base, without)).to have_selector('div.alert.alert-danger', text: text) }
+      it { expect(helper.errors_bar(with, with)).to have_selector('div.alert.alert-danger', text: "Base error\nBase error") }
+      it { expect(helper.errors_bar(with_non_base, with, with)).to have_selector('div.alert.alert-danger', text: "Base error\nBase error\n#{text}") }
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sal-engine
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Daniel Cruz Horts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-04 00:00:00.000000000 Z
+date: 2015-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails