garails 0.0.5 → 0.0.6

data/Gemfile

@@ -7,5 +7,7 @@ gem "rails", "~> 3.0.3"
 
 group :test do
   gem 'shoulda'
+  gem 'webmock'
+  gem 'flexmock'
 end
 

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    garails (0.0.5)
-      gabbara (~> 0.0.4)
+    garails (0.0.6)
+      gabbara (~> 0.0.5)
 
 GEM
   remote: http://rubygems.org/
@@ -34,11 +34,14 @@ GEM
       activemodel (= 3.0.3)
       activesupport (= 3.0.3)
     activesupport (3.0.3)
+    addressable (2.2.5)
     arel (2.0.6)
     builder (2.1.2)
+    crack (0.1.8)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    gabbara (0.0.4)
+    flexmock (0.9.0)
+    gabbara (0.0.5)
       activesupport
     i18n (0.5.0)
     mail (2.2.12)
@@ -72,11 +75,16 @@ GEM
     treetop (1.4.9)
       polyglot (>= 0.3.1)
     tzinfo (0.3.23)
+    webmock (1.6.2)
+      addressable (>= 2.2.2)
+      crack (>= 0.1.7)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  flexmock
   garails!
   rails (~> 3.0.3)
   shoulda
+  webmock

data/app/controllers/garails/google_analytics_controller.rb

@@ -18,7 +18,7 @@ class Garails::GoogleAnalyticsController < ActionController::Base
 
   def utm
     if Garails.ga_setup?
-      g = Garails.mobile_gabba(request, :utmn => params[:utmn])
+      g = Garails.mobile_gabba(request, :utmn => params[:utmn], :utmcc => "__utma=999.999.999.999.999.1;", :utmhid => "")
       g.page_view('', :utmvid => @visitor_id)
     end
     response.headers.merge(UTM_HEADERS)

data/garails.gemspec

@@ -17,5 +17,5 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency("gabbara", "~> 0.0.4")
+  s.add_dependency("gabbara", "~> 0.0.5")
 end

data/lib/garails/version.rb

@@ -1,3 +1,3 @@
 module Garails
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/test/controllers/google_analytics_controller_test.rb

@@ -4,13 +4,18 @@ class GoogleAnalyticsControllerTest < ActionController::TestCase
   tests Garails::GoogleAnalyticsController
 
   context "GET to :utm" do
-    setup { get :utm, :format => :gif }
+    setup do
+      flexmock(@controller, :rand => 405451725)
+      stub_analytics("0xd5d59357458cc280")
+      get :utm, :format => :gif
+    end
     should respond_with :success
     should assign_to(:visitor_id)
   end
 
   context "GET to :utm with guid" do
     setup do
+      stub_analytics("0x80620d96c658ed0f")
       request.env["HTTP_X_DCMGUID"] = "blah"
       get :utm, :format => :gif
     end
@@ -18,4 +23,14 @@ class GoogleAnalyticsControllerTest < ActionController::TestCase
     should assign_to(:visitor_id)
   end
 
+  def stub_analytics(vid)
+    query = {
+      :utmac => "MO-12345678-9", :utmcc => "__utma=999.999.999.999.999.1;", :utmcs => "UTF-8", 
+      :utmhn => "example.org", :utmip => "0.0.0.0", :utmr => "-", :utmul => "en-us", 
+      :utmvid => vid, :utmwv => "4.4sh" }
+    stub_request(:get, "http://www.google-analytics.com/__utm.gif").
+      with(:query => query, :headers => {'Accept'=>'*/*', 'User-Agent'=>'Rails%20Testing'}).
+      to_return(:status => 200, :body => "", :headers => {})
+  end
+
 end

data/test/test_app/config/initializers/garails.rb

@@ -0,0 +1 @@
+Garails.ga_account = 'UA-12345678-9'

data/test/test_helper.rb

@@ -3,4 +3,6 @@ $:.unshift File.dirname(__FILE__)
 
 require 'test_app/config/environment'
 require 'rails/test_help'
+require 'webmock/test_unit'
+require 'flexmock/test_unit'
 

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: garails
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 5
-  version: 0.0.5
+  prerelease: 
+  version: 0.0.6
 platform: ruby
 authors: 
 - Michael Reinsch
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-19 00:00:00 +09:00
+date: 2011-04-25 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,11 +21,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 0
-        - 4
-        version: 0.0.4
+        version: 0.0.5
   type: :runtime
   version_requirements: *id001
 description: Google Analytics for Rails
@@ -69,6 +61,7 @@ files:
 - test/test_app/config/environment.rb
 - test/test_app/config/environments/test.rb
 - test/test_app/config/initializers/backtrace_silencers.rb
+- test/test_app/config/initializers/garails.rb
 - test/test_app/config/initializers/inflections.rb
 - test/test_app/config/initializers/mime_types.rb
 - test/test_app/config/initializers/secret_token.rb
@@ -95,46 +88,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Google Analytics for Rails
-test_files: 
-- test/controllers/google_analytics_controller_test.rb
-- test/test_app/.gitignore
-- test/test_app/app/controllers/application_controller.rb
-- test/test_app/app/helpers/application_helper.rb
-- test/test_app/app/views/layouts/application.html.erb
-- test/test_app/config.ru
-- test/test_app/config/application.rb
-- test/test_app/config/boot.rb
-- test/test_app/config/database.yml
-- test/test_app/config/environment.rb
-- test/test_app/config/environments/test.rb
-- test/test_app/config/initializers/backtrace_silencers.rb
-- test/test_app/config/initializers/inflections.rb
-- test/test_app/config/initializers/mime_types.rb
-- test/test_app/config/initializers/secret_token.rb
-- test/test_app/config/initializers/session_store.rb
-- test/test_app/config/routes.rb
-- test/test_app/db/seeds.rb
-- test/test_app/public/404.html
-- test/test_app/public/422.html
-- test/test_app/public/500.html
-- test/test_app/public/favicon.ico
-- test/test_app/script/rails
-- test/test_helper.rb
+test_files: []
+