schemata-dea 0.0.1.beta16 → 0.0.1.beta17

data/lib/schemata/common/componentbase.rb

@@ -27,15 +27,18 @@ module Schemata
     end
 
     def require_message_classes
-      path = "./lib/schemata/"
-      path << Schemata::Helpers.decamelize(component_name)
-      path << "/*.rb"
+      path = [
+        File.expand_path("../../", __FILE__),
+        "/",
+        Schemata::Helpers.decamelize(component_name),
+        "/*.rb"
+      ].join
       Dir.glob(path, &method(:require))
     end
 
-    def self.extended(klass)
-      klass.require_message_classes
-      klass.register_mock_methods
+    def self.extended(mod)
+      mod.require_message_classes
+      mod.register_mock_methods
     end
 
   end

data/lib/schemata/common/msgtypebase.rb

@@ -80,11 +80,14 @@ module Schemata
     end
 
     def require_message_versions
-      path = "./lib/schemata/"
-      path << Schemata::Helpers.decamelize(component_name)
-      path << "/"
-      path << Schemata::Helpers.decamelize(message_type_name)
-      path << "/*.rb"
+      path = [
+        File.expand_path("../../", __FILE__),
+        "/",
+        Schemata::Helpers.decamelize(component_name),
+        "/",
+        Schemata::Helpers.decamelize(message_type_name),
+        "/*.rb"
+      ].join
 
       Dir.glob(path, &method(:require))
     end

data/lib/schemata/dea/start_request/start_request_v1.rb

@@ -21,12 +21,7 @@ module Schemata
               "version_output"      => String,
               "version_flag"        => String,
               "additional_checks"   => String,
-              "environment" => {
-                "LD_LIBRARY_PATH"   => String,
-                "BUNDLE_GEMFILE"    => enum(String, NilClass),
-                "PATH"              => String,
-                "GEM_PATH"          => String
-              },
+              "environment"         => Hash,
               "status" => {
                 "name"              => String
               },
@@ -42,7 +37,7 @@ module Schemata
             "version"               => String,
             "services" => [{
               "label"               => String,
-              "tags"                => [String],
+              optional("tags")                => [String],
               "name"                => String,
               "credentials" => {
                 "hostname"          => String,
@@ -57,10 +52,9 @@ module Schemata
                 optional("user")    => String,
                 optional("pass")    => String,
               },
-              "options"             => any,
               "plan"                => String,
-              "plan_option"         => enum(String, NilClass),
-              "type"                => String,
+              optional("plan_option")   => enum(String, NilClass),
+              optional("type")          => String,
               "version"             => String,
               "vendor"              => String
             }],
@@ -70,9 +64,8 @@ module Schemata
               "fds"                 => Integer
             },
             "env"                   => [String],
-            "users"                 => [String],
             "cc_partition"          => String,
-            "debug"                 => any,
+            optional("debug")         => any,
             "console"               => any,
             "index"                 => Integer,
             optional("flapping")    => bool,
@@ -129,7 +122,6 @@ module Schemata
               "fds" => 256
             },
             "env" => [],
-            "users" => ["user@rbcon.com"],
             "cc_partition" => "default",
             "debug" => nil,
             "console" => nil,

data/lib/schemata/dea/version.rb

@@ -1,5 +1,5 @@
 module Schemata
   module Dea
-    VERSION = "0.0.1.beta16"
+    VERSION = "0.0.1.beta17"
   end
 end

data/spec/common/componentbase_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+require 'schemata/dea'
+require 'schemata/common/componentbase'
+
+describe Schemata::ComponentBase do
+  let(:component) { Schemata::Dea }
+
+  describe '#require_message_classes' do
+    subject { component.require_message_classes }
+
+    it 'require the full path as consumers will need absolute not relative paths' do
+      Dir.should_receive(:glob).with(File.expand_path("../../../lib/schemata/dea/*.rb", __FILE__))
+      subject
+    end
+  end
+end
+
+

data/spec/common/msgtypebase_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+require 'schemata/dea'
+require 'schemata/common/msgtypebase'
+
+describe Schemata::MessageTypeBase do
+  let(:msgtype) { Schemata::Dea::AdvertiseMessage }
+
+  describe '#require_message_versions' do
+    subject { msgtype.require_message_versions }
+
+    it 'require the full path as consumers will need absolute not relative paths' do
+      Dir.should_receive(:glob).with(File.expand_path("../../../lib/schemata/dea/advertise_message/*.rb", __FILE__))
+      subject
+    end
+  end
+end

data/spec/support/component_helpers.rb

@@ -36,13 +36,9 @@ end
 shared_examples "a mocking method" do |version|
 
   context "when current_version is #{version}" do
-    before :each do
-      set_current_version(message_type, version)
-    end
+    before { set_current_version(message_type, version) }
 
-    after :each do
-      reset_version(message_type)
-    end
+    after { reset_version(message_type) }
 
     it "should return a V#{version} object if called with no argument" do
       msg_obj = component.send(mock_method)
@@ -58,7 +54,7 @@ shared_examples "a mocking method" do |version|
 
     it "should raise an error if called with input > #{version}" do
       expect {
-        msg_obj = component.send(mock_method, version + 1)
+        component.send(mock_method, version + 1)
       }.to raise_error(NameError)
     end
   end

data/spec/support/message_helpers.rb

@@ -23,14 +23,13 @@ shared_examples "a message" do |msg|
     it "should raise an error if the hash contains incorrect types" do
       mock_hash = component.send(mock_method, 1).contents
       first_key = mock_hash.keys[0]
-      first_value = mock_hash[first_key]
 
       schema = message.schema.schemas[first_key]
       unallowed_classes = get_unallowed_classes(schema)
       bad_value = default_value(unallowed_classes.to_a[0])
 
       expect {
-        msg_obj = message.new({first_key => bad_value})
+        message.new(first_key => bad_value)
       }.to raise_error(Schemata::UpdateAttributeError)
     end
 
@@ -75,7 +74,6 @@ shared_examples "a message" do |msg|
         end
         json_hash.should have_key "min_version"
 
-        data = Schemata::Helpers.deep_copy(json_hash["V#{version}"])
         1.upto(version) do |i|
           json_hash.delete("V#{i}")
         end
@@ -111,7 +109,7 @@ shared_examples "a message" do |msg|
           it "should allow nil values during instantiation" do
             mock_value = component.send(mock_method, version).contents[attr]
             hash = { attr => mock_value }
-            msg_obj = message.new(hash)
+            expect { message.new(hash) }.not_to raise_error
           end
 
           it "should be able to set the attribute to nil" do
@@ -133,8 +131,6 @@ shared_examples "a message" do |msg|
 
       unless msg.schema.schemas[attr].kind_of? Membrane::Schema::Any
         it "should raise an error if the wrong type is written" do
-          mock_value = component.send(mock_method, version).contents[attr]
-
           schema = message.schema.schemas[attr]
           unallowed_classes = get_unallowed_classes(schema)
           bad_value = default_value(unallowed_classes.to_a[0])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schemata-dea
 version: !ruby/object:Gem::Version
-  version: 0.0.1.beta16
+  version: 0.0.1.beta17
   prerelease: 6
 platform: ruby
 authors:
@@ -150,7 +150,9 @@ files:
 - lib/schemata/helpers/hash_copy.rb
 - lib/schemata/helpers/stringify.rb
 - spec/cloud_controller_spec.rb
+- spec/common/componentbase_spec.rb
 - spec/common/helpers_spec.rb
+- spec/common/msgtypebase_spec.rb
 - spec/common/parsed_msg_spec.rb
 - spec/component/aux_data_spec.rb
 - spec/component/component_bar_spec.rb
@@ -192,7 +194,9 @@ specification_version: 3
 summary: validation for cloundfoundry DEA messages
 test_files:
 - spec/cloud_controller_spec.rb
+- spec/common/componentbase_spec.rb
 - spec/common/helpers_spec.rb
+- spec/common/msgtypebase_spec.rb
 - spec/common/parsed_msg_spec.rb
 - spec/component/aux_data_spec.rb
 - spec/component/component_bar_spec.rb