vcap_common 1.0.10 → 2.0.8

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vcap_common
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 2.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,56 +9,56 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-02-09 00:00:00.000000000 Z
+date: 2012-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.12.11.cloudfoundry.3
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.12.11.cloudfoundry.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nats
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.22.beta.8
+        version: 0.4.24
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.22.beta.8
+        version: 0.4.24
 - !ruby/object:Gem::Dependency
   name: posix-spawn
   requirement: !ruby/object:Gem::Requirement
@@ -91,6 +91,86 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.6
+- !ruby/object:Gem::Dependency
+  name: membrane
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+- !ruby/object:Gem::Dependency
+  name: httpclient
+  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: em-http-request
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0.beta3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0.beta3
+- !ruby/object:Gem::Dependency
+  name: multipart-post
+  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: mime-types
+  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: rake
   requirement: !ruby/object:Gem::Requirement
@@ -114,31 +194,32 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/json_message.rb
-- lib/json_schema.rb
-- lib/services/api/async_requests.rb
-- lib/services/api/clients/service_gateway_client.rb
-- lib/services/api/const.rb
-- lib/services/api/messages.rb
-- lib/services/api/util.rb
-- lib/services/api.rb
-- lib/vcap/common.rb
 - lib/vcap/component.rb
-- lib/vcap/config.rb
-- lib/vcap/fiber_tracing.rb
-- lib/vcap/json_schema.rb
-- lib/vcap/priority_queue.rb
-- lib/vcap/process_utils.rb
-- lib/vcap/quota.rb
-- lib/vcap/rolling_metric.rb
+- lib/vcap/user_pools/user_pool.rb
+- lib/vcap/user_pools/user_pool_util.rb
+- lib/vcap/user_pools/user_ops.rb
 - lib/vcap/spec/em.rb
+- lib/vcap/spec/forked_component.rb
 - lib/vcap/spec/forked_component/base.rb
 - lib/vcap/spec/forked_component/nats_server.rb
-- lib/vcap/spec/forked_component.rb
+- lib/vcap/priority_queue.rb
+- lib/vcap/common.rb
+- lib/vcap/fiber_tracing.rb
 - lib/vcap/subprocess.rb
-- lib/vcap/user_pools/user_ops.rb
-- lib/vcap/user_pools/user_pool.rb
-- lib/vcap/user_pools/user_pool_util.rb
+- lib/vcap/quota.rb
+- lib/vcap/process_utils.rb
+- lib/vcap/rolling_metric.rb
+- lib/vcap/config.rb
+- lib/vcap/sorted_set_utils.rb
+- lib/json_message.rb
+- lib/services/api.rb
+- lib/services/api/multipart.rb
+- lib/services/api/util.rb
+- lib/services/api/const.rb
+- lib/services/api/async_requests.rb
+- lib/services/api/messages.rb
+- lib/services/api/clients/sds_client.rb
+- lib/services/api/clients/service_gateway_client.rb
 homepage: http://github.com/vmware-ac/core
 licenses: []
 post_install_message: 
@@ -159,7 +240,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.22
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: vcap common

data/lib/json_schema.rb

