gosquared 3.0.1 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88379cf385bcdca47258e96149e3f9f9d0534b2d
-  data.tar.gz: 97592708e18c0a9627d433c8fdb0c91c11a94ddd
+  metadata.gz: 78358a00b7bf496eef23fa1b7dacbb2f1e1096e1
+  data.tar.gz: dd61d41cf61c67bf9ec5c505335448e792af6c67
 SHA512:
-  metadata.gz: a14fab23a886e2a959f3a1ac5d92e0cc8d15f5be5ce8f576bdf9551e40a2cda00d9ebd4dfc27836293e778ced178f6b32712932017dbab9ee49d06c6ded1889c
-  data.tar.gz: 45ad5d99aa0b145a03e4997f78b57c27853e3d993e18896095f62b494cc0e8489f1df5bf94a3f0ba88e271b3f360409f2a23a722163dd36bcfc9345917b5208a
+  metadata.gz: 38f86d39c694124b9f2e517cb7e12e74dc20c32b91010852da37951957cbd79b04e766029a04fb8319c17b9581b030807d744e1747447e7e6ff7aaa84aa9c4f0
+  data.tar.gz: 868a7cb63f24a03d094c19f87245caa2e749455dfd638c9f8e3caf86284a609c363f1d105b841aa7fe33846290f2cdd745fa965095f1fb667616a57a5be46fb9

data/README.md

@@ -4,7 +4,10 @@
 
 **This is an early beta, please open an issue if you find anything not working, or to leave feedback for improvement. You can also get in touch directly: russell@gosquared.com**
 
-This gems works with the [GoSquared API](https://www.gosquared.com/docs/api/), making it simple to integrate GoSquared with your Rails app. You can use it for both fetching metrics from your GoSquared account and also posting new events and contacts.
+This gems works with the [GoSquared API](https://www.gosquared.com/docs/api/), You can use it for both fetching metrics from your GoSquared account and also posting new events and contacts.
+
+Note, if you are looking to set up GoSquared for the first time and install Analytics, People and Live Chat within a Rails app,  you can do so by using our [GoSquared-Rails gem]
+(https://github.com/gosquared/gosquared-rails)
 
 All functions listed in the API documentation are methods you can call on the GoSquared class.
 

data/lib/gosquared.rb

@@ -16,23 +16,23 @@ module Gosquared
 		end
 
 		def trends
-			@trends ||= Trends.new(@api_key, @site_id)
+			@trends ||= Gosquared::Trends.new(@api_key, @site_id)
 		end
 
 		def tracking
-			@tracking ||= Tracking.new(@api_key, @site_id)
+			@tracking ||= Gosquared::Tracking.new(@api_key, @site_id)
 		end
 
 		def people
-			@people ||=  People.new(@api_key, @site_id)
+			@people ||= Gosquared::People.new(@api_key, @site_id)
 		end
 
 		def now
-			@now ||= Now.new(@api_key, @site_id)
+			@now ||= Gosquared::Now.new(@api_key, @site_id)
 		end
 
 		def account
-			@account ||= Account.new(@api_key, @site_id)
+			@account ||= Gosquared::Account.new(@api_key, @site_id)
 		end
 
 	end

data/lib/gosquared/account.rb

@@ -1,83 +1,83 @@
-require_relative "client"
+require_relative 'client'
 
-class Account
+module Gosquared
+  class Account
+    BASEURL = 'https://api.gosquared.com/account/v1/'.freeze
+    DIMENSIONS = %w(blocked feeds reportPreferences sharedUsers sites taggedVisitors triggerTypes webhooks).freeze
+    DIMENSION_FILTER = %w(token webhookID visitorID triggerType).freeze
+    @@filters = { presenter: @presenter, ip: @ip, url: @url, email: @email }
 
-	BASEURL = "https://api.gosquared.com/account/v1/"
-	DIMENSIONS = %w(blocked feeds reportPreferences sharedUsers sites taggedVisitors triggerTypes webhooks)
-	DIMENSION_FILTER = %w(token webhookID visitorID triggerType)
-	@@filters = {presenter: @presenter, ip: @ip, url: @url, email: @email}
+    def initialize(api_key, site_token, client = Gosquared::Client.new)
+      @site_token = site_token
+      @api_key = api_key
+      @client = client
+      @bots = ''
+      @ips = ''
+      @visitor = ''
+      @dimension_filter = ''
+    end
 
-	def initialize(api_key, site_token, client = Client.new)
-		@site_token = site_token
-		@api_key = api_key
-		@client = client
-		@bots= ""
-		@ips = ""
-		@visitor = ""
-		@dimension_filter = ""
-	end
+    DIMENSION_FILTER.each do |filter|
+      define_method filter do |parameter = ''|
+        @dimension_filter = '/' + parameter
+        self
+      end
+    end
 
-	DIMENSION_FILTER.each do |filter|
-		define_method filter do |parameter = ""|
-			@dimension_filter = "/" + parameter
-			self
-		end
-	end
+    DIMENSIONS.each do |dimension|
+      define_method dimension do |options = ''|
+        @dimension = dimension
+        @data = options
+        self
+      end
+    end
 
-	DIMENSIONS.each do |dimension|
-		define_method dimension do |options = ""|
-			@dimension = dimension
-			@data = options
-			self
-		end
-	end
+    @@filters.each do |key, _value|
+      define_method key do |argument|
+        @@filters[key] = argument
+        self
+      end
+    end
 
-	@@filters.each do |key, value|
-		define_method key do |argument|
-			@@filters[key] = argument
-			self
-		end
-	end
+    def fetch
+      data = @client.get(build_url)
+      @@filters.each { |key, _value| @@filters[key] = nil } if data
+      data
+    end
 
-	def fetch
-		data = @client.get(build_url)
-		@@filters.each{|key, value| @@filters[key]=nil} if data
-		data
-	end
+    def post
+      response = @client.post(build_url, @data)
+      @@filters.each { |key, _value| @@filters[key] = nil } if response.code === '200'
+      response
+    end
 
-	def post
-		response = @client.post(build_url, @data)
-		@@filters.each{|key, value| @@filters[key]=nil} if response.code === '200'
-		response
-	end
+    def delete
+      response = @client.post(build_url, @data)
+      @@filters.each { |key, _value| @@filters[key] = nil } if response.code === '200'
+      response
+    end
 
-	def delete
-		response = @client.post(build_url, @data)
-		@@filters.each{|key, value| @@filters[key]=nil} if response.code === '200'
-		response
-	end
+    def bots
+      @bots = '/bots'
+    end
 
-	def bots
-		@bots = "/bots"
-	end
+    def ips
+      @ips = '/ips'
+      self
+    end
 
-	def ips
-		@ips = "/ips"
-		self
-	end
-
-	def visitors(id="")
-		@visitor = "/visitors/#{id}"
-		self
-	end
-
-	def build_url(ips = @ips)
-		array = [""]
-		@url = BASEURL + @dimension + @dimension_filter + @visitor + @bots + ips +
-		"?api_key=#{@api_key}" + "&site_token=#{@site_token}"
-		@@filters.each {|key, value| array << "#{key}=#{value}" if value }
-		parameters=array.join('&')
-		@url = @url.concat(parameters)
-	end
+    def visitors(id = '')
+      @visitor = "/visitors/#{id}"
+      self
+    end
 
+    def build_url(ips = @ips)
+      array = ['']
+      @url = BASEURL + @dimension + @dimension_filter + @visitor + @bots + ips +
+             "?api_key=#{@api_key}" + "&site_token=#{@site_token}"
+      @@filters.each { |key, value| array << "#{key}=#{value}" if value }
+      parameters = array.join('&')
+      @url = @url.concat(parameters)
+    end
+  end
 end

data/lib/gosquared/client.rb

@@ -2,67 +2,69 @@ require 'net/https'
 require 'uri'
 require 'json'
 
-class Client
+module Gosquared
+  class Client
 
-	def get(url)
-		uri = URI(url)
-		begin
-			response = Net::HTTP.get(uri)
-		rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError,
-			Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e
-			puts "[error] HTTP error: #{e}"
-			begin 
-				JSON.parse(response)
-			rescue StandardError => e 
-				puts "[error] StandardError: Could not parse JSON"
-				response = false
-			end
-		end
-	@data = JSON.parse(response) if response
-	end
+  	def get(url)
+  		uri = URI(url)
+  		begin
+  			response = Net::HTTP.get(uri)
+  		rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError,
+  			Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e
+  			puts "[error] HTTP error: #{e}"
+  			begin
+  				JSON.parse(response)
+  			rescue StandardError => e
+  				puts "[error] StandardError: Could not parse JSON"
+  				response = false
+  			end
+  		end
+  	@data = JSON.parse(response) if response
+  	end
 
-	def post(url,data)
-	uri = URI.parse(url)
-	begin
-		https = Net::HTTP.new(uri.host, uri.port)
-		https.use_ssl = true
-		request = Net::HTTP::Post.new(uri.request_uri, initheader = {'Content-Type' =>'application/json'})
-		request.body = "[ #{data.to_json} ]"
-		response = https.request(request)
-	rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError,
-		Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e
-		puts "[error] HTTP error: #{e}"
-		begin 
-				response.message
-			rescue StandardError => e 
-				puts "[error] StandardError: Could not print response message"
-				response = false
-			end
-	end
-	puts "Response Message: #{response.message}" if response
-	response
-end
+  	def post(url,data)
+  	uri = URI.parse(url)
+  	begin
+  		https = Net::HTTP.new(uri.host, uri.port)
+  		https.use_ssl = true
+  		request = Net::HTTP::Post.new(uri.request_uri, initheader = {'Content-Type' =>'application/json'})
+  		request.body = "[ #{data.to_json} ]"
+  		response = https.request(request)
+  	rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError,
+  		Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e
+  		puts "[error] HTTP error: #{e}"
+  		begin
+  				response.message
+  			rescue StandardError => e
+  				puts "[error] StandardError: Could not print response message"
+  				response = false
+  			end
+  	end
+  	puts "Response Message: #{response.message}" if response
+  	response
+  end
 
-def delete(url,data)
-	uri = URI.parse(url)
-	begin
-		https = Net::HTTP.new(uri.host, uri.port)
-		https.use_ssl = true
-		request = Net::HTTP::Delete.new(uri.request_uri, initheader = {'Content-Type' =>'application/json'})
-		request.body = "[ #{data.to_json} ]"
-		response = https.request(request)
-	rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError,
-		Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e
-		puts "[error] HTTP error: #{e}"
-		begin 
-				response.message
-			rescue StandardError => e 
-				puts "[error] StandardError: Could not print response message"
-				response = false
-			end
-	end
-	puts "Response Message: #{response.message}" if response
-	response
-end
+  def delete(url,data)
+  	uri = URI.parse(url)
+  	begin
+  		https = Net::HTTP.new(uri.host, uri.port)
+  		https.use_ssl = true
+  		request = Net::HTTP::Delete.new(uri.request_uri, initheader = {'Content-Type' =>'application/json'})
+  		request.body = "[ #{data.to_json} ]"
+  		response = https.request(request)
+  	rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError,
+  		Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e
+  		puts "[error] HTTP error: #{e}"
+  		begin
+  				response.message
+  			rescue StandardError => e
+  				puts "[error] StandardError: Could not print response message"
+  				response = false
+  			end
+  	end
+  	puts "Response Message: #{response.message}" if response
+  	response
+  end
 
-end
+  end
+end

data/lib/gosquared/now.rb

@@ -1,50 +1,53 @@
 require_relative "client"
-class Now
-
-	BASEURL = "https://api.gosquared.com/now/v3/"
-	DIMENSIONS = %w(browsers campaigns concurrents engagement geo languages notifications
-		organisations overview pages platforms sources time timeSeries visitors)
-@@filters = {dateFormat: @date_format, from: @from, to: @to,
-	format: @format, limit: @limit, sort: @sort,
-	presenter: @presenter, visitors_mode: @string, href: @href,
-	drill_limit: @drill_limit, sections: @sections,
-	minimal: @minimal, interval: @interval}
-
-	def initialize(api_key, site_token, client=Client.new)
-		@site_token = site_token
-		@api_key = api_key
-		@client = client
-	end
-
-
-	DIMENSIONS.each do |dimension|
-		define_method dimension do
-			@dimension = dimension
-			self
-		end
-	end
-
-	@@filters.each do |key, value|
-		define_method key do |argument|
-			@@filters[key] = argument
-			self
-		end
-	end
-
-	def fetch
-		data = @client.get(url)
-		@@filters.each{|key, value| @@filters[key]=nil} if data
-		data
-	end
-
-	private
-
-	def url
-		array = [""]
-		@url = BASEURL + @dimension + "?api_key=#{@api_key}" + "&site_token=#{@site_token}"
-		@@filters.each {|key, value| array << "#{key}=#{value}" if value }
-		parameters=array.join('&')
-		@url = @url.concat(parameters)
-	end
 
+module Gosquared
+  class Now
+
+  	BASEURL = "https://api.gosquared.com/now/v3/".freeze
+  	DIMENSIONS = %w(browsers campaigns concurrents engagement geo languages notifications
+  		organisations overview pages platforms sources time timeSeries visitors).freeze
+  @@filters = {date_format: @date_format, from: @from, to: @to,
+  	format: @format, limit: @limit, sort: @sort,
+  	presenter: @presenter, visitors_mode: @string, href: @href,
+  	drill_limit: @drill_limit, sections: @sections,
+  	minimal: @minimal, interval: @interval}
+
+  	def initialize(api_key, site_token, client = Gosquared::Client.new)
+  		@site_token = site_token
+  		@api_key = api_key
+  		@client = client
+  	end
+
+
+  	DIMENSIONS.each do |dimension|
+  		define_method dimension do
+  			@dimension = dimension
+  			self
+  		end
+  	end
+
+  	@@filters.each do |key, value|
+  		define_method key do |argument|
+  			@@filters[key] = argument
+  			self
+  		end
+  	end
+
+  	def fetch
+  		data = @client.get(url)
+  		@@filters.each{|key, value| @@filters[key]=nil} if data
+  		data
+  	end
+
+  	private
+
+  	def url
+  		array = [""]
+  		@url = BASEURL + @dimension + "?api_key=#{@api_key}" + "&site_token=#{@site_token}"
+  		@@filters.each {|key, value| array << "#{key}=#{value}" if value }
+  		parameters=array.join('&')
+  		@url = @url.concat(parameters)
+  	end
+
+  end
 end

data/lib/gosquared/people.rb

@@ -1,54 +1,57 @@
 require_relative "client"
-class People
-
-	BASEURL = "https://api.gosquared.com/people/v1/"
-	VERSION = %w(v1 v2 v3)
-	DIMENSIONS = %w(devices eventTypes people propertyTypes feed smartgroups)
-	@@filters = {query: @query, filters: @filters, sort: @sort,
-		format: @presenter, limit: @limit, type: @type, from: @from, to: @to}
-
-		def initialize(api_key, site_token, client =Client.new)
-			@site_token = site_token
-			@api_key = api_key
-			@person_id = ""
-			@person_filter = ""
-			@client = client
-		end
-
-		DIMENSIONS.each do |dimension|
-			define_method dimension do |options = ""|
-				@dimension = dimension
-				@data = options
-				self
-			end
-		end
-
-		@@filters.each do |key, value|
-			define_method key do |argument|
-				@@filters[key] = argument
-				self
-			end
-		end
-
-		def person_id(object, filter)
-			@person_id = "/" + object
-			@person_filter = "/" + filter
-			self
-		end
-
-		def fetch
-			data = @client.get(url)
-			@@filters.each{|key, value| @@filters[key]=nil} if data
-			data
-		end
-
-		def url
-			array = [""]
-			url = BASEURL + @dimension + @person_id + @person_filter +
-			"?api_key=#{@api_key}" + "&site_token=#{@site_token}"
-			@@filters.each { |key, value| array << "#{key}=#{value}" if value }
-			parameters=array.join('&')
-			url.concat(parameters)
-		end
-
-	end
+
+module Gosquared
+  class People
+
+  	BASEURL = "https://api.gosquared.com/people/v1/".freeze
+  	VERSION = %w(v1 v2 v3).freeze
+  	DIMENSIONS = %w(devices eventTypes people propertyTypes feed smartgroups).freeze
+  	@@filters = {query: @query, filters: @filters, sort: @sort,
+  		format: @presenter, limit: @limit, type: @type, from: @from, to: @to}
+
+  		def initialize(api_key, site_token, client = Gosquared::Client.new)
+  			@site_token = site_token
+  			@api_key = api_key
+  			@person_id = ""
+  			@person_filter = ""
+  			@client = client
+  		end
+
+  		DIMENSIONS.each do |dimension|
+  			define_method dimension do |options = ""|
+  				@dimension = dimension
+  				@data = options
+  				self
+  			end
+  		end
+
+  		@@filters.each do |key, value|
+  			define_method key do |argument|
+  				@@filters[key] = argument
+  				self
+  			end
+  		end
+
+  		def person_id(object, filter)
+  			@person_id = "/" + object
+  			@person_filter = "/" + filter
+  			self
+  		end
+
+  		def fetch
+  			data = @client.get(url)
+  			@@filters.each{|key, value| @@filters[key]=nil} if data
+  			data
+  		end
+
+  		def url
+  			array = [""]
+  			url = BASEURL + @dimension + @person_id + @person_filter +
+  			"?api_key=#{@api_key}" + "&site_token=#{@site_token}"
+  			@@filters.each { |key, value| array << "#{key}=#{value}" if value }
+  			parameters=array.join('&')
+  			url.concat(parameters)
+  		end
+
+  	end
+end

data/lib/gosquared/tracking.rb

@@ -1,41 +1,44 @@
 require_relative "client"
-class Tracking
-
-	BASEURL = "https://api.gosquared.com/tracking/v1/"
-	DIMENSIONS = %w(event identify pageview ping properties timeout transaction)
-
-	def initialize(api_key, site_token, client=Client.new)
-		@site_token = site_token
-		@api_key = api_key
-		@client = client
-	end
-
-	DIMENSIONS.each do |dimension|
-		define_method dimension do |options|
-			@dimension = dimension
-			@data = options
-			self
-		end
-	end
-
-	def post
-		check_for_nil_user
-		response = @client.post(url, @data)
-		@data = nil if response.code === '200'
-		response
-	end
-
-	def url
-		url = BASEURL + @dimension + "?api_key=#{@api_key}" + "&site_token=#{@site_token}"
-	end
-
-	private
-
-	def check_for_nil_user
-		if @data.key?(:person_id) && @data[:person_id] == nil
-			@data.tap { |data| @data.delete(:person_id) }
-			warn 'person_id is nil, event will not be track against a user'
-		end
-	end
 
+module Gosquared
+  class Tracking
+
+  	BASEURL = "https://api.gosquared.com/tracking/v1/".freeze
+  	DIMENSIONS = %w(event identify pageview ping properties timeout transaction).freeze
+
+  	def initialize(api_key, site_token, client = Gosquared::Client.new)
+  		@site_token = site_token
+  		@api_key = api_key
+  		@client = client
+  	end
+
+  	DIMENSIONS.each do |dimension|
+  		define_method dimension do |options|
+  			@dimension = dimension
+  			@data = options
+  			self
+  		end
+  	end
+
+  	def post
+  		check_for_nil_user
+  		response = @client.post(url, @data)
+  		@data = nil if response.code === '200'
+  		response
+  	end
+
+  	def url
+  		url = BASEURL + @dimension + "?api_key=#{@api_key}" + "&site_token=#{@site_token}"
+  	end
+
+  	private
+
+  	def check_for_nil_user
+  		if @data.key?(:person_id) && @data[:person_id] == nil
+  			@data.tap { |data| @data.delete(:person_id) }
+  			warn 'person_id is nil, event will not be track against a user'
+  		end
+  	end
+
+  end
 end

data/lib/gosquared/trends.rb

@@ -1,12 +1,15 @@
 require_relative "client"
+
+module Gosquared
 	class Trends
 
-		BASEURL = "https://api.gosquared.com/trends/v2/"
-		DIMENSIONS = %w(aggregate browser category country event language organisation os page path1 product screenDimensions sources transactions)
+		BASEURL = "https://api.gosquared.com/trends/v2/".freeze
+		DIMENSIONS = %w(aggregate browser category country event language organisation os page path1 product screenDimensions sources transactions).freeze
 		@@filters = {date_format: @date_format, from: @from, to: @to,
-			format: @format, limit: @limit, sort: @sort, group: @group}
+			format: @format, limit: @limit, sort: @sort, group: @group,
+			source_type: @source_type}
 
-			def initialize(api_key, site_token, client=Client.new)
+			def initialize(api_key, site_token, client = Gosquared::Client.new)
 				@site_token = site_token
 				@api_key = api_key
 				@client = client
@@ -37,8 +40,13 @@ require_relative "client"
 			def url
 				array = [""]
 				url = BASEURL + @dimension + "?api_key=#{@api_key}" + "&site_token=#{@site_token}"
-				@@filters.each {|key, value| array << "#{key}=#{value}" if value }
+				@@filters.each {|key, value| array << "#{camelize(key.to_s)}=#{value}" if value }
 				parameters=array.join('&')
 				url.concat(parameters)
 			end
+
+			def camelize(key)
+				key.split('_').each_with_index.map{|fragment, index| index == 0 ? fragment : fragment.capitalize }.join('')
+			end
 		end
+	end

data/spec/account_spec.rb

@@ -1,8 +1,8 @@
-describe Account do
+describe Gosquared::Account do
 	subject(:gs) { described_class.new("demo", "GSN-2194840-F") }
 
-	Account::DIMENSIONS.each do |dimension|	
-		before do 
+	Gosquared::Account::DIMENSIONS.each do |dimension|
+		before do
 			data = '{"a": [{"test": "response"}]}'
 			stub_request(:get, "https://api.gosquared.com/account/v1/#{dimension}?api_key=demo&site_token=GSN-2194840-F" ).
 			with(headers: {'Accept'=>'*/*', 'User-Agent'=>'Ruby'}).
@@ -10,26 +10,26 @@ describe Account do
 		end
 	end
 
-	Account::DIMENSIONS.each do |dimension|	
-		it "fetches a request from the GoSquared Account API with #{dimension} dimension"  do 
+	Gosquared::Account::DIMENSIONS.each do |dimension|
+		it "fetches a request from the GoSquared Account API with #{dimension} dimension"  do
 			gs.send("#{dimension}")
 			expect(gs.fetch).to eq("a" => [{"test"=>"response"}])
 		end
 	end
 
-	before do 
+	before do
 		data = '{"a": [{"test": "response"}]}'
 		stub_request(:get, "https://api.gosquared.com/account/v1/sites/GSN-086224-W?api_key=demo&site_token=GSN-2194840-F").
 		with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Host'=>'api.gosquared.com', 'User-Agent'=>'Ruby'}).
 		to_return(:status => 200, :body => data, :headers => {})
 	end
 
-	it "retrieves a site by its site token"  do 
+	it "retrieves a site by its site token"  do
 		gs.sites.token("GSN-086224-W")
 		expect(gs.fetch).to eq("a" => [{"test"=>"response"}])
 	end
 
-	before do 
+	before do
 		stub_request(:post, "https://api.gosquared.com/account/v1/blocked/ips?api_key=demo&ip=20.15.33.99&site_token=GSN-2194840-F").
 		with(:body => "[ \"\" ]",
 			:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Content-Type'=>'application/json', 'User-Agent'=>'Ruby'}).
@@ -40,28 +40,28 @@ describe Account do
 		to_return(:status => 200, :body => "", :headers => {})
 	end
 
-	it "posts a request to the GoSquared Account API with an IP address to block bots"  do 
+	it "posts a request to the GoSquared Account API with an IP address to block bots"  do
 		gs.blocked.ips.ip('20.15.33.99')
 		expect(gs.post.code).to eq('200')
 	end
 
-	it "sends a delete request to the GoSquared Account API with an IP address to block bots"  do 
+	it "sends a delete request to the GoSquared Account API with an IP address to block bots"  do
 		gs.blocked.ips.ip('20.15.33.99')
 		expect(gs.delete.code).to eq('200')
 	end
 
-	before do 
+	before do
 		data = '{"a": [{"test": "response"}]}'
 		stub_request(:get, "https://api.gosquared.com/account/v1/blocked/visitors/test.email@gmail.com?api_key=demo&site_token=GSN-2194840-F").
 		with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Host'=>'api.gosquared.com', 'User-Agent'=>'Ruby'}).
 		to_return(:status => 200, :body => data, :headers => {})
 	end
 
-	it "retrieves a list of blocked visitors"  do 
+	it "retrieves a list of blocked visitors"  do
 		gs.blocked.visitors("test.email@gmail.com")
 		expect(gs.fetch).to eq("a" => [{"test"=>"response"}])
 	end
 
-	
 
-end
+
+end

data/spec/client_spec.rb

@@ -2,38 +2,38 @@ require 'net/https'
 require 'uri'
 require 'json'
 
-describe Client do
+describe Gosquared::Client do
 	subject(:client) { described_class.new }
 
 	EXCEPTIONS = [Timeout::Error, EOFError,
 			Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError]
 
-EXCEPTIONS.each do |exception|	
+EXCEPTIONS.each do |exception|
 	it "raises a #{exception} error on a get request" do
 		uri = URI('www.example.com')
 		allow(Net::HTTP).to receive(:get).with(uri).and_raise(exception)
 		expect{client.get('www.example.com')}.to output("[error] HTTP error: #{exception}\n[error] StandardError: Could not parse JSON\n").to_stdout
-	end 
+	end
 end
 
 it "raises a Errno::EINVAL error on a get request" do
 		uri = URI('www.example.com')
 		allow(Net::HTTP).to receive(:get).with(uri).and_raise(Errno::EINVAL)
 		expect{client.get('www.example.com')}.to output("[error] HTTP error: Invalid argument\n[error] StandardError: Could not parse JSON\n").to_stdout
-	end 
+	end
 
 it "raises a Errno::ECONNRESET error on a get request" do
 		uri = URI('www.example.com')
 		allow(Net::HTTP).to receive(:get).with(uri).and_raise(Errno::ECONNRESET)
 		expect{client.get('www.example.com')}.to output("[error] HTTP error: Connection reset by peer\n[error] StandardError: Could not parse JSON\n").to_stdout
-	end 
+	end
 
-EXCEPTIONS.each do |exception|	
+EXCEPTIONS.each do |exception|
 	it "raises a #{exception} error on a post request" do
 		uri = URI.parse("www.example.com")
 		allow(Net::HTTP).to receive(:new).with(uri.host, uri.port).and_raise(exception)
 		expect{client.post("www.example.com", "body")}.to output("[error] HTTP error: #{exception}\n[error] StandardError: Could not print response message\n").to_stdout
-	end 
+	end
 end
 
 it "raises a Errno::EINVAL error on a post request" do
@@ -46,14 +46,14 @@ it "raises a Errno::ECONNRESET error on a post request" do
 		uri = URI.parse("www.example.com")
 		allow(Net::HTTP).to receive(:new).with(uri.host, uri.port).and_raise(Errno::ECONNRESET)
 		expect{client.post("www.example.com", "body")}.to output("[error] HTTP error: Connection reset by peer\n[error] StandardError: Could not print response message\n").to_stdout
-	end  
+	end
 
-EXCEPTIONS.each do |exception|	
+EXCEPTIONS.each do |exception|
 	it "raises a #{exception} error on a delete request" do
 		uri = URI.parse("www.example.com")
 		allow(Net::HTTP).to receive(:new).with(uri.host, uri.port).and_raise(exception)
 		expect{client.delete("www.example.com", "body")}.to output("[error] HTTP error: #{exception}\n[error] StandardError: Could not print response message\n").to_stdout
-	end 
+	end
 end
 
 it "raises a Errno::EINVAL error on a delete request" do
@@ -66,6 +66,6 @@ it "raises a Errno::ECONNRESET error on a delete request" do
 		uri = URI.parse("www.example.com")
 		allow(Net::HTTP).to receive(:new).with(uri.host, uri.port).and_raise(Errno::ECONNRESET)
 		expect{client.delete("www.example.com", "body")}.to output("[error] HTTP error: Connection reset by peer\n[error] StandardError: Could not print response message\n").to_stdout
-	end  
+	end
 
-end
+end

data/spec/now_spec.rb

@@ -1,8 +1,8 @@
-describe Now do
+describe Gosquared::Now do
 	subject(:gs) { described_class.new("demo", "GSN-2194840-F") }
 
-	Now::DIMENSIONS.each do |dimension|	
-	before do 
+	Gosquared::Now::DIMENSIONS.each do |dimension|
+	before do
 			data = '{"a": [{"test": "response"}]}'
 			stub_request(:get, "https://api.gosquared.com/now/v3/#{dimension}?api_key=demo&site_token=GSN-2194840-F" ).
 			with(headers: {'Accept'=>'*/*', 'User-Agent'=>'Ruby'}).
@@ -10,14 +10,14 @@ describe Now do
 		end
 	end
 
-		Now::DIMENSIONS.each do |dimension|	
-		it "fetches a request from the GoSquared Now API with #{dimension} dimension" do 
+		Gosquared::Now::DIMENSIONS.each do |dimension|
+		it "fetches a request from the GoSquared Now API with #{dimension} dimension" do
 			gs.send "#{dimension}"
 			expect(gs.fetch).to eq("a" => [{"test"=>"response"}])
 		end
 	end
 
-	before do 
+	before do
 		data = '{"a": [{"test": "response"}, {"with": "params"}]}'
 		stub_request(:get, "https://api.gosquared.com/now/v3/browsers?api_key=demo&site_token=GSN-2194840-F&limit=5").
 		with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Host'=>'api.gosquared.com', 'User-Agent'=>'Ruby'}).
@@ -29,4 +29,4 @@ describe Now do
 		expect(gs.fetch).to eq("a" => [{"test"=>"response"}, {"with"=>"params"}])
 	end
 
-end
+end

data/spec/people_spec.rb

@@ -1,7 +1,7 @@
-describe People do
+describe Gosquared::People do
 	subject(:gs) { described_class.new("demo", "GSN-106863-S") }
 
-	People::DIMENSIONS.each do |dimension|
+	Gosquared::People::DIMENSIONS.each do |dimension|
 		before do
 			data = '{"a": [{"test": "response"}]}'
 			stub_request(:get, "https://api.gosquared.com/people/v1/#{dimension}?api_key=demo&site_token=GSN-106863-S"
@@ -11,7 +11,7 @@ describe People do
 		end
 	end
 
-	People::DIMENSIONS.each do |dimension|
+	Gosquared::People::DIMENSIONS.each do |dimension|
 		it "fetches a request from the GoSquared People API with #{dimension} dimension" do
 			gs.send "#{dimension}"
 			expect(gs.fetch).to eq("a" => [{"test"=>"response"}])
@@ -31,7 +31,7 @@ describe People do
 	end
 
 
-	People::DIMENSIONS.each do |dimension|
+	Gosquared::People::DIMENSIONS.each do |dimension|
 		before do
 			data = '{"a": [{"test": "response"}, {"with": "params"}]}'
 			stub_request(:get, "https://api.gosquared.com/people/v1/#{dimension}?api_key=demo&site_token=GSN-106863-S&limit=5").
@@ -40,7 +40,7 @@ describe People do
 		end
 	end
 
-	People::DIMENSIONS.each do |dimension|
+	Gosquared::People::DIMENSIONS.each do |dimension|
 		it "fetches a request from the GoSquared People API with dimension and paramaters" do
 			gs.send("#{dimension}").limit(5)
 			expect(gs.fetch).to eq("a" => [{"test"=>"response"}, {"with"=>"params"}])

data/spec/tracking_spec.rb

@@ -1,7 +1,7 @@
-describe Tracking do
+describe Gosquared::Tracking do
 	subject(:gs) { described_class.new("demo", "GSN-2194840-F") }
 
-	Tracking::DIMENSIONS.each do |dimension|
+	Gosquared::Tracking::DIMENSIONS.each do |dimension|
 		before do
 			stub_request(:post, "https://api.gosquared.com/tracking/v1/#{dimension}?api_key=demo&site_token=GSN-2194840-F").
 			with(:body => "[ {\"person_id\":\"email:test@example.com\",\"properties\":{\"email\":\"test@example.com\"}} ]",
@@ -10,7 +10,7 @@ describe Tracking do
 		end
 	end
 
-	Tracking::DIMENSIONS.each do |dimension|
+	Gosquared::Tracking::DIMENSIONS.each do |dimension|
 		it "posts a request to the GoSquared Track API with #{dimension} dimension" do
 			gs.send "#{dimension}", ({person_id: "email:test@example.com",
 				properties:{email: "test@example.com"}})

data/spec/trends_spec.rb

@@ -1,7 +1,7 @@
-describe Trends do
+describe Gosquared::Trends do
 	subject(:gs) { described_class.new("demo","GSN-106863-S") }
 
-	Trends::DIMENSIONS.each do |dimension|
+	Gosquared::Trends::DIMENSIONS.each do |dimension|
 		before do
 			data = '{"a": [{"test": "response"}]}'
 			stub_request(:get, "https://api.gosquared.com/trends/v2/#{dimension}?api_key=demo&site_token=GSN-106863-S").
@@ -10,23 +10,23 @@ describe Trends do
 		end
 	end
 
-	Trends::DIMENSIONS.each do |dimension|
+	Gosquared::Trends::DIMENSIONS.each do |dimension|
 		it "fetches a request from the GoSquared Trends API with #{dimension} dimension" do
 			gs.send "#{dimension}"
 			expect(gs.fetch).to eq("a" => [{"test"=>"response"}])
 		end
 	end
 
-	Trends::DIMENSIONS.each do |dimension|
+	Gosquared::Trends::DIMENSIONS.each do |dimension|
 		before do
 			data = '{"a": [{"test": "response"}, {"with": "params"}]}'
-			stub_request(:get, "https://api.gosquared.com/trends/v2/#{dimension}?api_key=demo&site_token=GSN-106863-S&date_format=yyyy-mm-dd&format=json&from=2016-06-20&group=true&limit=5&site_token=GSN-106863-S&sort=visits&to=2016-06-30").
+			stub_request(:get, "https://api.gosquared.com/trends/v2/#{dimension}?api_key=demo&site_token=GSN-106863-S&dateFormat=yyyy-mm-dd&format=json&from=2016-06-20&group=true&limit=5&site_token=GSN-106863-S&sort=visits&to=2016-06-30").
 			with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Host'=>'api.gosquared.com', 'User-Agent'=>'Ruby'}).
 			to_return(:status => 200, :body => data, :headers => {})
 		end
 	end
 
-	Trends::DIMENSIONS.each do |dimension|
+	Gosquared::Trends::DIMENSIONS.each do |dimension|
 		it "fetches a request from the GoSquared Trends API with #{dimension} dimension and paramaters" do
 			gs.send("#{dimension}").from('2016-06-20').to('2016-06-30')
 			.date_format('yyyy-mm-dd').sort('visits').group(true).format('json').limit(5)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gosquared
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.3
 platform: ruby
 authors:
 - Russell Vaughan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-20 00:00:00.000000000 Z
+date: 2017-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -84,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: GoSquared Ruby Library