legato 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7f49997e495542d636ee2f1937c26f44a06f831
-  data.tar.gz: 4bada052ee24bcd680f3ab0e236e407991771526
+  metadata.gz: c6894ffe83c0b0804d91e08de3ff8b6afddf03fc
+  data.tar.gz: 75f96f307e200111ab1cb3ef0925aa3c1fe5d189
 SHA512:
-  metadata.gz: 9b32fd09f5268b038f2a39ce46b1cb2ea858d8bd7a776e5aa6094155f224a44610f5c75bbe656a8077f5373335ea93adcee3a2ca2d7bc04280130ac1037e1c44
-  data.tar.gz: 1f7b6b5f9ce488bee564710ad499adfa9b80059b309f0fbf35019134fd1e728e8c7da04e2a68b7edfe2ed5c7aba660bba2946f81d36ca2914deaf32cbcdfe584
+  metadata.gz: 3d9acc61f35b61b73969fbe12dace66ac5b82552e9089186825acf3596ba5e6c1f2578883acb56ab5d33b3ebb54d06157dcf2e40a2a4651b9281babbcd7628fe
+  data.tar.gz: 822a73cbf77fa7c33a12f21a7c71309b946cd18c9ca4f06b145e132aefcb1712488db0937d5d92343b13f6cf3b2e1e55026e6e4224cc6eb444b927894ea8584a

data/.travis.yml

@@ -1,6 +1,5 @@
 language: ruby
 rvm:
-  - 1.8.7
   - 1.9.2
   - 1.9.3
   - 2.0.0

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## Legato 0.5.0 ##
+
+*   Use Query#tracking_scope when converting `metrics`, `dimensions`, and `sort` list of parameters with `to_params`
+
+    *Tony Pitale*
+
 ## Legato 0.4.0 ##
 
 *   Adds support to lookup parent `web_property` or `account` from a child `profile`.

data/README.md

@@ -64,7 +64,7 @@ profile.user == user #=> true
 7. The profile can also lookup its "parent" Web Property
 
 ```ruby
-profile.web_propery
+profile.web_property
 ```
 
 ## Google Analytics Model ##

data/lib/legato.rb

@@ -25,7 +25,11 @@ module Legato
   end
 
   def self.format_time(t)
-    t.strftime('%Y-%m-%d')
+    if t.is_a?(String)
+      t
+    else
+      t.strftime('%Y-%m-%d')
+    end
   end
 
   def self.and_join_character

data/lib/legato/list_parameter.rb

@@ -1,12 +1,11 @@
 module Legato
   class ListParameter
 
-    attr_reader :name, :elements, :tracking_scope
+    attr_reader :name
 
-    def initialize(name, elements=[], tracking_scope = "ga")
+    def initialize(name, elements=[])
       @name = name
-      @elements = Array.wrap(elements)
-      @tracking_scope = tracking_scope
+      @elements = Set.new Array.wrap(elements).compact
     end
 
     def name
@@ -14,11 +13,15 @@ module Legato
     end
 
     def <<(element)
-      (@elements += Array.wrap(element)).compact!
+      @elements += Array.wrap(element).compact
       self
     end
 
-    def to_params
+    def elements
+      @elements.to_a
+    end
+
+    def to_params(tracking_scope)
       value = elements.map{|element| Legato.to_ga_string(element, tracking_scope)}.join(',')
       value.empty? ? {} : {name => value}
     end

data/lib/legato/model.rb

@@ -9,8 +9,7 @@ module Legato
     # @param *fields [Symbol] the names of the fields to retrieve
     # @return [ListParameter] the set of all metrics
     def metrics(*fields)
-      fields, options = options_from_fields(fields)
-      @metrics ||= ListParameter.new(:metrics, [], options.fetch(:tracking_scope, "ga"))
+      @metrics ||= ListParameter.new(:metrics, [])
       @metrics << fields
     end
 
@@ -19,8 +18,7 @@ module Legato
     # @param *fields [Symbol] the names of the fields to retrieve
     # @return [ListParameter] the set of all dimensions
     def dimensions(*fields)
-      fields, options = options_from_fields(fields)
-      @dimensions ||= ListParameter.new(:dimensions, [], options.fetch(:tracking_scope, "ga"))
+      @dimensions ||= ListParameter.new(:dimensions, [])
       @dimensions << fields
     end
 
@@ -61,7 +59,7 @@ module Legato
     end
 
     # Set the class used to make new instances of returned results from GA
-    # 
+    #
     # @param klass [Class] any class that accepts a hash of attributes to
     #   initialize the values of the class
     # @return the original class given
@@ -74,7 +72,7 @@ module Legato
     end
 
     # Builds a `query` to get results from GA
-    # 
+    #
     # @param profile [Legato::Management::Profile] the profile to query GA against
     # @param options [Hash] options:
     #   * start_date
@@ -92,16 +90,10 @@ module Legato
     end
 
     # Builds a `query` and sets the `realtime` property
-    # 
+    #
     # @return [Query] a new query with `realtime` property set
     def realtime
       Query.new(self).realtime
     end
-
-    def options_from_fields(fields)
-      options = fields.pop if fields.last.is_a?(Hash)
-      [fields, (options || {})]
-    end
-
   end
 end

data/lib/legato/query.rb

@@ -182,7 +182,7 @@ module Legato
     end
 
     def sort=(arr)
-      @sort = Legato::ListParameter.new(:sort, arr, tracking_scope)
+      @sort = Legato::ListParameter.new(:sort, arr)
     end
 
     def segment
@@ -221,7 +221,7 @@ module Legato
       }
 
       [metrics, dimensions, sort].each do |list|
-        params.merge!(list.to_params) unless list.nil?
+        params.merge!(list.to_params(tracking_scope)) unless list.nil?
       end
 
       params.reject {|k,v| v.nil? || v.to_s.strip.length == 0}

data/lib/legato/version.rb

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

data/spec/lib/legato/list_parameter_spec.rb

@@ -29,7 +29,7 @@ describe Legato::ListParameter do
 
     it 'converts itself to params' do
       @list_parameter << :pageviews
-      @list_parameter.to_params.should == {"metrics" => "ga:exits,ga:pageviews"}
+      @list_parameter.to_params("ga").should == {"metrics" => "ga:exits,ga:pageviews"}
     end
   end
-end
+end

data/spec/lib/legato/model_spec.rb

@@ -22,6 +22,13 @@ describe "Legato::Model" do
       @model.metrics.should == Legato::ListParameter.new(:metrics, [:exits, :pageviews])
     end
 
+    it 'does not add duplicated metrics' do
+      @model.metrics :exits
+      @model.metrics :exits
+      @model.metrics :exits, :exits
+      @model.metrics.should == Legato::ListParameter.new(:metrics, [:exits])
+    end
+
     it 'has a dimension' do
       @model.dimensions :browser
       @model.dimensions.should == Legato::ListParameter.new(:dimensions, [:browser])
@@ -32,6 +39,13 @@ describe "Legato::Model" do
       @model.dimensions.should == Legato::ListParameter.new(:dimensions, [:browser, :city])
     end
 
+    it 'does not add duplicated dimensions' do
+      @model.dimensions :browser
+      @model.dimensions :browser
+      @model.dimensions :browser, :browser
+      @model.dimensions.should == Legato::ListParameter.new(:dimensions, [:browser])
+    end
+
     it 'knows the instance class it should use' do
       klass = Class.new
       @model.set_instance_klass(klass)

data/spec/lib/legato/query_spec.rb

@@ -386,6 +386,17 @@ describe Legato::Query do
         }
       end
 
+      it "supports string formatted dates" do
+        @query.start_date = "2014-01-01"
+        @query.end_date = "yesterday"
+
+        @query.to_params.should == {
+          'start-date' => "2014-01-01",
+          'end-date' => "yesterday",
+          'fields' => Legato::Query::REQUEST_FIELDS,
+        }
+      end
+
       it 'includes the limit' do
         @query.limit = 1000
         @query.to_params['max-results'].should == 1000

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: legato
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Tony Pitale
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-14 00:00:00.000000000 Z
+date: 2015-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -204,7 +204,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: legato
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Access the Google Analytics API with Ruby