google-apis 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5bedf6667092812f0ef8e2292a028ae8d63dd0f3
-  data.tar.gz: 4a3d38dec4fe35449d6b0b71e397f49008d900c4
+  metadata.gz: 40cf27a2e19679987b6aa02d3419450df91b0cf8
+  data.tar.gz: c1a8dbb160c470f63784633e8a41516ccb81c51f
 SHA512:
-  metadata.gz: 2ca597c89963a2e0464d8d30b8cea8f963f7b6163aadebc6a071eb6269951233a0c9456fb6fc9efa68f222a1e92cb676aa85b0f9425f193a9f7bfb915675b467
-  data.tar.gz: 616f14c243a99469ade6b4a1c809f3853ae4ac95f1d3c5cfab8cd1a62c623819d4cca35a7c2ab5e346706d4526c77f6afd798c06f93b9c815d7b04b97fd738d4
+  metadata.gz: 9b70082d8f1a07f02c13b26ee88de8314c67862d5370cfdf1b9dabc650c311bc1055251d883d3a6e66fde309a616f7fcacc307daabb0cb5799b39413af0c767a
+  data.tar.gz: 8019e1af722bdce66e749725a7dbec8a02555e50c1c86891cf5728c6c2b80e728c0b67366d18b745820eb01740a98293c96adabe6cfce92efd2fa4943b764b95

data/CHANGELOG.rdoc

@@ -1,5 +1,11 @@
 = Google APIs CHANGELOG
 
+== Version 0.1.4 (April 21, 2015)
+
+* Introduced GoogleApis.config
+* Improved handling default API parameters
+* Auto-connecting to API when having a GoogleApis.connection available
+
 == Version 0.1.3 (April 20, 2015)
 
 * Camelizing underscored default param keys

data/README.md

@@ -99,7 +99,7 @@ Please note that `Google::BigQuery.connection` is provided with several methods
 
 ##### Google::Storage.connection
 
-The following example demonstrates how to download a file from Google Storage:
+The following example demonstrates how to download and upload a file from Google Storage:
 
 ```ruby
 [1] pry(main)> Google::Storage.connect :email_address => "lorem@developer.gserviceaccount.com", :private_key => "/path/to/private/key.p12"
@@ -170,19 +170,30 @@ Please make sure that you also have created a "Public API access" server key and
 
 If it isn't already clear, you can specify a global Google API connection and use different APIs:
 
+```yaml
+---
+  email_address: lorem@developer.gserviceaccount.com
+  private_key: "/path/to/private/key.p12"
+  project_id: your_project_id
+  dataset_id: your_dataset_id
+  bucket: your_bucket
+```
+
 ```ruby
-[1] pry(main)> GoogleApis.connect :email_address => "lorem@developer.gserviceaccount.com", :private_key => "/path/to/private/key.p12"
+[1] pry(main)> require "yaml"
+=> true
+[2] pry(main)> GoogleApis.connect YAML.load_file("config/google-apis.yml")
 => #<GoogleApis::Connection:0x007ffe0aa95d70 [lorem@developer.gserviceaccount.com]>
-[2] pry(main)> Google::Drive.connect
-=> #<Google::Drive:0x007fcfec1265b0 v2:[about,apps,changes,channels,children,comments,files,parents,permissions,properties,realtime,replies,revisions] {}>
 [3] pry(main)> Google::Drive.files.list
 => {"kind"=>"drive#fileList",
 ...
-[4] pry(main)> Google::BigQuery.connect :project_id => "your_project_id", :dataset_id => "your_dataset_id"
+[4] pry(main)> Google::BigQuery.connection
 => #<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",
 ...
+[6] pry(main)> Google::Storage.objects.list :prefix => "path/to/your/file/awesome.txt"
+=> {"kind"=>"storage#objects",
 ```
 
 ### Using the console
@@ -193,7 +204,7 @@ Run the following command in your console:
 
 ```ruby
 $ script/console
-Loading Google APIs development environment (0.1.3)
+Loading Google APIs development environment (0.1.4)
 [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 :project_id => "your_project_id", :dataset_id => "your_dataset_id"
@@ -206,14 +217,16 @@ You can also define `script/config.yml` containing the connection config:
 ---
   email_address: lorem@developer.gserviceaccount.com
   private_key: "/path/to/private/key.p12"
+  project_id: your_project_id
+  dataset_id: your_dataset_id
 ```
 
 And immediately start instantiating a Google API:
 
 ```ruby
 $ script/console
-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"
+Loading Google APIs development environment (0.1.4)
+[1] pry(main)> Google::BigQuery.connection
 => #<Google::BigQuery:0x007fa6c9cc3450 v2:[datasets,jobs,projects,tabledata,tables] {projectId:"your_project_id",datasetId:"your_dataset_id"}>
 ```
 

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/google_apis.rb

@@ -10,7 +10,12 @@ module GoogleApis
   class Error < StandardError; end
 
   def self.connect(options)
-    @connection = Connection.new options
+    @config = options.symbolize_keys
+    @connection = Connection.new config
+  end
+
+  def self.config
+    @config || {}
   end
 
   def self.connection

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

@@ -27,12 +27,20 @@ module GoogleApis
           end
         end
 
+        def default_parameters(*keys)
+          if keys.any?
+            @default_parameters = keys
+          else
+            @default_parameters || []
+          end
+        end
+
         def connect(options = {})
           @instance = new(options)
         end
 
         def instance
-          @instance
+          @instance || (connect if GoogleApis.connection)
         end
 
         def connection

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

@@ -6,14 +6,15 @@ module GoogleApis
         attr_accessor :connection, :discovered_api
 
         def initialize(options = {})
-          options = options.symbolize_keys
+          config, params = options.symbolize_keys.partition{|(k, v)| [:email_address, :private_key].include?(k)}.collect{|x| Hash[x]}
 
-          config, default_params = options.partition{|(k, v)| [:email_address, :private_key].include?(k)}.collect{|x| Hash[x] unless x.empty?}
-          @connection = config ? GoogleApis::Connection.new(config) : GoogleApis.connection
+          @connection = config.empty? ? GoogleApis.connection : GoogleApis::Connection.new(config)
           raise Error, "Please ensure a Google API connection" unless @connection
 
+          params = GoogleApis.config.merge(params).inject({}){|h, (k, v)| h[k.to_s.gsub(/_(.)/){$1.upcase}.to_sym] = v if v; h}
+
           @discovered_api = connection.discover_api self.class.api, self.class.version
-          @default_params = (default_params || {}).inject({}){|h, (k, v)| h[k.to_s.gsub(/_(.)/){$1.upcase}.to_sym] = v; h}
+          @default_params = params.select{|k, v| self.class.default_parameters.include?(k)}
         end
 
         def execute(api_method, *params)

data/lib/google_apis/api/big_query.rb

@@ -6,6 +6,7 @@ module GoogleApis
       api "bigquery"
       version 2
       auth_scope "https://www.googleapis.com/auth/bigquery"
+      default_parameters :projectId, :datasetId
 
       def project
         default_params[:projectId]

data/lib/google_apis/api/storage.rb

@@ -6,6 +6,7 @@ module GoogleApis
       api "storage"
       version 1
       auth_scope "https://www.googleapis.com/auth/devstorage.read_write"
+      default_parameters :bucket
 
     end
   end

data/lib/google_apis/version.rb

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

data/test/unit/api/test_big_query.rb

@@ -22,6 +22,12 @@ module Unit
             assert_equal "https://www.googleapis.com/auth/bigquery", GoogleApis::Api::BigQuery.auth_scope
           end
         end
+
+        describe ".default_parameters" do
+          it "returns the default API parameters" do
+            assert_equal [:projectId, :datasetId], GoogleApis::Api::BigQuery.default_parameters
+          end
+        end
       end
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google-apis
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Paul Engel
@@ -184,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A thin layer on top of Google::APIClient (google-api-client) for a more intuitive