freebase-api 0.1.2 → 0.1.3

data/Gemfile

@@ -6,7 +6,6 @@ group :test do
   gem 'coveralls', :require => false
   gem 'rspec', '~> 2.12'
   gem 'yard', '~> 0.8'
-  gem 'rspec', '~> 2.12'
   gem 'simplecov', '~> 0.7', :require => false
   gem 'redcarpet', '~> 2.2'
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    freebase-api (0.1.2)
+    freebase-api (0.1.3)
       httparty (~> 0.10)
 
 GEM
@@ -15,12 +15,13 @@ GEM
       simplecov (>= 0.7)
       thor
     diff-lcs (1.2.4)
-    httparty (0.11.0)
-      multi_json (~> 1.0)
+    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.3)
+    multi_xml (0.5.5)
     rake (10.0.4)
     redcarpet (2.2.2)
     rest-client (1.6.7)

data/lib/freebase_api/session.rb

@@ -21,6 +21,7 @@ module FreebaseAPI
       @env = options[:env]
       @key = options[:key] || ENV['GOOGLE_API_KEY']
       @query_options = options[:query_options]
+      @proxy_options = get_proxy_options
     end
 
     # Execute a MQL read query
@@ -90,7 +91,9 @@ module FreebaseAPI
     def get(url, params={}, options={})
       FreebaseAPI.logger.debug("GET #{url}")
       params[:key] = @key if @key
-      response = self.class.get(url, :format => options[:format], :query => params)
+      options = { format: options[:format], query: params }
+      options.merge!(@proxy_options)
+      response = self.class.get(url, options)
       handle_response(response)
     end
 
@@ -110,5 +113,20 @@ module FreebaseAPI
         end
       end
     end
+
+    # Get the proxy options for HTTParty
+    #
+    # @return [Hash] the proxy options
+    def get_proxy_options
+      options = {}
+      if 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
+        options[:http_proxyuser] = proxy_uri.user
+        options[:http_proxypass] = proxy_uri.password
+      end
+      options
+    end
   end
 end

data/lib/freebase_api/version.rb

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

data/spec/session_spec.rb

@@ -162,4 +162,25 @@ describe FreebaseAPI::Session do
       end
     end
   end
+
+  describe "#get" do
+    let(:session) { FreebaseAPI::Session.new }
+
+    context "with a proxy env variable" do
+      before do
+        ENV['http_proxy'] = 'http://user:pass@site.com:2020'
+        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

metadata

@@ -1,29 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: freebase-api
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  prerelease: 
+  version: 0.1.3
 platform: ruby
 authors:
 - Aymeric Brisse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-30 00:00:00.000000000 Z
+date: 2013-12-05 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'
-  type: :runtime
-  prerelease: false
+    none: 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
@@ -60,7 +63,6 @@ files:
 - travis.yml
 homepage: https://github.com/PerfectMemory/freebase-api
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -69,17 +71,25 @@ 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: 2.0.1
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Provides access to both a raw-access and an abstract-layer to the Freebase
   API
 test_files:

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MTg1YWI3YTlmNzU4YjY5N2EzNDhiYjE0MzJmMzRjNzVmMmQ1ZTMzNg==
-  data.tar.gz: !binary |-
-    NWQ3NGY0MWNhZDNiYWI4ZDg1ZWMyZDQ5NjJkNjI5ZWRkMGNlMDg0NA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    NTczZTBhOTU1N2I0Zjg4YmI5MGU0ZDlkYTEzODhmZTU4ZTQ3ZTVkMmMzYzcx
-    YzQzMTIzMDZmMzMzNDZhZDllMDMyMjc3MzJmYTZjYjU5NTk1YTI3ZWFlNzg5
-    YmFiNTM1ZDIzNGU0M2JkMmY5YmM5OWI3ZGJkZDA3M2E2MzRlOGM=
-  data.tar.gz: !binary |-
-    MTJhNDRjYzIzNDM2ZTkyMDc5NTY0OTYzNTE1YzI4OWNmNDc5ZDAzZTI3NjI1
-    YmU5NGZmODNhNGJmYmVhMTY3ZTJlY2VhZTc1OGYzMGJlNjc5ZGNmY2Y4NDg0
-    ZjA5NjA3NjBhODY3MDE1ZTlhN2Q5M2NlNTE4MWU3ZjMxMjU1YTA=