@@ -1,84 +0,0 @@
-# Copyright (c) 2009-2011 VMware, Inc.
-# This class provides dead simple declarative validation for decoded json using
-# a fairly intuitive DSL like syntax.
-#
-# For example, the following is a sample schema that exercises all functionality
-#
-# {'foo' => [String],            # 'foo' must be a list of strings
-#  'bar' => {'baz' => Fixnum,    # 'bar' must be a hash where
-#            'jaz' => /foo/,     #   'baz' is a Fixnum, and
-#           }                    #   'jaz' matches the regex /foo/
-# }
-#
-class JsonSchema
-  WILDCARD = Object
-
-  # TODO(mjp): validate that schema is syntatically correct
-
-  def initialize(schema)
-    @schema = schema
-  end
-
-  def validate(json)
-    _validate(json, @schema)
-  end
-
-  protected
-
-  def _validate(json, schema)
-    case schema
-    when Class
-      # Terminal case, type check
-      klass = json.class
-      if json.is_a? schema
-        nil
-      else
-        "Type mismatch (expected #{schema}, got #{klass})"
-      end
-
-    when Hash
-      # Recursive case, check for required params, recursively check them against the supplied schema
-      missing_keys = schema.keys.select {|k| !json.has_key?(k)} if json.is_a? Hash
-
-      if !(json.is_a? Hash)
-        "Type mismatch (expected hash, got #{json.class})"
-      elsif missing_keys.length > 0
-        "Missing params: '#{missing_keys.join(', ')}'"
-      else
-        errs = nil
-        schema.each_key do |k|
-          sub_errs = _validate(json[k], schema[k])
-          if sub_errs
-            errs ||= {}
-            errs[k] = sub_errs
-          end
-        end
-        errs
-      end
-
-    when Array
-      # Recursive case, check that array isn't empty, recursively check array against supplied schema
-      if !(json.is_a? Array)
-        "Type mismatch (expected array, got #{json.class}"
-      else
-        errs = nil
-        json.each do |v|
-          errs = _validate(v, schema[0])
-          break if errs
-        end
-        errs
-      end
-
-    when Regexp
-      if schema.match(json)
-        nil
-      else
-        "Invalid value (doesn't match '#{schema.source})"
-      end
-
-    else
-      # Terminal case, value check
-      "Value mismatch (expected '#{schema}', got #{json})" unless json == schema
-    end
-  end
-end

data/lib/vcap/json_schema.rb

@@ -1,202 +0,0 @@
-# Copyright (c) 2009-2011 VMware, Inc.
-
-# This provides very basic support for creating declarative validators
-# for decoded json. Useful for validating things like configs or
-# messages that are published via NATS.
-#
-# Basic usage:
-#
-# schema = VCAP::JsonSchema.build do
-#   { :foo => [String],
-#     :bar => {:baz => Integer},
-#     optional(:jaz) => Float,
-#   }
-# end
-#
-# Fails:
-#
-# schema.validate({
-#   'foo' => ['bar', 5],
-#   'bar' => {'baz' => 7},
-# })
-#
-# Succeeds:
-#
-# schema.validate({
-#   'foo' => ['bar', 'baz'],
-#   'bar' => {'baz' => 7},
-# })
-#
-#
-module VCAP
-  module JsonSchema
-
-    class SyntaxError < StandardError; end
-    class ValidationError < StandardError
-      attr_accessor :message
-      def initialize(msg)
-        @message = msg
-      end
-
-      def to_s
-        @message
-      end
-    end
-
-    class ValueError      < ValidationError; end
-    class TypeError       < ValidationError; end
-    class MissingKeyError < ValidationError; end
-
-    # Defines an interface that all schemas must implement
-    class BaseSchema
-      # Verfies that val conforms to the schema being validated
-      # Throws exceptions derived from ValidationError upon schema violations
-      #
-      # @param  Object val  An object decoded from json
-      #
-      # @return nil
-      def validate(dec_json)
-        raise NotImplementedError.new("You must implement validate")
-      end
-   end
-
-    class BoolSchema < BaseSchema
-      def validate(dec_json)
-        unless dec_json.kind_of?(TrueClass) || dec_json.kind_of?(FalseClass)
-          raise TypeError, "Expected instance of TrueClass or FalseClass, got #{dec_json.class}"
-        end
-      end
-    end
-
-    # Checks that supplied value is an instance of a given class
-    class TypeSchema < BaseSchema
-      def initialize(klass)
-        raise ArgumentError, "You must supply a class #{klass} given" unless klass.kind_of?(Class)
-        @klass = klass
-      end
-
-      def validate(dec_json)
-        raise TypeError, "Expected instance of #{@klass}, got #{dec_json.class}" unless dec_json.kind_of?(@klass)
-      end
-    end
-
-    # Checks that supplied value is an array, and each value in the array validates
-    class ArraySchema < BaseSchema
-      attr_accessor :item_schema
-
-      def initialize(schema)
-        raise ArgumentError, "You must supply a schema, #{schema.class} given" unless schema.kind_of?(BaseSchema)
-        @item_schema = schema
-      end
-
-      def validate(dec_json)
-        raise TypeError, "Expected instance of Array, #{dec_json.class} given" unless dec_json.kind_of?(Array)
-        for v in dec_json
-          @item_schema.validate(v)
-        end
-      end
-    end
-
-    # Check that required keys are present, and that they validate
-    class HashSchema < BaseSchema
-      class Field
-        attr_reader :name, :schema
-        attr_accessor :optional
-
-        def initialize(name, schema, optional=false)
-          raise ArgumentError, "Schema must be an instance of a schema, #{schema.class} given #{schema.inspect}" unless schema.kind_of?(BaseSchema)
-          @name = name
-          @schema = schema
-          @optional = optional
-        end
-      end
-
-      def initialize(kvs={})
-        raise ArgumentError, "Expected Hash, #{kvs.class} given" unless kvs.is_a?(Hash)
-        # Convert symbols to strings. Validation will be performed against decoded json, which will have
-        # string keys.
-        @fields = {}
-        for k, v in kvs
-          raise ArgumentError, "Expected schema for key #{k}, got #{v.class}" unless v.kind_of?(BaseSchema)
-          k_s = k.to_s
-          @fields[k_s] = Field.new(k_s, v, false)
-        end
-      end
-
-      def required(name, schema)
-        name_s = name.to_s
-        @fields[name_s] = Field.new(name_s, schema, false)
-      end
-
-      def optional(name, schema)
-        name_s = name.to_s
-        @fields[name_s] = Field.new(name_s, schema, true)
-      end
-
-      def validate(dec_json)
-        raise TypeError, "Expected instance of Hash, got instance of #{dec_json.class}" unless dec_json.kind_of?(Hash)
-
-        missing_keys = []
-        for k in @fields.keys
-          missing_keys << k unless dec_json.has_key?(k) || @fields[k].optional
-        end
-        raise MissingKeyError, "Missing keys: #{missing_keys.join(', ')}" unless missing_keys.empty?
-
-        for k, f in @fields
-          next if f.optional && !dec_json.has_key?(k)
-          begin
-            f.schema.validate(dec_json[k])
-          rescue ValidationError => ve
-            ve.message = "'#{k}' => " + ve.message
-            raise ve
-          end
-        end
-      end
-    end
-
-    class << self
-      class OptionalKeyMarker
-        attr_reader :name
-        def initialize(name)
-          @name = name
-        end
-
-        def to_s
-          @name.to_s
-        end
-      end
-
-      def optional(key)
-        OptionalKeyMarker.new(key)
-      end
-
-      def build(&blk)
-        schema_def = instance_eval(&blk)
-        parse(schema_def)
-      end
-
-      def parse(schema_def)
-        case schema_def
-        when VCAP::JsonSchema::BaseSchema
-          schema_def
-        when Hash
-          schema = VCAP::JsonSchema::HashSchema.new
-          for k, v in schema_def
-            sym = k.kind_of?(OptionalKeyMarker) ? :optional : :required
-            schema.send(sym, k, parse(v))
-          end
-          schema
-        when Array
-          raise SyntaxError, "Schema definition for an array must have exactly 1 element" unless schema_def.size == 1
-          item_schema = parse(schema_def[0])
-          VCAP::JsonSchema::ArraySchema.new(item_schema)
-        when Class
-          VCAP::JsonSchema::TypeSchema.new(schema_def)
-        else
-          raise SyntaxError, "Don't know what to do with class #{schema_def.class}"
-        end
-      end
-    end
-
-  end # VCAP::JsonSchema
-end   # VCAP