bodhi-slam 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9e0fc2114db2a841586eb0937833f53d7696cf4
-  data.tar.gz: c47da0ee237f0a404ec5d3e8b8f12c2c957ba1b4
+  metadata.gz: c45878f252d649075583fd52fc45cad4e315e0be
+  data.tar.gz: 52234cfc5d5fceac85ffe74d3615e4b595570f7d
 SHA512:
-  metadata.gz: 0fd1e845bdf7e809e7bf8ba750a60e9d1a2e27924846c576fa838ec1ce300e8f78eba9b1b6d23dd02c00886c982d37456ae9e3bf651428ceb62ff037568b3d87
-  data.tar.gz: 86440102243b951b235e7a4eb9bce696c530d86fe6a8193a9e1fe7470915b9582d30c4df36948da0b666a0e03ae549a6152aedf6d6b2d7ea44bb174de1b9e290
+  metadata.gz: 645d1ad9fe41976e4dc5dc8292f6e7ac53427bafef3c249739460dedad671b21645bf12a3617d229c0ee34bae269a6d042e94ba57c40993bdbf5cda5ee2b6b59
+  data.tar.gz: 3735d2c630c5f825aa785111a1c13dba6605dfdde2d582d65c93eef5952f48a2adb1d30a6be49745f19370d37268021ee453cc861f3d31ee6dc8dfe5a8679c9e

data/lib/bodhi-slam/enumerations.rb

@@ -29,20 +29,19 @@ module Bodhi
     #
     #   Bodhi::Enumeration.find_all(context) # => [#<Bodhi::Enumeration:0x007fbff403e808>, #<Bodhi::Enumeration:0x007fbff403e808>, ...]
     def self.find_all(context)
-      raise context.errors unless context.valid?
-      
+      if context.invalid?
+        raise Bodhi::ContextErrors.new(context.errors.messages), context.errors.to_a.to_s
+      end
+
       result = context.connection.get do |request|
         request.url "/#{context.namespace}/enums"
         request.headers[context.credentials_header] = context.credentials
       end
-    
+
       if result.status != 200
-        errors = JSON.parse result.body
-        errors.each{|error| error['status'] = result.status } if errors.is_a? Array
-        errors["status"] = result.status if errors.is_a? Hash
-        raise errors.to_s
+        raise Bodhi::ApiErrors.new(body: result.body, status: result.status), "status: #{result.status}, body: #{result.body}"
       end
-    
+
       JSON.parse(result.body).collect{ |enum| Bodhi::Enumeration.new(enum) }
     end
 

data/lib/bodhi-slam/factory.rb

@@ -98,6 +98,10 @@ module Bodhi
             generator = lambda{ [*0..5].sample.times.collect{ /\p{Alnum}{5,10}@\p{Alnum}{5,10}\.\p{Alnum}{2,3}/i.random_example } }
           elsif options[:matches]
             generator = lambda{ [*0..5].sample.times.collect{ Regexp.new(options[:matches]).random_example } }
+          elsif options[:length]
+            min = JSON.parse(options[:length]).first
+            max = JSON.parse(options[:length]).last
+            generator = lambda{ [*0..5].sample.times.collect{ [*min..max].sample.times.map{ characters[rand(characters.length)] }.join } }
           else
             generator = lambda{ [*0..5].sample.times.collect{ [*0..100].sample.times.map{ characters[rand(characters.length)] }.join } }
           end
@@ -108,6 +112,10 @@ module Bodhi
             generator = lambda{ /\p{Alnum}{5,10}@\p{Alnum}{5,10}\.\p{Alnum}{2,3}/i.random_example }
           elsif options[:matches]
             generator = lambda{ Regexp.new(options[:matches]).random_example }
+          elsif options[:length]
+            min = JSON.parse(options[:length]).first
+            max = JSON.parse(options[:length]).last
+            generator = lambda{ [*min..max].sample.times.map{ characters[rand(characters.length)] }.join }
           else
             generator = lambda{ [*0..100].sample.times.map{ characters[rand(characters.length)] }.join }
           end

data/lib/bodhi-slam/resource.rb

@@ -230,7 +230,7 @@ module Bodhi
           request.url "/#{bodhi_context.namespace}/resources/#{self.class}/#{sys_id}"
           request.headers['Content-Type'] = 'application/json'
           request.headers[bodhi_context.credentials_header] = bodhi_context.credentials
-          request.body = params
+          request.body = params.to_json
         end
   
         if result.status != 204

data/lib/bodhi-slam/types.rb

@@ -4,7 +4,7 @@ module Bodhi
 
     SYSTEM_ATTRIBUTES = [:sys_created_at, :sys_version, :sys_modified_at, :sys_modified_by,
       :sys_namespace, :sys_created_by, :sys_type_version, :sys_id, :sys_embeddedType]
-    ATTRIBUTES = [:name, :namespace, :package, :embedded, :properties, :version]
+    ATTRIBUTES = [:name, :namespace, :package, :embedded, :properties, :version, :extends]
 
     attr_accessor *ATTRIBUTES
     attr_reader *SYSTEM_ATTRIBUTES
@@ -17,6 +17,7 @@ module Bodhi
     # Returns a factory for the Bodhi::Type class
     def self.factory
       @factory ||= Bodhi::Factory.new(Bodhi::Type).tap do |factory|
+        factory.add_generator(:extends, type: "String", matches: "[a-zA-Z_-]{10,20}")
         factory.add_generator(:name, type: "String", required: true, is_not_blank: true)
         factory.add_generator(:namespace, type: "String", required: true)
         factory.add_generator(:properties, type: "Object", required: true)
@@ -52,6 +53,7 @@ module Bodhi
       ATTRIBUTES.each do |attribute|
         result[attribute] = send(attribute)
       end
+      result.delete_if { |k, v| v.nil? }
       result
     end
 

data/lib/bodhi-slam/validators/length.rb

@@ -3,7 +3,7 @@ module Bodhi
     attr_reader :value
 
     def initialize(value)
-      @value = value
+      @value = JSON.parse(value)
     end
 
     def validate(record, attribute, value)
@@ -11,10 +11,10 @@ module Bodhi
         
         if value.is_a?(Array)
           unless value.empty?
-            record.errors.add(attribute, "must all be #{value} characters long") unless value.select{ |item| !item.length == @value }.empty?
+            record.errors.add(attribute, "must all be #{@value} characters long") unless value.select{ |item| !item.length.between?(@value.first, @value.last) }.empty?
           end
         else
-          record.errors.add(attribute, "must be #{value} characters long") unless value.length == @value
+          record.errors.add(attribute, "must be #{@value} characters long") unless value.length.between?(@value.first, @value.last)
         end
         
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bodhi-slam
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - willdavis
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: bump
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: will.davis@hotschedules.com
 executables: []