schemata-dea 0.0.1.beta14 → 0.0.1.beta15

data/lib/schemata/common/componentbase.rb

@@ -0,0 +1,42 @@
+require 'schemata/helpers/decamelize'
+
+module Schemata
+  module ComponentBase
+
+    def message_types
+      self.constants.select { |x| x != :VERSION }
+    end
+
+    def component_name
+      self.name.split("::")[1]
+    end
+
+    def eigenclass
+      class << self; self; end
+    end
+
+    def register_mock_methods
+      message_types.each do |type|
+        message_type = self::const_get(type)
+        mock_method_name = "mock_#{Schemata::Helpers.decamelize(type.to_s)}"
+        eigenclass.send(:define_method, mock_method_name) do |*args|
+          version = args[0] || message_type.current_version
+          message_type::const_get("V#{version}").mock
+        end
+      end
+    end
+
+    def require_message_classes
+      path = "./lib/schemata/"
+      path << Schemata::Helpers.decamelize(component_name)
+      path << "/*.rb"
+      Dir.glob(path, &method(:require))
+    end
+
+    def self.extended(klass)
+      klass.require_message_classes
+      klass.register_mock_methods
+    end
+
+  end
+end

data/lib/schemata/common/msgbase.rb

@@ -14,7 +14,7 @@ module Schemata
         @contents = {}
 
         data.each do |key, field_value|
-          key = Schemata::HashCopyHelpers.stringify(key)
+          key = Schemata::Helpers.stringify(key)
           field_schema = @schema.schemas[key]
           next unless field_schema
 
@@ -27,7 +27,7 @@ module Schemata
           # symbols, but on the decoding side, it should expect strings. To allow
           # for this in the schema definition, Schemata stringifies all symbols during
           # construction of Schemata objects.
-          field_value = Schemata::HashCopyHelpers.stringify(field_value)
+          field_value = Schemata::Helpers.stringify(field_value)
 
           begin
             field_schema.validate(field_value)
@@ -35,7 +35,7 @@ module Schemata
             raise Schemata::UpdateAttributeError.new(key, e.message)
           end
 
-          @contents[key] = Schemata::HashCopyHelpers.deep_copy(field_value)
+          @contents[key] = Schemata::Helpers.deep_copy(field_value)
         end
       end
 
@@ -45,7 +45,7 @@ module Schemata
         schema.schemas.each do |key, field_schema|
           vc_klass.send(:define_method, key) do
             unless @contents[key].nil?
-              return Schemata::HashCopyHelpers.deep_copy(@contents[key])
+              return Schemata::Helpers.deep_copy(@contents[key])
             end
             nil
           end
@@ -53,13 +53,15 @@ module Schemata
           # TODO This call to stringify should be removed when cc/dea stops using
           # symbols. See comment above for a better description.
           vc_klass.send(:define_method, "#{key}=") do |field_value|
-            field_value = Schemata::HashCopyHelpers.stringify(field_value)
-            begin
-              field_schema.validate(field_value)
-            rescue Membrane::SchemaValidationError => e
-              raise Schemata::UpdateAttributeError.new(key, e.message)
+            field_value = Schemata::Helpers.stringify(field_value)
+            unless schema.optional_keys.include?(key) && field_value == nil
+              begin
+                field_schema.validate(field_value)
+              rescue Membrane::SchemaValidationError => e
+                raise Schemata::UpdateAttributeError.new(key, e.message)
+              end
             end
-            @contents[key] = Schemata::HashCopyHelpers.deep_copy(field_value)
+            @contents[key] = Schemata::Helpers.deep_copy(field_value)
             field_value
           end
         end
@@ -67,7 +69,7 @@ module Schemata
       end
 
       def contents
-        Schemata::HashCopyHelpers.deep_copy(@contents)
+        Schemata::Helpers.deep_copy(@contents)
       end
 
       def empty?

data/lib/schemata/common/msgtypebase.rb

@@ -1,5 +1,6 @@
 require 'schemata/common/msgbase'
 require 'schemata/common/parsed_msg'
+require 'schemata/helpers/decamelize'
 
 module Schemata
   module MessageTypeBase
@@ -70,8 +71,27 @@ module Schemata
       Schemata::const_get(component)
     end
 
+    def component_name
+      self.name.split("::")[1]
+    end
+
+    def message_type_name
+      self.name.split("::")[2]
+    end
+
+    def require_message_versions
+      path = "./lib/schemata/"
+      path << Schemata::Helpers.decamelize(component_name)
+      path << "/"
+      path << Schemata::Helpers.decamelize(message_type_name)
+      path << "/*.rb"
+
+      Dir.glob(path, &method(:require))
+    end
+
     def self.extended(o)
       o.extend Dsl
+      o.require_message_versions
     end
 
     module Dsl

data/lib/schemata/common/parsed_msg.rb

@@ -37,7 +37,7 @@ module Schemata
     end
 
     def contents
-      Schemata::HashCopyHelpers.deep_copy(@contents)
+      Schemata::Helpers.deep_copy(@contents)
     end
   end
 end

data/lib/schemata/dea/advertise_message/advertise_message_v1.rb

@@ -2,7 +2,7 @@ require 'schemata/helpers/hash_copy'
 require 'schemata/common/msgtypebase'
 
 module Schemata
-  module DEA
+  module Dea
     module AdvertiseMessage
       version 1 do
         include_preschemata

data/lib/schemata/dea/advertise_message.rb

@@ -1,13 +1,9 @@
 require 'schemata/common/msgtypebase'
 
 module Schemata
-  module DEA
+  module Dea
     module AdvertiseMessage
       extend Schemata::MessageTypeBase
     end
   end
 end
-
-Dir[File.dirname(__FILE__) + '/advertise_message/*.rb'].each do |file|
-  require file
-end

data/lib/schemata/dea/dea_status_response/dea_status_response_v1.rb

@@ -1,7 +1,7 @@
 require 'schemata/common/msgtypebase'
 
 module Schemata
-  module DEA
+  module Dea
     module DeaStatusResponse
       version 1 do
         include_preschemata

data/lib/schemata/dea/dea_status_response.rb

@@ -1,13 +1,9 @@
 require 'schemata/common/msgtypebase'
 
 module Schemata
-  module DEA
+  module Dea
     module DeaStatusResponse
       extend Schemata::MessageTypeBase
     end
   end
 end
-
-Dir[File.dirname(__FILE__) + '/dea_status_response/*.rb'].each do |file|
-  require file
-end

data/lib/schemata/dea/discover_request/discover_request_v1.rb

@@ -1,7 +1,7 @@
 require 'vcap/common'
 
 module Schemata
-  module DEA
+  module Dea
     module DiscoverRequest
       version 1 do
         include_preschemata

data/lib/schemata/dea/discover_request.rb

@@ -1,13 +1,9 @@
 require 'schemata/common/msgtypebase'
 
 module Schemata
-  module DEA
+  module Dea
     module DiscoverRequest
       extend Schemata::MessageTypeBase
     end
   end
 end
-
-Dir[File.dirname(__FILE__) + '/discover_request/*.rb'].each do |file|
-  require file
-end

data/lib/schemata/dea/droplet_status_response/droplet_status_response_v1.rb

@@ -4,7 +4,7 @@ require 'schemata/common/msgtypebase'
 require 'vcap/common'
 
 module Schemata
-  module DEA
+  module Dea
     module DropletStatusResponse
       version 1 do
         include_preschemata

data/lib/schemata/dea/droplet_status_response.rb

@@ -1,13 +1,9 @@
 require 'schemata/common/msgtypebase'
 
 module Schemata
-  module DEA
+  module Dea
     module DropletStatusResponse
       extend Schemata::MessageTypeBase
     end
   end
 end
-
-Dir[File.dirname(__FILE__) + '/droplet_status_response/*.rb'].each do |file|
-  require file
-end

data/lib/schemata/dea/exit_message/exit_message_v1.rb

@@ -2,7 +2,7 @@ require 'schemata/common/msgtypebase'
 require 'vcap/common'
 
 module Schemata
-  module DEA
+  module Dea
     module ExitMessage
       version 1 do
         include_preschemata

data/lib/schemata/dea/exit_message.rb

@@ -1,13 +1,9 @@
 require 'schemata/common/msgtypebase'
 
 module Schemata
-  module DEA
+  module Dea
     module ExitMessage
       extend Schemata::MessageTypeBase
     end
   end
 end
-
-Dir[File.dirname(__FILE__) + '/exit_message/*.rb'].each do |file|
-  require file
-end

data/lib/schemata/dea/find_droplet_request/find_droplet_request_v1.rb

@@ -2,7 +2,7 @@ require 'schemata/common/msgtypebase'
 require 'vcap/common'
 
 module Schemata
