proxima 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa932b050d7417a30200065e08bd1f1b7c769107
-  data.tar.gz: e710e6b680d1996ba891a8ab8939084f3325e80d
+  metadata.gz: 24311aa26e3346bf960345d304ce06d55b81dff8
+  data.tar.gz: a66129b2cb4b677ea05cfa55a5ff0f606ea711f8
 SHA512:
-  metadata.gz: c147cef8a8a9ad828c0a20062a354d43d8ebcaa243cdb24ad3ba5facd2cab7db258300b2ae6df8f741b8bfc825dfec5c6bedd23393b940701186128ea9d64349
-  data.tar.gz: 2515e810ee5260fad961ac819e9f666ce2e9458e46a5f507581952e8e81c40ed5e73583efc276bc95c7bf5f50d6f18131e17d788549bbdde9244833ba584dbd3
+  metadata.gz: aff9c654c5b106aec74ec6dfa1941e2857b82960081834ce8859b37c9212888d9ee0577f80c22b7d6bfeb1ad017cce6f66346073ae2f0d7d7d07840ec6a4ba7c
+  data.tar.gz: a270bd19fa4b9350326d9783ab91226b5b23953350f947f1aad1c9bb00479d76c75e10016f69b7bbaf8fe67f20534bb34ef980fbdca9e2a7e22c3543a823c511

data/lib/proxima/model.rb

@@ -60,38 +60,29 @@ module Proxima
       model
     end
 
-    def self.find(query = {}, params = {}, opts = nil)
-
-      # NOTE: This is a compatibility fix for 0.2 to 0.3
-      if opts == nil
-        opts   = params
-        params = query
-      end
-
+    def self.find(query = {}, params = {}, opts = {})
       opts[:query] = self.convert_query_or_delta_to_json query
-      @response    = self.api.get self.find_path.call(params), opts
+      @response    = self.api.get self.find_path.call(params.merge(query)), opts
 
-      if @response.code != 200
-        return []
-      end
+      return [] unless @response.code == 200
 
       models = self.from_json @response.body
       models.each { |model| model.new_record = false }
     end
 
-    def self.find_one(query, params, opts = nil)
+    def self.count_and_find(query = {}, params = {}, opts = {})
+      items       = self.find query, params, opts
+      total_count = self.response.headers[:x_total_count].to_i || 0
+
+      Struct.new(:total_count, :items).new(total_count, items)
+    end
+
+    def self.find_one(query = {}, params = {}, opts = {})
       query['$limit'] = 1
       self.find(query, params, opts)[0]
     end
 
-    def self.count(query = {}, params = {}, opts = nil)
-
-      # NOTE: This is a compatibility fix for 0.2 to 0.3
-      if opts == nil
-        opts   = params
-        params = query
-      end
-
+    def self.count(query = {}, params = {}, opts = {})
       query['$limit'] = 0
       opts[:query]    = self.convert_query_or_delta_to_json query
       @response       = self.api.get self.find_path.call(params), opts

data/lib/proxima/version.rb

@@ -1,5 +1,5 @@
 
 
 module Proxima
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/lib/proxima.rb

@@ -63,11 +63,19 @@ module Proxima
 
   def self.type_from_json(klass, value)
     type = @types.find { |t| t[:klass] == klass }
-    type[:from_json].call(value) if type else value
+    if type
+      type[:from_json].call(value)
+    else
+      value
+    end
   end
 
   def self.type_to_json(klass, value)
     type = @types.find { |t| t[:klass] == klass }
-    type[:to_json].call(value) if type else value
+    if type
+      type[:to_json].call(value)
+    else
+      value
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proxima
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Robert Hurst
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-17 00:00:00.000000000 Z
+date: 2017-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler