membrane 0.0.4 → 0.0.5

data/Rakefile

@@ -12,3 +12,4 @@ RSpec::Core::RakeTask.new("spec:ci" => "ci:setup:rspec") do |t|
   t.rspec_opts = %w[--no-color --format documentation]
 end
 
+task :default => [:spec]

data/lib/membrane/schemas/bool.rb

@@ -16,15 +16,13 @@ class Membrane::Schemas::Bool < Membrane::Schemas::Base
     end
 
     def validate
-      if !TRUTH_VALUES.include?(@object)
-        fail!
-      end
+      fail!(@object) if !TRUTH_VALUES.include?(@object)
     end
 
     private
 
-    def fail!
-      emsg = "Expected instance of true or false, given #{@object}"
+    def fail!(object)
+      emsg = "Expected instance of true or false, given #{object}"
       raise Membrane::SchemaValidationError.new(emsg)
     end
   end

data/lib/membrane/schemas/class.rb

@@ -21,14 +21,14 @@ class Membrane::Schemas::Class < Membrane::Schemas::Base
     end
 
     def validate
-      fail! if !@object.kind_of?(@klass)
+      fail!(@klass, @object) if !@object.kind_of?(@klass)
     end
 
     private
 
-    def fail!
-      emsg = "Expected instance of #{@klass}," \
-             + " given an instance of #{@object.class}"
+    def fail!(klass, object)
+      emsg = "Expected instance of #{klass}," \
+             + " given an instance of #{object.class}"
       raise Membrane::SchemaValidationError.new(emsg)
     end
   end

data/lib/membrane/schemas/enum.rb

@@ -32,15 +32,15 @@ class Membrane::Schemas::Enum < Membrane::Schemas::Base
         end
       end
 
-      fail!(@elem_schemas)
+      fail!(@elem_schemas, @object)
     end
 
     private
 
-    def fail!(elem_schemas)
+    def fail!(elem_schemas, object)
       elem_schema_str = elem_schemas.map { |s| s.to_s }.join(", ")
 
-      emsg = "Object #{@object} doesn't validate" \
+      emsg = "Object #{object} doesn't validate" \
            + " against any of #{elem_schema_str}"
       raise Membrane::SchemaValidationError.new(emsg)
     end

data/lib/membrane/schemas/list.rb

@@ -24,13 +24,13 @@ class Membrane::Schemas::List < Membrane::Schemas::Base
     end
 
     def validate
-      fail! if !@object.kind_of?(Array)
+      fail!(@object) if !@object.kind_of?(Array)
     end
 
     private
 
-    def fail!
-      emsg = "Expected instance of Array, given instance of #{@object.class}"
+    def fail!(object)
+      emsg = "Expected instance of Array, given instance of #{object.class}"
       raise Membrane::SchemaValidationError.new(emsg)
     end
   end

data/lib/membrane/schemas/record.rb

@@ -83,13 +83,13 @@ class Membrane::Schemas::Record < Membrane::Schemas::Base
     end
 
     def validate
-      fail! unless @object.kind_of?(Hash)
+      fail!(@object) unless @object.kind_of?(Hash)
     end
 
     private
 
-    def fail!
-      emsg = "Expected instance of Hash, given instance of #{@object.class}"
+    def fail!(object)
+      emsg = "Expected instance of Hash, given instance of #{object.class}"
       raise Membrane::SchemaValidationError.new(emsg)
     end
   end

data/lib/membrane/schemas/regexp.rb

@@ -27,13 +27,13 @@ class Membrane::Schemas::Regexp < Membrane::Schemas::Base
     end
 
     def validate
-      fail! if !@object.kind_of?(String)
+      fail!(@object) if !@object.kind_of?(String)
     end
 
     private
 
-    def fail!
-      emsg = "Expected instance of String, given instance of #{@object.class}"
+    def fail!(object)
+      emsg = "Expected instance of String, given instance of #{object.class}"
       raise Membrane::SchemaValidationError.new(emsg)
     end
 
@@ -47,13 +47,13 @@ class Membrane::Schemas::Regexp < Membrane::Schemas::Base
     end
 
     def validate
-      fail! if !@regexp.match(@object)
+      fail!(@regexp, @object) if !@regexp.match(@object)
     end
 
     private
 
-    def fail!
-      emsg = "Value #{@object} doesn't match regexp #{@regexp}"
+    def fail!(regexp, object)
+      emsg = "Value #{object} doesn't match regexp #{regexp.inspect}"
       raise Membrane::SchemaValidationError.new(emsg)
     end
   end

data/lib/membrane/schemas/tuple.rb

@@ -27,13 +27,13 @@ class Membrane::Schemas::Tuple < Membrane::Schemas::Base
     end
 
     def validate
-      fail! if !@object.kind_of?(Array)
+      fail!(@object) if !@object.kind_of?(Array)
     end
 
     private
 
-    def fail!
-      emsg = "Expected instance of Array, given instance of #{@object.class}"
+    def fail!(object)
+      emsg = "Expected instance of Array, given instance of #{object.class}"
       raise Membrane::SchemaValidationError.new(emsg)
     end
   end

data/lib/membrane/version.rb

@@ -1,3 +1,3 @@
 module Membrane
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/membrane.gemspec

@@ -4,7 +4,6 @@ require File.expand_path('../lib/membrane/version', __FILE__)
 Gem::Specification.new do |gem|
   gem.name          = "membrane"
   gem.version       = Membrane::VERSION
-  gem.date          = "2012-07-09"
   gem.summary       = "A DSL for validating data."
   gem.homepage      = "http://www.cloudfoundry.org"
   gem.authors       = ["mpage"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: membrane
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-09 00:00:00.000000000 Z
+date: 2014-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ci_reporter