schemata-dea 0.0.1.beta13 → 0.0.1.beta14

data/lib/schemata/common/msgbase.rb

@@ -14,6 +14,7 @@ module Schemata
         @contents = {}
 
         data.each do |key, field_value|
+          key = Schemata::HashCopyHelpers.stringify(key)
           field_schema = @schema.schemas[key]
           next unless field_schema
 

data/lib/schemata/dea/version.rb

@@ -1,5 +1,5 @@
 module Schemata
   module DEA
-    VERSION = "0.0.1.beta13"
+    VERSION = "0.0.1.beta14"
   end
 end

data/spec/cloud_controller/cloud_controller_spec.rb

@@ -0,0 +1,6 @@
+require 'schemata/cloud_controller'
+require 'spec_helper'
+
+describe Schemata::CloudController do
+  it_behaves_like "a schemata component"
+end

data/spec/cloud_controller/droplet_updated_message_spec.rb

@@ -0,0 +1,10 @@
+require 'schemata/cloud_controller'
+require 'spec_helper'
+
+describe Schemata::CloudController::DropletUpdatedMessage do
+  it_behaves_like "a message type"
+end
+
+describe Schemata::CloudController::DropletUpdatedMessage::V1 do
+  it_behaves_like "a message"
+end

data/spec/cloud_controller/hm_start_request_spec.rb

@@ -0,0 +1,11 @@
+require "schemata/cloud_controller"
+
+describe Schemata::CloudController::HmStartRequest do
+  it_behaves_like "a message type"
+end
+
+Schemata::CloudController::HmStartRequest.versions.each do |v|
+  describe Schemata::CloudController::HmStartRequest::const_get("V#{v}") do
+    it_behaves_like "a message"
+  end
+end

data/spec/cloud_controller/hm_stop_request_spec.rb

@@ -0,0 +1,12 @@
+require 'schemata/cloud_controller'
+require 'spec_helper'
+
+describe Schemata::CloudController::HmStopRequest do
+  it_behaves_like "a message type"
+end
+
+Schemata::CloudController::HmStopRequest.versions.each do |v|
+  describe Schemata::CloudController::HmStopRequest::const_get("V#{v}") do
+    it_behaves_like "a message"
+  end
+end

data/spec/{cloud_controller/cc_bar_spec.rb → component2/component2_bar_spec.rb}

@@ -1,7 +1,7 @@
-require 'schemata/cloud_controller/cloud_controller'
+require 'schemata/component2/component2'
 require 'support/helpers'
 
-describe Schemata::CloudController do
+describe Schemata::Component2 do
   before :each do
     @v10_msg = '{
       "min_version": 10,
@@ -37,21 +37,21 @@ describe Schemata::CloudController do
   describe "#decode" do
     describe "(current version is 10)" do
       before :each do
-        set_current_version(Schemata::CloudController::Bar, 10)
+        set_current_version(Schemata::Component2::Bar, 10)
       end
 
       after :each do
-        reset_version(Schemata::CloudController::Bar)
+        reset_version(Schemata::Component2::Bar)
       end
 
       it "should take a v10 msg and create a v10 obj" do
-        msg_obj = Schemata::CloudController::Bar.decode(@v10_msg)
+        msg_obj = Schemata::Component2::Bar.decode(@v10_msg)
         msg_obj.bar1.should == "first"
         msg_obj.bar2.should == "second"
       end
 
       it "should take a v11 msg and create a v10 obj" do
-        msg_obj = Schemata::CloudController::Bar.decode(@v11_msg)
+        msg_obj = Schemata::Component2::Bar.decode(@v11_msg)
         msg_obj.bar1.should == "1"
         msg_obj.bar2.should == "second"
       end
@@ -59,21 +59,21 @@ describe Schemata::CloudController do
 
     describe "(current version is 11)" do
       before :each do
-        set_current_version(Schemata::CloudController::Bar, 11)
+        set_current_version(Schemata::Component2::Bar, 11)
       end
 
       after :each do
-        reset_version(Schemata::CloudController::Bar)
+        reset_version(Schemata::Component2::Bar)
       end
 
       it "should take a v10 msg and create a v11 obj" do
-        msg_obj = Schemata::CloudController::Bar.decode(@v10_msg)
+        msg_obj = Schemata::Component2::Bar.decode(@v10_msg)
         msg_obj.bar1.should == 5
         msg_obj.bar3.should == "third"
       end
 
       it "should take a v11 msg and create a v11 obj" do
-        msg_obj = Schemata::CloudController::Bar.decode(@v11_msg)
+        msg_obj = Schemata::Component2::Bar.decode(@v11_msg)
         msg_obj.bar1.should == 1
         msg_obj.bar3.should == "third"
       end
@@ -83,15 +83,15 @@ describe Schemata::CloudController do
   describe "#encode" do
     describe "(current version is 10)" do
       before :each do
-        set_current_version(Schemata::CloudController::Bar, 10)
+        set_current_version(Schemata::Component2::Bar, 10)
       end
 
       after :each do
-        reset_version(Schemata::CloudController::Bar)
+        reset_version(Schemata::Component2::Bar)
       end
 
       it "should take a v10 obj and encode a json msg" do
-        v10_obj = Schemata::CloudController::Bar::V10.new(@v10_hash)
+        v10_obj = Schemata::Component2::Bar::V10.new(@v10_hash)
         json_msg = v10_obj.encode
         returned_hash = Yajl::Parser.parse(json_msg)
 
@@ -108,12 +108,12 @@ describe Schemata::CloudController do
 
     describe "(current version is 11)" do
       before :each do
-        set_current_version(Schemata::CloudController::Bar, 11)
+        set_current_version(Schemata::Component2::Bar, 11)
       end
 
       it "should take a v11 obj and encode a json msg" do
         aux_data = {"bar2" => "second" }
-        v11_obj = Schemata::CloudController::Bar::V11.new(@v11_hash, aux_data)
+        v11_obj = Schemata::Component2::Bar::V11.new(@v11_hash, aux_data)
         json_msg = v11_obj.encode
         returned_hash = Yajl::Parser.parse(json_msg)
 
@@ -133,7 +133,7 @@ describe Schemata::CloudController do
       end
 
       after :each do
-        reset_version(Schemata::CloudController::Bar)
+        reset_version(Schemata::Component2::Bar)
       end
     end
   end

data/spec/health_manager/health_manager_spec.rb

@@ -0,0 +1,6 @@
+require 'schemata/health_manager'
+require 'spec_helper'
+
+describe Schemata::HealthManager do
+  it_behaves_like 'a schemata component'
+end

data/spec/health_manager/health_request_spec.rb

@@ -0,0 +1,12 @@
+require 'schemata/health_manager'
+require 'spec_helper'
+
+describe Schemata::HealthManager::HealthRequest do
+  it_behaves_like "a message type"
+end
+
+Schemata::HealthManager::HealthRequest.versions.each do |v|
+  describe Schemata::HealthManager::HealthRequest::const_get("V#{v}") do
+    it_behaves_like "a message"
+  end
+end

data/spec/health_manager/health_response_spec.rb

@@ -0,0 +1,12 @@
+require 'schemata/health_manager'
+require 'spec_helper'
+
+describe Schemata::HealthManager::HealthResponse do
+  it_behaves_like "a message type"
+end
+
+Schemata::HealthManager::HealthResponse.versions.each do |v|
+  describe Schemata::HealthManager::HealthResponse::const_get("V#{v}") do
+    it_behaves_like "a message"
+  end
+end

data/spec/health_manager/status_crashed_response_spec.rb

@@ -0,0 +1,12 @@
+require 'schemata/health_manager'
+require 'spec_helper'
+
+describe Schemata::HealthManager::StatusCrashedResponse do
+  it_behaves_like "a message type"
+end
+
+Schemata::HealthManager::StatusCrashedResponse.versions.each do |v|
+  describe Schemata::HealthManager::StatusCrashedResponse::const_get("V#{v}") do
+    it_behaves_like "a message"
+  end
+end

data/spec/health_manager/status_flapping_response_spec.rb

@@ -0,0 +1,12 @@
+require 'schemata/health_manager'
+require 'spec_helper'
+
+describe Schemata::HealthManager::StatusFlappingResponse do
+  it_behaves_like "a message type"
+end
+
+Schemata::HealthManager::StatusFlappingResponse.versions.each do |v|
+  describe Schemata::HealthManager::StatusFlappingResponse::const_get("V#{v}") do
+    it_behaves_like "a message"
+  end
+end

data/spec/health_manager/status_request_spec.rb

@@ -0,0 +1,12 @@
+require 'schemata/health_manager'
+require 'spec_helper'
+
+describe Schemata::HealthManager::StatusRequest do
+  it_behaves_like "a message type"
+end
+
+Schemata::HealthManager::StatusRequest.versions.each do |v|
+  describe Schemata::HealthManager::StatusRequest::const_get("V#{v}") do
+    it_behaves_like "a message"
+  end
+end

data/spec/support/helpers.rb

@@ -53,6 +53,10 @@ def num_mandatory_fields(msg_obj)
   return diff.size
 end
 
