kinto_box 0.1.10 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a82cbc2032eb2fbac538e53b4d3556bd06f8b227
-  data.tar.gz: c814a3a47e72c92d8850c49ef817d37f50caa8a8
+  metadata.gz: 32a1ab4c6cd2f76e5a07c2c7df08e281b6ef8ae3
+  data.tar.gz: e4935d11684d5f8a6346c0b9dd7de758ef51548d
 SHA512:
-  metadata.gz: 3066b795cdf28e23a3eef7b730600ef2f2775b8e0f1330df32437add3f2fb872ad45dfe3a672b8a348854ec0b7fd394ba218902d270267a26a8a2d36cb70df8e
-  data.tar.gz: 03923f433c65c0471f5fad445338c20b5d16a2cdad09cebff0e2e09b3002d78d78cd929ab0bfba0ad1738c4dc788da0a9458acd9843ffb5035fdcafcb4e46f1d
+  metadata.gz: 84f70e98d251392478f69938e5cfc480bf6ba608af4c03324eedf36d10ba2346bec2a9b69529af9e9f902eb139c175adfe718f5737803cb9cf031959f69871ee
+  data.tar.gz: 802b3bfc51dd2dbbb21357e8b629e919a70e5206082b6e669f2ede5d7df12ac8dade82ac33cbc6ea6de333b61ffe28ef39d048b3c6cb7f58b29684b4a6b5bf9f

data/lib/kinto_box.rb

@@ -84,6 +84,39 @@ module KintoBox
       delete '/buckets'
     end
 
+    # Raw request
+    #
+    def request(path, method, data = {})
+      case method.upcase
+      when 'PUT'
+        self.class.put(path, :body => data.to_json)
+      when 'GET'
+        self.class.get(path)
+      when 'POST'
+        self.class.post(path, :body => data.to_json)
+      when 'DELETE'
+        self.class.delete(path)
+      when 'OPTIONS'
+        self.class.options(path)
+      when 'HEAD'
+        self.class.head(path)
+      when 'MOVE'
+        self.class.move(path, :body => data.to_json)
+      when 'COPY'
+        self.class.copy(path, :body => data.to_json)
+      when 'PATCH'
+        self.class.copy(path, :body => data.to_json)
+      else
+        raise HTTPBadRequest
+      end
+    end
+
+    # Make batch requests
+    def create_batch_request
+        KintoBatchRequest.new(self)
+    end
+
+
     # Calls http PUT on path
     #
     # @params [String]path Url path
@@ -128,5 +161,14 @@ module KintoBox
     def get(path)
       ResponseHandler.handle self.class.get(path)
     end
+
+    # Calls http HEAD on path
+    #
+    # @params [String]path Url path
+    # @params [Hash] data to be sent in the body
+    # @return [Hash] response body
+    def head(path, data = {})
+      ResponseHandler.get_response_head self.class.head(path)
+    end
   end
 end

data/lib/kinto_box/kinto_batch_request.rb

@@ -0,0 +1,30 @@
+require 'kinto_box/kinto_collection'
+require 'kinto_box/kinto_object'
+require 'kinto_box/kinto_request'
+
+module KintoBox
+  class KintoBatchRequest
+
+    def initialize(kinto_client)
+      @kinto_client = kinto_client
+      @request_data = {'defaults' => {
+                        'method'=> 'POST',
+                        'path'=> '/'
+                       },
+                       'requests' =>[]
+      }
+      @requests = @request_data['requests']
+    end
+
+    def add_request(request)
+        @requests.push(request.hashed_object)
+        self
+    end
+
+    def send
+
+      @kinto_client.post('/batch', @request_data)
+    end
+
+  end
+end

data/lib/kinto_box/kinto_bucket.rb

@@ -2,10 +2,8 @@ require 'kinto_box/kinto_collection'
 require 'kinto_box/kinto_object'
 require 'kinto_box/kinto_group'
 module KintoBox
-  class KintoBucket
-    include KintoObject
+  class KintoBucket < KintoObject
 
-    attr_accessor :id
     attr_reader :kinto_client
 
     def initialize (client, bucket_id)
@@ -14,10 +12,11 @@ module KintoBox
       @kinto_client = client
       @id = bucket_id
       @url_path = "/buckets/#{@id}"
+      @child_path = '/collections'
     end
 
-    def list_collections
-      @kinto_client.get("#{@url_path}/collections")
+    def list_collections(filters = nil, sort = nil)
+      @kinto_client.get(url_w_qsp(filters, sort))
     end
 
     def list_groups
@@ -26,16 +25,14 @@ module KintoBox
 
     def collection (collection_id)
       @collection = KintoCollection.new(self, collection_id)
-      @collection
     end
 
     def group(group_id)
       @group = KintoGroup.new(self, group_id)
-      @group
     end
 
     def create_collection(collection_id)
-      @kinto_client.post("#{@url_path}/collections", { 'data' => { 'id' => collection_id}})
+      @kinto_client.post("#{@url_path}#{@child_path}", { 'data' => { 'id' => collection_id}})
       collection(collection_id)
     end
 
@@ -46,7 +43,20 @@ module KintoBox
     end
 
     def delete_collections
-      @kinto_client.delete("#{@url_path}/collections")
+      @kinto_client.delete(url_w_qsp)
     end
+
+    def delete_groups
+      @kinto_client.delete("#{@url_path}/groups")
+    end
+
+    def count_collections(filters = nil)
+      @kinto_client.head(url_w_qsp(filters))['Total-Records'].to_i
+    end
+
+    alias_method :create_collection_request, :create_child_request
+    alias_method :list_collection_request, :list_children_request
+    alias_method :delete_collections_request, :delete_children_request
+    alias_method :count_collections_request, :count_children_request
   end
 end

data/lib/kinto_box/kinto_collection.rb

@@ -1,11 +1,11 @@
 require 'kinto_box/kinto_record'
 require 'kinto_box/kinto_object'
+require 'kinto_box/kinto_batch_request'
 
 module KintoBox
-  class KintoCollection
-    include KintoObject
+  class KintoCollection < KintoObject
+
 
-    attr_accessor :id
     attr_reader :bucket
 
     def initialize (bucket, collection_id)
@@ -14,31 +14,39 @@ module KintoBox
       @bucket = bucket
       @id = collection_id
       @url_path = "/buckets/#{bucket.id}/collections/#{@id}"
+      @child_path = '/records'
     end
 
     def record (record_id)
-      record = KintoRecord.new(self, record_id)
-      record
+      KintoRecord.new(self, record_id)
     end
 
 
     def list_records(filters = nil, sort = nil)
-      query_string = '?'
-      query_string += filters unless filters.nil?
-      query_string += '&' unless filters.nil? || sort.nil?
-      query_string += "_sort=#{sort}" unless sort.nil?
-      path = query_string == '?' ? "#{@url_path}/records" : "#{@url_path}/records#{query_string}"
-      @kinto_client.get(path)
+      @kinto_client.get(url_w_qsp(filters, sort))
     end
 
+
     def create_record(data)
-      resp = @kinto_client.post("#{@url_path}/records", { 'data' => data})
+      resp = @kinto_client.post("#{@url_path}#{@child_path}", { 'data' => data})
       record_id = resp['data']['id']
       record(record_id)
     end
 
-    def delete_records
-      @kinto_client.delete("#{@url_path}/records")
+
+    def delete_records(filters = nil)
+      @kinto_client.delete(url_w_qsp(filters))
+    end
+
+
+    def count_records(filters = nil)
+      @kinto_client.head(url_w_qsp(filters))['Total-Records'].to_i
     end
+
+
+    alias_method :create_record_request, :create_child_request
+    alias_method :list_records_request, :list_children_request
+    alias_method :delete_records_request, :delete_children_request
+    alias_method :count_records_request, :count_children_request
   end
 end

data/lib/kinto_box/kinto_group.rb

@@ -1,8 +1,7 @@
 require 'kinto_box/kinto_object'
 
 module KintoBox
-  class KintoGroup
-    include KintoObject
+  class KintoGroup < KintoObject
 
     attr_accessor :id
     attr_reader :bucket

data/lib/kinto_box/kinto_object.rb

@@ -1,5 +1,9 @@
 module KintoBox
-  module KintoObject
+  class KintoObject
+
+    attr_accessor :id
+    attr_reader :url_path
+
     def info
       @kinto_client.get(@url_path)
     end
@@ -21,20 +25,49 @@ module KintoBox
       true
     end
 
+    def info_request
+      KintoRequest.new('GET', @url_path)
+    end
+
+    def update_request(data)
+      KintoRequest.new('PATCH', @url_path, {'data' => data})
+    end
+
+    def delete_request
+      KintoRequest.new('DELETE', @url_path)
+    end
+
+    def create_child_request(data)
+      KintoRequest.new('POST', url_w_qsp, { 'data' => data})
+    end
+
+    def list_children_request(filters = nil, sort = nil)
+      KintoRequest.new('GET', url_w_qsp(filters, sort))
+    end
+
+    def delete_children_request(filters = nil)
+      KintoRequest.new('DELETE', url_w_qsp(filters))
+    end
+
+    def count_children_request(filters = nil)
+      KintoRequest.new('HEAD',  url_w_qsp(filters))
+    end
+
     def add_permission(principal, permission)
       @kinto_client.patch(@url_path, {'permissions' => { permission => [principal_name(principal)] }})
-      return self
+      self
     end
 
     def replace_permission(principal, permission)
       @kinto_client.put(@url_path, {'permissions' => { permission => [principal_name(principal)] }})
-      return self
+      self
     end
 
     def permissions
       info['permissions']
     end
 
+
     private
 
     def principal_name(principal)
@@ -49,5 +82,14 @@ module KintoBox
           return principal
       end
     end
+
+    def url_w_qsp(filters = nil, sort = nil, add_child = true)
+      url = @child_path.nil? || !add_child ? @url_path : "#{@url_path}#{@child_path}"
+      query_string = ''
+      query_string = filters unless filters.nil?
+      query_string = "#{query_string}&" unless filters.nil? || sort.nil?
+      query_string = "#{query_string}_sort=#{sort}" unless sort.nil?
+      query_string == '' ? url : "#{url}?#{query_string}"
+    end
   end
 end

data/lib/kinto_box/kinto_record.rb

@@ -1,13 +1,13 @@
 require 'kinto_box/kinto_object'
 module KintoBox
-  class KintoRecord
-    include KintoObject
+  class KintoRecord < KintoObject
     attr_reader :id
     def initialize (collection, record_id)
       raise ArgumentError if collection.nil? || record_id.nil?
       @kinto_client = collection.bucket.kinto_client
       @id = record_id
       @url_path = "/buckets/#{collection.bucket.id}/collections/#{collection.id}/records/#{@id}"
+      @child_path = nil
     end
 
     def replace(data)

data/lib/kinto_box/kinto_request.rb

@@ -0,0 +1,18 @@
+module KintoBox
+  class KintoRequest
+
+    def initialize(method = 'GET', path = nil , body = {}, headers = nil)
+      @method = method
+      @path = path
+      @body = body
+      @headers = headers
+    end
+
+    def hashed_object
+      { 'method' => @method,
+        'path' => @path,
+        'body' => @body
+      }
+    end
+  end
+end

data/lib/kinto_box/response_handler.rb

@@ -50,6 +50,12 @@ module KintoBox
       end
     end
 
+    def self.get_response_head(resp)
+      if [200, 201].include? resp.code
+        resp.headers
+      else
+        raise BadRequest, resp
+      end
+    end
   end
-
 end

data/lib/kinto_box/version.rb

@@ -1,3 +1,3 @@
 module KintoBox
-  VERSION = "0.1.10"
+  VERSION = "0.1.12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kinto_box
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.12
 platform: ruby
 authors:
 - Kavya Sukumar
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-14 00:00:00.000000000 Z
+date: 2016-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -103,11 +103,13 @@ files:
 - bin/setup
 - kinto_box.gemspec
 - lib/kinto_box.rb
+- lib/kinto_box/kinto_batch_request.rb
 - lib/kinto_box/kinto_bucket.rb
 - lib/kinto_box/kinto_collection.rb
 - lib/kinto_box/kinto_group.rb
 - lib/kinto_box/kinto_object.rb
 - lib/kinto_box/kinto_record.rb
+- lib/kinto_box/kinto_request.rb
 - lib/kinto_box/response_handler.rb
 - lib/kinto_box/version.rb
 homepage: http://github.com/voxmedia/kinto_box