garb 0.7.1 → 0.7.2

data/lib/garb/filter_parameters.rb

@@ -4,7 +4,7 @@ module Garb
       methods.each do |method|
         class_eval <<-CODE
           def #{method}(field, value)
-            self.parameters << {SymbolOperator.new(field, :#{method}) => value}
+            @filter_hash.merge!({SymbolOperator.new(field, :#{method}) => value})
           end
         CODE
       end
@@ -20,7 +20,11 @@ module Garb
     end
 
     def filters(&block)
+      @filter_hash = {}
+
       instance_eval &block
+
+      self.parameters << @filter_hash
     end
 
     def to_params
@@ -28,8 +32,8 @@ module Garb
         param.map do |k,v|
           next unless k.is_a?(SymbolOperator)
           "#{URI.encode(k.to_google_analytics, /[=<>]/)}#{CGI::escape(v.to_s)}"
-        end.join(',') # Hash AND
-      end.join(';') # Array OR
+        end.join(';') # Hash AND (no duplicate keys)
+      end.join(',') # Array OR
 
       value.empty? ? {} : {'filters' => value}
     end

data/lib/garb/version.rb

@@ -3,7 +3,7 @@ module Garb
 
     MAJOR = 0
     MINOR = 7
-    TINY  = 1
+    TINY  = 2
 
     def self.to_s # :nodoc:
       [MAJOR, MINOR, TINY].join('.')

data/test/unit/garb/filter_parameters_test.rb

@@ -9,7 +9,9 @@ module Garb
           symbol = :foo
 
           SymbolOperator.expects(:new).with(:bar, operator).returns(new_operator)
-          @filter_parameters.send(operator.to_sym, :bar, 100)
+          @filter_parameters.filters do
+            send(operator.to_sym, :bar, 100)
+          end
 
           parameter = {new_operator => 100}
           assert_equal parameter, @filter_parameters.parameters.last
@@ -33,14 +35,14 @@ module Garb
       end
 
       context "when converting parameters hash into query string parameters" do
-        should "parameterize hash operators and join elements" do
+        should "parameterize hash operators and join elements with AND" do
           @filter_parameters.filters do
-            eql(:city, 'New York')
+            eql(:city, 'New York City')
             eql(:state, 'New York')
           end
 
-          params = {'filters' => 'ga:city%3D%3DNew+York;ga:state%3D%3DNew+York'}
-          assert_equal params, @filter_parameters.to_params
+          params = ['ga:city%3D%3DNew+York+City', 'ga:state%3D%3DNew+York']
+          assert_equal params, @filter_parameters.to_params['filters'].split(';').sort
         end
 
         should "properly encode operators" do

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: garb
 version: !ruby/object:Gem::Version 
-  version: 0.7.1
+  prerelease: false
+  segments: 
+  - 0
+  - 7
+  - 2
+  version: 0.7.2
 platform: ruby
 authors: 
 - Tony Pitale
@@ -9,29 +14,37 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-02 00:00:00 -05:00
+date: 2010-03-05 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: happymapper
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 3
+        - 0
         version: 0.3.0
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 3
+        - 0
         version: 2.3.0
-    version: 
+  type: :runtime
+  version_requirements: *id002
 description: 
 email: tony.pitale@viget.com
 executables: []
@@ -94,18 +107,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: viget
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Google Analytics API Ruby Wrapper