jirafe 0.6.0 → 0.7.0

data/README.md

@@ -32,7 +32,7 @@ If you're using Jirafe in a rails app, drop this into `config/initializers/jiraf
 
 ```ruby
 Jirafe.configure do |config|
-  config.api_key = '12345abcde'               # required
+  config.token  = '12345abcde'                # required
   config.logger = Logger.new('/dev/null')     # defaults to Rails.logger or Logger.new(STDOUT).
                                               # Set to Logger.new('/dev/null') to disable logging.
 end

data/lib/jirafe/configuration.rb

@@ -43,6 +43,18 @@ module Jirafe
       [uri.host, uri.path].join("")
     end
 
+    def data_path
+      uri = URI.parse(callback_url)
+      [uri.host, uri.path].join("")
+    end
+
+    def default?
+      self.url == DEFAULT_URL &&
+        self.callback_url == DEFAULT_CALLBACK_URL &&
+        self.assets_url == DEFAULT_ASSETS_URL &&
+        self.tracking_url == DEFAULT_TRACKING_URL
+    end
+
     def reset!
       self.url = DEFAULT_URL
       self.callback_url = DEFAULT_CALLBACK_URL

data/lib/jirafe/resource/jirafe_resource.rb

@@ -7,7 +7,7 @@ module Jirafe
 
       base_uri Jirafe.config.url
       format :json
-      default_params :token => Jirafe.config.token
+      default_params :token => Jirafe.config.token unless Jirafe.config.token.nil?
       debug_output Jirafe.config.logger if ENV["DEBUG_JIRAFE"]
 
       class << self

data/lib/jirafe/tracker.rb

@@ -7,6 +7,10 @@ module Jirafe
       end
 
       def js_tag(json_data = "{}", html_options = {})
+        unless Jirafe.config.default?
+          original_json_data = JSON.parse(json_data)
+          json_data = { "baseUrl" => Jirafe.config.data_path }.merge(original_json_data).to_json
+        end
         tag_id = html_options[:id] || "jirafe_analytics"
         <<-HTML
 <script type='text/javascript' id='#{tag_id}'>

data/lib/jirafe/version.rb

@@ -1,3 +1,3 @@
 module Jirafe
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

data/spec/jirafe/tracker_spec.rb

@@ -16,10 +16,10 @@ describe Jirafe::Tracker do
       let(:expected_html) do
         <<-HTML
 <script type='text/javascript' id='myid'>
-  var jirafe = {"foo":"bar"};
+  var jirafe = {"baseUrl":"#{Jirafe.config.data_path}","foo":"bar"};
   (function(){
   var d=document,g=d.createElement('script'),s=d.getElementsByTagName('script')[0];
-  g.type='text/javascript',g.defer=g.async=true;g.src=d.location.protocol+'//test-c.jirafe.com/jirafe.js';
+  g.type='text/javascript',g.defer=g.async=true;g.src=d.location.protocol+'//#{Jirafe.config.tracking_path}/jirafe.js';
   s.parentNode.insertBefore(g, s);
   })();
 </script>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jirafe
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-14 00:00:00.000000000 Z
+date: 2012-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty