mvcli 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39bb6d037a235e80b610d16a1cff026dd0945134
-  data.tar.gz: 42a1e909308dea92677bf8e76abb6dcee1d8358f
+  metadata.gz: 88557c947ef7dda45f0e854d7c56806e979e75f5
+  data.tar.gz: 357ee1d5fd303402b6e538e69f245638b82b1621
 SHA512:
-  metadata.gz: 2812db9dc93f3a3ec99d6cfa5b2af883e6ed04af8aea8538404b28b5969234c14c3b71615996011dbd348e7e4343de0ec923e48078487e3d3142a9da6b6b5a8f
-  data.tar.gz: e2913626bac2de10934365c49a80924365885aac67c7bf23f76764a1ed8ca53fd08792b38dd04dae92aa5c2619385b89b44309552d46216115203bf148b962ab
+  metadata.gz: c77eeab72a1f9e1dca58b8910b7dd1dee562b4e412e512911b265cdcb059f8d51fe66d2d9077155d3765f858a295c7e4b1b5f2d583d2f69e4d1d579f5fa776a1
+  data.tar.gz: 13187537df716ae571c93eb1df4a9b8b3faf4d71820fd3f9672ccbff5e223ff069c1680fc3d456136fc9c79e1f7e3409387b7816dec342ce1eab50bcc6ea7ded

data/lib/mvcli/erb.rb

@@ -15,19 +15,25 @@ module MVCLI
       Template.new code, enc, filename
     end
 
+    class Context < BasicObject
+      attr_reader :this
+      def initialize(this)
+        @this = this
+      end
+    end
+
     class Template
       def initialize(code, enc, filename)
         @code, @enc, @filename = code, enc, filename
       end
 
-      def call(context, output)
+      def call(this, output)
+        context = Context.new this
         binding = context.instance_eval do
           @_erbout = output
           Kernel.binding
         end
         eval @code, binding, @filename, 1
-      ensure
-        context.remove_instance_variable(:@_erbout)
       end
 
       def to_proc

data/lib/mvcli/validatable.rb

@@ -172,9 +172,8 @@ module MVCLI::Validatable
       value, error = read validatable
       if error
         errors[@field] << error
-      elsif value.nil?
-        return unless !!@options[:nil]
       else
+        return if value.nil? && !@options[:nil]
         violations[@field] << @message unless @predicate.call value
       end
     end

data/lib/mvcli/version.rb

@@ -1,3 +1,3 @@
 module MVCLI
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/spec/mvcli/erb_spec.rb

@@ -5,7 +5,7 @@ describe "MVCLI::ERB" do
   Given(:erb) {MVCLI::ERB.new}
   context "when I compile a template" do
     Given(:output) {""}
-    Given(:template) {erb.compile "name: <%= name %>"}
+    Given(:template) {erb.compile "name: <%= this.name %>"}
     context "and call it with a context" do
       When {template.call mock(:Context, :name => 'Charles'), output}
       Then {output.should eql "name: Charles"}

data/spec/mvcli/validatable_spec.rb

@@ -2,11 +2,14 @@ require "spec_helper"
 require "mvcli/validatable"
 
 describe "a validator" do
+  use_natural_assertions
+  Given(:object) {Object.new}
   Given(:validator) {MVCLI::Validatable::Validator.new}
+  Given(:validation) { validator.validate object }
   context "when it validates a field that does not exist on the object" do
     Given {validator.validates(:does_not_exist, "invalid") {}}
-    When(:validation) {validator.validate(Object.new)}
-    Then {validation.errors[:does_not_exist].class < NameError}
+    When(:validation) {validator.validate object}
+    Then {not validation.errors[:does_not_exist].empty?}
     Then {not validation.valid?}
   end
   describe "validating a child" do
@@ -21,4 +24,17 @@ describe "a validator" do
       And {not validation.valid?}
     end
   end
+
+  describe "validating a nil field" do
+    Given { object.stub(:property) {nil} }
+    context "when the validate-on-nil option is passed" do
+      When { validator.validates(:property, "check nil", nil: true) {false} }
+      Then { not validation.valid? }
+      And { not validation.violations[:property].empty? }
+    end
+    context "when the validate on nil option is not passed" do
+      When { validator.validates(:property, "check nil") {false}}
+      Then { validation.valid? }
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mvcli
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Charles Lowell
@@ -29,7 +29,7 @@ cert_chain:
   UgImJlChAzCoDP9zi9tdm6jAr7ttF25R9PPYr11ILb7dYe3qUzlNlM6zJx/nb31b
   IhdyRVup4qLcqYSTPsm6u7VA
   -----END CERTIFICATE-----
-date: 2013-06-26 00:00:00.000000000 Z
+date: 2013-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: map