freebase-api 0.1.3 → 0.1.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 1b7e8a2c6fe8238795c80a201f277020c42ea8ea
+  data.tar.gz: e627b3686db5e0db9f374b9130f720e3ae5e2aed
+SHA512:
+  metadata.gz: a8074d7dc7be46e31da0c6bff00e6f021dbf1fd477a2d2a00130277e30f96cec052b70aa07056a7625eb71f2817ce10f5bb5b1b703b4c24aa4f83f14de2f84dc
+  data.tar.gz: d989451faf085ac0cf720e1d5c666115b785912ab05641a6fb237d4337efabdc647b95f60dcf2a48db69c331ce1a236eeea9cec6dadd003fe45fbcb05c4eca5c

data/.gitignore

@@ -2,3 +2,5 @@
 /.env
 /pkg/
 /doc/
+/.bundle/
+/Gemfile.lock

data/.rspec

@@ -1,2 +1,3 @@
 --colour
 --format documentation
+--tty

data/{travis.yml → .travis.yml}

@@ -1,8 +1,8 @@
 language: ruby
 rvm:
-  - rbx-19mode
   - jruby-19mode
-  - 1.9.2
   - 1.9.3
+  - 2.0.0
+  - 2.1.0
   - ruby-head
   - jruby-head

data/Gemfile

@@ -7,8 +7,7 @@ group :test do
   gem 'rspec', '~> 2.12'
   gem 'yard', '~> 0.8'
   gem 'simplecov', '~> 0.7', :require => false
-  gem 'redcarpet', '~> 2.2'
 end
 
 # Specify your gem's dependencies in freebase-api.gemspec
-gemspec
+gemspec

data/README.markdown

@@ -30,13 +30,14 @@ If you have a [Google API key](https://code.google.com/apis/console), you can se
 You can override the default session by providing some options, like the language or the environment.
 
 ```ruby
-FreebaseAPI.session = FreebaseAPI::Session.new(key: 'GOOGLE_API_KEY', env: => :stable)
+FreebaseAPI.session = FreebaseAPI::Session.new(key: 'GOOGLE_API_KEY', env: :stable)
 ```
 
 Options are :
 
 * `:key` : your Google API key
 * `:env` : the environment (sandbox or stable) (default is :stable)
+* `:proxy` : an optional url for a proxy that requests will be sent through
 * `:query_options` : some options that will be used in each query
  * `:limit` : the number of items returned (default is 10)
  * `:lang` : the language you would like the content in (default is 'en')

data/lib/freebase_api/session.rb

@@ -21,7 +21,7 @@ module FreebaseAPI
       @env = options[:env]
       @key = options[:key] || ENV['GOOGLE_API_KEY']
       @query_options = options[:query_options]
-      @proxy_options = get_proxy_options
+      @proxy_options = get_proxy_options(options[:proxy])
     end
 
     # Execute a MQL read query
@@ -117,9 +117,9 @@ module FreebaseAPI
     # Get the proxy options for HTTParty
     #
     # @return [Hash] the proxy options
-    def get_proxy_options
+    def get_proxy_options(url=nil)
       options = {}
-      if url = ENV['HTTPS_PROXY'] || ENV['https_proxy'] || ENV['HTTP_PROXY'] || ENV['http_proxy']
+      if url = url || ENV['HTTPS_PROXY'] || ENV['https_proxy'] || ENV['HTTP_PROXY'] || ENV['http_proxy']
         proxy_uri = URI.parse(url)
         options[:http_proxyaddr] = proxy_uri.host
         options[:http_proxyport] = proxy_uri.port

data/lib/freebase_api/version.rb

@@ -1,3 +1,3 @@
 module FreebaseAPI
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/spec/image_spec.rb

@@ -40,7 +40,7 @@ describe FreebaseAPI::Image do
   end
 
   describe "#size" do
-    it "should return the topic related ID" do
+    it "should return the image size" do
       image.size.should == data.size
     end
   end

data/spec/session_spec.rb

@@ -45,7 +45,7 @@ describe FreebaseAPI::Session do
     end
 
     context "in a stable environnment" do
-      it "should return the sandbox service URL" do
+      it "should return the stable service URL" do
         session.send(:surl, 'service').should == 'https://www.googleapis.com/freebase/v1/service'
       end
     end
@@ -182,5 +182,23 @@ describe FreebaseAPI::Session do
         session.send(:get, 'URL')
       end
     end
+
+    context "with a proxy configuration" do
+      let(:session) { FreebaseAPI::Session.new(:proxy => 'http://user:pass@site.com:2020') }
+
+      before do
+        session.stub(:handle_response)
+      end
+
+      it "should use the proxy" do
+        session.class.should_receive(:get) do |url, params, options|
+          params[:http_proxyaddr].should eq "site.com"
+          params[:http_proxyport].should eq 2020
+          params[:http_proxyuser].should eq "user"
+          params[:http_proxypass].should eq "pass"
+        end
+        session.send(:get, 'URL')
+      end
+    end
   end
-end
+end

data/spec/support/helpers.rb

@@ -6,7 +6,7 @@ module FreebaseAPI
     end
 
     def load_data(file)
-      IO.read(File.join(File.dirname(__FILE__), "..", "fixtures", file))
+      IO.read(File.join(File.dirname(__FILE__), "..", "fixtures", file), encoding: 'BINARY')
     end
   end
 end

metadata

@@ -1,32 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: freebase-api
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Aymeric Brisse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-05 00:00:00.000000000 Z
+date: 2014-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  prerelease: false
   name: httparty
-  type: :runtime
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
-    none: false
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
-    none: false
 description: A library to use the Freebase API
 email:
 - aymeric.brisse@mperfect-memory.com
@@ -34,10 +31,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.markdown
 - Rakefile
@@ -60,36 +57,28 @@ files:
 - spec/spec_helper.rb
 - spec/support/helpers.rb
 - spec/topic_spec.rb
-- travis.yml
 homepage: https://github.com/PerfectMemory/freebase-api
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: 2916215866854017455
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: 2916215866854017455
       version: '0'
-  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Provides access to both a raw-access and an abstract-layer to the Freebase
   API
 test_files:

data/Gemfile.lock

@@ -1,54 +0,0 @@
-PATH
-  remote: .
-  specs:
-    freebase-api (0.1.3)
-      httparty (~> 0.10)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    colorize (0.5.8)
-    coveralls (0.6.7)
-      colorize
-      multi_json (~> 1.3)
-      rest-client
-      simplecov (>= 0.7)
-      thor
-    diff-lcs (1.2.4)
-    httparty (0.12.0)
-      json (~> 1.8)
-      multi_xml (>= 0.5.2)
-    json (1.8.1)
-    mime-types (1.23)
-    multi_json (1.7.2)
-    multi_xml (0.5.5)
-    rake (10.0.4)
-    redcarpet (2.2.2)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.1)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
-    thor (0.18.1)
-    yard (0.8.6.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  coveralls
-  freebase-api!
-  rake (~> 10.0)
-  redcarpet (~> 2.2)
-  rspec (~> 2.12)
-  simplecov (~> 0.7)
-  yard (~> 0.8)