mvcli 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 508c2c185acef69a64bb0adc1c39831523ff8f21
-  data.tar.gz: d6c2e35724efe351ae7be2a333e7cf0c75d17c30
+  metadata.gz: b724357af63c1eccdda3de7f4c73d1f4d8dc2355
+  data.tar.gz: 9a0e068f92f544c184bd2fb72fe4cbdf908c9583
 SHA512:
-  metadata.gz: b6918dc61af99ae091bbdd811e62f25798798c6a9b8b3557efc968f8a6af07cb4a9378bc0d4e8b5537c6253bd4d0f55f5bf0f8577d313d6158b7a562a5304a5d
-  data.tar.gz: 6741eca2aba70f1db5fca77285856583a82257c513260848b8cdbc620a74c240fc2fa636905e4553903685582f041d6519a1368cf71633669c74ab7eb3f93993
+  metadata.gz: 83bbc6c3c668363569cf81c3de98b219212ab96bd9e4b25b609c403aa28e2fd200170df986ce7dcc29d0731a2bc50730af9432d3c39eed3ea3efd4ca20b4bc39
+  data.tar.gz: 833e8aa8e762de423b8bf8287667040c245481cbd5d02995d1def13b57c13e027578d30176715b89ed70407e8c3092cb18f062ad608533df154f67595425e39f

data/Gemfile

@@ -4,6 +4,7 @@ source 'https://rubygems.org'
 gemspec
 
 gem "rake"
-gem "rspec"
+gem "rspec", "~> 2.13.0"
 gem "rspec-given"
 gem "rspec-spies"
+gem "pry"

data/lib/mvcli/form/input.rb

@@ -9,11 +9,11 @@ class MVCLI::Form::Input
 
   def decode(&block)
     @handler.decode &block
-    return self
   end
 
-  def value(source, context = nil)
-    @handler.value source, context
+  def value(source, context = nil, &transform)
+    transform ||= ->(v) { v }
+    @handler.value source, context, &transform
   end
 
   def handler(target)
@@ -33,7 +33,12 @@ class MVCLI::Form::Input
       @decoders << block
     end
 
-    def value(source, context = nil)
+
+    def value(source, context = nil, &transform)
+      transform.call decoded source, context
+    end
+
+    def decoded(source, context)
       if value = [source[@name]].flatten.first
         @decoders.reduce(value) do |value, decoder|
           decoder.call value
@@ -60,12 +65,12 @@ class MVCLI::Form::Input
   class ListTarget < Target
     include ActiveSupport::Inflector
 
-    def value(source, context = nil)
+    def value(source, context = nil, &transform)
       source = Map(source)
       list = [source[singularize @name]].compact.flatten.map do |value|
-        super({@name => value}, context)
+        super({@name => value}, context, &transform)
       end.compact
-      list.empty? ? [default(context)].compact.flatten : list
+      list.empty? ? [transform.call(default(context))].compact.flatten : list
     end
   end
 

data/lib/mvcli/form.rb

@@ -18,7 +18,9 @@ module MVCLI
       self.class.inputs.reduce(Map.new) do |map, pair|
         name, input = *pair
         map.tap do
-          map[name] = input.value @source, self
+          map[name] = input.value(@source, self) do |value|
+            value.is_a?(Form) ? value.attributes : value
+          end
         end
       end
     end
@@ -71,7 +73,7 @@ module MVCLI
         @inputs[name] = input
         if options[:required]
           if target.is_a?(Array)
-            validates(name, "cannot be empty", nil: true) {|value| value && !value.empty?}
+            validates(name, "cannot be empty", nil: true, each: false) {|value| value && !value.empty?}
           else
             validates(name, "is required", nil: true) {|value| !value.nil?}
           end

data/lib/mvcli/middleware/exception_logger/validation_summary.rb

@@ -0,0 +1,23 @@
+module MVCLI
+  class Middleware
+    class ExceptionLogger
+      class ValidationSummary
+        def initialize(validation)
+          @validation = validation
+        end
+
+        def keys
+          @validation.violations.keys
+        end
+
+        def values
+          @validation.violations.values
+        end
+
+        def write
+          #Write object to a stream
+        end
+      end
+    end
+  end
+end

data/lib/mvcli/middleware/exception_logger.rb

@@ -1,8 +1,13 @@
+require "mvcli/erb"
+require "mvcli/middleware/exception_logger/validation_summary"
+
 module MVCLI
   class Middleware
     class ExceptionLogger
       def call(command)
         yield command
+      rescue MVCLI::Validatable::ValidationError => e
+        ValidationSummary.new(e).write command.log
       rescue Exception => e
         command.log << e.message + "\n"
         raise e

data/lib/mvcli/validatable.rb

@@ -50,6 +50,7 @@ module MVCLI::Validatable
   class Validator
     def initialize
       @rules = []
+      @all = []
       @children = []
     end
 
@@ -88,13 +89,13 @@ module MVCLI::Validatable
     def initialize(object)
       @object = object
       @children = Map.new do |h,k|
-        h[k] = []
+        h[k] = [] unless k.nil?
       end
       @violations = Map.new do |h,k|
-        h[k] = []
+        h[k] = [] unless k.nil?
       end
       @errors = Map.new do |h,k|
-        h[k] = []
+        h[k] = [] unless k.nil?
       end
     end
 
@@ -166,20 +167,32 @@ module MVCLI::Validatable
 
   class Rule
     def initialize(field, message, options, predicate)
-      @field, @message, @options, @predicate = field, message, options, predicate
+      @field, @message, @predicate = field, message, predicate
+      @options = options.reverse_merge each: true
     end
+
     def call(validatable, violations, errors)
       value, error = read validatable
       if error
         errors[@field] << error
       else
-        return if value.nil? && !@options[:nil]
-        violations[@field] << @message unless @predicate.call value
+        check value, violations
+      end
+    end
+
+    def check(object, violations)
+      if object.is_a?(Enumerable) && @options[:each]
+        object.each_with_index do |item, i|
+          violations["#{@field}[#{i}]"] << @message unless @predicate.call item
+        end
+      else
+        return if object.nil? && !@options[:nil]
+        violations[@field] << @message unless @predicate.call object
       end
     end
 
     def read(validatable)
-      return validatable.send(@field), nil
+      return validatable.instance_eval(@field.to_s), nil
     rescue StandardError => e
       return nil, e
     end

data/lib/mvcli/version.rb

@@ -1,3 +1,3 @@
 module MVCLI
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/spec/mvcli/form/input_spec.rb

@@ -91,5 +91,9 @@ describe "Form Inputs" do
       When(:value) { input.value field: 10 }
       Then {value == [10]}
     end
+    context "when the value is retrieved with a transform" do
+      When(:value) { input.value(field: 10) {|v| v * 2} }
+      Then { value == [20] }
+    end
   end
 end

data/spec/mvcli/form_spec.rb

@@ -25,6 +25,7 @@ describe "A form for creating a load balancer" do
         validates(:type, "invalid type") {|type| ['PRIMARY', 'SECONDARY'].member? type}
         validates(:condition, "invalid condition") {|c| ['ENABLED', 'DISABLED'].member? c}
       end
+      validates(:virtual_ips, "invalid virtual IP") {|ip| ['PUBLIC', 'SERVICENET'].member? ip}
     end
   end
   Given(:form) do
@@ -33,6 +34,12 @@ describe "A form for creating a load balancer" do
       f.stub(:naming) {mock(:NameGenerator, generate: 'random-name')}
     end
   end
+  context "with invalid array properties" do
+    Given(:params) { ({virtual_ip: ['PERBLIC'], node: ['10.0.0.1']}) }
+    Then { not form.valid? }
+    And {form.violations["virtual_ips[0]"] == ["invalid virtual IP"]}
+
+  end
   context "with no nodes provided" do
     Given(:params) {({node: []})}
     Then {!form.valid?}
@@ -91,6 +98,9 @@ describe "A form for creating a load balancer" do
     Given(:attributes) {form.value.to_hash.reject {|k,v| k == "nodes"}}
     Then {attributes == {"name" => "foo", "port" => 80, "protocol" => "HTTP", "virtual_ips" => ["PUBLIC", "SERVICENET"]}}
 
+    Given (:nodeattrs) { form.attributes[:nodes]}
+    Then { nodeattrs.first == {"address" => IPAddr.new('10.0.0.1'), "port" =>  80, "condition" => "ENABLED", "type" =>  "PRIMARY"} }
+
     context ". On the first node" do
       Given(:node) {form.nodes.first}
       Then {node.address == IPAddr.new('10.0.0.1')}

data/spec/mvcli/middleware/exception_logger/validation_summary_spec.rb

@@ -0,0 +1,23 @@
+require "spec_helper"
+require "mvcli/validatable"
+require "mvcli/middleware/exception_logger/validation_summary"
+
+describe "ValidationSummary" do
+  use_natural_assertions
+  Given(:validator) { MVCLI::Validatable::Validator.new }
+  Given(:object) { Object.new }
+  Given(:validation) { validator.validate object }
+  Given(:summary) { MVCLI::Middleware::ExceptionLogger::ValidationSummary.new validation }
+  context "With a simple validation" do
+    Given do
+      validator.validates(:foo, "You dun goofed", nil: true) {|foo| foo != nil}
+      validator.validate object
+    end
+
+    context "When validation fails" do
+      When { object.stub(:foo) }
+      Then { summary.keys.first == "foo" }
+      And { summary.values.first == ["You dun goofed"] }
+    end
+  end
+end

data/spec/mvcli/validatable_spec.rb

@@ -6,6 +6,8 @@ describe "a validator" do
   Given(:object) {Object.new}
   Given(:validator) {MVCLI::Validatable::Validator.new}
   Given(:validation) { validator.validate object }
+  Given(:violations) { validation.violations }
+
   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}
@@ -37,4 +39,28 @@ describe "a validator" do
       Then { validation.valid? }
     end
   end
+
+  describe "validating each element in an enumerable" do
+    Given { validator.validates(:foodles, "invalid", nil: true) {|foodle| not foodle.nil? } }
+    context "when there are invalid elements in the enumerable" do
+      When { object.stub(:foodles) {["not nil", nil, "not nil"]} }
+      Then { not validation.valid? }
+      Then { violations.has_key? "foodles[1]" }
+      And { not violations.has_key? "foodles"}
+    end
+  end
+
+  describe "validating an enumerable itself" do
+    Given { object.stub(:array) {array} }
+    Given { validator.validates(:array, "invalid", each: false) {|a| a.length < 3} }
+    context "when it is valid" do
+      When(:array) { [1,2] }
+      Then { validation.valid? }
+    end
+    context "when it is invalid" do
+      When(:array) { [1,2,3] }
+      Then { not validation.valid? }
+      And {not violations["array"].empty?}
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mvcli
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Charles Lowell
@@ -29,7 +29,7 @@ cert_chain:
   UgImJlChAzCoDP9zi9tdm6jAr7ttF25R9PPYr11ILb7dYe3qUzlNlM6zJx/nb31b
   IhdyRVup4qLcqYSTPsm6u7VA
   -----END CERTIFICATE-----
-date: 2013-07-01 00:00:00.000000000 Z
+date: 2013-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: map
@@ -85,6 +85,7 @@ files:
 - lib/mvcli/loader.rb
 - lib/mvcli/middleware.rb
 - lib/mvcli/middleware/exception_logger.rb
+- lib/mvcli/middleware/exception_logger/validation_summary.rb
 - lib/mvcli/middleware/exit_status.rb
 - lib/mvcli/provisioning.rb
 - lib/mvcli/renderer.rb
@@ -100,6 +101,7 @@ files:
 - spec/mvcli/form/input_spec.rb
 - spec/mvcli/form_spec.rb
 - spec/mvcli/loader_spec.rb
+- spec/mvcli/middleware/exception_logger/validation_summary_spec.rb
 - spec/mvcli/middleware/exception_logger_spec.rb
 - spec/mvcli/middleware/exit_status_spec.rb
 - spec/mvcli/middleware_spec.rb
@@ -140,6 +142,7 @@ test_files:
 - spec/mvcli/form/input_spec.rb
 - spec/mvcli/form_spec.rb
 - spec/mvcli/loader_spec.rb
+- spec/mvcli/middleware/exception_logger/validation_summary_spec.rb
 - spec/mvcli/middleware/exception_logger_spec.rb
 - spec/mvcli/middleware/exit_status_spec.rb
 - spec/mvcli/middleware_spec.rb