staccato 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a133c5bd94203f0b4f6f66e66d0b4d183d4a8e28
-  data.tar.gz: 57c730f2fb6d60554ec02a7c50ccceb02bdd195a
+  metadata.gz: e97aa73390d413bbedaa2e0e446464786fd1b49f
+  data.tar.gz: cc2f451c4c4fb995f7e77eb5870b6f710b492862
 SHA512:
-  metadata.gz: 72ef4b784bc8da3969708389bc7934027d313882fff8bcf26e45cd13d6a639bedd9549a20b2662b1bb4ff481f183fd37fad77d9c2f47b73a0c48a61f9459d883
-  data.tar.gz: c0e785ff8b4d1cbf569ecac480413c573a8e27f1c90497ef3c537bff6f497d9c0662ab8054c0b0d475198bfad3eabc794dce5253b3edf98a0991659103144c54
+  metadata.gz: ae763217419637c7abe0abf2a45dfdab7bc04d876e9b0619dfe0daa4b19f60abf6e1260f6a9cb26daca75ad9a24b5ad3f7fe5e491faa5dfb28ee8f36b80368f8
+  data.tar.gz: 742ac898202b1215eca2978528802a3cd05dbae7c04238edbb88a79c5eb514c2bd0946c7561028d5e83c34fe94c7e15807b07cb5ac4af0e866538829935f0583

data/.ruby-version

@@ -1 +1 @@
-2.2.2
+2.3

data/.travis.yml

@@ -1,8 +1,11 @@
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.6
-  - 2.2.2
+  - 1.9
+  - 2.0
+  - 2.1
+  - 2.2
+  - 2.3
+  - 2.4
+  - 2.5
 script: bundle exec rake
 sudo: false

data/CHANGELOG.md

@@ -1,4 +1,10 @@
-## Staccato 0.5.0 ##
+## Staccato 0.5.2 ##
+
+*   Multiple adapter support
+
+    *Tony Pitale - @tpitale*
+
+## Staccato 0.5.1 ##
 
 *   Logger adapter uses the appropriate `::Logger` class
 

data/README.md

@@ -10,6 +10,8 @@ https://developers.google.com/analytics/devguides/collection/protocol/v1/
 [![Build Status](https://travis-ci.org/tpitale/staccato.png?branch=master)](https://travis-ci.org/tpitale/staccato)
 [![Code Climate](https://codeclimate.com/github/tpitale/staccato.png)](https://codeclimate.com/github/tpitale/staccato)
 
+If you're using Rails and would like to use Staccato, we have an gem for that! [Staccato Rails](https://github.com/tpitale/staccato-rails)
+
 
 ## Installation
 
@@ -453,6 +455,20 @@ https://developers.google.com/analytics/devguides/collection/protocol/v1/paramet
 
 Staccato provides a variety of adapters for sending or debugging requests being made. To use them, first require the adapter by name: `require 'staccato/adapter/#{chosen-adapter-name}'`
 
+Multiple adapters can be used by calling `add_adapter`:
+
+```ruby
+require 'staccato/adapter/validate'
+
+tracker = Staccato.tracker('UA-XXXX-Y') do |c|
+  c.add_adapter Staccato::Adapter::Validate.new
+  c.add_adapter Staccato::Adapter::Logger.new(Staccato.ga_collection_uri)
+  c.add_adapter Staccato::Adapter::Faraday.new(Staccato.ga_collection_uri)
+end
+```
+
+**Results returned will be in an array, as returned by each adapter in the order the adapters were added.**
+
 ### HTTP Adapters ###
 
 Staccato provides a number of basic adapters to different ruby http libraries. By default, Staccato uses `net/http` when you create a new tracker. If you are using Faraday or [The Ruby HTTP library](https://github.com/httprb/http.rb) Staccato provides adapters.
@@ -519,6 +535,12 @@ tracker = Staccato.tracker('UA-XXXX-Y') do |c|
 end
 ```
 
+See results by printing a call to track any hit:
+
+```ruby
+puts tracker.pageview(path: '/')
+```
+
 By default, the staccato `default_adapter` is used to send validation hits, but a different adapter can be used (e.g. `Faraday` or `Net::HTTP`).
 
 ```ruby

data/lib/staccato.rb

@@ -36,7 +36,7 @@ module Staccato
 
   # The tracking endpoint we use to submit requests to GA
   def self.ga_collection_uri(ssl = false)
-    url = (ssl ? 'https://ssl' : 'http://www') + '.google-analytics.com/collect'
+    url = (ssl ? 'https://' : 'http://') + 'www.google-analytics.com/collect'
     URI(url)
   end
 

data/lib/staccato/tracker.rb

@@ -4,7 +4,6 @@ module Staccato
   # 
   # @author Tony Pitale
   class Tracker
-    attr_writer :adapter
     attr_accessor :hit_defaults
 
     # sets up a new tracker
@@ -15,10 +14,19 @@ module Staccato
       @id = id
       @client_id = client_id
       @ssl = options.delete(:ssl) || false
+      @adapters = []
 
       self.hit_defaults = options
     end
 
+    def adapter=(adapter)
+      @adapters = [new_adapter]
+    end
+
+    def add_adapter(adapter)
+      @adapters << adapter
+    end
+
     # The tracker id for GA
     # @return [String, nil]
     def id
@@ -165,20 +173,40 @@ module Staccato
 
     private
 
+    # @private
+    def single_adapter?
+      adapters.length == 1
+    end
+
     # @private
     def post(params)
-      adapter.post(params)
+      single_adapter? ? post_first(params) : post_all(params)
     end
 
-    def adapter
-      @adapter ||= Staccato.default_adapter.new(default_uri)
+    # @private
+    def post_first(params)
+      adapters.first.post(params)
+    end
+
+    # @private
+    def post_all(params)
+      adapters.map {|adapter| adapter.post(params)}
+    end
+
+    # @private
+    def adapters
+      @adapters.empty? ? [default_adapter] : @adapters
+    end
+
+    # @private
+    def default_adapter
+      @default_adapter ||= Staccato.default_adapter.new(default_uri)
     end
   end
 
   # A tracker which does no tracking
   #   Useful in testing
   class NoopTracker
-    attr_writer :adapter
     attr_accessor :hit_defaults
 
     # (see Tracker#initialize)
@@ -186,6 +214,14 @@ module Staccato
       self.hit_defaults = hit_defaults
     end
 
+    def adapter=(*)
+      []
+    end
+
+    def add_adapter(*)
+      []
+    end
+
     # (see Tracker#id)
     def id
       nil

data/lib/staccato/version.rb

@@ -1,4 +1,4 @@
 module Staccato
   # The current Staccato VERSION
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

data/spec/integration/tracker_spec.rb

@@ -1,5 +1,8 @@
 require 'spec_helper'
 
+require 'staccato/adapter/http'
+require 'staccato/adapter/net_http'
+
 describe Staccato::Tracker do
   let(:uri) {Staccato.ga_collection_uri}
   let(:tracker) {Staccato.tracker('UA-XXXX-Y')}
@@ -12,7 +15,7 @@ describe Staccato::Tracker do
 
   describe "#pageview" do
     before(:each) do
-      tracker.pageview(path: '/foobar', title: 'FooBar', hostname: 'mysite.com')
+      expect(tracker.pageview(path: '/foobar', title: 'FooBar', hostname: 'mysite.com')).to eq(response)
     end
 
     it 'tracks page path and page title' do
@@ -235,3 +238,22 @@ describe Staccato::Tracker do
     end
   end
 end
+
+describe Staccato::Tracker, "with multiple adapters" do
+  let(:uri) {Staccato.ga_collection_uri}
+  let(:net_http_adapter) {Staccato::Adapter::Net::HTTP.new(uri)}
+  let(:http_adapter) {Staccato::Adapter::HTTP.new(uri)}
+  let(:tracker) {Staccato.tracker('UA-XXXX-Y') do |c|
+    c.add_adapter net_http_adapter
+    c.add_adapter http_adapter
+  end}
+
+  before(:each) do
+    net_http_adapter.stubs(:post).returns("Net::HTTP response")
+    http_adapter.stubs(:post).returns("HTTP Response")
+  end
+
+  it 'returns an array of responses in order of adapter' do
+    expect(tracker.pageview(path: '/')).to eq(["Net::HTTP response", "HTTP Response"])
+  end
+end

data/spec/spec_helper.rb

@@ -6,6 +6,7 @@ require 'bundler/setup'
 require 'rspec'
 require 'mocha/api'
 require 'bourne'
+require 'net/http' # no longer auto-required in ruby
 
 require File.expand_path('../../lib/staccato', __FILE__)
 

data/staccato.gemspec

@@ -18,7 +18,6 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake", ">= 3.0.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "mocha"

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: staccato
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Tony Pitale
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-23 00:00:00.000000000 Z
+date: 2019-07-24 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement