bodhi-slam 0.2.5 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c3c82642a103662a2881ac8e07c236853d2e812
-  data.tar.gz: ac2ebf8f9226eb5395ace0a7a8d4da99a3159b24
+  metadata.gz: 918cd6ede8d2d5cd62621b10fa6c80db870ef708
+  data.tar.gz: 26cbbadd0c463339016f7b60d4e87993373aaf5a
 SHA512:
-  metadata.gz: fcccae214b0272c9fed879dc74e49980521db7f8bc27fb5cda37350b63c795f40c852902b59c95e64788ab8edf8d8d97c8f7c1e95eb144d88857e75c83a0c472
-  data.tar.gz: 799f5e418a7ce569b70543002dd9dcbccc897c6658f088f2fc2622e530e75b2d708b6262445747fe37c1ba0d5393f8f04ad96ff1675b4f0acd40c12f4a1fe5bd
+  metadata.gz: 0d8e3134e705a6aeafe8fbea15831e1e3aefe5dca26e466c6484420531e5da67bb7436761c1c80db6077441cc8b3437726ad1d99250ec8fab3b72f055590b197
+  data.tar.gz: 3db2df8a8b36503709c1c9589a574977024d19b2bb8ac78eb9780001e592269d1be7f8c197867514d50644220fad3d5a89d35fc77a547b1d08d0dad1b00b9658

data/lib/bodhi-slam.rb

@@ -4,13 +4,16 @@ require "json"
 require "time"
 require "SecureRandom"
 
-require 'bodhi-slam/context'
-require 'bodhi-slam/errors'
-require 'bodhi-slam/resource'
-require 'bodhi-slam/types'
 require 'bodhi-slam/validations'
+require 'bodhi-slam/errors'
+
+require 'bodhi-slam/batches'
+require 'bodhi-slam/context'
 require 'bodhi-slam/enumerations'
 require 'bodhi-slam/factory'
+require 'bodhi-slam/resource'
+require 'bodhi-slam/types'
+require 'bodhi-slam/users'
 
 class BodhiSlam
   # Defines a context to interact with the Bodhi API

data/lib/bodhi-slam/batches.rb

@@ -0,0 +1,19 @@
+module Bodhi
+  class Batch
+    attr_accessor :records
+    attr_reader :created, :failed
+
+    def initialize(records=[])
+      @records = records
+      @created = []
+      @failed = []
+    end
+
+    # Saves the batch of records to the Bodhi cloud.
+    def save!(context)
+      raise NotImplementedError, "Subclasses must implement a save!(context) method."
+    end
+  end
+end
+
+Dir[File.dirname(__FILE__) + "/batches/*.rb"].each { |file| require file }

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

@@ -0,0 +1,49 @@
+module Bodhi
+  class ResourceBatch < Batch
+    include Bodhi::Validations
+
+    attr_accessor :type
+
+    validates :type, type: "String", required: true, is_not_blank: true
+    validates :records, type: "Bodhi::Resource", required: true, multi: true
+
+    def initialize(type, resources=[])
+      super(resources)
+      @type = type
+    end
+
+    # Saves all records in the batch to the cloud
+    # and populates the +created+ and +failed+ arrays with the results
+    def save!(context)
+      if context.invalid?
+        raise Bodhi::ContextErrors.new(context.errors.messages), context.errors.to_a.to_s
+      end
+
+      records.each{ |record| record.validate! }
+
+      response = context.connection.post do |request|
+        request.url "/#{context.namespace}/resources/#{type}"
+        request.headers['Content-Type'] = 'application/json'
+        request.headers[context.credentials_header] = context.credentials
+        request.body = records.to_json
+      end
+
+      if response.status != 200
+        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.each do |response, record|
+        if response["location"]
+          record.sys_id = response["location"].match(/(?<id>[a-zA-Z0-9]{24})/)[:id]
+          @created.push record
+        else
+          @failed.push record
+        end
+      end
+
+    end
+  end
+end

data/lib/bodhi-slam/factory.rb

@@ -69,21 +69,11 @@ module Bodhi
       end
 
       resources = build_list(size, params)
-      result = context.connection.post do |request|
-        request.url "/#{context.namespace}/resources/#{klass}"
-        request.headers['Content-Type'] = 'application/json'
-        request.headers[context.credentials_header] = context.credentials
-        request.body = resources.to_json
+      resources.each do |resource|
+        resource.bodhi_context = context
+        resource.save!
       end
 
-      #puts "\033[33mResult Body\033[0m: \033[36m#{result.body}\033[0m"
-
-      if result.status != 200
-        raise Bodhi::ApiErrors.new(body: result.body, status: result.status), "status: #{result.status}, body: #{result.body}"
-      end
-
-      #puts "\033[33mRecords\033[0m: \033[36m#{records.map(&:attributes)}\033[0m"
-
       resources
     end
 

data/lib/bodhi-slam/resource.rb

@@ -1,8 +1,10 @@
 module Bodhi
   module Resource
-    SYSTEM_ATTRIBUTES = [:bodhi_context, :sys_created_at, :sys_version, :sys_modified_at, :sys_modified_by,
+    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]
+    SUPPORT_ATTRIBUTES = [:bodhi_context, :errors]
     attr_accessor *SYSTEM_ATTRIBUTES
+    attr_accessor *SUPPORT_ATTRIBUTES
 
     module ClassMethods
       def factory; @factory; end
@@ -14,22 +16,9 @@ module Bodhi
       #   list = Resource.factory.build_list(10)
       #   Resource.save_batch(context, list)
       def save_batch(context, objects)
-        if context.invalid?
-          raise Bodhi::ContextErrors.new(context.errors.messages), context.errors.to_a.to_s
-        end
-
-        result = context.connection.post do |request|
-          request.url "/#{context.namespace}/resources/#{name}"
-          request.headers['Content-Type'] = 'application/json'
-          request.headers[context.credentials_header] = context.credentials
-          request.body = objects.to_json
-        end
-
-        if result.status != 200
-          raise Bodhi::ApiErrors.new(body: result.body, status: result.status), "status: #{result.status}, body: #{result.body}"
-        end
-
-        objects
+        batch = Bodhi::ResourceBatch.new(name, objects)
+        batch.save!(context)
+        batch
       end
 
       # Returns a single resource from the Bodhi Cloud that matches the given +id+
@@ -168,7 +157,9 @@ module Bodhi
         attributes = Hash.new
         self.instance_variables.each do |variable|
           attribute_name = variable.to_s.delete('@').to_sym
-          attributes[attribute_name] = send(attribute_name) unless SYSTEM_ATTRIBUTES.include?(attribute_name)
+          unless SYSTEM_ATTRIBUTES.include?(attribute_name) || SUPPORT_ATTRIBUTES.include?(attribute_name)
+            attributes[attribute_name] = send(attribute_name)
+          end
         end
         attributes
       end

data/lib/bodhi-slam/types.rb

@@ -2,18 +2,31 @@ module Bodhi
   class Type
     include Bodhi::Validations
 
-    BODHI_SYSTEM_ATTRIBUTES = [:sys_created_at, :sys_version, :sys_modified_at, :sys_modified_by,
+    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]
-    BODHI_TYPE_ATTRIBUTES = [:name, :namespace, :package, :embedded, :properties]
+    ATTRIBUTES = [:name, :namespace, :package, :embedded, :properties, :version]
 
-    attr_accessor *BODHI_TYPE_ATTRIBUTES
-    attr_reader *BODHI_SYSTEM_ATTRIBUTES
+    attr_accessor *ATTRIBUTES
+    attr_reader *SYSTEM_ATTRIBUTES
     attr_reader :validations
+    attr_accessor :bodhi_context
 
     validates :name, required: true, is_not_blank: true
     validates :namespace, required: true
     validates :properties, required: true
 
+    # Returns a factory for the Bodhi::Type class
+    def self.factory
+      @factory ||= Bodhi::Factory.new(Bodhi::Type).tap do |factory|
+        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)
+        factory.add_generator(:package, type: "String")
+        factory.add_generator(:embedded, type: "Boolean")
+        factory.add_generator(:version, type: "String")
+      end
+    end
+
     def initialize(params={})
       # same as symbolize_keys!
       params = params.reduce({}) do |memo, (k, v)| 
@@ -21,7 +34,7 @@ module Bodhi
       end
 
       # set attributes
-      BODHI_TYPE_ATTRIBUTES.each do |attribute|
+      ATTRIBUTES.each do |attribute|
         send("#{attribute}=", params[attribute])
       end
 
@@ -52,8 +65,84 @@ module Bodhi
       end
     end
 
-    # Queries the Bodhi API for all types within the given +context+
-    # Returns an array of Bodhi::Type objects
+    # Returns a Hash of the Objects form attributes
+    # 
+    #   s = SomeResource.factory.build({foo:"test", bar:12345})
+    #   s.attributes # => { foo: "test", bar: 12345 }
+    def attributes
+      result = Hash.new
+      ATTRIBUTES.each do |attribute|
+        result[attribute] = send(attribute)
+      end
+      result
+    end
+
+    # Returns all the Objects attributes as JSON.
+    # It converts any nested Objects to JSON if they respond to +to_json+
+    # 
+    #   s = SomeResource.factory.build({foo:"test", bar:12345})
+    #   s.to_json # => "{ 'foo':'test', 'bar':12345 }"
+    def to_json(base=nil)
+      super if base
+      attributes.to_json
+    end
+
+    # Saves the resource to the Bodhi Cloud.  Raises ArgumentError if record could not be saved.
+    # 
+    #   obj = Resouce.new
+    #   obj.save!
+    #   obj.persisted? # => true
+    def save!
+      result = bodhi_context.connection.post do |request|
+        request.url "/#{bodhi_context.namespace}/types"
+        request.headers['Content-Type'] = 'application/json'
+        request.headers[bodhi_context.credentials_header] = bodhi_context.credentials
+        request.body = attributes.to_json
+      end
+
+      if result.status != 201
+        raise Bodhi::ApiErrors.new(body: result.body, status: result.status), "status: #{result.status}, body: #{result.body}"
+      end
+    end
+
+    def delete!
+      result = bodhi_context.connection.delete do |request|
+        request.url "/#{bodhi_context.namespace}/types/#{name}"
+        request.headers[bodhi_context.credentials_header] = bodhi_context.credentials
+      end
+
+      if result.status != 204
+        raise Bodhi::ApiErrors.new(body: result.body, status: result.status), "status: #{result.status}, body: #{result.body}"
+      end
+    end
+
+    # Queries the Bodhi API for the given +type_name+ and
+    # returns a Bodhi::Type
+    # 
+    #   context = BodhiContext.new(valid_params)
+    #   type = Bodhi::Type.find(context, "MyTypeName")
+    #   type # => #<Bodhi::Type:0x007fbff403e808 @name="MyTypeName">
+    def self.find(context, type_name)
+      if context.invalid?
+        raise context.errors, context.errors.to_a.to_s
+      end
+
+      result = context.connection.get do |request|
+        request.url "/#{context.namespace}/types/#{type_name}"
+        request.headers[context.credentials_header] = context.credentials
+      end
+
+      if result.status != 200
+        raise Bodhi::ApiErrors.new(body: result.body, status: result.status), "status: #{result.status}, body: #{result.body}"
+      end
+
+      type = Bodhi::Type.new(result)
+      type.bodhi_context = context
+      type
+    end
+
+    # Queries the Bodhi API for all types within the given +context+ and
+    # returns an array of Bodhi::Type objects
     # 
     #   context = BodhiContext.new(valid_params)
     #   types = Bodhi::Type.find_all(context)
@@ -70,10 +159,7 @@ module Bodhi
         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
 
         page += 1
@@ -81,7 +167,11 @@ module Bodhi
         all_records << records
       end while records.size == 100
 
-      all_records.flatten.collect{ |type| Bodhi::Type.new(type) }
+      all_records.flatten.collect do |type|
+        record = Bodhi::Type.new(type)
+        record.bodhi_context = context
+        record
+      end
     end
 
     # Dynamically defines a new Ruby class for the given +type+

data/lib/bodhi-slam/users.rb

