rails-angulate 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 576545c753d58329200048bb33bec86c55d9ce24
-  data.tar.gz: 88c7ef8625b479fee67aaaff6e73491fdef2c397
+  metadata.gz: 6dcb4962532ac0cafd799575cf926491cd8d56cb
+  data.tar.gz: b0c5a57ff8b21c43ed22de79aa96beabdd7d64a3
 SHA512:
-  metadata.gz: 8cf18883909ca7da685db56e03d65bc7dc98d5d9d841170fab3a4914526e2fc18442822d10fb7e50cbba369830671a115f607c36396a8ba1034de174d50543b7
-  data.tar.gz: df92fabf45cb2f9a84ebcb05750ece38004082d5986cfd10e4bcf1ea2d1257b3715a34df224ce4896a0db06de4273db3d2b55f49463318354c7f01da4434a43f
+  metadata.gz: c8658c6365dff8c50b9f17a023a36ea78d6a46ec2ee5f93febb2dde04cd908ec992ab41e522f36d9a2123e7bb3dc6650dd15c49dd52977439db3790e079245af
+  data.tar.gz: 8dae40660d82128ad8db8fb7e8ea7bcf9e6ff62aa9e66570d51bc5214a40f3119dcbda67318df728ee5970e1db2c84c4fd40a2fae888886c8d5b346da101be42

data/lib/rails/angulate/helpers/tags/ng_validation_errors.rb

@@ -8,7 +8,7 @@ module Rails
           def render
             # We can't use content_tag with a block (no self.output_buffer)
             # so we pass in content
-            container(error_list_html) unless validators.empty?
+            container(error_list_html) unless validators.empty? && !has_optional_validators?
           end
 
           private
@@ -22,12 +22,32 @@ module Rails
           end
 
           def error_list_html
-            validators.map do |validator|
+            html = ''
+
+            html << validators.map do |validator|
               mapper = validator_mapper_for(validator)
               mapper.error_messages.map do |error_type, msg|
                 content_tag :li, msg, 'ng-show' => "#{form_field_object_name}.$error.#{error_type}"
               end.join
-            end.join.html_safe
+            end.join
+
+            html << (extra_validators || '')
+            html.html_safe
+          end
+
+          def extra_validators
+            options.inject('') do |html, (k, v)|
+              k = k.to_s
+              html << if k.start_with?('$')
+                content_tag(:li, v, 'ng-show' => "#{form_field_object_name}.$error.#{k[1..-1]}")
+              else
+                ''
+              end
+            end
+          end
+
+          def has_optional_validators?
+            options.keys.any? { |k| k.to_s.start_with?('$') }
           end
 
           def container_attrs

data/lib/rails/angulate/version.rb

@@ -1,5 +1,5 @@
 module Rails
   module Angulate
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-angulate
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Stan Bondi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-01 00:00:00.000000000 Z
+date: 2014-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails