google-apis 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8d1add3229c971662ab77620ca8b6a11021803e
-  data.tar.gz: ba08f0e27722cc5055ab23c6142777e7edbc2b60
+  metadata.gz: 5bedf6667092812f0ef8e2292a028ae8d63dd0f3
+  data.tar.gz: 4a3d38dec4fe35449d6b0b71e397f49008d900c4
 SHA512:
-  metadata.gz: 13de4d3734a4c18d8534c69478c2ce988648be0deb0475a3743343c6fd1e9f02bcdd13b9b96617a9f7de156dda5aed9683d1fbe6537c6b03a659e6d30187c70c
-  data.tar.gz: 83788437def396e77c72749567e75a54f570c14db8a1c0f2b2cced2bba0b9c7d5da98d94fda08b7cb785dfab780aa028761568565887128b2098a754d5004f15
+  metadata.gz: 2ca597c89963a2e0464d8d30b8cea8f963f7b6163aadebc6a071eb6269951233a0c9456fb6fc9efa68f222a1e92cb676aa85b0f9425f193a9f7bfb915675b467
+  data.tar.gz: 616f14c243a99469ade6b4a1c809f3853ae4ac95f1d3c5cfab8cd1a62c623819d4cca35a7c2ab5e346706d4526c77f6afd798c06f93b9c815d7b04b97fd738d4

data/CHANGELOG.rdoc

@@ -1,5 +1,14 @@
 = Google APIs CHANGELOG
 
+== Version 0.1.3 (April 20, 2015)
+
+* Camelizing underscored default param keys
+* Defined private #default_params
+* Defined Google::BigQuery.connection.project and Google::BigQuery.connection.dataset
+* Using HTTPClient as default Faraday adapter
+* Being able to (easily) upload to Google Storage
+* Improved downloading files from Google Storage
+
 == Version 0.1.2 (April 17, 2015)
 
 * Added Google Storage API definition

data/README.md

@@ -25,7 +25,7 @@ Do not forget to download the private key by generating a P12 key file.
 ```ruby
 [1] pry(main)> GoogleApis.connect :email_address => "lorem@developer.gserviceaccount.com", :private_key => "/path/to/private/key.p12"
 => #<GoogleApis::Connection:0x007fa5a4743668 [lorem@developer.gserviceaccount.com]>
-[2] pry(main)> bq = Google::BigQuery.new :projectId => "your_project_id", :datasetId => "your_dataset_id"
+[2] pry(main)> bq = Google::BigQuery.new :project_id => "your_project_id", :dataset_id => "your_dataset_id"
 => #<Google::BigQuery:0x007fc5c68647a8 v2:[datasets,jobs,projects,tabledata,tables] {projectId:"your_project_id",datasetId:"your_dataset_id"}>
 [3] pry(main)> bq.tables.list
 => {"kind"=>"bigquery#tableList",
@@ -77,8 +77,8 @@ You can also configure an application-wide API connection. Let's say you also st
 ---
   email_address: lorem@developer.gserviceaccount.com
   private_key: "/path/to/private/key.p12"
-  projectId: your_project_id
-  datasetId: your_dataset_id
+  project_id: your_project_id
+  dataset_id: your_dataset_id
 ```
 
 ```ruby
@@ -123,11 +123,28 @@ The following example demonstrates how to download a file from Google Storage:
     "owner"=>{"entity"=>"user-00b4903a97b10389ce680ca45ba5999e068c4d0c8ccbbfbb7094238bc85a567", "entityId"=>"00b4903a97b20004ce680ca5f5aeebe068c4d0c8ccbbfbb7094266d1b9787457"},
     "crc32c"=>"P4UlsJQ==",
     "etag"=>"EN93lyNu/j8QCEAE="}]}
-[3] pry(main)> Google::Storage.download metadata["items"][0]["mediaLink"]
+[3] pry(main)> Google::Storage.download metadata["items"][0]["mediaLink"], "foo/"
 => 5592792
-[4] pry(main)> puts `ls -l | grep awesome`
+[4] pry(main)> puts `ls -l foo | grep awesome`
 -rw-rw-r--  1 paulengel  paulengel  5592792 Apr 17 16:38 awesome.tsv
 => nil
+[5] pry(main)> Google::Storage.objects.insert :bucket => "your-bucket", :media => "path/to/your/local/awesome.file.gz", :directory => "awesome_directory"
+=> {"kind"=>"storage#object",
+ "id"=>"your-bucket/awesome_directory/awesome.file.gz/1429539088390000",
+ "selfLink"=>"https://www.googleapis.com/storage/v1/b/your-bucket/o/awesome_directory%2Fawesome.file.gz",
+ "name"=>"awesome_directory/awesome.file.gz",
+ "bucket"=>"your-bucket",
+ "generation"=>"1429539088390000",
+ "metageneration"=>"1",
+ "contentType"=>"text/plain",
+ "updated"=>"2015-04-20T14:11:28.390Z",
+ "storageClass"=>"STANDARD",
+ "size"=>"5898192",
+ "md5Hash"=>"82Pe0oFOTdC6nP86/K4fmA==",
+ "mediaLink"=>"https://www.googleapis.com/download/storage/v1/b/your-bucket/o/awesome_directory%2Fawesome.file.gz?generation=1429539088390000&alt=media",
+ "owner"=>{"entity"=>"user-00b49031947c40e21c1934ed03110ed7f71bfc2f8dd1982c257ad66d72e5d9a2", "entityId"=>"00b49031947c40e21c0e306d03110ed7f71bfc2f8dd1982c257ad66d72ea1934"},
+ "crc32c"=>"qPMe/Q==",
+ "etag"=>"ENGluYyIhcUCEAE="}
 ```
 
 Easy, huh? :)
@@ -161,7 +178,7 @@ If it isn't already clear, you can specify a global Google API connection and us
 [3] pry(main)> Google::Drive.files.list
 => {"kind"=>"drive#fileList",
 ...
-[4] pry(main)> Google::BigQuery.connect :projectId => "your_project_id", :datasetId => "your_dataset_id"
+[4] pry(main)> Google::BigQuery.connect :project_id => "your_project_id", :dataset_id => "your_dataset_id"
 => #<Google::BigQuery:0x007ffe0b1fb240 v2:[datasets,jobs,projects,tabledata,tables] {projectId:"your_project_id",datasetId:"your_dataset_id"}>
 [5] pry(main)> Google::BigQuery.tables.list
 => {"kind"=>"bigquery#tableList",
@@ -176,10 +193,10 @@ Run the following command in your console:
 
 ```ruby
 $ script/console
-Loading Google APIs development environment (0.1.0)
+Loading Google APIs development environment (0.1.3)
 [1] pry(main)> GoogleApis.connect :email_address => "", :private_key => "/path/to/private/key.p12"
 => #<GoogleApis::Connection:0x007ff3d356cbf0 [lorem@developer.gserviceaccount.com]>
-[2] pry(main)> bq = Google::BigQuery.new :projectId => "your_project_id", :datasetId => "your_dataset_id"
+[2] pry(main)> bq = Google::BigQuery.new :project_id => "your_project_id", :dataset_id => "your_dataset_id"
 => #<Google::BigQuery:0x007f8c09a05338 v2:[datasets,jobs,projects,tabledata,tables] {projectId:"your_project_id",datasetId:"your_dataset_id"}>
 ```
 
@@ -195,8 +212,8 @@ And immediately start instantiating a Google API:
 
 ```ruby
 $ script/console
-Loading Google APIs development environment (0.1.0)
-[1] pry(main)> bq = Google::BigQuery.new :projectId => "your_project_id", :datasetId => "your_dataset_id"
+Loading Google APIs development environment (0.1.3)
+[1] pry(main)> bq = Google::BigQuery.new :project_id => "your_project_id", :dataset_id => "your_dataset_id"
 => #<Google::BigQuery:0x007fa6c9cc3450 v2:[datasets,jobs,projects,tabledata,tables] {projectId:"your_project_id",datasetId:"your_dataset_id"}>
 ```
 

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/google-apis.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |gem|
   gem.licenses      = ["MIT"]
 
   gem.add_dependency "google-api-client", "~> 0.8.2"
+  gem.add_dependency "httpclient"
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency "yard"

data/lib/google_apis/api/base/instance_methods.rb

@@ -13,12 +13,12 @@ module GoogleApis
           raise Error, "Please ensure a Google API connection" unless @connection
 
           @discovered_api = connection.discover_api self.class.api, self.class.version
-          @default_params = default_params || {}
+          @default_params = (default_params || {}).inject({}){|h, (k, v)| h[k.to_s.gsub(/_(.)/){$1.upcase}.to_sym] = v; h}
         end
 
         def execute(api_method, *params)
           params[0] = (params[0] || {}).symbolize_keys
-          params[0].reverse_merge!(@default_params)
+          params[0].reverse_merge!(default_params)
           connection.execute self.class, api_method, *params
         end
 
@@ -27,7 +27,7 @@ module GoogleApis
         end
 
         def inspect
-          "#<#{self.class}:#{object_hexid} #{discovered_api.version}:[#{discovered_api.discovered_resources.collect(&:name).sort.join(",")}] {#{@default_params.collect{|k, v| "#{k}:#{v.inspect}"}.join(",")}}>"
+          "#<#{self.class}:#{object_hexid} #{discovered_api.version}:[#{discovered_api.discovered_resources.collect(&:name).sort.join(",")}] {#{default_params.collect{|k, v| "#{k}:#{v.inspect}"}.join(",")}}>"
         end
 
         def method_missing(name, *args)
@@ -40,6 +40,10 @@ module GoogleApis
 
       private
 
+        def default_params
+          @default_params
+        end
+
         def find(name)
           discovered_api.discovered_resources.detect{|x| x.name == name.to_s}
         end

data/lib/google_apis/api/big_query.rb

@@ -7,6 +7,14 @@ module GoogleApis
       version 2
       auth_scope "https://www.googleapis.com/auth/bigquery"
 
+      def project
+        default_params[:projectId]
+      end
+
+      def dataset
+        default_params[:datasetId]
+      end
+
       def select_rows(statement)
         result = jobs.query :query => statement
         types = result["schema"]["fields"].collect{|x| x["type"].downcase.to_sym}

data/lib/google_apis/connection.rb

@@ -1,4 +1,5 @@
 require "uri"
+require "fileutils"
 
 module GoogleApis
   class Connection
@@ -28,32 +29,40 @@ module GoogleApis
     end
 
     def execute(api, api_method, *params)
-      authenticate!(api)
-
-      nested, top_level = params
+      options, headers = params
 
-      if nested
+      if options
         parameter_keys = (api_method.discovery_document["parameters"] || {}).keys.collect(&:to_sym)
-        parameters, body_object = nested.partition{|k, v| parameter_keys.include?(k)}.collect{|x| Hash[x] unless x.empty?}
+        media = options.delete(:media)
+        parameters, body_object = options.partition{|k, v| parameter_keys.include?(k)}.collect{|x| Hash[x]}
+      end
+
+      if media && media.is_a?(String)
+        parameters[:uploadType] = "resumable"
+        parameters[:name] ||= File.basename(media)
+        if directory = body_object.delete(:directory)
+          parameters[:name] = File.join(directory, parameters[:name])
+        end
+        media = Google::APIClient::UploadIO.new(media, `file --mime -b #{media}`.split(";")[0])
       end
 
       options = {:api_method => api_method}
-      options[:parameters] = parameters if parameters
-      options[:body_object] = body_object if body_object
-      options.merge!(top_level) if top_level
+      options[:parameters] = parameters unless parameters.empty?
+      options[:body_object] = body_object unless body_object.empty?
+      options[:media] = media if media
+      options.merge!(headers) if headers
 
-      parse! @client.execute(options)
+      parse! execute!(api, options)
     end
 
     def download(api, uri, to = nil)
-      authenticate!(api)
+      options = Google::APIClient::Request.new(:uri => uri)
 
-      response = @client.execute Google::APIClient::Request.new(:uri => uri)
-      to ||= File.basename CGI.unescape(URI.parse(uri).path)
-
-      File.open(to, "wb") do |file|
-        file.write response.body
+      if to.nil? || File.directory?(to) || to.match(/\/$/)
+        to = File.join *[to, File.basename(CGI.unescape(URI.parse(uri).path))].compact
       end
+
+      save! execute!(api, options), to
     end
 
     def inspect
@@ -62,6 +71,11 @@ module GoogleApis
 
   private
 
+    def execute!(api, options)
+      authenticate!(api)
+      @client.execute(options)
+    end
+
     def authenticate!(api)
       if !@asserter.scope.include?(api.auth_scope) || @client.authorization.expired?
         @asserter.scope = (@asserter.scope.split(" ") << api.auth_scope).uniq
@@ -79,5 +93,12 @@ module GoogleApis
       end
     end
 
+    def save!(response, to)
+      FileUtils.mkdir_p File.dirname(to)
+      File.open(to, "wb") do |file|
+        file.write(response.body)
+      end
+    end
+
   end
 end

data/lib/google_apis/version.rb

@@ -1,7 +1,7 @@
 module GoogleApis
   MAJOR = 0
   MINOR = 1
-  TINY  = 2
+  TINY  = 3
 
   VERSION = [MAJOR, MINOR, TINY].join(".")
 end

data/lib/google_apis.rb

@@ -18,3 +18,5 @@ module GoogleApis
   end
 
 end
+
+Faraday.default_adapter = :httpclient

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google-apis
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Paul Engel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-17 00:00:00.000000000 Z
+date: 2015-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-api-client
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.2
+- !ruby/object:Gem::Dependency
+  name: httpclient
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement