loquor 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39b95098c1be5aa6115bfe299f9e0ffe900b1c34
-  data.tar.gz: df73558cb5a1f5e9215f102c3c099db768457809
+  metadata.gz: 0ad76c89016157ae20f02505acbda23ca0cc3617
+  data.tar.gz: 277e5922c2a7b41053fececa763bf96fd1001e21
 SHA512:
-  metadata.gz: 7132361f5e11f1f4abcf6696389d54e4805aefc211a83a984fc04927ef58bc9c0c7bb4b5b6012f3b0eb06bdeac764ce08129948f50a66fa13ba001209edd137d
-  data.tar.gz: af3c8063b4a0af2f67a04ec00981943d6f7bfadfffe40cb924e7c8fe7f17ba7f86790cdea863edb086a7069d2fe343a7e6695521712d53cd9f6c0b12653da2ea
+  metadata.gz: 87967e954097c11795e7cc931b77f955974b08a24a7c31fdf32069a6378ff2597f7ddb3339522f34903de510e6488f59b1f8254bfa157bfe671669b26bfa168c
+  data.tar.gz: 497f582435455dd8eabe8e3f2262872a3e53a77186a86684b5ff80f17931fba86ab7ba87f036c9b1edc97f58fa93af5f9728f42fa2dbe9337d3a167c99dde456

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 1.3.0 / 2014-02-20
+* [FEATURE] Allow for SQL fragment strings within calls to where.
+
 # 1.2.1 / 2014-02-19
 * [BUGFIX] Posts should return JSON, not resources
 

data/lib/loquor/api_calls/index.rb

@@ -1,16 +1,22 @@
 module Loquor
   class ApiCall::Index < ApiCall
 
-    attr_reader :criteria
+    attr_reader :criteria, :clauses
 
     def initialize(klass)
       super(klass)
       @criteria = {}
+      @clauses = []
     end
 
-    def where(value)
-      value.each do |key, value|
-        @criteria[key] = value
+    def where(data)
+      case data
+      when String
+        @clauses << data
+      else
+        data.each do |key, value|
+          @criteria[key] = value
+        end
       end
       self
     end
@@ -54,6 +60,10 @@ module Loquor
       @criteria.each do |key,value|
         add_criteria(query_string, key, value)
       end
+      @clauses.each do |clause|
+        add_clause(query_string, clause)
+      end
+
       "#{klass.path}?#{query_string.join("&")}"
     end
 
@@ -78,5 +88,9 @@ module Loquor
         end
       end
     end
+
+    def add_clause(query_string, clause)
+      query_string << "clauses[]=#{URI.encode(clause.to_s)}"
+    end
   end
 end

data/lib/loquor/http_actions/get.rb

@@ -14,7 +14,7 @@ module Loquor
       @config.logger.info "Response: #{response}"
       response
     end
-      
+
     def execute_against_cache
       cache = @config.cache
       if cache
@@ -26,7 +26,7 @@ module Loquor
         val
       else
         execute
-      end 
+      end
     end
 
     private

data/lib/loquor/version.rb

@@ -1,3 +1,3 @@
 module Loquor
-  VERSION = "1.2.1"
+  VERSION = "1.3.0"
 end

data/test/api_calls/index_test.rb

@@ -14,6 +14,12 @@ module Loquor
       assert_equal({fields: fields}, searcher.criteria)
     end
 
+    def test_where_sets_clauses
+      clause = "WHERE 1 = 1"
+      searcher = ApiCall::Index.new(resource).where(clause)
+      assert_equal([clause], searcher.clauses)
+    end
+
     def test_where_sets_criteria
       criteria = {genre: 'Animation'}
       searcher = ApiCall::Index.new(resource).where(criteria)
@@ -34,7 +40,12 @@ module Loquor
       assert_equal({genre: "Action"}, searcher.criteria)
     end
 
-    def test_where_gets_correct_url
+    def test_where_gets_correct_url_with_clauses
+      searcher = ApiCall::Index.new(resource).where("WHERE 1=1")
+      assert searcher.send(:generate_url).include? "?clauses[]=WHERE%201=1"
+    end
+
+    def test_where_gets_correct_url_with_crtieria
       searcher = ApiCall::Index.new(resource).where(name: 'Star Wars')
       assert searcher.send(:generate_url).include? "?name=Star%20Wars"
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: loquor
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Jeremy Walker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-19 00:00:00.000000000 Z
+date: 2014-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: filum