garb 0.4.0 → 0.4.1

data/Rakefile

@@ -19,6 +19,7 @@ spec = Gem::Specification.new do |s|
   s.test_files        = Dir.glob("test/**/*")
 
   s.add_dependency("happymapper", ["~> 0.3.0"])
+  s.add_dependency("activesupport", [">= 2.3.0"])
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|

data/lib/extensions/string.rb

@@ -1,12 +1,4 @@
 class String
-  def underscored
-    self.gsub(/([A-Z])/, '_\1').downcase
-  end
-  
-  def lower_camelized
-    self.gsub(/(_)(.)/) { $2.upcase }
-  end
-  
   def to_ga
     "ga:#{self}"
   end

data/lib/extensions/symbol.rb

@@ -5,7 +5,7 @@ class Symbol
     operators.each do |method, operator|
       class_eval <<-CODE
         def #{method}
-          Operator.new(self, '#{operator}')
+          Garb::Operator.new(self, '#{operator}')
         end
       CODE
     end
@@ -13,7 +13,7 @@ class Symbol
 
   # Sorting
   def desc
-    Operator.new(self, '-', true)
+    Garb::Operator.new(self, '-', true)
   end
 
   operator  :eql => '==',
@@ -31,6 +31,6 @@ class Symbol
 
   # Metric filters  
   def to_ga
-    "ga:#{self.to_s.lower_camelized}"
+    self.to_s.camelize(:lower).to_ga
   end
-end
+end

data/lib/garb.rb

@@ -2,10 +2,11 @@ $:.unshift File.expand_path(File.dirname(__FILE__))
 
 require 'net/http'
 require 'net/https'
-require 'rubygems'
+
 require 'cgi'
 require 'ostruct'
 require 'happymapper'
+require 'active_support'
 
 require 'garb/version'
 require 'garb/authentication_request'
@@ -17,9 +18,9 @@ require 'garb/report_parameter'
 require 'garb/report_response'
 require 'garb/resource'
 require 'garb/report'
+require 'garb/operator'
 
 require 'extensions/string'
-require 'extensions/operator'
 require 'extensions/symbol'
 require 'extensions/array'
 

data/lib/garb/operator.rb

@@ -0,0 +1,22 @@
+# Concept from dm-core
+module Garb
+  class Operator
+    attr_reader :target, :operator, :prefix
+  
+    def initialize(target, operator, prefix=false)
+      @target   = target.to_ga
+      @operator = operator
+      @prefix = prefix
+    end
+  
+    def to_ga
+      @prefix ? "#{operator}#{target}" : "#{target}#{operator}"
+    end
+  
+    def ==(rhs)
+      target == rhs.target &&
+      operator == rhs.operator &&
+      prefix == rhs.prefix
+    end
+  end
+end

data/lib/garb/profile.rb

@@ -13,7 +13,7 @@ module Garb
       attribute :value, String
 
       def instance_name
-        name.from_ga.underscored
+        name.from_ga.underscore
       end
     end
 

data/lib/garb/report_response.rb

@@ -13,12 +13,12 @@ module Garb
         hash = {}
         
         entry.metrics.each do |m|
-          name = m.name.sub(/^ga\:/,'').underscored
+          name = m.name.sub(/^ga\:/,'').underscore
           hash.merge!({name => m.value})
         end
         
         entry.dimensions.each do |d|
-          name = d.name.sub(/^ga\:/,'').underscored
+          name = d.name.sub(/^ga\:/,'').underscore
           hash.merge!({name => d.value})
         end
         

data/lib/garb/version.rb

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

data/test/unit/operator_test.rb

@@ -1,37 +1,39 @@
 require File.join(File.dirname(__FILE__), '..', '/test_helper')
 
-class OperatorTest < MiniTest::Unit::TestCase
-  context "An instance of an Operator" do
-    should "lower camelize the target" do
-      assert_equal "ga:uniqueVisits=", Operator.new(:unique_visits, "=").to_ga
-    end
+module Garb
+  class OperatorTest < MiniTest::Unit::TestCase
+    context "An instance of an Operator" do
+      should "lower camelize the target" do
+        assert_equal "ga:uniqueVisits=", Operator.new(:unique_visits, "=").to_ga
+      end
     
-    should "return target and operator together" do
-      assert_equal "ga:metric=", Operator.new(:metric, "=").to_ga
-    end
+      should "return target and operator together" do
+        assert_equal "ga:metric=", Operator.new(:metric, "=").to_ga
+      end
     
-    should "prefix the operator to the target" do
-      assert_equal "-ga:metric", Operator.new(:metric, "-", true).to_ga
-    end
+      should "prefix the operator to the target" do
+        assert_equal "-ga:metric", Operator.new(:metric, "-", true).to_ga
+      end
     
-    should "know if it is equal to another operator" do
-      op1 = Operator.new(:hello, "==")
-      op2 = Operator.new(:hello, "==")
-      assert_equal op1, op2
-    end
+      should "know if it is equal to another operator" do
+        op1 = Operator.new(:hello, "==")
+        op2 = Operator.new(:hello, "==")
+        assert_equal op1, op2
+      end
     
-    should "not be equal to another operator if target, operator, or prefix is different" do
-      op1 = Operator.new(:hello, "==")
-      op2 = Operator.new(:hello, "==", true)
-      refute_equal op1, op2
+      should "not be equal to another operator if target, operator, or prefix is different" do
+        op1 = Operator.new(:hello, "==")
+        op2 = Operator.new(:hello, "==", true)
+        refute_equal op1, op2
       
-      op1 = Operator.new(:hello1, "==")
-      op2 = Operator.new(:hello2, "==")
-      refute_equal op1, op2
+        op1 = Operator.new(:hello1, "==")
+        op2 = Operator.new(:hello2, "==")
+        refute_equal op1, op2
       
-      op1 = Operator.new(:hello, "!=")
-      op2 = Operator.new(:hello, "==")
-      refute_equal op1, op2
+        op1 = Operator.new(:hello, "!=")
+        op2 = Operator.new(:hello, "==")
+        refute_equal op1, op2
+      end
     end
   end
-end
+end

data/test/unit/symbol_test.rb

@@ -12,7 +12,7 @@ class SymbolTest < MiniTest::Unit::TestCase
       operator = stub()
       symbol = :foo
       
-      Operator.expects(:new).with(:foo, '-', true).returns(operator)
+      Garb::Operator.expects(:new).with(:foo, '-', true).returns(operator)
       assert_equal operator, :foo.desc
     end
 
@@ -22,7 +22,7 @@ class SymbolTest < MiniTest::Unit::TestCase
           new_operator = stub()
           symbol = :foo
 
-          Operator.expects(:new).with(:foo, operator).returns(new_operator)
+          Garb::Operator.expects(:new).with(:foo, operator).returns(new_operator)
           assert_equal new_operator, :foo.send(method)
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: garb
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors: 
 - Tony Pitale
@@ -23,6 +23,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.3.0
     version: 
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.3.0
+    version: 
 description: 
 email: tony.pitale@viget.com
 executables: []
@@ -35,13 +45,13 @@ files:
 - README.md
 - Rakefile
 - lib/extensions/array.rb
-- lib/extensions/operator.rb
 - lib/extensions/string.rb
 - lib/extensions/symbol.rb
 - lib/garb/account.rb
 - lib/garb/authentication_request.rb
 - lib/garb/data_request.rb
 - lib/garb/oauth_session.rb
+- lib/garb/operator.rb
 - lib/garb/profile.rb
 - lib/garb/report.rb
 - lib/garb/report_parameter.rb

data/lib/extensions/operator.rb

@@ -1,20 +0,0 @@
-# Concept from dm-core
-class Operator
-  attr_reader :target, :operator, :prefix
-  
-  def initialize(target, operator, prefix=false)
-    @target   = target.to_ga
-    @operator = operator
-    @prefix = prefix
-  end
-  
-  def to_ga
-    @prefix ? "#{operator}#{target}" : "#{target}#{operator}"
-  end
-  
-  def ==(rhs)
-    target == rhs.target &&
-    operator == rhs.operator &&
-    prefix == rhs.prefix
-  end
-end