bodhi-slam 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae5feb37bac90c1ac538d316c0fb7d2ecc7b18f8
-  data.tar.gz: dc1850ef0aae5d42a869be2c3dce98e4c8fdb288
+  metadata.gz: d37d15d216eee1331997b6c36c8354c96f2a5cc8
+  data.tar.gz: 1f718df6ea9586e6af5f3b24c82b3d3a7a54af7a
 SHA512:
-  metadata.gz: 4540be38c57de2cf525f0de62f2abb1b52076b3ed4b71edc54bc0be28211df974c99032dc2a783dc909ba3206f3bf65cee515829b2ab815e6de342d085941ce9
-  data.tar.gz: db46ee061a66b8b24e63fbfefcd30c709a92b2ed1a98c6c5932d91054d9b169bce7b5ba3701e48d23c11f65e038f0f0e1b3ef614e4d3039a4231bab674e35d49
+  metadata.gz: 9dd80e02c44454dbb8abf5d813578186e4492fb43fe4bd76ddf60fff63e76f0674689d0cdbe301e5e77c3233ecff49d9a66eac3604eb53b5e73030bb562319ad
+  data.tar.gz: a1d883d59e1f0aae13bb8cdff2f86dfa8e30a4891d4bb4f5f872cd169b4de42fad77ae62b9a8627f7cc60a9535ec0d8eb29625c30102733dfcad13cd8c1d2835

data/lib/bodhi-slam.rb

@@ -1,15 +1,11 @@
+require "json"
+require "time"
 require 'faraday'
 require 'faraday_middleware'
 require 'net/http/persistent'
-
-require "json"
-require "time"
-require "SecureRandom"
 require 'regexp-examples'
-require 'active_model'
 
 require 'bodhi-slam/support'
-
 require 'bodhi-slam/validations'
 require 'bodhi-slam/errors'
 require 'bodhi-slam/context'
@@ -42,11 +38,41 @@ class BodhiSlam
     yield bodhi_context
   end
 
+  def self.define_resources(context, options={})
+    # symbolize keys for the options hash
+    options = options.reduce({}) do |memo, (k, v)|
+      memo.merge({ k.to_sym => v})
+    end
+
+    if context.invalid?
+      raise Bodhi::ContextErrors.new(context.errors.messages), context.errors.to_a.to_s
+    end
+
+    enumerations = Bodhi::Enumeration.find_all(context)
+
+    if options[:include].is_a? Array
+      types = Bodhi::Type.where("{name: { $in: #{options[:include].map(&:to_s)} }}").from(context).all
+    elsif options[:except].is_a? Array
+      types = Bodhi::Type.where("{name: { $nin: #{options[:except].map(&:to_s)} }}").from(context).all
+    else
+      types = Bodhi::Type.find_all(context)
+    end
+
+    types.collect do |type|
+      begin
+        Bodhi::Type.create_class_with(type)
+      rescue Exception => error
+        puts "WARNING: Unable to create class for #{type.name}.  The following error was encountered: #{error}"
+      end
+    end
+  end
+
   # Dynamically creates Ruby Classes for each type in the given +context+
   # 
   #   context = Bodhi::Context.new(valid_params)
   #   BodhiSlam.analyze(context) # => [#<Class:0x007fbff403e808 @name="TestType">, #<Class:0x007fbff403e808 @name="TestType2">, ...]
   def self.analyze(context)
+    puts "WARNING: The method BodhiSlam.analyze(context) has been depreciated and will be removed by version 1.0"
     if context.invalid?
       raise Bodhi::ContextErrors.new(context.errors.messages), context.errors.to_a.to_s
     end

data/lib/bodhi-slam/queries.rb

@@ -1,8 +1,9 @@
 module Bodhi
   class Query
-    attr_reader :klass, :url, :context, :criteria, :fields, :paging, :sorting
+    attr_reader :klass, :controller, :url, :context, :criteria, :fields, :paging, :sorting
 
-    def initialize(klass)
+    def initialize(klass, controller="resources")
+      @controller = controller
       @klass = Object.const_get(klass.to_s)
       @criteria = []
       @fields = []
@@ -20,9 +21,13 @@ module Bodhi
 
     def url
       unless context.nil?
