legato 0.0.2 → 0.0.4

data/CHANGELOG.md

@@ -0,0 +1,42 @@
+## Legato 0.0.3 ##
+
+*   Merged branch oauth-1-support
+
+      If you pass on an OAuth 1 (not 2, the default) token from the OAuth gem, Legato will use that.
+      Support for OAuth 2 is greater than OAuth 1 because of subtle and annoying differences in their operation.
+
+    *Tony Pitale*
+
+## Legato 0.0.2 ##
+
+*   Specify request fields to slim down content returned
+
+      Include request fields columnHeaders/name, rows, totalResults, totalsForAllResults
+
+    *Patrick Roby*
+
+*   Add total results and totals_for_all_results to Query#load
+
+    *Patrick Roby*
+
+*   Change :order to :sort to match GA
+
+    *Patrick Roby*
+
+*   Add webPropertyId to Management::Profile
+
+    *Patrick Roby*
+
+*   Allow explicitly setting the join character on filters
+
+    *Tony Pitale*
+
+*   1.8.7 Support
+
+    *Tony Pitale*
+
+## Legato 0.0.1 ##
+
+*   Initial implementation
+
+    *Tony Pitale*

data/Gemfile

@@ -2,3 +2,8 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in legato.gemspec
 gemspec
+
+group :development do
+  gem 'oauth2'
+  gem 'oauth'
+end

data/Rakefile

@@ -1,5 +1,6 @@
 require "bundler/gem_tasks"
 
+require 'oauth'
 require 'oauth2'
 
 # get oauth2 via device code, unimplemented as of now
@@ -8,7 +9,7 @@ require 'oauth2'
 # curl -d "client_id={{client_id}}&client_secret={{client_secret}}&code=4/8O1xUKWzOdJESG7ednnulZPsbyNt&grant_type=http://oauth.net/grant_type/device/1.0" https://accounts.google.com/o/oauth2/token
 # { "access_token" : "ERspXATXoblahblahblah", "token_type" : "Bearer", "expires_in" : 3600, "refresh_token" : "1/balhaajsdfklasfdjs;df" }
 
-namespace :oauth do
+namespace :oauth2 do
   def client
     # This is my test client account for Legato.
     OAuth2::Client.new('779170787975.apps.googleusercontent.com', 'mbCISoZiSwyVQIDEbLj4EeEc', {
@@ -35,3 +36,38 @@ namespace :oauth do
     puts access_token.token
   end
 end
+
+namespace :oauth do
+  def consumer
+    OAuth::Consumer.new('779170787975.apps.googleusercontent.com', 'mbCISoZiSwyVQIDEbLj4EeEc', {
+      :site => "https://www.google.com",
+      :request_token_path => "/accounts/OAuthGetRequestToken",
+      :access_token_path => "/accounts/OAuthGetAccessToken",
+      :authorize_path => "/accounts/OAuthAuthorizeToken"
+    })
+  end
+
+  def request_token
+    @request_token ||= consumer.get_request_token({}, {:scope => "https://www.googleapis.com/auth/analytics.readonly"})
+  end
+
+  def auth_url
+    request_token.authorize_url
+  end
+
+  def access_token
+    @access_token ||= begin
+      print 'OAuth Code: '
+      code = $stdin.gets.strip
+      request_token.get_access_token(:oauth_verifier => code)
+    end
+  end
+
+  desc "Get a new OAuth Token"
+  task :token do
+    `open "#{auth_url}"`
+
+    puts "Token: #{access_token.token}"
+    puts "Secret: #{access_token.secret}"
+  end
+end

data/legato.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 require "legato/version"
 
 Gem::Specification.new do |s|
-  s.required_ruby_version = '>= 1.9.2'
+  s.required_ruby_version = '>= 1.8.7'
 
   s.name        = "legato"
   s.version     = Legato::VERSION

data/lib/legato/management/finder.rb

@@ -6,6 +6,14 @@ module Legato
       end
 
       def all(user, path=default_path)
+        uri = if user.api_key
+          # oauth + api_key
+          base_uri + path + "?key=#{user.api_key}"
+        else
+          # oauth 2
+          base_uri + path
+        end
+
         json = user.access_token.get(base_uri + path).body
         MultiJson.decode(json)['items'].map {|item| new(item, user)}
       end

data/lib/legato/query.rb

@@ -192,6 +192,11 @@ module Legato
       params.reject {|k,v| v.nil? || v.to_s.strip.length == 0}
     end
 
+    def to_query_string
+      list = to_params.map {|k,v| [k,v].join("=")}
+      "?#{list.join("&")}"
+    end
+
     private
     def request_for_query
       profile.user.request(self)

data/lib/legato/user.rb

@@ -1,20 +1,26 @@
 module Legato
   class User
-    attr_accessor :access_token
+    attr_accessor :access_token, :api_key
 
-    def initialize(token)
+    def initialize(token, api_key = nil)
       self.access_token = token
+      self.api_key = api_key
     end
 
     URL = "https://www.googleapis.com/analytics/v3/data/ga"
 
     def request(query)
-      begin
-        Response.new(access_token.get(URL, :params => query.to_params))
-      rescue => e
-        p e.code
-        raise e
+      raw_response = if api_key
+        # oauth 1 + api key
+        query_string = URI.escape(query.to_query_string, '<>') # may need to add !~@
+
+        access_token.get(URL + query_string + "&key=#{api_key}")
+      else
+        # oauth 2
+        access_token.get(URL, :params => query.to_params)
       end
+
+      Response.new(raw_response)
     end
 
     # Management

data/lib/legato/version.rb

@@ -1,3 +1,3 @@
 module Legato
-  VERSION = "0.0.2"
+  VERSION = "0.0.4"
 end

data/spec/lib/legato/management/account_spec.rb

@@ -9,7 +9,7 @@ describe Legato::Management::Account do
     it_behaves_like "a management finder"
 
     it 'creates a new account instance from a hash of attributes' do
-      user = stub
+      user = stub(:api_key => nil)
       account = Legato::Management::Account.new({"id" => 12345, "name" => "Account 1"}, user)
       account.user.should == user
       account.id.should == 12345

data/spec/support/examples/management_finder.rb

@@ -3,7 +3,7 @@ shared_examples_for "a management finder" do
     MultiJson.stubs(:decode).returns({'items' => ['item1', 'item2']})
     response = stub(:body => 'some json')
     access_token = stub(:get => response)
-    user = stub(:access_token => access_token)
+    user = stub(:access_token => access_token, :api_key => nil)
     described_class.stubs(:new).returns('thing1', 'thing2')
 
     described_class.all(user).should == ['thing1', 'thing2']

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: legato
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Tony Pitale
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-26 00:00:00 -04:00
+date: 2012-05-17 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -80,7 +80,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: -161295594
+        hash: -3728883836
         segments: 
         - 2
         - 0
@@ -147,6 +147,7 @@ files:
 - .gitignore
 - .rspec
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
 - README.md
 - Rakefile
@@ -204,12 +205,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 55
+      hash: 57
       segments: 
       - 1
-      - 9
-      - 2
-      version: 1.9.2
+      - 8
+      - 7
+      version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: