factual-api 1.3 → 1.3.1

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## v1.3.1
+* removed sugar crosswalk, switch to normal table
+
 ## v1.3
 * added diffs
 * changed raw read to get 

data/README.md

@@ -42,6 +42,7 @@ Once the gem is installed, you can use it in your Ruby project like:
 require 'factual'
 factual = Factual.new("YOUR_KEY", "YOUR_SECRET")
 ````
+If you don't have a Factual API account yet, [it's free and easy to get one](https://www.factual.com/api-keys/request).
   
 ## Simple Read Examples
 
@@ -64,18 +65,6 @@ factual.table("restaurants-us")
 
 ## Simple Places Example
 
-````ruby
-# Concordance information of a place
-FACTUAL_ID = "110ace9f-80a7-47d3-9170-e9317624ebd9"
-query = factual.crosswalk(FACTUAL_ID)
-query.rows
-
-# Or specify a place with its namespace_id and namespace
-SIMPLEGEO_ID = "SG_6XIEi3qehN44LH8m8i86v0"
-query = factual.crosswalk(SIMPLEGEO_ID, :simplegeo)
-query.rows
-````
-
 ````ruby
 # Returns resolved entities as an array of hashes
 query = factual.resolve("name" => "McDonalds",

data/lib/factual.rb

@@ -4,7 +4,6 @@ require 'factual/query/table'
 require 'factual/query/facets'
 require 'factual/query/match'
 require 'factual/query/resolve'
-require 'factual/query/crosswalk'
 require 'factual/query/monetize'
 require 'factual/query/geocode'
 require 'factual/query/geopulse'
@@ -27,15 +26,6 @@ class Factual
     Query::Facets.new(@api, "t/#{table_id_or_alias}")
   end
 
-  def crosswalk(namespace_id, namespace = nil)
-    if namespace
-      raise "DEPRECATED. For more information, please visit http://developer.factual.com/display/docs/Places+API+-+Crosswalk"
-      Query::Crosswalk.new(@api, :filters => {:namespace_id => namespace_id, :namespace => namespace})
-    else
-      Query::Crosswalk.new(@api, :filters => {:factual_id => namespace_id})
-    end
-  end
-
   def monetize
     Query::Monetize.new(@api)
   end

data/lib/factual/api.rb

@@ -3,7 +3,7 @@ require 'cgi'
 
 class Factual
   class API
-    VERSION = "1.3"
+    VERSION = "1.3.1"
     API_V3_HOST = "api.v3.factual.com"
     DRIVER_VERSION_TAG = "factual-ruby-driver-v" + VERSION
     PARAM_ALIASES = { :search => :q, :sort_asc => :sort }

metadata

@@ -1,77 +1,65 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: factual-api
-version: !ruby/object:Gem::Version
-  version: '1.3'
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 1.3.1
 platform: ruby
-authors:
+authors: 
 - Rudiger Lippert
 - Forrest Cao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-08 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-08-20 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: oauth
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.4.4
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 0.4.4
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.2.0
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: json
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 1.2.0
-- !ruby/object:Gem::Dependency
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id003
 description: Factual's official Ruby driver for the Factual public API.
-email:
+email: 
 - rudy@factual.com
 - forrest@factual.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - lib/factual/api.rb
 - lib/factual/multi.rb
 - lib/factual/query/base.rb
-- lib/factual/query/crosswalk.rb
 - lib/factual/query/facets.rb
 - lib/factual/query/geocode.rb
 - lib/factual/query/geopulse.rb
@@ -87,26 +75,30 @@ files:
 - CHANGELOG.md
 homepage: http://github.com/Factual/factual-ruby-driver
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
       version: 1.8.6
-required_rubygems_version: !ruby/object:Gem::Requirement
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
       version: 1.3.6
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Ruby driver for Factual
 test_files: []
+

data/lib/factual/query/crosswalk.rb

@@ -1,31 +0,0 @@
-require 'factual/query/base'
-
-class Factual
-  module Query
-    class Crosswalk < Base
-      def initialize(api, params = {})
-        @path = "t/crosswalk"
-        @action = :read
-        super(api, params)
-      end
-
-      def only(*namespaces)
-        filters = @params[:filters] ? @params[:filters].dup : {}
-
-        if (namespaces.length == 1)
-          filters.merge!(:namespace => namespaces.first)
-        else
-          filters.merge!(:namespace => {"$in" => namespaces})
-        end
-
-        self.class.new(@api, @params.merge(:filters => filters))
-      end
-
-      [:limit, :include_count].each do |param|
-        define_method(param) do |*args|
-          self.class.new(@api, @params.merge(param => form_value(args)))
-        end
-      end
-    end
-  end
-end