-  module DEA
+  module Dea
     module FindDropletRequest
       version 1 do
         include_preschemata

data/lib/schemata/dea/find_droplet_request.rb

@@ -1,13 +1,9 @@
 require 'schemata/common/msgtypebase'
 
 module Schemata
-  module DEA
+  module Dea
     module FindDropletRequest
       extend Schemata::MessageTypeBase
     end
   end
 end
-
-Dir[File.dirname(__FILE__) + '/find_droplet_request/*.rb'].each do |file|
-  require file
-end

data/lib/schemata/dea/find_droplet_response/find_droplet_response_v1.rb

@@ -4,7 +4,7 @@ require 'schemata/common/msgtypebase'
 require 'vcap/common'
 
 module Schemata
-  module DEA
+  module Dea
     module FindDropletResponse
       version 1 do
         include_preschemata

data/lib/schemata/dea/find_droplet_response.rb

@@ -1,13 +1,9 @@
 require "schemata/common/msgtypebase"
 
 module Schemata
-  module DEA
+  module Dea
     module FindDropletResponse
       extend Schemata::MessageTypeBase
     end
   end
 end
-
-Dir[File.dirname(__FILE__) + '/find_droplet_response/*.rb'].each do |file|
-  require file
-end

data/lib/schemata/dea/heartbeat_response/heartbeat_response_v1.rb

@@ -4,7 +4,7 @@ require 'schemata/common/msgtypebase'
 require 'vcap/common'
 
 module Schemata
-  module DEA
+  module Dea
     module HeartbeatResponse
 
       version 1 do

data/lib/schemata/dea/heartbeat_response.rb

@@ -1,13 +1,9 @@
 require "schemata/common/msgtypebase"
 
 module Schemata
-  module DEA
+  module Dea
     module HeartbeatResponse
       extend Schemata::MessageTypeBase
     end
   end
 end
-
-Dir[File.dirname(__FILE__) + '/heartbeat_response/*.rb'].each do |file|
-  require file
-end

data/lib/schemata/dea/hello_message/hello_message_v1.rb

@@ -2,7 +2,7 @@ require 'schemata/common/msgtypebase'
 require 'vcap/common'
 
 module Schemata
-  module DEA
+  module Dea
     module HelloMessage
       version 1 do
         include_preschemata

data/lib/schemata/dea/hello_message.rb

@@ -1,13 +1,9 @@
 require 'schemata/common/msgtypebase'
 
 module Schemata
-  module DEA
+  module Dea
     module HelloMessage
       extend Schemata::MessageTypeBase
     end
   end
 end
-
-Dir[File.dirname(__FILE__) + '/hello_message/*.rb'].each do |file|
-  require file
-end

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

@@ -2,7 +2,7 @@ require 'schemata/common/msgtypebase'
 require 'vcap/common'
 
 module Schemata
-  module DEA
+  module Dea
     module StartRequest
       version 1 do
         include_preschemata
@@ -74,7 +74,8 @@ module Schemata
             "cc_partition"          => String,
             "debug"                 => any,
             "console"               => any,
-            "index"                 => Integer
+            "index"                 => Integer,
+            optional("flapping")    => bool,
           }
         end
 
@@ -132,7 +133,8 @@ module Schemata
             "cc_partition" => "default",
             "debug" => nil,
             "console" => nil,
-            "index" => 0
+            "index" => 0,
+            "flapping" => false,
           }
         end
       end

data/lib/schemata/dea/start_request.rb

@@ -1,13 +1,9 @@
 require 'schemata/common/msgtypebase'
 
 module Schemata
-  module DEA
+  module Dea
     module StartRequest
       extend Schemata::MessageTypeBase
     end
   end
 end
-
-Dir[File.dirname(__FILE__) + '/start_request/*.rb'].each do |file|
-  require file
-end

data/lib/schemata/dea/stop_request/stop_request_v1.rb

@@ -1,7 +1,7 @@
 require 'vcap/common'
 
 module Schemata
-  module DEA
+  module Dea
     module StopRequest
       version 1 do
         include_preschemata

data/lib/schemata/dea/stop_request.rb

@@ -1,13 +1,9 @@
 require 'schemata/common/msgtypebase'
 
 module Schemata
-  module DEA
+  module Dea
     module StopRequest
       extend Schemata::MessageTypeBase
     end
   end
 end
