charted 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a42efb242a29b6a2634fce409c83332faec2bb9f
-  data.tar.gz: 9107198182f58f9f07c10fe72d27b44f5fefca70
+  metadata.gz: 3b3722ae50640b979a76a4c63e96ac99301f837d
+  data.tar.gz: d89bdd5a8e34062b7ed6924cbed41ad509343399
 SHA512:
-  metadata.gz: 9fc09e83cc5c4bfb4cc34c9c13b461a40d6d8d07bdca7f582dd8a706452245deefb2ced18e8aebfaa38114333ae7c8df7f258169fd8fe93e396f069806636225
-  data.tar.gz: 8ad15e63db5b8576d3955088f292ea92b77f48b0e5f55771ab3c58bc92dde8f3aca49480bcf6cb6ac3f6eb877fd8ff06f2162896c074b133d8ac013407502563
+  metadata.gz: f20ed2703edf9b882c9c907efde422941da146926c6a698d839870307cf51df919163761a31b8f91b497e03599e81e03b2c3ab9dad0b15b78d4f1558f75256a0
+  data.tar.gz: 1a04f82b9337934b3309aab892dade88c978a4353d0a180bcc1fd7f5a481628586cd4d2ce751d727650b0d0976b1bc54d91d3bd7cd21f1bbca330062e4005713

data/lib/charted.rb

@@ -1,4 +1,3 @@
-require 'bundler/setup'
 require 'dashes'
 require 'date'
 require 'geoip'

data/lib/charted/app.rb

@@ -5,7 +5,7 @@ module Charted
     set :show_exceptions, false
 
     before do
-      @site = Site.first(domain: request.host)
+      @site = Site.first(domain: params[:domain] || request.host)
       halt(404) if @site.nil?
       @visitor = @site.visitor_with_cookie(request.cookies['charted'])
     end

data/lib/charted/command.rb

@@ -64,7 +64,7 @@ module Charted
         total = query.count
         query.group_and_count(field).each do |row|
           count = row[:count]
-          label = row[:label].to_s.strip
+          label = row[field].to_s.strip
           next if label == ""
           label = "#{label[0..37]}..." if label.length > 40
           rows << [format(count), "#{((count / total.to_f) * 100).round}%", label]

data/lib/charted/version.rb

@@ -1,3 +1,3 @@
 module Charted
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/public/charted/script.js

@@ -9,12 +9,15 @@ var Charted = {
       script.async = true;
       script.src = url + "?" + queryString;
       document.getElementsByTagName("head")[0].appendChild(script);
-    } else if (url.match(/^https?:\/\//)) {
+    } else if (this.external()) {
       jQuery.getScript(url + "?" + queryString);
     } else {
       jQuery.get(url, queryString);
     }
   },
+  external: function() {
+    return !!this.URL.match(/^https?:\/\//);
+  },
   cookie: function(name) {
     var obj = {};
     var val = document.cookie.match(new RegExp("(?:^|;) *"+name+"=([^;]*)"));
@@ -61,6 +64,10 @@ var Charted = {
     var bucketNum = cookie ?
       parseInt(cookie.split("-")[1]) :
       Math.floor(Math.random() * 10);
+    var domainQuery = "";
+    if (this.external()) {
+      domainQuery = "&domain=" + encodeURIComponent(window.location.hostname);
+    }
     var convQuery = "";
     var conversions = document.body.getAttribute("data-conversions");
     if (conversions) {
@@ -90,7 +97,7 @@ var Charted = {
       "&referrer=" + encodeURIComponent(document.referrer) +
       "&resolution=" + encodeURIComponent(screen.width+"x"+screen.height) +
       "&bucket=" + bucketNum +
-      convQuery + expQuery);
+      domainQuery + convQuery + expQuery);
   }
 };
 Charted.init();

data/test/app_test.rb

@@ -32,6 +32,14 @@ class AppTest < ChartedTest
     assert_equal(0, Charted::Visit.count)
   end
 
+  def test_override_domain
+    site = Charted::Site.create(domain: 'chartedrb.com')
+    get '/charted', @params.merge(domain: 'chartedrb.com'), @env
+    assert(last_response.ok?)
+    assert_equal(1, Charted::Visitor.count)
+    assert_equal('chartedrb.com', Charted::Visitor.first.site.domain)
+  end
+
   def test_error
     raises_error = lambda { |*args| raise('Stubbed Error') }
     Charted::Site.stub(:first, raises_error) do

data/test/helper.rb

@@ -1,5 +1,6 @@
 ENV['RACK_ENV'] = 'test'
 
+require 'bundler/setup'
 require_relative '../lib/charted'
 require 'minitest/autorun'
 require 'rack'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: charted
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Hugh Bien