gosquared 3.0.3 → 3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78358a00b7bf496eef23fa1b7dacbb2f1e1096e1
-  data.tar.gz: dd61d41cf61c67bf9ec5c505335448e792af6c67
+  metadata.gz: 190af14d102193d71cd19ee272100216f2192fae
+  data.tar.gz: d736e2f7d7fc41c69e98628fe6886144f00e2744
 SHA512:
-  metadata.gz: 38f86d39c694124b9f2e517cb7e12e74dc20c32b91010852da37951957cbd79b04e766029a04fb8319c17b9581b030807d744e1747447e7e6ff7aaa84aa9c4f0
-  data.tar.gz: 868a7cb63f24a03d094c19f87245caa2e749455dfd638c9f8e3caf86284a609c363f1d105b841aa7fe33846290f2cdd745fa965095f1fb667616a57a5be46fb9
+  metadata.gz: 6f050ba2156fb41fe186a622b04162446b0eb80de08b47617a89ed7babfad4b16ebf4d7e5572f4670dc7712387fad73c9bb04d526f3a0c7ea9c7d25bdf15fc87
+  data.tar.gz: a8393ddb2aa97c3a116a6270423f6fba3c880f3646927ce545e9faf60c73b7f120fedc4e725fefa82f20b875798152b14ada071571740d2207d8f71aa5fccaf7

data/README.md

@@ -2,11 +2,11 @@
 
 [![Build Status](https://travis-ci.org/gosquared/ruby-client.svg?branch=master)](https://travis-ci.org/gosquared/ruby-gem)
 
-**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**
+**Please feel free to 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/), 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]
+**Note:** if you are looking to set up GoSquared for the first time and install Analytics, People CRM 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/people.rb

@@ -9,12 +9,11 @@ module Gosquared
   	@@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)
+  		def initialize(api_key, site_token)
   			@site_token = site_token
   			@api_key = api_key
   			@person_id = ""
   			@person_filter = ""
-  			@client = client
   		end
 
   		DIMENSIONS.each do |dimension|
@@ -28,30 +27,54 @@ module Gosquared
   		@@filters.each do |key, value|
   			define_method key do |argument|
   				@@filters[key] = argument
-  				self
-  			end
-  		end
+          puts @@filters[key]
+          self
+        end
+      end
 
-  		def person_id(object, filter)
-  			@person_id = "/" + object
-  			@person_filter = "/" + filter
-  			self
-  		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 fetch
+       data = Client.new.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
+     def url
+       array = [""]
+       url = BASEURL + @dimension + @person_id + @person_filter +
+       "?api_key=#{@api_key}" + "&site_token=#{@site_token}"
+       @@filters.each do |key, value|
+        if @dimension=="people" && key == :filters && value.is_a?(Array)
+          json_object=JSON.generate(value)
+          filter_request=URI.escape(json_object, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
+          array << "#{key}=#{filter_request}"
+        else
+          array << "#{key}=#{value}" if value
+        end
+      end
+      parameters=array.join('&')
+      url.concat(parameters)
+    end
+
+    def post
+      puts @data
+      check_for_nil_user
+      response = Client.new.post(url, @data)
+      @data = nil if response.code === '200'
+      response
+    end
+
+    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
 end

data/spec/people_spec.rb

@@ -13,6 +13,7 @@ describe Gosquared::People do
 
 	Gosquared::People::DIMENSIONS.each do |dimension|
 		it "fetches a request from the GoSquared People API with #{dimension} dimension" do
+			next if dimension == "people"
 			gs.send "#{dimension}"
 			expect(gs.fetch).to eq("a" => [{"test"=>"response"}])
 		end
@@ -47,5 +48,36 @@ describe Gosquared::People do
 		end
 	end
 
+	before do
+	data = '{"a": [{"test": "response"}, {"with": "filters"}]}'
+	 stub_request(:get, "https://api.gosquared.com/people/v1/people?api_key=demo&filters=%5B%7B%22key%22:%22property%22,%22path%22:%22last.location.city%22,%22operator%22:%22contains%22,%22value%22:%22london%22%7D,%7B%22key%22:%22and%22,%22filters%22:%5B%7B%22key%22:%22property%22,%22path%22:%22totals.visits%22,%22operator%22:%22%3E%22,%22value%22:%221000%22%7D%5D%7D%5D&site_token=GSN-106863-S").
+   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 "fetches a request from the GoSquared People API with filtering on properties" do
+		array=[
+			{
+				key: "property",
+				path: "last.location.city",
+				operator: "contains",
+				value: "london"
+				},
+				{
+					key: "and",
+					filters: [
+						{
+							"key": "property",
+							"path": "totals.visits",
+							"operator": ">",
+							"value": "1000"
+						}
+					]
+				}
+			]
+			gs.people.people.filters(array)
+			expect(gs.fetch).to eq("a" => [{"test"=>"response"}, {"with"=>"filters"}])
+		end
 
-end
+
+	end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gosquared
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.4
 platform: ruby
 authors:
 - Russell Vaughan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-04 00:00:00.000000000 Z
+date: 2017-05-02 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.4.8
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: GoSquared Ruby Library