ball_gag 0.0.3 → 0.0.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ball_gag (0.0.2)
+    ball_gag (0.0.4)
 
 GEM
   remote: http://rubygems.org/

data/ball_gag.gemspec

@@ -20,4 +20,6 @@ Gem::Specification.new do |s|
 
   # specify any dependencies here; for example:
   s.add_development_dependency 'rspec'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'activemodel'
 end

data/lib/ball_gag/cloak.rb

@@ -24,13 +24,13 @@ module BallGag
     end
 
     def preterite= preterite
-      set_preterite preterite
       @preterite_negative = false
+      set_preterite preterite
     end
 
     def negative_preterite= preterite
-      set_preterite preterite
       @preterite_negative = true
+      set_preterite preterite
     end
 
     def preterite_negative?
@@ -39,8 +39,10 @@ module BallGag
 
     private
     def set_preterite preterite
-      undefine_old_preterite_validators @preterite
-      define_preterite_validators preterite
+      if defined?(ActiveModel::EachValidator)
+        undefine_old_preterite_validators @preterite
+        define_preterite_validators preterite
+      end
       
       @preterite = preterite
     end
@@ -48,8 +50,10 @@ module BallGag
     def define_preterite_validators preterite
       return unless preterite
 
-      Kernel.const_set(validator_name(preterite), Class.new(GaggedValidator))
-      Kernel.const_set(not_validator_name(preterite), Class.new(NotGaggedValidator))
+      new_validators = [ Class.new(GaggedValidator), Class.new(NotGaggedValidator) ]
+      new_validators.reverse! if BallGag.preterite_negative?
+      Kernel.const_set(validator_name(preterite), new_validators[0])
+      Kernel.const_set(not_validator_name(preterite), new_validators[1])
     end
 
     def undefine_old_preterite_validators preterite

data/lib/ball_gag/validations.rb

@@ -13,7 +13,9 @@ class GaggedValidator < ActiveModel::EachValidator
   end
 
   def default_message
-    "is not #{BallGag.preterite}"
+    BallGag.preterite_negative? ?
+      "is #{BallGag.preterite}" :
+      "is not #{BallGag.preterite}"
   end
 
   def neg_method_name attribute
@@ -34,7 +36,9 @@ class NotGaggedValidator < GaggedValidator
   end
 
   def default_message
-    "is #{BallGag.preterite}"
+    BallGag.preterite_negative? ?
+      "is not #{BallGag.preterite}" :
+      "is #{BallGag.preterite}"
   end
 end
 

data/lib/ball_gag/version.rb

@@ -1,4 +1,4 @@
 module BallGag
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end
 

data/spec/cloak_spec.rb

@@ -105,14 +105,23 @@ describe 'BallGag cloaking' do
       instance.errors[:words].should include 'is censored'
     end
 
-    specify 'negative preterite should not alter meaning of extant validators' do
+    specify 'negative preterite should create inverse validator' do
+      BallGag.negative_preterite = 'acceptable'
+      ExampleActiveModel.gag(:words) { |words| false }
+      ExampleActiveModel.validates :words, acceptable: true
+      instance = ExampleActiveModel.new
+      instance.valid?
+      instance.errors[:words].should include 'is not acceptable'
+    end
+
+    specify 'negative preterite should alter message but not meaning of extant validators' do
       BallGag.negative_preterite = 'acceptable'
 
       ExampleActiveModel.gag(:words) { |words| false }
       ExampleActiveModel.validates :words, not_gagged: true
       instance = ExampleActiveModel.new
       instance.valid?
-      instance.errors[:words].should include 'is acceptable'
+      instance.errors[:words].should include 'is not acceptable'
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ball_gag
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70253003020680 !ruby/object:Gem::Requirement
+  requirement: &70274670743440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,29 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70253003020680
+  version_requirements: *70274670743440
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70274670742620 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70274670742620
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: &70274670741600 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70274670741600
 description: Validate user input using pluggable back-ends
 email:
 - duncan@dweebd.com