legato 0.0.1 → 0.0.2

data/.gitignore

@@ -3,3 +3,4 @@
 Gemfile.lock
 pkg/*
 lib/demo.rb
+.rvmrc

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+script: bundle exec rspec spec

data/README.md

@@ -143,7 +143,7 @@ Operators on dimensions:
   * :end_date - The date to end, inclusive
   * :limit - The maximum number of results to be returned
   * :offset - The starting index
-  * :order - metric/dimension to order by
+  * :sort - metric/dimension to sort by
 
 ## License ##
 

data/Rakefile

@@ -2,6 +2,12 @@ require "bundler/gem_tasks"
 
 require 'oauth2'
 
+# get oauth2 via device code, unimplemented as of now
+# curl -d "client_id={{client_id}}&scope=https://www.googleapis.com/auth/analytics.readonly" https://accounts.google.com/o/oauth2/device/code
+# { "device_code" : "4/8O1xUKWzOdJESG7ednnulZPsbyNt", "user_code" : "3tywhirg", "verification_url" : "http://www.google.com/device", "expires_in" : 1800, "interval" : 5 }
+# 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
   def client
     # This is my test client account for Legato.

data/legato.gemspec

@@ -3,6 +3,8 @@ $:.push File.expand_path("../lib", __FILE__)
 require "legato/version"
 
 Gem::Specification.new do |s|
+  s.required_ruby_version = '>= 1.9.2'
+
   s.name        = "legato"
   s.version     = Legato::VERSION
   s.authors     = ["Tony Pitale"]
@@ -11,7 +13,7 @@ Gem::Specification.new do |s|
   s.summary     = %q{Access the Google Analytics API with Ruby}
   s.description = %q{Access the Google Analytics Core Reporting and Management APIs with Ruby. Create models for metrics and dimensions. Filter your data to tell you what you need.}
 
-  s.rubyforge_project = "legato" # ?
+  s.rubyforge_project = "legato"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
@@ -19,11 +21,13 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # specify any dependencies here; for example:
+  s.add_development_dependency "rake"
   s.add_development_dependency "rspec"
   s.add_development_dependency "mocha"
   s.add_development_dependency "bourne"
   s.add_development_dependency "vcr", "2.0.0.beta2"
   s.add_development_dependency "fakeweb"
 
+  s.add_runtime_dependency "multi_json"
   s.add_runtime_dependency "oauth2"
 end

data/lib/legato.rb

@@ -1,7 +1,7 @@
 require "legato/version"
 
-require 'json'
 require 'oauth2'
+require 'multi_json'
 require 'cgi'
 require 'ostruct'
 

data/lib/legato/collection.rb

@@ -0,0 +1,5 @@
+module Legato
+	class Collection
+		
+	end
+end

data/lib/legato/filter.rb

@@ -3,27 +3,29 @@ module Legato
     attr_accessor :field, :operator, :value, :join_character
 
     OPERATORS = {
+      # metrics
       :eql => '==',
       :not_eql => '!=',
       :gt => '>',
       :gte => '>=',
       :lt => '<',
       :lte => '<=',
+      # dimensions
       :matches => '==',
       :does_not_match => '!=',
-      :contains => '=~',
-      :does_not_contain => '!~',
       :substring => '=@',
       :not_substring => '!@',
-      :desc => '-',
-      :descending => '-'
+      :contains => '=~', # regex
+      :does_not_contain => '!~' # regex
+      # :desc => '-',
+      # :descending => '-'
     }
 
-    def initialize(field, operator, value, join_character=';')
+    def initialize(field, operator, value, join_character)
       self.field = field
       self.operator = operator
       self.value = value
-      self.join_character = join_character
+      self.join_character = join_character # if nil, will be overridden by Query#apply_filter
     end
 
     def google_field
@@ -34,8 +36,12 @@ module Legato
       OPERATORS[operator]
     end
 
+    # escape comma and semicolon in value to differentiate
+    # from those used as join characters for OR/AND
     def escaped_value
-      CGI.escape(value.to_s.gsub(/([,;\\])/) {|c| '\\'+c})
+      # backslash is escaped in strings
+      # oauth will cgi/uri escape for us
+      value.to_s.gsub(/([,;])/) {|c| '\\'+c}
     end
 
     def to_param

data/lib/legato/management/finder.rb

@@ -7,7 +7,7 @@ module Legato
 
       def all(user, path=default_path)
         json = user.access_token.get(base_uri + path).body
-        JSON.parse(json)['items'].map {|item| new(item, user)}
+        MultiJson.decode(json)['items'].map {|item| new(item, user)}
       end
     end
   end

data/lib/legato/management/profile.rb

@@ -13,12 +13,13 @@ module Legato
         self.class.default_path + "/" + id.to_s
       end
 
-      attr_accessor :id, :name, :user
+      attr_accessor :id, :name, :web_property_id, :user
 
       def initialize(attributes, user)
         self.user = user
         self.id = attributes['id']
         self.name = attributes['name']
+        self.web_property_id = attributes['webPropertyId']
       end
 
       def self.for_account(account)

data/lib/legato/model.rb

@@ -18,11 +18,11 @@ module Legato
       @filters ||= {}
     end
 
-    def filter(name, block)
+    def filter(name, &block)
       filters[name] = block
 
       (class << self; self; end).instance_eval do
-        define_method(name) {|*args| Query.new(self).apply_filter(*args, block)}
+        define_method(name) {|*args| Query.new(self).apply_filter(*args, &block)}
       end
     end
 

data/lib/legato/query.rb

@@ -3,18 +3,19 @@ module Legato
     include Enumerable
 
     MONTH = 2592000
+    REQUEST_FIELDS = 'columnHeaders/name,rows,totalResults,totalsForAllResults'
 
-    def define_filter(name, block)
+    def define_filter(name, &block)
       (class << self; self; end).instance_eval do
-        define_method(name) {|*args| apply_filter(*args, block)}
+        define_method(name) {|*args| apply_filter(*args, &block)}
       end
     end
 
     def self.define_filter_operators(*methods)
       methods.each do |method|
         class_eval <<-CODE
-          def #{method}(field, value)
-            Filter.new(field, :#{method}, value) # defaults to joining with AND
+          def #{method}(field, value, join_character=nil)
+            Filter.new(field, :#{method}, value, join_character)
           end
         CODE
       end
@@ -22,7 +23,7 @@ module Legato
 
     attr_reader :parent_klass
     attr_accessor :profile, :start_date, :end_date
-    attr_accessor :order, :limit, :offset#, :segment # individual, overwritten
+    attr_accessor :sort, :limit, :offset#, :segment # individual, overwritten
     attr_accessor :filters # appended to, may add :segments later for dynamic segments
 
     def initialize(klass)
@@ -33,7 +34,7 @@ module Legato
       self.end_date = Time.now
 
       klass.filters.each do |name, block|
-        define_filter(name, block)
+        define_filter(name, &block)
       end
 
       # may add later for dynamic segments
@@ -42,14 +43,14 @@ module Legato
       # end
     end
 
-    def apply_filter(*args, block)
+    def apply_filter(*args, &block)
       @profile = extract_profile(args)
 
       join_character = Legato.and_join_character # filters are joined by AND
 
       # # block returns one filter or an array of filters
       Array.wrap(instance_exec(*args, &block)).each do |filter|
-        filter.join_character = join_character
+        filter.join_character ||= join_character # only set when not set explicitly
         self.filters << filter
 
         join_character = Legato.or_join_character # arrays are joined by OR
@@ -60,7 +61,7 @@ module Legato
     def apply_options(options)
       if options.has_key?(:sort)
         # warn
-        options[:order] = options.delete(:sort)
+        options[:sort] = options.delete(:sort)
       end
 
       apply_basic_options(options)
@@ -70,7 +71,7 @@ module Legato
     end
 
     def apply_basic_options(options)
-      [:order, :limit, :offset, :start_date, :end_date].each do |key| #:segment
+      [:sort, :limit, :offset, :start_date, :end_date].each do |key| #:segment
         self.send("#{key}=".to_sym, options[key]) if options.has_key?(key)
       end
     end
@@ -108,7 +109,10 @@ module Legato
     end
 
     def load
-      @collection = request_for_query.collection
+      response = request_for_query
+      @collection = response.collection
+      @total_results = response.total_results
+      @totals_for_all_results = response.totals_for_all_results
       @loaded = true
     end
 
@@ -118,12 +122,24 @@ module Legato
     end
     alias :to_a :collection
 
+    def total_results
+      load unless loaded?
+      @total_results
+    end
+
+    def totals_for_all_results
+      load unless loaded?
+      @totals_for_all_results
+    end
+
     def each(&block)
       collection.each(&block)
     end
 
     # if no filters, we use results to add profile
     def results(profile=nil, options={})
+      options, profile = profile, nil if profile.is_a?(Hash)
+
       self.profile = profile unless profile.nil?
       apply_options(options)
       self
@@ -145,8 +161,8 @@ module Legato
       parent_klass.dimensions
     end
 
-    def order=(arr)
-      @order = Legato::ListParameter.new(:order, arr)
+    def sort=(arr)
+      @sort = Legato::ListParameter.new(:sort, arr)
     end
 
     # def segment_id
@@ -165,10 +181,11 @@ module Legato
         'max-results' => limit,
         'start-index' => offset,
         # 'segment' => segment_id,
-        'filters' => filters.to_params # defaults to AND filtering
+        'filters' => filters.to_params, # defaults to AND filtering
+        'fields' => REQUEST_FIELDS
       }
 
-      [metrics, dimensions, order].each do |list|
+      [metrics, dimensions, sort].each do |list|
         params.merge!(list.to_params) unless list.nil?
       end
 

data/lib/legato/request.rb

@@ -11,7 +11,7 @@
 #     end
 # 
 #     def parsed_response
-#       JSON.parse(raw_response)
+#       MultiJson.decode(raw_response)
 #     end
 # 
 #     def raw_response

data/lib/legato/response.rb

@@ -6,13 +6,21 @@ module Legato
     end
 
     def data
-      @data ||= JSON.parse(@raw_response.body)
+      @data ||= MultiJson.decode(@raw_response.body)
     end
 
     def collection
       raw_attributes.map {|attributes| @instance_klass.new(attributes)}
     end
 
+    def total_results
+      data["totalResults"]
+    end
+
+    def totals_for_all_results
+      Hash[data["totalsForAllResults"].map{|k,v| [Legato.from_ga_string(k), number_for(v)]}]
+    end
+
     private
     def headers
       data['columnHeaders']
@@ -23,69 +31,16 @@ module Legato
     end
 
     def rows
-      data['rows']
+      Array.wrap(data['rows']).compact
     end
 
     def raw_attributes
       rows.map {|row| Hash[fields.zip(row)]}
     end
-  end
-end
 
-# module Legato
-#   class Response
-#     KEYS = ['dxp$metric', 'dxp$dimension']
-# 
-#     # we could take the request, and be lazy about loading here, #refactoring
-#     def initialize(response_body, instance_klass = OpenStruct)
-#       @data = response_body
-#       @instance_klass = instance_klass
-#     end
-# 
-#     def results
-#       if @results.nil?
-#         @results = ResultSet.new(parse)
-#         @results.total_results = parse_total_results
-#         @results.sampled = parse_sampled_flag
-#       end
-# 
-#       @results
-#     end
-# 
-#     def sampled?
-#     end
-# 
-#     private
-#     def parse
-#       entries.map do |entry|
-#         @instance_klass.new(Hash[
-#           values_for(entry).map {|v| [Garb.from_ga(v['name']), v['value']]}
-#         ])
-#       end
-#     end
-# 
-#     def entries
-#       feed? ? [parsed_data['feed']['entry']].flatten.compact : []
-#     end
-# 
-#     def parse_total_results
-#       feed? ? parsed_data['feed']['openSearch:totalResults'].to_i : 0
-#     end
-# 
-#     def parse_sampled_flag
-#       feed? ? (parsed_data['feed']['dxp$containsSampledData'] == 'true') : false
-#     end
-# 
-#     def parsed_data
-#       @parsed_data ||= JSON.parse(@data)
-#     end
-# 
-#     def feed?
-#       !parsed_data['feed'].nil?
-#     end
-# 
-#     def values_for(entry)
-#       KEYS.map {|k| entry[k]}.flatten.compact
-#     end
-#   end
-# end
+    def number_for(str)
+      return str.to_f if str.index('.')
+      str.to_i
+    end
+  end
+end

data/lib/legato/version.rb

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

data/spec/lib/legato/filter_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Legato::Filter do
   context "a Filter instance" do
     before :each do
-      @filter = Legato::Filter.new(:exits, :lt, 1000)
+      @filter = Legato::Filter.new(:exits, :lt, 1000, nil)
     end
 
     it 'has a field' do
@@ -28,8 +28,8 @@ describe Legato::Filter do
       @filter.value.should == 1000
     end
 
-    it 'has a default join character' do
-      @filter.join_character.should == ';'
+    it 'has a no default join character' do
+      @filter.join_character.should == nil
     end
 
     it 'represents itself as a parameter' do
@@ -45,5 +45,15 @@ describe Legato::Filter do
     it 'returns to_param if joining with nil' do
       @filter.join_with(nil).should == @filter.to_param
     end
+
+    it 'properly escapes commas' do
+      @filter.value = ","
+      @filter.escaped_value.should == "\\,"
+    end
+
+    it 'properly escapes semicolons' do
+      @filter.value = ";"
+      @filter.escaped_value.should == "\\;"
+    end
   end
 end

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

@@ -10,10 +10,11 @@ describe Legato::Management::Profile do
 
     it 'creates a new profile instance from a hash of attributes' do
       user = stub
-      profile = Legato::Management::Profile.new({"id" => 12345, "name" => "Profile 1"}, user)
+      profile = Legato::Management::Profile.new({"id" => 12345, "name" => "Profile 1", "webPropertyId" => "WebProperty 7"}, user)
       profile.user.should == user
       profile.id.should == 12345
       profile.name.should == "Profile 1"
+      profile.web_property_id.should == "WebProperty 7"
     end
 
     it 'returns an array of all profiles available to a user under an account' do

data/spec/lib/legato/model_spec.rb

@@ -38,12 +38,12 @@ describe "Legato::Model" do
       end
 
       it 'creates a class method' do
-        @model.filter :high, @block
+        @model.filter :high, &@block
         @model.respond_to?(:high).should be_true
       end
 
       it 'stores the filter' do
-        @model.filter :high, @block
+        @model.filter :high, &@block
         @model.filters[:high].should == @block
       end
 
@@ -51,11 +51,11 @@ describe "Legato::Model" do
         query = stub(:apply_filter => "a query")
         Legato::Query.stubs(:new).returns(query)
 
-        @model.filter :high, @block
+        @model.filter :high, &@block
         @model.high('arg1').should == 'a query'
 
         Legato::Query.should have_received(:new).with(@model)
-        query.should have_received(:apply_filter).with('arg1', @block)
+        query.should have_received(:apply_filter).with('arg1')
       end
     end
 

data/spec/lib/legato/query_spec.rb

@@ -10,7 +10,7 @@ describe Legato::Query do
       it "returns a new filter for #{operator} to the set" do
         Legato::Filter.stubs(:new).returns("a filter")
         filter = @query.send(operator, :key, 2000)
-        Legato::Filter.should have_received(:new).with(:key, operator, 2000)
+        Legato::Filter.should have_received(:new).with(:key, operator, 2000, nil)
       end
     end
   end
@@ -39,7 +39,7 @@ describe Legato::Query do
     it "has filter methods that call apply with the given block" do
       @query.stubs(:apply_filter)
       @query.high('hi')
-      @query.should have_received(:apply_filter).with('hi', @block)
+      @query.should have_received(:apply_filter).with('hi')
     end
 
     it 'does not load results by default' do
@@ -47,7 +47,7 @@ describe Legato::Query do
     end
 
     it "loads a collection of results" do
-      response = stub(:collection => [])
+      response = stub(:collection => [], :total_results => 0, :totals_for_all_results => {})
       user = stub(:request => response)
       @query.stubs(:profile => stub(:user => user))
 
@@ -56,15 +56,29 @@ describe Legato::Query do
       @query.loaded?.should be_true
       @query.profile.user.should have_received(:request).with(@query)
       response.should have_received(:collection)
+      response.should have_received(:total_results)
+      response.should have_received(:totals_for_all_results)
     end
 
     it "returns the collection" do
-      @query.stubs(:request_for_query).returns(stub(:collection => [1,2,3]))
+      @query.stubs(:request_for_query).returns(stub(:collection => [1,2,3], :total_results => 3, :totals_for_all_results => {'foo' => 34.2}))
       @query.load
       @query.collection.should == [1,2,3]
       @query.to_a.should == [1,2,3]
     end
 
+    it "returns the total number of results" do
+      @query.stubs(:request_for_query).returns(stub(:collection => [1,2,3], :total_results => 3, :totals_for_all_results => {'foo' => 34.2}))
+      @query.load
+      @query.total_results.should == 3
+    end
+
+    it "returns the totals for all results" do
+      @query.stubs(:request_for_query).returns(stub(:collection => [1,2,3], :total_results => 3, :totals_for_all_results => {'foo' => 34.2}))
+      @query.load
+      @query.totals_for_all_results.should == {'foo' => 34.2}
+    end
+
     it "behaves like an enumerable delegating to the collection" do
       collection = []
       collection.stubs(:each)
@@ -100,9 +114,19 @@ describe Legato::Query do
       @query.should have_received(:apply_options).with({})
     end
 
+    it 'sets options and returns self' do
+      @query.stubs(:profile=)
+      @query.stubs(:apply_options)
+
+      @query.results({:sort => [:city]}).should == @query
+
+      @query.should have_received(:profile=).never
+      @query.should have_received(:apply_options).with({:sort => [:city]})
+    end
+
     context 'when applying filters' do
       before :each do
-        @filter = Legato::Filter.new(:key, :eql, 1000)
+        @filter = Legato::Filter.new(:key, :eql, 1000, nil)
         @query.stubs(:eql).returns(@filter)
 
         @filters = stub(:<<)
@@ -110,17 +134,17 @@ describe Legato::Query do
       end
 
       it 'returns the query' do
-        @query.apply_filter(@block).should == @query
+        @query.apply_filter(&@block).should == @query
       end
 
       it 'executes the block' do
-        @query.apply_filter(@block)
+        @query.apply_filter(&@block)
         @query.should have_received(:eql).with(:key, 1000)
       end
 
       it 'accepts a profile as the first argument' do
         profile = Legato::Management::Profile.new({}, stub)
-        @query.apply_filter(profile, @block)
+        @query.apply_filter(profile, &@block)
         @query.should have_received(:eql)
         @query.profile.should == profile
       end
@@ -128,7 +152,7 @@ describe Legato::Query do
       it 'accepts a profile as the last argument' do
         profile = Legato::Management::Profile.new({}, stub)
         block_with_arg = lambda {|count| eql(:key, count)}
-        @query.apply_filter(100, profile, block_with_arg)
+        @query.apply_filter(100, profile, &block_with_arg)
         @query.should have_received(:eql).with(:key, 100)
         @query.profile.should == profile
       end
@@ -136,12 +160,12 @@ describe Legato::Query do
       it 'does not override the existing profile if none is provide' do
         @query.profile = Legato::Management::Profile.new({}, stub)
         block_with_arg = lambda {|count| eql(:key, count)}
-        @query.apply_filter(100, block_with_arg)
+        @query.apply_filter(100, &block_with_arg)
         @query.profile.should_not == nil
       end
 
       it 'adds to the filter set' do
-        @query.apply_filter(@block)
+        @query.apply_filter(&@block)
 
         @filters.should have_received(:<<).with(@filter)
       end
@@ -150,7 +174,7 @@ describe Legato::Query do
         block = lambda {|*browsers| browsers.map {|browser| eql(:browser, browser)}}
         @filter.stubs(:join_character=)
 
-        @query.apply_filter('chrome', 'safari', block)
+        @query.apply_filter('chrome', 'safari', &block)
 
         @filter.should have_received(:join_character=).with(Legato.and_join_character)
         @filter.should have_received(:join_character=).with(Legato.or_join_character)
@@ -162,26 +186,26 @@ describe Legato::Query do
         @query.apply_options({}).should == @query
       end
 
-      it "stores the order" do
-        @query.apply_options({:order => [:page_path]})
-        @query.order.should == Legato::ListParameter.new(:order, [:page_path])
+      it "stores the sort" do
+        @query.apply_options({:sort => [:page_path]})
+        @query.sort.should == Legato::ListParameter.new(:sort, [:page_path])
       end
 
-      it 'replaces the order' do
-        @query.order = [:pageviews]
-        @query.apply_options({:order => [:page_path]})
-        @query.order.should == Legato::ListParameter.new(:order, [:page_path])
+      it 'replaces the sort' do
+        @query.sort = [:pageviews]
+        @query.apply_options({:sort => [:page_path]})
+        @query.sort.should == Legato::ListParameter.new(:sort, [:page_path])
       end
 
-      it "does not replace order if option is omitted" do
-        @query.order = [:pageviews]
+      it "does not replace sort if option is omitted" do
+        @query.sort = [:pageviews]
         @query.apply_options({})
-        @query.order.should == Legato::ListParameter.new(:order, [:pageviews])
+        @query.sort.should == Legato::ListParameter.new(:sort, [:pageviews])
       end
 
-      it "moves :sort option into order" do
+      it "moves :sort option into sort" do
         @query.apply_options({:sort => [:page_path]})
-        @query.order.should == Legato::ListParameter.new(:order, [:page_path])
+        @query.sort.should == Legato::ListParameter.new(:sort, [:page_path])
       end
 
       it "sets the limit" do
@@ -265,6 +289,7 @@ describe Legato::Query do
         @query.to_params.should == {
           'ids' => 'ga:1234567890',
           'start-date' => Legato.format_time(Time.now-Legato::Query::MONTH),
+          'fields' => Legato::Query::REQUEST_FIELDS,
           'end-date' => Legato.format_time(Time.now)
         }
       end
@@ -273,7 +298,11 @@ describe Legato::Query do
         now = Time.now
         @query.start_date = now
         @query.end_date = now
-        @query.to_params.should == {'start-date' => Legato.format_time(now), 'end-date' => Legato.format_time(now)}
+        @query.to_params.should == {
+          'start-date' => Legato.format_time(now),
+          'fields' => Legato::Query::REQUEST_FIELDS,
+          'end-date' => Legato.format_time(now)
+        }
       end
 
       it 'includes the limit' do
@@ -311,13 +340,13 @@ describe Legato::Query do
         @query.to_params['dimensions'].should == 'browser,country'
       end
 
-      it 'includes order' do
-        order = Legato::ListParameter.new(:order)
-        order.stubs(:to_params).returns({'order' => 'pageviews'})
-        order.stubs(:empty?).returns(false)
-        @query.stubs(:order).returns(order)
+      it 'includes sort' do
+        sort = Legato::ListParameter.new(:sort)
+        sort.stubs(:to_params).returns({'sort' => 'pageviews'})
+        sort.stubs(:empty?).returns(false)
+        @query.stubs(:sort).returns(sort)
 
-        @query.to_params['order'].should == 'pageviews'
+        @query.to_params['sort'].should == 'pageviews'
       end
     end
   end

data/spec/lib/legato/response_spec.rb

@@ -11,5 +11,18 @@ describe Legato::Response do
     it 'has a collection of OpenStruct instances' do
       @response.collection.first.should == OpenStruct.new({:browser=>"Android Browser", :pageviews=>"93"})
     end
+
+    it 'has the number of total results' do
+      @response.total_results.should == 13
+    end
+
+    it 'has the totals for all results hash' do
+      @response.totals_for_all_results.should == {'pageviews' => 3710}
+    end
+
+    it 'handles no rows returned' do
+      @response.stubs(:data).returns({'rows' => nil})
+      @response.collection.should == []
+    end
   end
-end
+end

data/spec/support/examples/management_finder.rb

@@ -1,6 +1,6 @@
 shared_examples_for "a management finder" do
   it "returns an array of all #{subject_class_name} available to a user" do
-    JSON.stubs(:parse).returns({'items' => ['item1', 'item2']})
+    MultiJson.stubs(:decode).returns({'items' => ['item1', 'item2']})
     response = stub(:body => 'some json')
     access_token = stub(:get => response)
     user = stub(:access_token => access_token)
@@ -11,7 +11,7 @@ shared_examples_for "a management finder" 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)
-    JSON.should have_received(:parse).with('some json')
+    MultiJson.should have_received(:decode).with('some json')
     described_class.should have_received(:new).with('item1', user)
     described_class.should have_received(:new).with('item2', user)
   end

metadata

@@ -1,98 +1,158 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: legato
-version: !ruby/object:Gem::Version
-  version: 0.0.1
+version: !ruby/object:Gem::Version 
+  hash: 27
   prerelease: 
+  segments: 
+  - 0
+  - 0
+  - 2
+  version: 0.0.2
 platform: ruby
-authors:
+authors: 
 - Tony Pitale
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-14 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &70178713324740 !ruby/object:Gem::Requirement
+
+date: 2012-04-26 00:00:00 -04:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
   type: :development
+  requirement: *id001
+  name: rake
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: *70178713324740
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: &70178713323760 !ruby/object:Gem::Requirement
+  type: :development
+  requirement: *id002
+  name: rspec
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
   type: :development
+  requirement: *id003
+  name: mocha
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: *70178713323760
-- !ruby/object:Gem::Dependency
+  type: :development
+  requirement: *id004
   name: bourne
-  requirement: &70178713322240 !ruby/object:Gem::Requirement
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: -161295594
+        segments: 
+        - 2
+        - 0
+        - 0
+        - beta
+        - 2
+        version: 2.0.0.beta2
   prerelease: false
-  version_requirements: *70178713322240
-- !ruby/object:Gem::Dependency
+  type: :development
+  requirement: *id005
   name: vcr
-  requirement: &70178713320200 !ruby/object:Gem::Requirement
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
-        version: 2.0.0.beta2
-  type: :development
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: *70178713320200
-- !ruby/object:Gem::Dependency
+  type: :development
+  requirement: *id006
   name: fakeweb
-  requirement: &70178713319120 !ruby/object:Gem::Requirement
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: *70178713319120
-- !ruby/object:Gem::Dependency
-  name: oauth2
-  requirement: &70178713318020 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :runtime
+  requirement: *id007
+  name: multi_json
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: *70178713318020
-description: Access the Google Analytics Core Reporting and Management APIs with Ruby.
-  Create models for metrics and dimensions. Filter your data to tell you what you
-  need.
-email:
+  type: :runtime
+  requirement: *id008
+  name: oauth2
+description: Access the Google Analytics Core Reporting and Management APIs with Ruby. Create models for metrics and dimensions. Filter your data to tell you what you need.
+email: 
 - tpitale@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - README.md
 - Rakefile
 - legato.gemspec
 - lib/legato.rb
+- lib/legato/collection.rb
 - lib/legato/core_ext/array.rb
 - lib/legato/core_ext/string.rb
 - lib/legato/filter.rb
@@ -130,37 +190,43 @@ files:
 - spec/spec_helper.rb
 - spec/support/examples/management_finder.rb
 - spec/support/macros/oauth.rb
+has_rdoc: true
 homepage: http://github.com/tpitale/legato
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 4156627960004650884
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 55
+      segments: 
+      - 1
+      - 9
+      - 2
+      version: 1.9.2
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 4156627960004650884
+      version: "0"
 requirements: []
+
 rubyforge_project: legato
-rubygems_version: 1.8.6
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Access the Google Analytics API with Ruby
-test_files:
+test_files: 
 - spec/cassettes/management/accounts.json
 - spec/cassettes/management/profiles.json
 - spec/cassettes/management/web_properties.json