jirafe 0.6.0 → 0.7.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/README.md CHANGED
@@ -32,7 +32,7 @@ If you're using Jirafe in a rails app, drop this into `config/initializers/jiraf
32
32
 
33
33
  ```ruby
34
34
  Jirafe.configure do |config|
35
- config.api_key = '12345abcde' # required
35
+ config.token = '12345abcde' # required
36
36
  config.logger = Logger.new('/dev/null') # defaults to Rails.logger or Logger.new(STDOUT).
37
37
  # Set to Logger.new('/dev/null') to disable logging.
38
38
  end
@@ -43,6 +43,18 @@ module Jirafe
43
43
  [uri.host, uri.path].join("")
44
44
  end
45
45
 
46
+ def data_path
47
+ uri = URI.parse(callback_url)
48
+ [uri.host, uri.path].join("")
49
+ end
50
+
51
+ def default?
52
+ self.url == DEFAULT_URL &&
53
+ self.callback_url == DEFAULT_CALLBACK_URL &&
54
+ self.assets_url == DEFAULT_ASSETS_URL &&
55
+ self.tracking_url == DEFAULT_TRACKING_URL
56
+ end
57
+
46
58
  def reset!
47
59
  self.url = DEFAULT_URL
48
60
  self.callback_url = DEFAULT_CALLBACK_URL
@@ -7,7 +7,7 @@ module Jirafe
7
7
 
8
8
  base_uri Jirafe.config.url
9
9
  format :json
10
- default_params :token => Jirafe.config.token
10
+ default_params :token => Jirafe.config.token unless Jirafe.config.token.nil?
11
11
  debug_output Jirafe.config.logger if ENV["DEBUG_JIRAFE"]
12
12
 
13
13
  class << self
@@ -7,6 +7,10 @@ module Jirafe
7
7
  end
8
8
 
9
9
  def js_tag(json_data = "{}", html_options = {})
10
+ unless Jirafe.config.default?
11
+ original_json_data = JSON.parse(json_data)
12
+ json_data = { "baseUrl" => Jirafe.config.data_path }.merge(original_json_data).to_json
13
+ end
10
14
  tag_id = html_options[:id] || "jirafe_analytics"
11
15
  <<-HTML
12
16
  <script type='text/javascript' id='#{tag_id}'>
@@ -1,3 +1,3 @@
1
1
  module Jirafe
2
- VERSION = "0.6.0"
2
+ VERSION = "0.7.0"
3
3
  end
@@ -16,10 +16,10 @@ describe Jirafe::Tracker do
16
16
  let(:expected_html) do
17
17
  <<-HTML
18
18
  <script type='text/javascript' id='myid'>
19
- var jirafe = {"foo":"bar"};
19
+ var jirafe = {"baseUrl":"#{Jirafe.config.data_path}","foo":"bar"};
20
20
  (function(){
21
21
  var d=document,g=d.createElement('script'),s=d.getElementsByTagName('script')[0];
22
- g.type='text/javascript',g.defer=g.async=true;g.src=d.location.protocol+'//test-c.jirafe.com/jirafe.js';
22
+ g.type='text/javascript',g.defer=g.async=true;g.src=d.location.protocol+'//#{Jirafe.config.tracking_path}/jirafe.js';
23
23
  s.parentNode.insertBefore(g, s);
24
24
  })();
25
25
  </script>
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: jirafe
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.6.0
4
+ version: 0.7.0
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-09-14 00:00:00.000000000 Z
12
+ date: 2012-09-17 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: httparty