schemata-router 0.0.1.beta6 → 0.0.1.beta7

data/lib/schemata/common/error.rb

@@ -6,7 +6,7 @@ module Schemata
   class UpdateAttributeError < StandardError
     def initialize(key, message)
       super("#{key}: #{message}")
-    end 
+    end
   end
 
   class IncompatibleVersionError < DecodeError

data/lib/schemata/common/msgbase.rb

@@ -1,4 +1,5 @@
 require 'yajl'
+require 'membrane'
 require 'schemata/common/error'
 require 'schemata/helpers/stringify'
 require 'membrane'
@@ -29,7 +30,7 @@ module Schemata
 
           begin
             field_schema.validate(field_value)
-          rescue ::Membrane::SchemaValidationError => e
+          rescue Membrane::SchemaValidationError => e
             raise Schemata::UpdateAttributeError.new(key, e.message)
           end
 
@@ -54,7 +55,7 @@ module Schemata
             field_value = Schemata::HashCopyHelpers.stringify(field_value)
             begin
               field_schema.validate(field_value)
-            rescue ::Membrane::SchemaValidationError => e
+            rescue Membrane::SchemaValidationError => e
               raise Schemata::UpdateAttributeError.new(key, e.message)
             end
             @contents[key] = Schemata::HashCopyHelpers.deep_copy(field_value)
@@ -96,7 +97,7 @@ module Schemata
       begin
         validate_contents
         validate_aux_data
-      rescue ::Membrane::SchemaValidationError => e
+      rescue Membrane::SchemaValidationError => e
         raise Schemata::EncodeError.new(e.message)
       end
 
@@ -194,16 +195,16 @@ module Schemata
 
   module Dsl
     def define_schema(&blk)
-      schema = ::Membrane::SchemaParser.parse(&blk)
-      unless schema.kind_of? ::Membrane::Schema::Record
+      schema = Membrane::SchemaParser.parse(&blk)
+      unless schema.kind_of? Membrane::Schema::Record
         Schemata::SchemaDefinitionError.new("Schema must be a hash")
       end
       self::const_set(:SCHEMA, schema)
     end
 
     def define_aux_schema(&blk)
-      aux_schema = ::Membrane::SchemaParser.parse(&blk)
-      unless aux_schema.kind_of? ::Membrane::Schema::Record
+      aux_schema = Membrane::SchemaParser.parse(&blk)
+      unless aux_schema.kind_of? Membrane::Schema::Record
         Schemata::SchemaDefinitionError.new("Schema must be a hash")
       end
 
@@ -223,7 +224,7 @@ module Schemata
         # decode, when aux_data is irrelevant
         begin
           previous_version::SCHEMA.validate(old_data)
-        rescue ::Membrane::SchemaValidationError => e
+        rescue Membrane::SchemaValidationError => e
           raise Schemata::DecodeError.new(e.message)
         end
 
@@ -264,7 +265,7 @@ module Schemata
       begin
         self.schema.validate(mock)
         define_constant(:MOCK_VALUES, hash)
-      rescue ::Membrane::SchemaValidationError => e
+      rescue Membrane::SchemaValidationError => e
         raise SchemaDefinitionError.new("Sample mock values do not match schema: #{e}")
       end
     end

data/lib/schemata/router/register_request/register_request_v1.rb

@@ -1,4 +1,4 @@
-#require 'vcap/common'
+require 'vcap/common'
 
 module Schemata
   module Router
@@ -34,7 +34,7 @@ module Schemata
 
         define_mock_values do
           {
-            "dea"   => "deadbeef", #proc { VCAP.secure_uuid },
+            "dea"   => proc { VCAP.secure_uuid },
             "app"   => proc { Random.rand(100).to_s },
             "uris"  => ["foo.vcap.me"],
             "host"  => "127.0.0.1",
@@ -44,7 +44,7 @@ module Schemata
               "runtime"   => "ruby18",
               "component" => "dashboard",
             },
-            "private_instance_id" => "deadbeef1",#proc { VCAP.secure_uuid },
+            "private_instance_id" => proc { VCAP.secure_uuid },
           }
         end
       end

data/lib/schemata/router/start_message/start_message_v1.rb

@@ -25,7 +25,7 @@ module Schemata
 
         define_mock_values do
           {
-            "id" => "deadbeef", #proc { VCAP.secure_uuid },
+            "id" => proc { VCAP.secure_uuid },
             "version" => 0.1,
           }
         end

data/lib/schemata/router/version.rb

@@ -1,5 +1,5 @@
 module Schemata
   module Router
-    VERSION = "0.0.1.beta6"
+    VERSION = "0.0.1.beta7"
   end
 end

data/spec/support/helpers.rb

@@ -52,3 +52,46 @@ def num_mandatory_fields(msg_obj)
   diff = mandatory - optional
   return diff.size
 end
+
+def get_allowed_classes(schema)
+  case schema
+  when Membrane::Schema::Bool
+    return Set.new([TrueClass, FalseClass])
+  when Membrane::Schema::Enum
+    return Set.new(schema.elem_schemas.map {|x| get_allowed_classes(x)}).flatten
+  when Membrane::Schema::Class
+    return Set.new([schema.klass])
+  when Membrane::Schema::Record
+    return Set.new([Hash])
+  when Membrane::Schema::List
+    return Set.new([Array])
+  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
+
+def default_value(klass)
+  # Yes this is silly
+  if klass == Integer
+    return 0
+  elsif klass == String
+    return "foo"
+  elsif klass == Float
+    return 3.14
+  elsif klass == TrueClass
+    return true
+  elsif klass == FalseClass
+    return false
+  elsif klass == NilClass
+    return nil
+  elsif klass == Hash
+    return {}
+  elsif klass == Array
+    return []
+  else
+  end
+end

data/spec/support/message_helpers.rb

@@ -35,11 +35,10 @@ shared_examples "a message" do
       mock_hash = component.send(mock_method, 1).contents
       first_key = mock_hash.keys[0]
       first_value = mock_hash[first_key]
-      if first_value.kind_of? Integer
-        bad_value = "foo"
-      else
-        bad_value = 1
-      end
+
+      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})
@@ -120,11 +119,9 @@ shared_examples "a message" do
         it "should raise an error if the wrong type is written" do
           mock_value = component.send(mock_method, version).contents[attr]
 
-          if mock_value.kind_of? Integer
-            bad_value = "foo"
-          else
-            bad_value = 1
-          end
+          schema = message.schema.schemas[attr]
+          unallowed_classes = get_unallowed_classes(schema)
+          bad_value = default_value(unallowed_classes.to_a[0])
 
           msg_obj = message.new
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schemata-router
 version: !ruby/object:Gem::Version
-  version: 0.0.1.beta6
+  version: 0.0.1.beta7
   prerelease: 6
 platform: ruby
 authors:
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: vcap_common
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ci_reporter
   requirement: !ruby/object:Gem::Requirement
@@ -99,11 +115,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/schemata/router/register_directory_server_request/register_directory_server_request_v1.rb
 - lib/schemata/router/register_request.rb
 - lib/schemata/router/register_request/register_request_v1.rb
 - lib/schemata/router/start_message.rb
 - lib/schemata/router/version.rb
 - lib/schemata/router/start_message/start_message_v1.rb
+- lib/schemata/router/register_directory_server_request.rb
 - lib/schemata/router.rb
 - lib/schemata/common/msgtypebase.rb
 - lib/schemata/common/parsed_msg.rb