bodhi-slam 0.7.1 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 142c61ba57d9623f1875dc7ad3ef1802a4c26c55
-  data.tar.gz: 4bc85952eebd17b260acab63647829f44773ec87
+  metadata.gz: 1fbe5ba6be9aceacf0acdc118e78a1a95ddd32ee
+  data.tar.gz: a7eae1661963319627d4694dfc90dd8bc5b1e327
 SHA512:
-  metadata.gz: 6144923d080241629cf3c137b89094bc5402df06289ec93ebe01ceba94059af8f8dd8e4d3745a4759500f4da9a57f7a2a3a2119c90ca1a65572da89aabe7f869
-  data.tar.gz: 6a71e114c72b1b31bae451a26e1c797cdb70e175c5cb91432c3531fcf69c5ac185aa981ff1cf6b93b0027f8e976e00c9b2dd91689b008d5885438ce229d9e5ad
+  metadata.gz: 938995fe271d5b2085a80c153931e3d0378c05daf587e247ef7baad00c2f48d4741b59299842c4042c0bbb3cf56ab44445983c200fbd6936e445d6ba3fb07dd1
+  data.tar.gz: 8f72e7317218ece3d876e7b803f738e55176e2de400bc368fa1c4d50bb1700c40f58be5d219fa1c2841d63a00a5d8a3cf18b0d1d393c64b30ae96213ef30ff75

data/lib/bodhi-slam/associations.rb

@@ -50,30 +50,66 @@ module Bodhi
             through_query.where(association[:through][:foreign_key].to_sym => self.send(association[:primary_key]))
             through_query.select(association[:through][:primary_key])
 
-            puts through_query.url
+            count = through_query.count
+            pages = (count.to_f / 100.0).ceil
 
+            instance_ids = []
             method_chain = association[:through][:primary_key].split('.')
-            if method_chain.size == 1
-              instance_ids = through_query.all.map{ |item| item.send(association[:through][:primary_key]) }
-            else
-              instance_ids = through_query.all.map do |item|
-                method_chain.reduce(item){ |memo, method| memo.send(method) }
+
+            # loop through each page of the through query
+            if pages > 0
+              pages.times.collect do |n|
+                paged_query = through_query.clone
+                paged_query.page(n+1)
+
+                puts paged_query.url
+
+                records = paged_query.all
+                instance_ids << records.map{ |item| method_chain.reduce(item){ |memo, method| memo.send(method) } }
               end
+
+              instance_ids.flatten!.uniq!
             end
 
-            query.where(association[:foreign_key].to_sym => { "$in" => instance_ids })
-          else
+            # partition the target query if larger than 4K
+            test_query = query.clone
+            query_size = test_query.where(association[:foreign_key].to_sym => { "$in" => instance_ids }).and(association[:query]).url.bytesize
+
+            if query_size > 4000
+              records = []
+              instance_ids.each_slice(100) do |slice|
+                sliced_query = query.clone
+                sliced_query.where(association[:foreign_key].to_sym => { "$in" => slice })
+                sliced_query.and(association[:query])
+
+                puts sliced_query.url
+
+                records << sliced_query.all
+              end
+
+              records.flatten!
+              return records
+            else
+              query.where(association[:foreign_key].to_sym => { "$in" => instance_ids })
+              query.and(association[:query])
+
+              puts query.url
+              return query.all
+            end
+          else # default :has_many flow
             instance_id = self.send(association[:primary_key])
+
             if instance_id.is_a?(Array)
               query.where(association[:foreign_key].to_sym => { "$in" => instance_id })
             else
               query.where(association[:foreign_key].to_sym => instance_id)
             end
-          end
 
-          query.and(association[:query])
-          puts query.url
-          query.all
+            query.and(association[:query])
+
+            puts query.url
+            return query.all
+          end
         end
       end
 

data/lib/bodhi-slam/context.rb

@@ -16,6 +16,8 @@ module Bodhi
 
     def initialize(params={})
       @connection = Faraday.new(url: params[:server]) do |faraday|
+        faraday.use :http_cache
+
         faraday.request :multipart
         faraday.request :url_encoded
 

data/lib/bodhi-slam/queries.rb

@@ -71,6 +71,48 @@ module Bodhi
       #query.gsub(/\s+/, "")
     end
 
+    def count
+      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.gsub(klass.name, "#{klass}/count")
+        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.body["count"]
+    end
+
+    def delete
+      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.delete do |request|
+        request.url self.url
+        request.headers[context.credentials_header] = context.credentials
+      end
+
+      if result.status != 204
+        raise Bodhi::ApiErrors.new(body: result.body, status: result.status), "status: #{result.status}, body: #{result.body}"
+      end
+
+      result.body
+    end
+
     def all
       if context.nil?
         raise ArgumentError.new("a Bodhi::Context is required to query the API")

data/lib/bodhi-slam/resource.rb

@@ -43,26 +43,24 @@ module Bodhi
         batch
       end
 
-      # Counts all of the Resources records and returns the result
-      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
-
-        result = context.connection.get do |request|
-          request.url "/#{context.namespace}/resources/#{name}/count"
-          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
+      # Counts all records that match the given query
+      #
+      #   context = Bodhi::Context.new
+      #   count = Resource.count(context, name: "Foo")
+      def count(context, query={})
+        query_obj = Bodhi::Query.new(name)
+        query_obj.where(query).from(context)
+        query_obj.count
+      end
 
-        result.body
+      # Deletes all records that match the given query
+      #
+      #   context = Bodhi::Context.new
+      #   count = Resource.delete(context, name: "Foo")
+      def delete!(context, query={})
+        query_obj = Bodhi::Query.new(name)
+        query_obj.where(query).from(context)
+        query_obj.delete
       end
 
       def create!(params, context=nil)
@@ -181,25 +179,6 @@ module Bodhi
         query_obj.where(query)
         query_obj
       end
-
-      # Deletes all records from a resource in the given +context+
-      # 
-      #   context = Bodhi::Context.new
-      #   Resource.delete_all(context)
-      def delete_all(context)
-        if context.invalid?
-          raise Bodhi::ContextErrors.new(context.errors.messages), context.errors.to_a.to_s
-        end
-
-        result = context.connection.delete do |request|
-          request.url "/#{context.namespace}/resources/#{name}"
-          request.headers[context.credentials_header] = 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
     end
 
     module InstanceMethods

data/lib/bodhi-slam.rb

@@ -3,6 +3,7 @@ require "time"
 require 'faraday'
 require 'SecureRandom'
 require 'faraday_middleware'
+require 'faraday-http-cache'
 require 'net/http/persistent'
 require 'regexp-examples'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bodhi-slam
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.3
 platform: ruby
 authors:
 - willdavis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-08 00:00:00.000000000 Z
+date: 2016-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
+- !ruby/object:Gem::Dependency
+  name: faraday-http-cache
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: net-http-persistent
   requirement: !ruby/object:Gem::Requirement
@@ -70,16 +84,16 @@ dependencies:
   name: regexp-examples
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 1.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 1.1.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement