factual-api 1.3.3 → 1.3.4

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## v1.3.4
+* multi requests as POST
+
 ## v1.3.3
 * fixed bug in multi #12
 

data/lib/factual/api.rb

@@ -4,7 +4,7 @@ require 'timeout'
 
 class Factual
   class API
-    VERSION = "1.3.3"
+    VERSION = "1.3.4"
     API_V3_HOST = "api.v3.factual.com"
     DRIVER_VERSION_TAG = "factual-ruby-driver-v" + VERSION
     PARAM_ALIASES = { :search => :q, :sort_asc => :sort }
@@ -22,9 +22,7 @@ class Factual
     end
 
     def post(request)
-      response = make_request("http://" + @host + request.path, request.body, :post)
-      payload = JSON.parse(response.body)
-      handle_payload(payload)
+      handle_request(nil, request.path, request.body, :post)
     end
 
     def schema(query)
@@ -68,12 +66,17 @@ class Factual
 
     private
 
-    def handle_request(action, path, params)
-      url = "http://#{@host}" + full_path(action, path, params)
-
-      payload = JSON.parse(make_request(url).body)
+    def handle_request(action, path, params, method=:get)
+      if (method == :get)
+        url = "http://#{@host}" + full_path(action, path, params)
+        req = make_request(url)
+      else
+        url = "http://#{@host}#{path}"
+        req = make_request(url, params, :post)
+      end
+      payload = JSON.parse(req.body)
 
-      if (path == :multi)
+      if (path == '/multi')
          payload.inject({}) do |res, item|
            name, p = item
            res[name] = handle_payload(p)

data/lib/factual/multi.rb

@@ -1,20 +1,19 @@
 class Factual
   class Multi
-    attr_reader :action, :path, :params
+    attr_reader :action, :path
 
     def initialize(api, queries)
       @api = api
       @queries = queries
 
       @action = nil
-      @path = :multi
-      @params = queries_param
+      @path = '/multi'
 
       @responses = {}
     end
 
     def send
-      res = @api.get(self)
+      res = @api.post(self)
       @queries.each do |name, query|
         query.populate(res[name.to_s])
         @responses[name] = query
@@ -23,15 +22,13 @@ class Factual
       @responses
     end
 
-    private
-
-    def queries_param
+    def body
       query_urls = {}
       @queries.each do |name, query|
         query_urls[name] = query.full_path
       end
 
-      { :queries => query_urls }
+      "queries=#{ CGI.escape(query_urls.to_json) }"
     end
 
   end

data/lib/factual/query/resolve.rb

@@ -9,7 +9,7 @@ class Factual
         super(api, params)
       end
 
-      [:values, :include_count].each do |param|
+      [:values].each do |param|
         define_method(param) do |*args|
           self.class.new(@api, @params.merge(param => form_value(args)))
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: factual-api
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-09 00:00:00.000000000 Z
+date: 2013-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth