activeresource-google_spreadsheets 0.0.9 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
---- 
-SHA512: 
-  metadata.gz: b119d39d25f74629960b194a0fd970d318827306e8550f9a8617960dfd6d5ee7e53498392bc10e81cb1656493530a456d0dbc74610f856ac097f5e776549b589
-  data.tar.gz: ff1e75731d04d348c0226bec429e07c3fa166bac1189f2c101c7e8bd3d0706f8456a0926d570fcad07f6ca429f663dfa944c2d1952ac4fa101f94961735709e9
-SHA1: 
-  metadata.gz: 64ad00bff2d0f3ef59dd5550c7f7d3cac7bd1de5
-  data.tar.gz: f3b47cc9aac71521e198234b6915b31c43cee641
+---
+SHA1:
+  metadata.gz: 59691c2bd7817f25d8065105e5b357aee2506080
+  data.tar.gz: 4d3ae79b0a0bb0e9f6120de3507ce1cd2d82eb3b
+SHA512:
+  metadata.gz: b47e0295e67c174828bb4bffbf66bd3623d89cd650c89f04bbca2596522065ada1f5ab18375f69f84e95b75b2a46b8e0101f1ec8549ed939c565be81f07a5f1f
+  data.tar.gz: 587b14efafcc01ebcff5cfdc88e290b025407598ddab283a7303bfa00a25aa04ad73daee92bda425ce5343dbde49ca330f216d3a60ca674a484364314eb540fb

data/activeresource-google_spreadsheets.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'activeresource'
   spec.add_dependency 'activesupport'
+  spec.add_dependency 'google-api-client'
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/lib/google_spreadsheets/auth/service_accounts_access_token.rb

@@ -0,0 +1,35 @@
+require 'google/api_client'
+require 'openssl'
+
+module GoogleSpreadsheets
+  module Auth
+    class ServiceAccountsAccessToken
+      def initialize(options = {})
+        @options = options.reverse_merge(
+          application_name: 'Ruby',
+          token_credential_uri: 'https://accounts.google.com/o/oauth2/token',
+          audience:             'https://accounts.google.com/o/oauth2/token',
+          scope:                'https://spreadsheets.google.com/feeds/'
+        )
+      end
+
+      def call(connection)
+        # cf. http://d.hatena.ne.jp/sugyan/20130112/1357996092
+        @client ||= Google::APIClient.new(application_name: @options[:application_name]).tap do |c|
+          c.authorization = Signet::OAuth2::Client.new(
+            token_credential_uri: @options[:token_credential_uri],
+            audience:             @options[:audience],
+            scope:                @options[:scope],
+            issuer:               @options[:client_email],
+            signing_key:          OpenSSL::PKey::RSA.new(@options[:private_key_pem])
+          )
+          c.authorization.fetch_access_token!
+        end
+        if @client.authorization.expired?
+          @client.authorization.refresh!
+        end
+        @client.authorization.access_token
+      end
+    end
+  end
+end

data/lib/google_spreadsheets/auth.rb

@@ -0,0 +1,5 @@
+module GoogleSpreadsheets
+  module Auth
+    autoload :ServiceAccountsAccessToken, 'google_spreadsheets/auth/service_accounts_access_token'
+  end
+end

data/lib/google_spreadsheets/base.rb

@@ -1,20 +1,53 @@
 module GoogleSpreadsheets
   class Base < ActiveResource::Base
-    self.site   = 'http://spreadsheets.google.com/'
+    self.site   = 'https://spreadsheets.google.com/'
     self.format = GDataFormat.new
 
     class << self
+      # Avoid dup & freeze
+      def password
+        if defined?(@password)
+          @password
+        elsif superclass != Object && superclass.password
+          superclass.password
+        end
+      end
+
+      # Inherit from superclass
+      def auth_type
+        if defined?(@auth_type)
+          @auth_type
+        elsif superclass != Object && superclass.auth_type
+          superclass.auth_type
+        end
+      end
+
+      def access_token=(access_token)
+        self.password = access_token
+      end
+
+      def access_token(&block)
+        if block_given?
+          self.password = block
+        else
+          password
+        end
+      end
+
       def connection(refresh = false)
         if defined?(@connection) || self == Base
           @connection = Connection.new(site, format) if refresh || @connection.nil?
+          @connection.proxy = proxy if proxy
           @connection.user = user if user
           @connection.password = password if password
+          @connection.auth_type = auth_type if auth_type
           @connection.timeout = timeout if timeout
           @connection
         else
           superclass.connection
         end
       end
+
       def element_path(id, prefix_options = {}, query_options = nil)
         prefix_options, query_options = split_options(prefix_options) if query_options.nil?
         "/feeds/#{collection_name}#{prefix(prefix_options)}#{id}#{query_string(query_options)}"

data/lib/google_spreadsheets/connection.rb

@@ -1,8 +1,20 @@
 module GoogleSpreadsheets
   class Connection < ActiveResource::Connection
-    DEBUG = false
     def authorization_header(http_method, uri)
-      if @user && @password && !@token
+      if auth_type == :bearer
+        { 'Authorization' => "Bearer #{access_token}" }
+      else
+        client_login_authorization_header(http_method, uri)
+      end
+    end
+
+    def access_token
+      @password.respond_to?(:call) ? @password.call(self) : @password
+    end
+
+    # Deprecated and Not recommended
+    def client_login_authorization_header(http_method, uri)
+      if @user && @password && !@auth_token
         email            = CGI.escape(@user)
         password         = CGI.escape(@password)
         http             = Net::HTTP.new('www.google.com', 443)
@@ -12,10 +24,15 @@ module GoogleSpreadsheets
                                "accountType=HOSTED_OR_GOOGLE&Email=#{email}&Passwd=#{password}&service=wise",
                                { 'Content-Type' => 'application/x-www-form-urlencoded' })
         handle_response(resp)
-        @token = (data || resp.body)[/Auth=(.*)/n, 1]
+        @auth_token = (data || resp.body)[/Auth=(.*)/n, 1]
       end
-      @token ? { 'Authorization' => "GoogleLogin auth=#{@token}" } : {}
+      @auth_token ? { 'Authorization' => "GoogleLogin auth=#{@auth_token}" } : {}
+    end
+
+    private
+    def legitimize_auth_type(auth_type)
+      auth_type = auth_type.to_sym
+      auth_type.in?([:basic, :digest, :bearer]) ? auth_type : :basic
     end
-    def http() http = super; http.set_debug_output($stderr) if DEBUG; http end
   end
 end

data/lib/google_spreadsheets/version.rb

@@ -1,3 +1,3 @@
 module GoogleSpreadsheets
-  VERSION = "0.0.9"
+  VERSION = "0.1.0"
 end

data/lib/google_spreadsheets.rb

@@ -16,6 +16,7 @@ module GoogleSpreadsheets
 
   autoload :Enhanced
   autoload :LinkRelations
+  autoload :Auth
 
   class BaseError < StandardError
     DefaultMessage = nil

metadata

@@ -1,64 +1,93 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: activeresource-google_spreadsheets
-version: !ruby/object:Gem::Version 
-  version: 0.0.9
+version: !ruby/object:Gem::Version
+  version: 0.1.0
 platform: ruby
-authors: 
+authors:
 - Chihiro Ito
 - Toru KAWAMURA
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-09-22 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-11-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activeresource
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - &id002 
-      - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id002
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: google-api-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.3"
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id002
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Google Spreadsheets accessor with ActiveResource
-email: 
+email:
 - tkawa@4bit.net
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE.txt
@@ -67,6 +96,8 @@ files:
 - activeresource-google_spreadsheets.gemspec
 - lib/activeresource-google_spreadsheets.rb
 - lib/google_spreadsheets.rb
+- lib/google_spreadsheets/auth.rb
+- lib/google_spreadsheets/auth/service_accounts_access_token.rb
 - lib/google_spreadsheets/base.rb
 - lib/google_spreadsheets/connection.rb
 - lib/google_spreadsheets/enhanced.rb
@@ -85,27 +116,27 @@ files:
 - lib/google_spreadsheets/version.rb
 - lib/google_spreadsheets/worksheet.rb
 homepage: https://github.com/tkawa/activeresource-google_spreadsheets
-licenses: 
+licenses:
 - MIT
 metadata: {}
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id002
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id002
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Google Spreadsheets accessor with ActiveResource
 test_files: []
-