bodhi-slam 0.3.4 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ea629d70a0b01fca9df643eb9477d625e3c5d47
-  data.tar.gz: f4057f1569b8d14baa709c439976af61a5b9b6fa
+  metadata.gz: 6df30b96a6aec463e6caa1ccbd279e47d27a57a2
+  data.tar.gz: 6852921c1be4570e84dab5869713af2f2f95bd81
 SHA512:
-  metadata.gz: 1d89be865cf3730e3567da45b32b0ee2611524d66d08866ab1a885b48db02d1bb7405d0544e7511e9771a6662099be3d025023c340b6cf5212f337267460030c
-  data.tar.gz: 12b9b414770e1ba9677b0bb58436afd6958e2eec9fcf02a87e8398b6dd91a009867e8019a12e327d58ea48be71bd2bee5ceccf9b5727776530a664751b740b96
+  metadata.gz: 7a04d8bf2df4d929e2d533283610f9d93eef65479383250d93c91e4cd22a27ae2b1ed14fdbe3c476b1576561acd85b84bd19e0d9479c18c7a88a2e66ff892d6c
+  data.tar.gz: 1df3159b31651ba636903099ac5f7ac5c1dd85bca80866c7de94be3ba1be5ac52c7e34e387ecd1a1cd591a770f44f8b714d7356e6eeee081edc30395720e79eb

data/lib/bodhi-slam.rb

@@ -4,6 +4,7 @@ require "json"
 require "time"
 require "SecureRandom"
 require 'regexp-examples'
+require 'active_model'
 
 require 'bodhi-slam/validations'
 require 'bodhi-slam/errors'
@@ -16,6 +17,7 @@ require 'bodhi-slam/resource'
 require 'bodhi-slam/types'
 require 'bodhi-slam/users'
 require 'bodhi-slam/profiles'
+require 'bodhi-slam/queries'
 
 class BodhiSlam
   # Defines a context to interact with the Bodhi API

data/lib/bodhi-slam/queries.rb

@@ -0,0 +1,209 @@
+module Bodhi
+  class Query
+    attr_reader :klass, :url, :context, :criteria, :fields, :paging, :sorting
+
+    def initialize(klass)
+      @klass = Object.const_get(klass.to_s)
+      @criteria = []
+      @fields = []
+      @paging = {}
+      @sorting = {}
+    end
+
+    def clear!
+      @context = nil
+      @criteria.clear
+      @fields.clear
+      @paging.clear
+      @sorting.clear
+    end
+
+    def url
+      unless context.nil?
+        query = "/#{context.namespace}/resources/#{klass}?"
+      else
+        query = "/resources/#{klass}?"
+      end
+      params = []
+
+      unless criteria.empty?
+        if criteria.size > 1
+          where_string = "{$and:[#{criteria.join(',')}]}"
+        else
+          where_string = criteria.join
+        end
+
+        params << "where=#{where_string}"
+      end
+
+      unless fields.empty?
+        params << "fields=#{fields.join(',')}"
+      end
+
+      unless paging.empty?
+        paging_params = []
+
+        if paging[:page]
+          paging_params << "page:#{paging[:page]}"
+        end
+
+        if paging[:limit]
+          paging_params << "limit:#{paging[:limit]}"
+        end
+
+        params << "paging=#{paging_params.join(',')}"
+      end
+
+      unless sorting.empty?
+        sort_params = []
+
+        if sorting[:field]
+          sort_params << sorting[:field]
+        end
+
+        if sorting[:order]
+          sort_params << sorting[:order]
+        end
+
+        params << "sort=#{sort_params.join(':')}"
+      end
+
+      query << params.join('&')
+      query.gsub(/\s+/, "")
+    end
+
+    def all
+      if context.nil?
+        raise ArgumentError.new("a Bodhi::Context is required to query the API")
+      end
+
+      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 self.url
+        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
+
+      resources = JSON.parse(result.body)
+      resources.map{ |attributes| klass.factory.build(context, attributes) }
+    end
+
+    def first
+      if context.nil?
+        raise ArgumentError.new("a Bodhi::Context is required to query the API")
+      end
+
+      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 self.url
+        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
+
+      resources = JSON.parse(result.body)
+      resources.map{ |attributes| klass.factory.build(context, attributes) }.first
+    end
+
+    def last
+      if context.nil?
+        raise ArgumentError.new("a Bodhi::Context is required to query the API")
+      end
+
+      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 self.url
+        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
+
+      resources = JSON.parse(result.body)
+      resources.map{ |attributes| klass.factory.build(context, attributes) }.last
+    end
+
+    def from(context)
+      unless context.is_a? Bodhi::Context
+        raise ArgumentError.new("Expected Bodhi::Context but received #{context.class}")
+      end
+
+      @context = context
+      self
+    end
+
+    def where(query)
+      unless query.is_a? String
+        raise ArgumentError.new("Expected String but received #{query.class}")
+      end
+
+      @criteria << query
+      @criteria.uniq!
+      self
+    end
+    alias :and :where
+
+    def select(field_names)
+      unless field_names.is_a? String
+        raise ArgumentError.new("Expected String but received #{field_names.class}")
+      end
+
+      fields_array = field_names.split(',')
+      @fields << fields_array
+      @fields.flatten!
+      @fields.uniq!
+      self
+    end
+
+    def limit(number)
+      unless number.is_a? Integer
+        raise ArgumentError.new("Expected Integer but received #{number.class}")
+      end
+
+      unless number <= 100
+        raise ArgumentError.new("Expected limit to be less than or equal to 100 but received #{number}")
+      end
+
+      @paging[:limit] = number
+      self
+    end
+
+    def page(number)
+      unless number.is_a? Integer
+        raise ArgumentError.new("Expected Integer but received #{number.class}")
+      end
+
+      @paging[:page] = number
+      self
+    end
+
+    def sort(field, order=nil)
+      unless field.is_a? String
+        raise ArgumentError.new("Expected String but received #{field.class}")
+      end
+
+      unless order.nil?
+        @sorting[:order] = order
+      end
+
+      @sorting[:field] = field
+      self
+    end
+
+  end
+end

data/lib/bodhi-slam/resource.rb

@@ -1,5 +1,6 @@
 module Bodhi
   module Resource
+
     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]
@@ -62,8 +63,9 @@ module Bodhi
           raise Bodhi::ApiErrors.new(body: result.body, status: result.status), "status: #{result.status}, body: #{result.body}"
         end
 
-        resource_attributes = JSON.parse(result.body)
-        factory.build(context, resource_attributes)
+        record = Object.const_get(name).new(JSON.parse(result.body))
+        record.bodhi_context = context
+        record
       end
 
       # Returns all records of the given resource from the Bodhi Cloud.
@@ -92,7 +94,7 @@ module Bodhi
           records << JSON.parse(result.body)
         end while records.size == 100
 
-        records.flatten.collect{ |record| factory.build(record) }
+        records.flatten.collect{ |record| Object.const_get(name).new(record) }
       end
 
       # Aggregates the given resource based on the supplied +pipeline+
@@ -120,30 +122,15 @@ module Bodhi
         JSON.parse(result.body)
       end
 
-      # Returns all records for a resource which match the given +query+
+      # Returns a Bodhi::Query object for quering the given Resource
       # 
       #   context = Bodhi::Context.new
-      #   Resource.where(context, "{property: 'value'}")
-      def where(context, query)
-        if context.invalid?
-          raise Bodhi::ContextErrors.new(context.errors.messages), context.errors.to_a.to_s
-        end
-
-        unless query.is_a? String
-          raise ArgumentError.new("Expected 'query' to be a String. 'query' #=> #{query.class}")
-        end
-
-        result = context.connection.get do |request|
-          request.url "/#{context.namespace}/resources/#{name}?where=#{query}"
-          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
-
-        resources = JSON.parse(result.body)
-        resources.map{ |attributes| factory.build(context, attributes) }
+      #   Resource.where("{property: 'value'}").from(context).all
+      #   Resource.where("{conditions}").and("{more conditions}").limit(10).from(context).all
+      def where(query)
+        query_obj = Bodhi::Query.new(name)
+        query_obj.where(query)
+        query_obj
       end
 
       # Deletes all records from a resource in the given +context+
@@ -167,6 +154,9 @@ module Bodhi
     end
 
     module InstanceMethods
+      def id; @sys_id; end
+      def persisted?; !@sys_id.nil?; end
+
       # Returns a Hash of the Objects form attributes
       # 
       #   s = SomeResource.build({foo:"test", bar:12345})
@@ -181,7 +171,22 @@ module Bodhi
         end
         attributes
       end
-  
+
+      # Updates the resource with the given attributes Hash
+      # 
+      #   s = SomeResource.factory.build(foo:"test", bar:12345)
+      #   s.attributes # => { foo: "test", bar: 12345 }
+      #   s.update_attributes(foo:"12345", bar:10)
+      #   s.attributes # => { foo: "12345", bar: 10 }
+      def update_attributes(params)
+        self.instance_variables.each do |variable|
+          attribute_name = variable.to_s.delete('@').to_sym
+          unless SYSTEM_ATTRIBUTES.include?(attribute_name) || SUPPORT_ATTRIBUTES.include?(attribute_name)
+            send("#{attribute_name}=", params[attribute_name])
+          end
+        end
+      end
+
       # Returns all the Objects attributes as JSON.
       # It converts any nested Objects to JSON if they respond to +to_json+
       # 
@@ -192,6 +197,34 @@ module Bodhi
         attributes.to_json
       end
 
+      # Saves the resource to the Bodhi Cloud.  Returns true if record was saved
+      # 
+      #   obj = Resource.new
+      #   obj.save # => true
+      #   obj.persisted? # => true
+      def save
+        if self.invalid?
+          return false
+        end
+
+        result = bodhi_context.connection.post do |request|
+          request.url "/#{bodhi_context.namespace}/resources/#{self.class}"
+          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
+
+        if result.headers['location']
+          @sys_id = result.headers['location'].match(/(?<id>[a-zA-Z0-9]{24})/)[:id]
+        end
+
+        true
+      end
+
       # Saves the resource to the Bodhi Cloud.  Raises ArgumentError if record could not be saved.
       # 
       #   obj = Resouce.new
@@ -224,6 +257,29 @@ module Bodhi
           raise Bodhi::ApiErrors.new(body: result.body, status: result.status), "status: #{result.status}, body: #{result.body}"
         end
       end
+      alias :destroy :delete!
+
+      def update!(params)
+        update_attributes(params)
+
+        if invalid?
+          return false
+        end
+
+        result = bodhi_context.connection.put do |request|
+          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.to_json
+        end
+
+        if result.status != 204
+          raise Bodhi::ApiErrors.new(body: result.body, status: result.status), "status: #{result.status}, body: #{result.body}"
+        end
+
+        true
+      end
+      alias :update :update!
 
       def patch!(params)
         result = bodhi_context.connection.patch do |request|
@@ -241,7 +297,7 @@ module Bodhi
 
     def self.included(base)
       base.extend(ClassMethods)
-      base.include(InstanceMethods, Bodhi::Validations)
+      base.include(InstanceMethods, Bodhi::Validations, ActiveModel::Model)
       base.instance_variable_set(:@factory, Bodhi::Factory.new(base))
     end
   end

data/lib/bodhi-slam/types.rb

@@ -176,7 +176,7 @@ module Bodhi
       })
 
       type.properties.each_pair do |attr_name, attr_properties|
-        attr_properties.delete_if{ |key, value| ["system", "trim", "unique", "default", "isCurrentUser"].include?(key) }
+        attr_properties.delete_if{ |key, value| ["system", "trim", "unique", "default", "isCurrentUser", "toLower"].include?(key) }
         klass.validates(attr_name.to_sym, attr_properties)
         klass.factory.add_generator(attr_name.to_sym, attr_properties)
       end

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

@@ -4,7 +4,11 @@ module Bodhi
     def initialize(value); end
 
     def validate(record, attribute, value)
-      record.errors.add(attribute, "must be an array") unless value.is_a? Array
+      if value.nil?
+        #do nothing
+      else
+        record.errors.add(attribute, "must be an array") unless value.is_a? Array
+      end
     end
 
     def to_options

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bodhi-slam
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.0
 platform: ruby
 authors:
 - willdavis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-23 00:00:00.000000000 Z
+date: 2015-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-http-persistent
@@ -66,6 +66,20 @@ 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
@@ -138,6 +152,7 @@ files:
 - lib/bodhi-slam/errors/context.rb
 - lib/bodhi-slam/factory.rb
 - lib/bodhi-slam/profiles.rb
+- lib/bodhi-slam/queries.rb
 - lib/bodhi-slam/resource.rb
 - lib/bodhi-slam/types.rb
 - lib/bodhi-slam/users.rb