+def all_classes
+  all_classes = Set.new([Integer, String, Float, TrueClass, FalseClass, NilClass, Hash, Array])
+end
+
 def get_allowed_classes(schema)
   case schema
   when Membrane::Schema::Bool
@@ -65,11 +69,12 @@ def get_allowed_classes(schema)
     return Set.new([Hash])
   when Membrane::Schema::List
     return Set.new([Array])
+  when Membrane::Schema::Value
+    return Set.new([schema.value.class])
   end
 end
 
 def get_unallowed_classes(schema)
-  all_classes = Set.new([Integer, String, Float, TrueClass, FalseClass, NilClass, Hash, Array])
   allowed_classes = get_allowed_classes(schema)
   all_classes - allowed_classes
 end

data/spec/support/message_helpers.rb

@@ -44,6 +44,18 @@ shared_examples "a message" do
         msg_obj = message.new({first_key => bad_value})
       }.to raise_error(Schemata::UpdateAttributeError)
     end
+
+    it "should stringify keys when they are symbols" do
+      mock_hash = component.send(mock_method, 1).contents
+      first_key = mock_hash.keys[0]
+      first_value = mock_hash[first_key]
+
+      input_hash = {
+        first_key.to_sym => first_value
+      }
+      msg_obj = message.new(input_hash)
+      msg_obj.send(first_key).should_not be_nil
+    end
   end
 
   describe "#encode" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schemata-dea
 version: !ruby/object:Gem::Version
-  version: 0.0.1.beta13
+  version: 0.0.1.beta14
   prerelease: 6
 platform: ruby
 authors:
@@ -147,13 +147,17 @@ files:
 - lib/schemata/common/error.rb
 - lib/schemata/helpers/stringify.rb
 - lib/schemata/helpers/hash_copy.rb
-- spec/cloud_controller/cc_bar_spec.rb
+- spec/cloud_controller/cloud_controller_spec.rb
+- spec/cloud_controller/droplet_updated_message_spec.rb
+- spec/cloud_controller/hm_start_request_spec.rb
+- spec/cloud_controller/hm_stop_request_spec.rb
 - spec/common/helpers_spec.rb
 - spec/common/parsed_msg_spec.rb
 - spec/component/aux_data_spec.rb
 - spec/component/component_bar_spec.rb
 - spec/component/component_foo_spec.rb
 - spec/component/foo_spec.rb
+- spec/component2/component2_bar_spec.rb
 - spec/dea/advertise_message_spec.rb
 - spec/dea/dea_spec.rb
 - spec/dea/dea_status_response_spec.rb
@@ -167,6 +171,12 @@ files:
 - spec/dea/start_request_spec.rb
 - spec/dea/stop_request_spec.rb
 - spec/dea/update_request_spec.rb
+- spec/health_manager/health_manager_spec.rb
+- spec/health_manager/health_request_spec.rb
+- spec/health_manager/health_response_spec.rb
+- spec/health_manager/status_crashed_response_spec.rb
+- spec/health_manager/status_flapping_response_spec.rb
+- spec/health_manager/status_request_spec.rb
 - spec/router/register_request_spec.rb
 - spec/router/router_spec.rb
 - spec/router/start_message_spec.rb
@@ -202,13 +212,17 @@ signing_key:
 specification_version: 3
 summary: validation for cloundfoundry DEA messages
 test_files:
-- spec/cloud_controller/cc_bar_spec.rb
+- spec/cloud_controller/cloud_controller_spec.rb
+- spec/cloud_controller/droplet_updated_message_spec.rb
+- spec/cloud_controller/hm_start_request_spec.rb
+- spec/cloud_controller/hm_stop_request_spec.rb
 - spec/common/helpers_spec.rb
 - spec/common/parsed_msg_spec.rb
 - spec/component/aux_data_spec.rb
 - spec/component/component_bar_spec.rb
 - spec/component/component_foo_spec.rb
 - spec/component/foo_spec.rb
+- spec/component2/component2_bar_spec.rb
 - spec/dea/advertise_message_spec.rb
 - spec/dea/dea_spec.rb
 - spec/dea/dea_status_response_spec.rb
@@ -222,6 +236,12 @@ test_files:
 - spec/dea/start_request_spec.rb
 - spec/dea/stop_request_spec.rb
 - spec/dea/update_request_spec.rb
+- spec/health_manager/health_manager_spec.rb
+- spec/health_manager/health_request_spec.rb
+- spec/health_manager/health_response_spec.rb
+- spec/health_manager/status_crashed_response_spec.rb
+- spec/health_manager/status_flapping_response_spec.rb
+- spec/health_manager/status_request_spec.rb
 - spec/router/register_request_spec.rb
 - spec/router/router_spec.rb
 - spec/router/start_message_spec.rb