rack-tracker 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7d3f0a731a9473254d058fda92f9e088a255470
-  data.tar.gz: 897423fe72752a8dc9a7a49513b6554b70245f53
+  metadata.gz: b473a608ce31dc8b7ccaeefd6f5dc63b2f646b06
+  data.tar.gz: 5222acfc0fc22d21c17bec320d67edb827d7c62a
 SHA512:
-  metadata.gz: d298b6b90718d9fbe380dc47c8408b1c9a7e987b2d85b2eafb98b69fb922289e5797e581891304c23f53dd5b9a0c26600a9cea4982ec7147c36f6f8e230cf6c9
-  data.tar.gz: 8480c1144c530cb3ba33739e4c5ecba55e5bcfa036bc14ced3633097590e936464899a49c31011380d1a9be90a8bd126d2034b5fc795aa96160c6de68196069a
+  metadata.gz: c76c3b35efb245af58c515e348301c699b6e91afc1a5476e98404937f3540716a453c82a5ffb01cb3d88febd49b1356b80d6995609550ad7101f3f8a405a907f
+  data.tar.gz: e1f155a40afb4f56467a10aff0bcec5dffe72584951daeb3ede7b24933322d804849376cf8ca045909b03fc6ac99362b3b6120a685d327a35d4081734c983b6d

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.2.6
+
+  * [ENHANCEMENT] rails 3 support
+
 # 0.2.5
 
   * [BUGFIX] stringify google analytics event values to be api compliant

data/README.md

@@ -259,7 +259,7 @@ Lets give it a try! We need to mount our new handler in the `Rack::Tracker` midd
 
 ```ruby
   config.middleware.use(Rack::Tracker) do
-    handler MyTracker, { awesome: true }
+    handler MyHandler, { awesome: true }
   end
 ````
 

data/lib/rack/tracker/extensions.rb

@@ -14,4 +14,20 @@ class Hash
       options
     end
   end
+
+  def compact
+    select { |_, value| !value.nil? }
+  end
+
+  def deep_merge!(other_hash, &block)
+    other_hash.each_pair do |k,v|
+      tv = self[k]
+      if tv.is_a?(Hash) && v.is_a?(Hash)
+        self[k] = tv.deep_merge(v, &block)
+      else
+        self[k] = block && tv ? block.call(k, tv, v) : v
+      end
+    end
+    self
+  end
 end

data/lib/rack/tracker/google_analytics/google_analytics.rb

@@ -25,7 +25,7 @@ class Rack::Tracker::GoogleAnalytics < Rack::Tracker::Handler
   end
 
   def tracker
-    options[:tracker].try(:call, env) || options[:tracker]
+    options[:tracker].respond_to?(:call) ? options[:tracker].call(env) : options[:tracker]
   end
 
   def render

data/lib/rack/tracker/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class Tracker
-    VERSION = '0.2.5'
+    VERSION = '0.2.6'
   end
 end

data/rack-tracker.gemspec

@@ -18,14 +18,14 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "rack", ">= 1.5.2"
+  spec.add_dependency "rack", ">= 1.4.0"
   spec.add_dependency "tilt", "~> 1.4.1"
-  spec.add_dependency "activesupport", ">= 4.0.0"
+  spec.add_dependency 'activesupport', '>= 3.0'
 
+  spec.add_development_dependency 'actionpack', '>= 3.0'
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 3.0.0"
   spec.add_development_dependency "capybara", "~> 2.4.1"
-  spec.add_development_dependency "actionpack", ">= 4.0.0"
   spec.add_development_dependency "pry"
 end

data/spec/support/metal_controller.rb

@@ -3,7 +3,14 @@ require 'action_controller'
 class MetalController < ActionController::Metal
   include Rack::Tracker::Controller
   include AbstractController::Rendering
-  include ActionView::Layouts
+
+  # depending on the actionpack version the layout code was moved
+  if defined?(ActionView::Layouts)
+    include ActionView::Layouts # => this is the new and shiny
+  else
+    include AbstractController::Layouts
+  end
+
   append_view_path File.join(File.dirname(__FILE__), '../fixtures/views')
   layout 'application'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-tracker
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Lars Brillert
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-20 00:00:00.000000000 Z
+date: 2014-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -45,14 +45,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -109,20 +123,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.4.1
-- !ruby/object:Gem::Dependency
-  name: actionpack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement