liquid-validations 1.0.1 → 1.0.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    liquid-validations (1.0.1)
+    liquid-validations (1.0.2)
       activerecord
       liquid
 

data/lib/liquid-validations/version.rb

@@ -1,3 +1,3 @@
 module LiquidValidations
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

data/lib/liquid-validations.rb

@@ -16,7 +16,7 @@ module LiquidValidations
       end
 
       for error in errors
-        record.errors.add(attr_name, friendly_liquid_error(error))
+        record.errors.add(:base, friendly_liquid_error(error) + " in your #{ friendly_attr_name(attr_name) }")
       end
     end
   end
@@ -35,9 +35,9 @@ module LiquidValidations
       container_re  = /<\s*#{ container }.*>.*#{ variable_re }.*<\/\s*#{ container }\s*>/im
 
       if container.blank? && !(value =~ variable_re)
-        record.errors.add(attr_name, "You must include {{ #{ variable } }} in your #{ friendly_attr_name(attr_name) }")
+        record.errors.add(:base, "You must include {{ #{ variable } }} in your #{ friendly_attr_name(attr_name) }")
       elsif !container.blank? && !(value =~ container_re)
-        record.errors.add(attr_name, "You must include {{ #{ variable } }} inside the <#{ container }> tag of your #{ friendly_attr_name(attr_name) }")
+        record.errors.add(:base, "You must include {{ #{ variable } }} inside the <#{ container }> tag of your #{ friendly_attr_name(attr_name) }")
       end
     end
   end

data/spec/liquid_validations_spec.rb

@@ -19,6 +19,7 @@ describe LiquidValidations do
       end
 
       @mixin = Mixin.new
+      @mixin.errors.clear
     end
 
     [ ' {{ Bad liquid ',
@@ -33,7 +34,7 @@ describe LiquidValidations do
     it 'should include the errors in the errors object' do
       @mixin.content = '{{ unclosed variable '
       @mixin.valid?
-      @mixin.errors.must_include(:content)
+      @mixin.errors.full_messages.any? { |e| e == "Variable '{{' was not properly closed in your content" }.must_equal true
     end
   end
 
@@ -58,7 +59,7 @@ describe LiquidValidations do
     it 'should include the errors in the errors object' do
       @mixin.content = '{{ josh_is_not_awesome }}'
       @mixin.valid?
-      @mixin.errors.must_include(:content)
+      @mixin.errors.full_messages.any? { |e| e == "You must include {{ josh_is_awesome }} in your content" }.must_equal true
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: liquid-validations
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Matt Wigham