bodhi-slam 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6df30b96a6aec463e6caa1ccbd279e47d27a57a2
-  data.tar.gz: 6852921c1be4570e84dab5869713af2f2f95bd81
+  metadata.gz: 0787ec3a9705faa25dab09c506a0a220e8d7d9a8
+  data.tar.gz: 7e5686d4a4417d53c0743596ef2b9e758c878a7b
 SHA512:
-  metadata.gz: 7a04d8bf2df4d929e2d533283610f9d93eef65479383250d93c91e4cd22a27ae2b1ed14fdbe3c476b1576561acd85b84bd19e0d9479c18c7a88a2e66ff892d6c
-  data.tar.gz: 1df3159b31651ba636903099ac5f7ac5c1dd85bca80866c7de94be3ba1be5ac52c7e34e387ecd1a1cd591a770f44f8b714d7356e6eeee081edc30395720e79eb
+  metadata.gz: bea65f3aed37d29efd1ef2fff6ab918341037656b2db0720000fc35d5aaa2645f60acc77b86bdab2c9714b81bb209af68ee7d1678b4d3258e6c8e1b0a9c96d99
+  data.tar.gz: 623c0e593b4e1b465bd3a4b5ad4890618b7d8e841c031367b18ca3a7efb33901c60bdc6e8bfdbb8ffe5f139a7a0e715e17da48773f6a468ea607c604161440a9

data/lib/bodhi-slam/batches/resource.rb

@@ -32,9 +32,7 @@ module Bodhi
         raise Bodhi::ApiErrors.new(body: response.body, status: response.status), "status: #{response.status}, body: #{response.body}"
       end
 
-      # Parse the result body and update records with their sys_id
-      response_body = JSON.parse(response.body)
-      results = response_body.zip(records)
+      results = response.body.zip(records)
       results.each do |response, record|
         if response["location"]
           record.sys_id = response["location"].match(/(?<id>[a-zA-Z0-9]{24})/)[:id]

data/lib/bodhi-slam/context.rb

@@ -3,19 +3,28 @@ require 'bodhi-slam/validations'
 module Bodhi
   class Context
     include Bodhi::Validations
-    attr_reader :connection, :server, :namespace, 
-      :credentials, :credentials_type, :credentials_header
-    
-      validates :server, required: true, is_not_blank: true, url: true
-      validates :namespace, required: true, is_not_blank: true
-    
-    def initialize(params)
+    attr_reader :connection, :server, :namespace, :credentials, :credentials_type, :credentials_header
+
+    validates :server, required: true, is_not_blank: true, url: true
+    validates :namespace, required: true, is_not_blank: true
+
+    def self.global_context
+      @@current_context ||= Bodhi::Context.new
+    end
+
+    def self.global_context=(context)
+      @@current_context = context
+    end
+
+    def initialize(params={})
       @connection = Faraday.new(url: params[:server]) do |faraday|
         faraday.request :multipart
         faraday.request :url_encoded
-        faraday.adapter :net_http_persistent
 
+        faraday.adapter :net_http_persistent
         #faraday.adapter  Faraday.default_adapter
+
+        faraday.response :json, :content_type => /\bjson$/
         #faraday.response :logger
       end
       @server = params[:server]

data/lib/bodhi-slam/enumerations.rb

@@ -42,7 +42,7 @@ module Bodhi
         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) }
+      result.body.collect{ |enum| Bodhi::Enumeration.new(enum) }
     end
 
     # Returns a Hash of all Bodhi::Enumerations in the cache

data/lib/bodhi-slam/factory.rb

@@ -97,7 +97,13 @@ module Bodhi
           elsif options[:is_email]
             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 } }
+            generator = lambda do
+              begin
+                [*0..5].sample.times.collect{ Regexp.new(options[:matches]).random_example }
+              rescue
+                nil
+              end
+            end
           elsif options[:length]
             min = JSON.parse(options[:length]).first
             max = JSON.parse(options[:length]).last
@@ -111,7 +117,13 @@ module Bodhi
           elsif options[:is_email]
             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 }
+            generator = lambda do
+              begin
+                Regexp.new(options[:matches]).random_example
+              rescue
+                nil
+              end
+            end
           elsif options[:length]
             min = JSON.parse(options[:length]).first
             max = JSON.parse(options[:length]).last

data/lib/bodhi-slam/profiles.rb

@@ -102,7 +102,7 @@ module Bodhi
         raise Bodhi::ApiErrors.new(body: result.body, status: result.status), "status: #{result.status}, body: #{result.body}"
       end
 
-      profile = Bodhi::Profile.new(JSON.parse(result.body))
+      profile = Bodhi::Profile.new(result.body)
       profile.bodhi_context = context
       profile
     end

data/lib/bodhi-slam/queries.rb

@@ -90,8 +90,7 @@ module Bodhi
         raise Bodhi::ApiErrors.new(body: result.body, status: result.status), "status: #{result.status}, body: #{result.body}"
       end
 
-      resources = JSON.parse(result.body)
-      resources.map{ |attributes| klass.factory.build(context, attributes) }
+      result.body.map{ |attributes| klass.new(attributes) }
     end
 
     def first
@@ -112,8 +111,7 @@ module Bodhi
         raise Bodhi::ApiErrors.new(body: result.body, status: result.status), "status: #{result.status}, body: #{result.body}"
       end
 
-      resources = JSON.parse(result.body)
-      resources.map{ |attributes| klass.factory.build(context, attributes) }.first
+      result.body.map{ |attributes| klass.new(attributes) }.first
     end
 
     def last
@@ -134,8 +132,7 @@ module Bodhi
         raise Bodhi::ApiErrors.new(body: result.body, status: result.status), "status: #{result.status}, body: #{result.body}"
       end
 
-      resources = JSON.parse(result.body)
-      resources.map{ |attributes| klass.factory.build(context, attributes) }.last
+      result.body.map{ |attributes| klass.new(attributes) }.last
     end
 
     def from(context)

data/lib/bodhi-slam/resource.rb

@@ -23,7 +23,11 @@ module Bodhi
       end
 
       # Counts all of the Resources records and returns the result
-      def count(context)
+      def count(context=nil)
+        if context.nil?
+          context = Bodhi::Context.global_context
+        end
+
         if context.invalid?
           raise Bodhi::ContextErrors.new(context.errors.messages), context.errors.to_a.to_s
         end
@@ -37,7 +41,22 @@ module Bodhi
           raise Bodhi::ApiErrors.new(body: result.body, status: result.status), "status: #{result.status}, body: #{result.body}"
         end
 
-        JSON.parse(result.body)
+        result.body
+      end
+
+      def create!(params, context=nil)
+        if context.nil?
+          context = Bodhi::Context.global_context
+        end
+
+        if context.invalid?
+          raise Bodhi::ContextErrors.new(context.errors.messages), context.errors.to_a.to_s
+        end
+
+        record = self.new(params)
+        record.bodhi_context = context
+        record.save!
+        return record
       end
 
       # Returns a single resource from the Bodhi Cloud that matches the given +id+
@@ -45,7 +64,11 @@ module Bodhi
       #   context = Bodhi::Context.new
       #   id = Resource.factory.create(context).sys_id
       #   obj = Resource.find(context, id)
-      def find(context, id)
+      def find(id, context=nil)
+        if context.nil?
+          context = Bodhi::Context.global_context
+        end
+
         if context.invalid?
           raise Bodhi::ContextErrors.new(context.errors.messages), context.errors.to_a.to_s
         end
@@ -63,7 +86,7 @@ module Bodhi
           raise Bodhi::ApiErrors.new(body: result.body, status: result.status), "status: #{result.status}, body: #{result.body}"
         end
 
-        record = Object.const_get(name).new(JSON.parse(result.body))
+        record = Object.const_get(name).new(result.body)
         record.bodhi_context = context
         record
       end
@@ -72,7 +95,11 @@ module Bodhi
       # 
       #   context = Bodhi::Context.new
       #   Resource.find_all(context) # => [#<Resource:0x007fbff403e808>, #<Resource:0x007fbff403e808>, ...]
-      def find_all(context)
+      def find_all(context=nil)
+        if context.nil?
+          context = Bodhi::Context.global_context
+        end
+
         if context.invalid?
           raise Bodhi::ContextErrors.new(context.errors.messages), context.errors.to_a.to_s
         end
@@ -91,11 +118,12 @@ module Bodhi
           end
 
           page += 1
-          records << JSON.parse(result.body)
+          records << result.body
         end while records.size == 100
 
         records.flatten.collect{ |record| Object.const_get(name).new(record) }
       end
+      alias :all :find_all
 
       # Aggregates the given resource based on the supplied +pipeline+
       # 
@@ -119,7 +147,7 @@ module Bodhi
           raise Bodhi::ApiErrors.new(body: result.body, status: result.status), "status: #{result.status}, body: #{result.body}"
         end
 
-        JSON.parse(result.body)
+        result.body
       end
 
       # Returns a Bodhi::Query object for quering the given Resource
@@ -156,6 +184,28 @@ module Bodhi
     module InstanceMethods
       def id; @sys_id; end
       def persisted?; !@sys_id.nil?; end
+      def new_record?; @sys_id.nil?; end
+
+      def initialize(params={})
+        params.each do |param_key, param_value|
+          if param_value.is_a? Hash
+            type_validator = self.class.validators[param_key.to_sym].find{ |validator| validator.is_a? Bodhi::TypeValidator }
+            if Object.const_defined?(type_validator.type)
+              klass = Object.const_get(type_validator.type)
+              if klass.ancestors.include?(Bodhi::Resource)
+                object = klass.new(param_value)
+                send("#{param_key}=", object)
+              else
+                send("#{param_key}=", param_value)
+              end
+            else
+              send("#{param_key}=", param_value)
+            end
+          else
+            send("#{param_key}=", param_value)
+          end
+        end
+      end
 
       # Returns a Hash of the Objects form attributes
       # 
@@ -203,10 +253,18 @@ module Bodhi
       #   obj.save # => true
       #   obj.persisted? # => true
       def save
-        if self.invalid?
+        if invalid?
           return false
         end
 
+        if bodhi_context.nil?
+          @bodhi_context = Bodhi::Context.global_context
+        end
+
+        if bodhi_context.invalid?
+          raise Bodhi::ContextErrors.new(bodhi_context.errors.messages), bodhi_context.errors.to_a.to_s
+        end
+
         result = bodhi_context.connection.post do |request|
           request.url "/#{bodhi_context.namespace}/resources/#{self.class}"
           request.headers['Content-Type'] = 'application/json'

data/lib/bodhi-slam/types.rb

@@ -116,7 +116,7 @@ module Bodhi
         raise Bodhi::ApiErrors.new(body: result.body, status: result.status), "status: #{result.status}, body: #{result.body}"
       end
 
-      type = Bodhi::Type.new(JSON.parse(result.body))
+      type = Bodhi::Type.new(result.body)
       type.bodhi_context = context
       type
     end
@@ -146,7 +146,7 @@ module Bodhi
         end
 
         page += 1
-        records = JSON.parse(result.body)
+        records = result.body
         all_records << records
       end while records.size == 100
 

data/lib/bodhi-slam/users.rb

@@ -110,7 +110,7 @@ module Bodhi
         raise Bodhi::ApiErrors.new(body: result.body, status: result.status), "status: #{result.status}, body: #{result.body}"
       end
 
-      user = Bodhi::User.new(JSON.parse(result.body))
+      user = Bodhi::User.new(result.body)
       user.bodhi_context = context
       user
     end
@@ -133,7 +133,7 @@ module Bodhi
         raise Bodhi::ApiErrors.new(body: result.body, status: result.status), "status: #{result.status}, body: #{result.body}"
       end
 
-      JSON.parse(result.body)
+      result.body
     end
   end
 end

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

@@ -3,7 +3,7 @@ module Bodhi
     attr_reader :value
 
     def initialize(value)
-      @value = JSON.parse(value)
+      @value = value
     end
 
     def validate(record, attribute, value)

data/lib/bodhi-slam.rb

@@ -1,5 +1,7 @@
-require "faraday"
+require 'faraday'
+require 'faraday_middleware'
 require 'net/http/persistent'
+
 require "json"
 require "time"
 require "SecureRandom"

metadata

@@ -1,43 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: bodhi-slam
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - willdavis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-02 00:00:00.000000000 Z
+date: 2015-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: net-http-persistent
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.10'
+- !ruby/object:Gem::Dependency
+  name: net-http-persistent
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.9'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -189,7 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Ruby bindings for the Bodhi API & factories for random data generation