-        query = "/#{context.namespace}/resources/#{klass}?"
+        if @controller == "resources"
+          query = "/#{context.namespace}/#{controller}/#{klass}?"
+        else
+          query = "/#{context.namespace}/#{controller}?"
+        end
       else
-        query = "/resources/#{klass}?"
+        query = "/#{controller}/#{klass}?"
       end
       params = []
 
@@ -69,7 +74,7 @@ module Bodhi
       end
 
       query << params.join('&')
-      query.gsub(/\s+/, "")
+      #query.gsub(/\s+/, "")
     end
 
     def all
@@ -90,7 +95,7 @@ module Bodhi
         raise Bodhi::ApiErrors.new(body: result.body, status: result.status), "status: #{result.status}, body: #{result.body}"
       end
 
-      result.body.map{ |attributes| klass.new(attributes) }
+      result.body.map{ |attributes| klass.new(attributes.merge(bodhi_context: context)) }
     end
 
     def first
@@ -111,7 +116,7 @@ module Bodhi
         raise Bodhi::ApiErrors.new(body: result.body, status: result.status), "status: #{result.status}, body: #{result.body}"
       end
 
-      result.body.map{ |attributes| klass.new(attributes) }.first
+      result.body.map{ |attributes| klass.new(attributes.merge(bodhi_context: context)) }.first
     end
 
     def last
@@ -132,7 +137,7 @@ module Bodhi
         raise Bodhi::ApiErrors.new(body: result.body, status: result.status), "status: #{result.status}, body: #{result.body}"
       end
 
-      result.body.map{ |attributes| klass.new(attributes) }.last
+      result.body.map{ |attributes| klass.new(attributes.merge(bodhi_context: context)) }.last
     end
 
     def from(context)

data/lib/bodhi-slam/resource.rb

@@ -366,7 +366,7 @@ module Bodhi
 
     def self.included(base)
       base.extend(ClassMethods)
-      base.include(InstanceMethods, Bodhi::Validations, Bodhi::Properties, Bodhi::Indexes, Bodhi::Factories, ActiveModel::Model)
+      base.include(InstanceMethods, Bodhi::Validations, Bodhi::Properties, Bodhi::Indexes, Bodhi::Factories)
       base.instance_variable_set(:@embedded, false)
     end
   end

data/lib/bodhi-slam/types.rb

@@ -139,6 +139,12 @@ module Bodhi
       end
     end
 
+    def self.where(query)
+      query_obj = Bodhi::Query.new(Bodhi::Type, "types")
+      query_obj.where(query)
+      query_obj
+    end
+
     # Dynamically defines a new Ruby class for the given +type+
     # Class validations, factory, and helper methods will also be added
     # 
@@ -164,9 +170,7 @@ module Bodhi
         attr_properties.delete_if{ |key, value| [:trim, :unique, :default, :isCurrentUser, :toLower].include?(key) }
 
         # Do not add factories or validations for system properties
-        if attr_properties[:system] == true
-          klass.property attr_name
-        else
+        unless attr_properties[:system] == true
           klass.field(attr_name, attr_properties)
         end
       end

data/lib/bodhi-slam/users.rb

@@ -88,6 +88,34 @@ module Bodhi
       end
     end
 
+    def update!(options)
+      update_attributes(options)
+
+      result = bodhi_context.connection.put do |request|
+        request.url "/#{bodhi_context.namespace}/users/#{username}"
+        request.headers['Content-Type'] = 'application/json'
+        request.headers[bodhi_context.credentials_header] = bodhi_context.credentials
+        request.body = attributes.to_json
+      end
+
+      if result.status != 204
+        raise Bodhi::ApiErrors.new(body: result.body, status: result.status), "status: #{result.status}, body: #{result.body}"
+      end
+    end
+
+    def patch!(options)
+      result = bodhi_context.connection.patch do |request|
+        request.url "/#{bodhi_context.namespace}/users/#{username}"
+        request.headers['Content-Type'] = 'application/json'
+        request.headers[bodhi_context.credentials_header] = bodhi_context.credentials
+        request.body = options.to_json
+      end
+
+      if result.status != 204
+        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}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bodhi-slam
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - willdavis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-19 00:00:00.000000000 Z
+date: 2015-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -80,20 +80,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: activemodel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement