legato 0.3.3 → 0.4.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZGEwNThlYTM2NzM2YTVlYTgxYmMxODFkMWEzNjEyM2QyYjg1NWI2Ng==
-  data.tar.gz: !binary |-
-    OGI3NzZlYzdlZmI3NzVlZDIxM2I0YWFkYjU5NzE5NGU2NDFmZGQzMw==
+SHA1:
+  metadata.gz: b7f49997e495542d636ee2f1937c26f44a06f831
+  data.tar.gz: 4bada052ee24bcd680f3ab0e236e407991771526
 SHA512:
-  metadata.gz: !binary |-
-    MjgxODA4Nzg3YmVjNjZhNDMwMmE2ZTQ2Y2U3ZmExOTg0ZjQ1NDdjMjI3YjNh
-    ZmNiNTk3ZjhkOWQ4OTJiY2ZiMGU2YTI2ZGU1MzUyYjAyYTBkZTViYjJlOTMy
-    MDdlNWUzNTBiODI1ZjQ4MGJhNzhiMGM4N2U0YTU1NzcxNTVhZGU=
-  data.tar.gz: !binary |-
-    Y2E3ZDQxNmIyMDJkOTU3NmQzMmE0ZDA1MmJkNDY3ZGE5MGUyYjVhZmFiOGI0
-    MWM0Y2E4YjJkY2EwNWNkNWFjN2NlM2Y4N2I2OWRhN2UxZGUwMDViYjc4MmJi
-    MjY2OTI0MjNkZmIxZGM1MzUzNjBiODQ0NDQ0Yzg5ODY1M2M5MDY=
+  metadata.gz: 9b32fd09f5268b038f2a39ce46b1cb2ea858d8bd7a776e5aa6094155f224a44610f5c75bbe656a8077f5373335ea93adcee3a2ca2d7bc04280130ac1037e1c44
+  data.tar.gz: 1f7b6b5f9ce488bee564710ad499adfa9b80059b309f0fbf35019134fd1e728e8c7da04e2a68b7edfe2ed5c7aba660bba2946f81d36ca2914deaf32cbcdfe584

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## Legato 0.4.0 ##
+
+*   Adds support to lookup parent `web_property` or `account` from a child `profile`.
+
 ## Legato 0.3.3 ##
 
 *   Adds `realtime` to `Legato::Model`, returns `Query` with tracking_scope set for the realtime API

data/README.md

@@ -61,6 +61,11 @@ profile = user.profiles.first
 profile.user == user #=> true
 ```
 
+7. The profile can also lookup its "parent" Web Property
+
+```ruby
+profile.web_propery
+```
 
 ## Google Analytics Model ##
 

data/lib/legato/cli.rb

@@ -26,10 +26,10 @@ module Legato
 
   class CLI
     def initialize
-      path = File.join(ENV['HOME'], '.legato.yml')
+      config_path = File.join(ENV['HOME'], '.legato.yml')
 
-      if File.exists?(path)
-        @config = YAML.load_file(path) rescue {}
+      if File.exists?(config_path)
+        @config = YAML.load_file(config_path) rescue {}
       else
         puts "##########################################################"
         puts "We can auto-load OAuth2 config from ~/.legato.yml"
@@ -40,7 +40,7 @@ module Legato
 
       build_access_token
 
-      print_yaml
+      print_yaml unless File.exists?(config_path)
     end
 
     def run
@@ -93,6 +93,10 @@ module Legato
 
         @access_token = client.auth_code.get_token(code, :redirect_uri => 'http://localhost')
         @config['token'] = @access_token.token
+
+        puts
+        print "Your oauth token is #{@config['token']}"
+        puts
       end
     end
 

data/lib/legato/management/account.rb

@@ -15,8 +15,9 @@ module Legato
 
       def initialize(attributes, user)
         self.user = user
-        self.id = attributes['id']
-        self.name = attributes['name']
+
+        self.id = attributes['id'] || attributes[:id]
+        self.name = attributes['name'] || attributes[:name]
       end
 
       def web_properties
@@ -26,6 +27,10 @@ module Legato
       def profiles
         Profile.for_account(self)
       end
+
+      def self.from_child(child)
+        all(child.user).detect {|a| a.id == child.account_id}
+      end
     end
   end
 end

data/lib/legato/management/finder.rb

@@ -6,17 +6,28 @@ module Legato
       end
 
       def all(user, path=default_path)
-        uri = if user.api_key
+        uri = uri_for_user(user, path)
+
+        json = user.access_token.get(uri).body
+        items = MultiJson.decode(json).fetch('items', [])
+        items.map {|item| new(item, user)}
+      end
+
+      def get(user, path)
+        uri = uri_for_user(user, path)
+        json = user.access_token.get(uri).body
+
+        new(MultiJson.decode(json), user)
+      end
+
+      def uri_for_user(user, path)
+        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
-        items = MultiJson.decode(json).fetch('items', [])
-        items.map {|item| new(item, user)}
       end
     end
   end

data/lib/legato/management/profile.rb

@@ -13,16 +13,23 @@ module Legato
         "/accounts/#{account_id}/webproperties/#{web_property_id}/profiles/#{id}"
       end
 
-      attr_accessor :id, :name, :web_property_id, :account_id, :user, :attributes
+      GA_ATTRIBUTES = {
+        :id => 'id',
+        :name => 'name',
+        :account_id => 'accountId',
+        :web_property_id => 'webPropertyId'
+      }
+
+      attr_accessor *GA_ATTRIBUTES.keys
+      attr_accessor :user, :attributes
 
       def initialize(attributes, user)
         self.user = user
-        self.id = attributes['id']
-        self.name = attributes['name']
-        self.account_id = attributes['accountId']
-        self.web_property_id = attributes['webPropertyId']
 
-        ['id', 'name', 'accountId', 'webPropertyId'].each { |key| attributes.delete(key) }
+        GA_ATTRIBUTES.each do |key,string_key|
+          self.send("#{key}=", attributes.delete(string_key) || attributes.delete(key))
+        end
+
         self.attributes = attributes
       end
 
@@ -34,6 +41,14 @@ module Legato
         all(web_property.user, web_property.path+'/profiles')
       end
 
+      def account
+        @account ||= Account.from_child(self)
+      end
+
+      def web_property
+        @web_property ||= WebProperty.from_child(self)
+      end
+
       def goals
         Goal.for_profile(self)
       end

data/lib/legato/management/web_property.rb

@@ -11,20 +11,43 @@ module Legato
         "/accounts/#{account_id}/webproperties/#{id}"
       end
 
-      attr_accessor :id, :name, :website_url, :account_id, :user, :attributes
+      GA_ATTRIBUTES = {
+        :id => 'id',
+        :name => 'name',
+        :account_id => 'accountId',
+        :website_url => 'websiteUrl'
+      }
+
+      attr_accessor *GA_ATTRIBUTES.keys
+      attr_accessor :user, :attributes
 
       def initialize(attributes, user)
         self.user = user
-        self.id = attributes['id']
-        self.name = attributes.delete('name')
-        self.website_url = attributes.delete('websiteUrl')
-        self.account_id = attributes.delete('accountId')
+
+        GA_ATTRIBUTES.each do |key,string_key|
+          self.send("#{key}=", attributes.delete(string_key) || attributes.delete(key))
+        end
+
         self.attributes = attributes
       end
 
       def self.for_account(account)
         all(account.user, account.path+'/webproperties')
       end
+
+      def profiles
+        Profile.for_web_property(self)
+      end
+
+      def account
+        @account ||= Account.from_child(self)
+      end
+
+      def self.from_child(child)
+        path = new({:id => child.web_property_id, :account_id => child.account_id}, nil).path
+
+        get(child.user, path)
+      end
     end
   end
 end

data/lib/legato/version.rb

@@ -1,3 +1,3 @@
 module Legato
-  VERSION = "0.3.3"
+  VERSION = "0.4.0"
 end

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

@@ -15,6 +15,12 @@ describe Legato::Management::Account do
       account.id.should == 12345
       account.name.should == "Account 1"
     end
+
+    it 'finds an instance from a child management instance' do
+      user = stub(:api_key => nil)
+      profile = Legato::Management::Profile.new({:account_id => 123}, user)
+      # account = Legato::Management::Account
+    end
   end
 
   context "An Account instance" do

data/spec/support/examples/management_finder.rb

@@ -1,29 +1,50 @@
 shared_examples_for "a management finder" do
   let(:response) { stub(:body => 'some json') }
-  let(:access_token) { access_token = stub(:get => response) }
+  let(:access_token) { stub(:get => response) }
   let(:user) { stub(:access_token => access_token, :api_key => nil) }
 
-  after do
-    user.should have_received(:access_token)
-    access_token.should have_received(:get).with('https://www.googleapis.com/analytics/v3/management'+described_class.default_path)
-    response.should have_received(:body)
-    MultiJson.should have_received(:decode).with('some json')
-  end
+  context ".all" do
+    after do
+      user.should have_received(:access_token)
+      access_token.should have_received(:get).with('https://www.googleapis.com/analytics/v3/management'+described_class.default_path)
+      response.should have_received(:body)
+      MultiJson.should have_received(:decode).with('some json')
+    end
+
+    it "returns an array of all #{subject_class_name} available to a user" do
+      MultiJson.stubs(:decode).returns({'items' => ['item1', 'item2']})
+      described_class.stubs(:new).returns('thing1', 'thing2')
+
+      described_class.all(user).should == ['thing1', 'thing2']
 
-  it "returns an array of all #{subject_class_name} available to a user" do
-    MultiJson.stubs(:decode).returns({'items' => ['item1', 'item2']})
-    described_class.stubs(:new).returns('thing1', 'thing2')
+      described_class.should have_received(:new).with('item1', user)
+      described_class.should have_received(:new).with('item2', user)
+    end
 
-    described_class.all(user).should == ['thing1', 'thing2']
+    it "returns an empty array of #{subject_class_name} when there are no results" do
+      MultiJson.stubs(:decode).returns({})
+      described_class.all(user).should == []
 
-    described_class.should have_received(:new).with('item1', user)
-    described_class.should have_received(:new).with('item2', user)
+      described_class.should have_received(:new).never
+    end
   end
 
-  it "returns an empty array of #{subject_class_name} when there are no results" do
-    MultiJson.stubs(:decode).returns({})
-    described_class.all(user).should == []
+  context ".get" do
+    after do
+      user.should have_received(:access_token)
+      access_token.should have_received(:get).with('https://www.googleapis.com/analytics/v3/management/path')
+      response.should have_received(:body)
+      MultiJson.should have_received(:decode).with('some json')
+    end
+
+    it "returns an instance of #{subject_class_name} for a given path" do
+      MultiJson.stubs(:decode).returns('attributes')
+      described_class.stubs(:new).returns('thing')
+
+      path = '/path'
 
-    described_class.should have_received(:new).never
+      expect(described_class.get(user, path)).to eq('thing')
+      expect(described_class).to have_received(:new).with('attributes', user)
+    end
   end
-end
+end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: legato
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Tony Pitale
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-01 00:00:00.000000000 Z
+date: 2014-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bourne
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -84,42 +84,42 @@ dependencies:
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: multi_json
   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'
 description: Access the Google Analytics Core Reporting and Management APIs with Ruby.
@@ -132,10 +132,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".ruby-version"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - README.md
@@ -194,17 +194,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: legato
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Access the Google Analytics API with Ruby
@@ -233,4 +233,3 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/examples/management_finder.rb
 - spec/support/macros/oauth.rb
-has_rdoc: