google_analytics_feeds 0.0.1 → 0.1.0

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.1.0

data/google_analytics_feeds.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{google_analytics_feeds}
-  s.version = "0.0.1"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Roland Swingler}]

data/lib/google_analytics_feeds.rb

@@ -133,6 +133,67 @@ module GoogleAnalyticsFeeds
     end
   end
 
+  class FilterBuilder
+    include Naming
+
+    def initialize
+      @filters = []
+    end
+
+    def build(&block)
+      instance_eval(&block)
+      @filters.join(';')
+    end
+
+    # TODO: remove duplication
+
+    def eql(name, value)
+      filter(name, value, '==')
+    end
+
+    def not_eql(name, value)
+      filter(name, value, '!=')
+    end
+
+    def contains(n, v)
+      filter(n, v, '=@')
+    end
+
+    def not_contains(n, v)
+      filter(n, v, '!@')
+    end
+
+    def gt(n, v)
+      filter(n, v, '>')
+    end
+
+    def gte(n, v)
+      filter(n, v, '>=')
+    end
+
+    def lt(n, v)
+      filter(n, v, '<')
+    end
+
+    def lte(n, v)
+      filter(n, v, '<=')
+    end
+        
+    def match(n, v)
+      filter(n, v, '=~')
+    end
+
+    def not_match(n, v)
+      filter(n, v, '!~')
+    end
+
+    private
+
+    def filter(name, value, operation)
+      @filters << [symbol_to_name(name), operation, value.to_s].join('')
+    end
+  end
+
   class DataFeed
     include Naming
     
@@ -179,6 +240,13 @@ module GoogleAnalyticsFeeds
       }
     end
 
+    def filters(&block)
+      builder = 
+      clone_and_set {|params|
+        params['filters'] = FilterBuilder.new.build(&block)
+      }
+    end
+
     # Sorts the result set by a column.
     #
     # Direction can be :asc or :desc.

data/spec/request_spec.rb

@@ -44,4 +44,17 @@ describe GoogleAnalyticsFeeds::DataFeed do
 
     headers["Authorization"].should == "GoogleLogin auth=123"
   end
+
+  it "can add filters" do
+    feed = described_class.new.
+      filters {
+      eql :baz, 4
+      contains :foo, "123"
+    }
+
+    uri = Addressable::URI.parse(feed.uri)
+    uri.query_values.should == {
+      "filters" => "ga:baz==4;ga:foo=@123"
+    }
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: google_analytics_feeds
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
-  - 0
   - 1
-  version: 0.0.1
+  - 0
+  version: 0.1.0
 platform: ruby
 authors: 
 - Roland Swingler