loquor 1.6.0 → 1.7.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    Nzc1YzA3OTlhOGVlZWQ1YTMzYzkwNjVjN2QzZjcyOGJjYzExNDFmYw==
-  data.tar.gz: !binary |-
-    NWYwNTc3MTRlOTBjZTU5MWMzNzE2YjI0OGMzZTUzZTFlZDViNjc1Yw==
+SHA1:
+  metadata.gz: 0207ff4371ea8daf3f959df6bac057d676666e7b
+  data.tar.gz: a10652e0df52283f7a0472fddd7002243af6a2a6
 SHA512:
-  metadata.gz: !binary |-
-    ZmQxODJlYTdmZTNkOTU5ZTE0ZDY1YmVhNjA0MDVhMTMyOTFmZTRjOWE1M2I5
-    ZDQxY2JmNDZlOThkYWExYWZjNzk2ZTBiODZkNGI2YzgxNjNjYjU2OTU5NWU1
-    NmE0MzI5YmNlMzYwYzgxZjY2NjhiMjFkY2FmMTUxZWVhN2JiMGQ=
-  data.tar.gz: !binary |-
-    OGFlZmEwMjY2YmVkZmIxMjIzY2RhYWMwZjYxYzkwNGE0NjNhNTJhOTA0YjFi
-    Yzg3Yzk1ODU2ZDAzNGUyYmVjZGE1MjU2NTE4ZGVmZjBhZGM1OTFkZjBhN2Yz
-    NDAzZWRiN2JjMTllNTcyODY5M2Y5ZTVkNDY3N2FhZDAzMTNjM2Y=
+  metadata.gz: 3a6e012d933a0a94b5b389958699b895a87e646e4ae73cf9e677b6cbac6111363ab759e0076e016d017195224dd83b6cecd7317cc1a097123604fdcafbb38c64
+  data.tar.gz: 4a7cd33b185e61bf519ace8175969171273267d92eefd07aa4e68ce3e17e606bbb4a05b1382c2543b3b2809d32d39ac9e0a5da3cb9f32cf0571e38002e9f98cf

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 1.7.0 / 2014-03-13
+* [FEATURE] Add support for per, page and limit
+
 # 1.6.0 / 2014-03-07
 * [FEATURE] Add support for date, time and datetime in filters.
 * [FEATURE] Add support deleting entities.

data/lib/loquor/api_calls/index.rb

@@ -27,6 +27,22 @@ module Loquor
       self
     end
 
+    def order(value)
+      @order = value
+      self
+    end
+
+    def per(value)
+      @per = value
+      self
+    end
+    alias_method :limit, :per
+
+    def page(value)
+      @page = value
+      self
+    end
+
     # Proxy everything to the results so that this this class
     # transparently acts as an Array.
     def method_missing(name, *args, &block)
@@ -64,6 +80,10 @@ module Loquor
         add_clause(query_string, clause)
       end
 
+      query_string << "per=#{@per}" if @per
+      query_string << "page=#{@page}" if @page
+      query_string << "order=#{@order}" if @order
+
       "#{klass.path}?#{query_string.join("&")}"
     end
 

data/lib/loquor/resource.rb

@@ -36,16 +36,10 @@ module Loquor
       ApiCall::Show.new(self, id).execute
     end
 
-    def self.find_each(&block)
-      ApiCall::Index.new(self).find_each(&block)
-    end
-
-    def self.select(*args)
-      ApiCall::Index.new(self).select(*args)
-    end
-
-    def self.where(*args)
-      ApiCall::Index.new(self).where(*args)
+    %w{where per page order select find_each}.each do |meth|
+      self.class.send :define_method, meth do |*args, &block|
+        ApiCall::Index.new(self).send(meth, *args, &block)
+      end
     end
 
     def self.create(payload)

data/lib/loquor/version.rb

@@ -1,3 +1,3 @@
 module Loquor
-  VERSION = "1.6.0"
+  VERSION = "1.7.0"
 end

data/test/api_calls/index_test.rb

@@ -14,6 +14,30 @@ module Loquor
       assert_equal({fields: fields}, searcher.criteria)
     end
 
+    def test_order_sets_order
+      order = :random
+      searcher = ApiCall::Index.new(resource).order(order)
+      assert_equal(order, searcher.instance_variable_get("@order"))
+    end
+
+    def test_limit_sets_per
+      per = 892
+      searcher = ApiCall::Index.new(resource).limit(per)
+      assert_equal(per, searcher.instance_variable_get("@per"))
+    end
+
+    def test_per_sets_per
+      per = 542
+      searcher = ApiCall::Index.new(resource).per(per)
+      assert_equal(per, searcher.instance_variable_get("@per"))
+    end
+
+    def test_page_set_page
+      page = 542
+      searcher = ApiCall::Index.new(resource).page(page)
+      assert_equal(page, searcher.instance_variable_get("@page"))
+    end
+
     def test_where_sets_clauses
       clause = "WHERE 1 = 1"
       searcher = ApiCall::Index.new(resource).where(clause)
@@ -188,5 +212,29 @@ module Loquor
       assert results[0].is_a?(Resource)
       assert results[1].is_a?(Resource)
     end
+
+    def test_generates_url_correctly_with_order
+      order = :random
+      searcher = ApiCall::Index.new(resource).order(order)
+      searcher.stubs(path: "foobar")
+      url = searcher.send(:generate_url)
+      assert url.include?("order=#{order}")
+    end
+
+    def test_generates_url_correctly_with_per
+      per = 123
+      searcher = ApiCall::Index.new(resource).per(per)
+      searcher.stubs(path: "foobar")
+      url = searcher.send(:generate_url)
+      assert url.include?("per=#{per}")
+    end
+
+    def test_generates_url_correctly_with_page
+      page = 45
+      searcher = ApiCall::Index.new(resource).page(page)
+      searcher.stubs(path: "foobar")
+      url = searcher.send(:generate_url)
+      assert url.include?("page=#{page}")
+    end
   end
 end

data/test/resource_test.rb

@@ -53,6 +53,14 @@ module Loquor
       Foobar.where(email: email).to_a
     end
 
+    %w{where per page order select find_each}.each do |meth|
+      define_method "test_#{meth}_should_proxy" do
+        args = [mock]
+        ApiCall::Index.any_instance.expects(meth).with(*args)
+        Foobar.send(meth, *args)
+      end
+    end
+
     def test_create_should_put_correct_params
       payload = {bar: 'foo'}
       Loquor.expects(:post).with("/foobar", payload: payload)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: loquor
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Jeremy Walker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-07 00:00:00.000000000 Z
+date: 2014-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: filum
@@ -84,28 +84,28 @@ dependencies:
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: An API dispatcher for Meducation
@@ -168,17 +168,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.9
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: This library dispatches requests to Meducation