-
-Dir[File.dirname(__FILE__) + '/stop_request/*.rb'].each do |file|
-  require file
-end

data/lib/schemata/dea/update_request/update_request_v1.rb

@@ -1,5 +1,5 @@
 module Schemata
-  module DEA
+  module Dea
     module UpdateRequest
       version 1 do
         include_preschemata

data/lib/schemata/dea/update_request.rb

@@ -1,13 +1,9 @@
 require 'schemata/common/msgtypebase'
 
 module Schemata
-  module DEA
+  module Dea
     module UpdateRequest
       extend Schemata::MessageTypeBase
     end
   end
 end
-
-Dir[File.dirname(__FILE__) + '/update_request/*.rb'].each do |file|
-  require file
-end

data/lib/schemata/dea/version.rb

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

data/lib/schemata/dea.rb

@@ -1,64 +1,7 @@
-require 'schemata/dea/heartbeat_response'
-require 'schemata/dea/find_droplet_request'
-require 'schemata/dea/find_droplet_response'
-require 'schemata/dea/droplet_status_response'
-require 'schemata/dea/advertise_message'
-require 'schemata/dea/hello_message'
-require 'schemata/dea/dea_status_response'
-require 'schemata/dea/exit_message'
-require 'schemata/dea/discover_request'
-require 'schemata/dea/start_request'
-require 'schemata/dea/stop_request'
-require 'schemata/dea/update_request'
+require 'schemata/common/componentbase'
 
 module Schemata
-  module DEA
-    def self.mock_heartbeat_response(version=HeartbeatResponse.current_version)
-      HeartbeatResponse::const_get("V#{version}").mock
-    end
-
-    def self.mock_find_droplet_request(version=FindDropletRequest.current_version)
-      FindDropletRequest::const_get("V#{version}").mock
-    end
-
-    def self.mock_find_droplet_response(version=FindDropletResponse.current_version)
-      FindDropletResponse::const_get("V#{version}").mock
-    end
-
-    def self.mock_droplet_status_response(version=DropletStatusResponse.current_version)
-      DropletStatusResponse::const_get("V#{version}").mock
-    end
-
-    def self.mock_advertise_message(version=AdvertiseMessage.current_version)
-      AdvertiseMessage::const_get("V#{version}").mock
-    end
-
-    def self.mock_hello_message(version=HelloMessage.current_version)
-      HelloMessage::const_get("V#{version}").mock
-    end
-
-    def self.mock_dea_status_response(version=DeaStatusResponse.current_version)
-      DeaStatusResponse::const_get("V#{version}").mock
-    end
-
-    def self.mock_exit_message(version=ExitMessage.current_version)
-      ExitMessage::const_get("V#{version}").mock
-    end
-
-    def self.mock_discover_request(version=DiscoverRequest.current_version)
-      DiscoverRequest::const_get("V#{version}").mock
-    end
-
-    def self.mock_start_request(version=StartRequest.current_version)
-      StartRequest::const_get("V#{version}").mock
-    end
-
-    def self.mock_stop_request(version=StopRequest.current_version)
-      StopRequest::const_get("V#{version}").mock
-    end
-
-    def self.mock_update_request(version=UpdateRequest.current_version)
-      UpdateRequest::const_get("V#{version}").mock
-    end
+  module Dea
+    extend Schemata::ComponentBase
   end
 end

data/lib/schemata/helpers/decamelize.rb

@@ -0,0 +1,23 @@
+module Schemata
+  module Helpers
+    def self.decamelize(str)
+      words = []
+      curr_word = ""
+      0.upto(str.length - 1) do |i|
+        ch = str[i]
+        if ch =~ /[A-Z]/
+          words.push(curr_word)
+          curr_word = ""
+        end
+        curr_word += ch
+      end
+      words.push(curr_word)
+      words.map! { |x| x.downcase }
+
+      # If the first letter is capitalized, then the first word here is empty
+      words.shift if words[0] == ""
+
+      words.join('_')
+    end
+  end
+end

data/lib/schemata/helpers/hash_copy.rb

@@ -1,5 +1,5 @@
 module Schemata
-  module HashCopyHelpers
+  module Helpers
     class CopyError < StandardError; end
 
     def self.deep_copy(node)

data/lib/schemata/helpers/stringify.rb

@@ -1,5 +1,5 @@
 module Schemata
-  module HashCopyHelpers
+  module Helpers
 
     def self.stringify(node)
       case node