@@ -0,0 +1,139 @@
+module Bodhi
+  class User
+    include Bodhi::Validations
+
+    ATTRIBUTES = [:username, :password, :profiles, :email, :firstName, :lastName, :phone]
+    attr_accessor *ATTRIBUTES
+    attr_accessor :bodhi_context
+
+    validates :username, type: "String", required: true, is_not_blank: true
+    validates :password, type: "String", required: true, is_not_blank: true
+    validates :profiles, type: "String", required: true, multi: true
+    validates :email, type: "String", is_email: true
+    validates :firstName, type: "String"
+    validates :lastName, type: "String"
+    validates :phone, type: "String"
+
+    def initialize(params={})
+      # same as symbolize_keys!
+      params = params.reduce({}) do |memo, (k, v)| 
+        memo.merge({ k.to_sym => v})
+      end
+
+      # set attributes
+      ATTRIBUTES.each do |attribute|
+        send("#{attribute}=", params[attribute])
+      end
+    end
+
+    # Returns a Hash of the Objects form attributes
+    # 
+    #   s = SomeResource.factory.build({foo:"test", bar:12345})
+    #   s.attributes # => { foo: "test", bar: 12345 }
+    def attributes
+      result = Hash.new
+      ATTRIBUTES.each do |attribute|
+        result[attribute] = send(attribute)
+      end
+      result
+    end
+
+    # Returns all the Objects attributes as JSON.
+    # It converts any nested Objects to JSON if they respond to +to_json+
+    # 
+    #   s = SomeResource.factory.build({foo:"test", bar:12345})
+    #   s.to_json # => "{ 'foo':'test', 'bar':12345 }"
+    def to_json(base=nil)
+      super if base
+      attributes.to_json
+    end
+
+    # Saves the resource to the Bodhi Cloud.  Raises ArgumentError if record could not be saved.
+    # 
+    #   obj = Resouce.new
+    #   obj.save!
+    #   obj.persisted? # => true
+    def save!
+      result = bodhi_context.connection.post do |request|
+        request.url "/#{bodhi_context.namespace}/users"
+        request.headers['Content-Type'] = 'application/json'
+        request.headers[bodhi_context.credentials_header] = bodhi_context.credentials
+        request.body = attributes.to_json
+      end
+
+      if result.status != 201
+        raise Bodhi::ApiErrors.new(body: result.body, status: result.status), "status: #{result.status}, body: #{result.body}"
+      end
+    end
+
+    def delete!
+      result = bodhi_context.connection.delete do |request|
+        request.url "/#{bodhi_context.namespace}/users/#{username}"
+        request.headers[bodhi_context.credentials_header] = bodhi_context.credentials
+      end
+
+      if result.status != 204
+        raise Bodhi::ApiErrors.new(body: result.body, status: result.status), "status: #{result.status}, body: #{result.body}"
+      end
+    end
+
+    # Returns a factory for the Bodhi::User class
+    def self.factory
+      @factory ||= Bodhi::Factory.new(Bodhi::User).tap do |factory|
+        factory.add_generator(:username, type: "String", required: true, is_not_blank: true)
+        factory.add_generator(:password, type: "String", required: true, is_not_blank: true)
+        factory.add_generator(:profiles, type: "String", required: true, multi: true)
+        factory.add_generator(:email, type: "String", is_email: true)
+        factory.add_generator(:firstName, type: "String")
+        factory.add_generator(:lastName, type: "String")
+        factory.add_generator(:phone, type: "String")
+      end
+    end
+
+    # Queries the Bodhi API for the given +user_name+ and
+    # returns a Bodhi::User
+    # 
+    #   context = BodhiContext.new(valid_params)
+    #   user = Bodhi::User.find(context, "User1")
+    #   user # => #<Bodhi::User:0x007fbff403e808 @username="User1">
+    def self.find(context, user_name)
+      if context.invalid?
+        raise context.errors, context.errors.to_a.to_s
+      end
+
+      result = context.connection.get do |request|
+        request.url "/#{context.namespace}/users/#{user_name}"
+        request.headers[context.credentials_header] = context.credentials
+      end
+
+      if result.status != 200
+        raise Bodhi::ApiErrors.new(body: result.body, status: result.status), "status: #{result.status}, body: #{result.body}"
+      end
+
+      user = Bodhi::User.new(result)
+      user.bodhi_context = context
+      user
+    end
+
+    # Queries the Bodhi API for the users account info
+    # 
+    #   context = BodhiContext.new(valid_params)
+    #   user_properties = Bodhi::User.find_me(context)
+    def self.find_me(context)
+      if context.invalid?
+        raise context.errors, context.errors.to_a.to_s
+      end
+
+      result = context.connection.get do |request|
+        request.url "/me"
+        request.headers[context.credentials_header] = context.credentials
+      end
+
+      if result.status != 200
+        raise Bodhi::ApiErrors.new(body: result.body, status: result.status), "status: #{result.status}, body: #{result.body}"
+      end
+
+      result
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bodhi-slam
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.0
 platform: ruby
 authors:
 - willdavis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-20 00:00:00.000000000 Z
+date: 2015-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-http-persistent
@@ -101,6 +101,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/bodhi-slam.rb
+- lib/bodhi-slam/batches.rb
+- lib/bodhi-slam/batches/resource.rb
 - lib/bodhi-slam/context.rb
 - lib/bodhi-slam/enumerations.rb
 - lib/bodhi-slam/errors.rb
@@ -109,6 +111,7 @@ files:
 - lib/bodhi-slam/factory.rb
 - lib/bodhi-slam/resource.rb
 - lib/bodhi-slam/types.rb
+- lib/bodhi-slam/users.rb
 - lib/bodhi-slam/validations.rb
 - lib/bodhi-slam/validators.rb
 - lib/bodhi-slam/validators/blank.rb