factual-api 1.3.8 → 1.3.9

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v1.3.9
+* adding support for following redirects
+* sunsetting monetize
+
 ## v1.3.8
 * adding user param for table and facets #15
 

data/lib/factual.rb

@@ -1,20 +1,26 @@
 require 'rubygems'
 gem 'oauth'
 
+require 'json'
+require 'cgi'
+require 'timeout'
+
 require 'oauth'
-require 'factual/api'
-require 'factual/query/table'
-require 'factual/query/facets'
-require 'factual/query/match'
-require 'factual/query/resolve'
-require 'factual/query/monetize'
-require 'factual/query/geocode'
-require 'factual/query/geopulse'
-require 'factual/write/flag'
-require 'factual/write/submit'
-require 'factual/write/clear'
-require 'factual/write/insert'
-require 'factual/multi'
+
+require File.expand_path('../factual/api', __FILE__)
+require File.expand_path('../factual/query/base', __FILE__)
+require File.expand_path('../factual/query/table', __FILE__)
+require File.expand_path('../factual/query/facets', __FILE__)
+require File.expand_path('../factual/query/match', __FILE__)
+require File.expand_path('../factual/query/resolve', __FILE__)
+require File.expand_path('../factual/query/geocode', __FILE__)
+require File.expand_path('../factual/query/geopulse', __FILE__)
+require File.expand_path('../factual/write/base', __FILE__)
+require File.expand_path('../factual/write/flag', __FILE__)
+require File.expand_path('../factual/write/submit', __FILE__)
+require File.expand_path('../factual/write/clear', __FILE__)
+require File.expand_path('../factual/write/insert', __FILE__)
+require File.expand_path('../factual/multi', __FILE__)
 
 class Factual
   def initialize(key, secret, options = {})
@@ -32,10 +38,6 @@ class Factual
     Query::Facets.new(@api, "t/#{table_id_or_alias}")
   end
 
-  def monetize
-    Query::Monetize.new(@api)
-  end
-
   def match(values)
     Query::Match.new(@api, :values => values)
   end

data/lib/factual/api.rb

@@ -1,10 +1,6 @@
-require 'json'
-require 'cgi'
-require 'timeout'
-
 class Factual
   class API
-    VERSION = "1.3.8"
+    VERSION = "1.3.9"
     API_V3_HOST = "api.v3.factual.com"
     DRIVER_VERSION_TAG = "factual-ruby-driver-v" + VERSION
     PARAM_ALIASES = { :search => :q, :sort_asc => :sort }
@@ -116,6 +112,10 @@ class Factual
       elapsed_time = (Time.now - start_time) * 1000
       debug(url, method, headers, body, res, elapsed_time) if @debug_mode
 
+      if res.code == '301' && res['location']
+        res = make_request(res['location'])
+      end
+
       res
     end
 

data/lib/factual/query/facets.rb

@@ -1,5 +1,3 @@
-require 'factual/query/base'
-
 class Factual
   module Query
     class Facets < Base

data/lib/factual/query/geocode.rb

@@ -1,5 +1,3 @@
-require 'factual/query/base'
-
 class Factual
   module Query
     class Geocode < Base

data/lib/factual/query/geopulse.rb

@@ -1,5 +1,3 @@
-require 'factual/query/base'
-
 class Factual
   module Query
     class Geopulse < Base

data/lib/factual/query/match.rb

@@ -1,5 +1,3 @@
-require 'factual/query/base'
-
 class Factual
   module Query
     class Match < Base

data/lib/factual/query/resolve.rb

@@ -1,5 +1,3 @@
-require 'factual/query/base'
-
 class Factual
   module Query
     class Resolve < Base

data/lib/factual/query/table.rb

@@ -1,5 +1,3 @@
-require 'factual/query/base'
-
 class Factual
   module Query
     class Table < Base

data/lib/factual/write/clear.rb

@@ -1,5 +1,3 @@
-require 'factual/write/base'
-
 class Factual
   module Write
     class Clear < Base

data/lib/factual/write/flag.rb

@@ -1,5 +1,3 @@
-require 'factual/write/base'
-
 class Factual
   module Write
     class Flag < Base

data/lib/factual/write/insert.rb

@@ -1,5 +1,3 @@
-require 'factual/write/base'
-
 class Factual
   module Write
     class Insert < Base

data/lib/factual/write/submit.rb

@@ -1,5 +1,3 @@
-require 'factual/write/base'
-
 class Factual
   module Write
     class Submit < Base

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: factual-api
 version: !ruby/object:Gem::Version
-  version: 1.3.8
+  version: 1.3.9
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-10 00:00:00.000000000 Z
+date: 2013-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth
@@ -75,7 +75,6 @@ files:
 - lib/factual/query/geocode.rb
 - lib/factual/query/geopulse.rb
 - lib/factual/query/match.rb
-- lib/factual/query/monetize.rb
 - lib/factual/query/resolve.rb
 - lib/factual/query/table.rb
 - lib/factual/write/base.rb

data/lib/factual/query/monetize.rb

@@ -1,24 +0,0 @@
-require 'factual/query/base'
-
-class Factual
-  module Query
-    class Monetize < Base
-      VALID_PARAMS  = [
-        :filters, :search, :geo, 
-        :limit, :offset
-      ] 
-
-      def initialize(api, params = {})
-        @path = "places/monetize"
-        @action = :read
-        super(api, params)
-      end
-
-      VALID_PARAMS.each do |param|
-        define_method(param) do |*args|
-          self.class.new(@api, @params.merge(param => form_value(args)))
-        end
-      end
-    end
-  end
-end