callrail 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32be84e443677aff60e60bb350c56f70ef2de42d
-  data.tar.gz: bd8e1ee25df3c9fb056966f267acf3dc1e354f9b
+  metadata.gz: 755f0a7d0503a15aa630debbb1bc4e93a9d1ed70
+  data.tar.gz: e4ade5757b8caa6ac48e8e8bfb4de30f2dd4af1a
 SHA512:
-  metadata.gz: e98b518e973b0e1cb095c2c5ca4e0623fa1ccaa7087352efe97831bb550432b58e8137f539cef4552fc7ecb86cfa7f45323087329859b9e9ac79240eef493b3a
-  data.tar.gz: 94e67d4af52dd4e1dc15ca96f8a519ab6562afbb16c474c772c34ea893d0ca13503b92716223e1560f2520eef659f6eece0fbfd29039f9b20cf3d732cec3a09f
+  metadata.gz: 300a031b407ba7bd46762784d0d0d5c8d445585ed3ae8f89f408c949aeb595d7d40c59368470a22d509626512655d46d5edf6c95a83fa6efce794d3a343711e8
+  data.tar.gz: 5e5a03de59af3a266cada07bae9c566302e036b220bd9f067936133a8a5e45fe5a3342d8878d836ee7c8df684a2d0c842bfdc192f158fa919184e5f300df26a9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    callrail (0.2.0)
+    callrail (0.2.1)
       json (~> 2.1.0)
       rest-client (~> 2.0.2)
 

data/README.md

@@ -90,6 +90,12 @@ testcon.disable_company(opts)
 ###### Get Users
 ``` testcon.get_users ```
 
+###### Get Users For a specific company
+```
+user_opts = {:company_id => <company_id>}
+puts testcon.get_users(user_opts)
+```
+
 ###### Get Specific User
 ```
 opts[:user_id] = <user_id>

data/lib/callrail.rb

@@ -100,48 +100,39 @@ module Callrail
         # Filtering: date_range
         # Searching: customer_phone_number, customer_name
       #pagination
-       params[:total_records] = get_total_records(params) if opts[:path]
-       params[:total_pages] = get_total_pages(params) if opts[:path]
 
       return params
     end
 
-    def get_total_records(params)
-      total_records = parse_json(RestClient.get(@url+params[:path], params: params, :content_type => 'application/json', :accept => 'application/json', :Authorization => @auth)).body['total_records'] || 1      
-      return total_records
-    end
-
-    def get_total_pages(params)
-      total_pages = parse_json(RestClient.get(@url+params[:path], params: params, :content_type => 'application/json', :accept => 'application/json', :Authorization => @auth)).body['total_pages'] || 1      
-      return total_pages
-    end
-
     def get_responses(opts = {})
       responses = []
       params = set_params(opts)
-      while params[:total_pages] > 0      
-        response = parse_json(RestClient.get(@url+params[:path], params: params,:Authorization => @auth)).body
-        response = (opts[:data]) ? response[opts[:data]] : response
+      response = parse_json(RestClient.get(@url+params[:path], params: params,:Authorization => @auth)).body
+      total_pages = response["total_pages"] || 1
+      total_records = response["total_records"] || 1              
+
+      while total_pages > 0
+        response = (opts[:data]) ? response[opts[:data]] : response 
         responses.push(response)
         params[:page] += 1 unless opts[:page]
-        params[:total_pages] -= 1
+        total_pages -= 1     
+        response = parse_json(RestClient.get(@url+params[:path], params: params,:Authorization => @auth)).body            
       end
-      return responses
+      return responses.flatten! || responses
     end
+
 # Account Calls
     def get_accounts(opts = {})
       opts[:path] = (opts[:account_id]) ? "/" + opts[:account_id].to_s + ".json" : ".json"
       opts[:data] = "accounts" unless  opts[:account_id]
-      results = get_responses(opts)  
-      return results
+      return get_responses(opts)  
     end
 
 # Company Calls
     def get_companies(opts = {}) 
       opts[:path] = (opts[:company_id]) ? "/" + @account_id + "/companies/" + opts[:company_id].to_s + ".json" : "/" + @account_id + "/companies.json"
       opts[:data] = "companies" unless opts[:company_id]
-      results = get_responses(opts)
-      return results
+      return get_responses(opts)
     end
 
     def create_company(opts = {}) # http://apidocs.callrail.com/#time-zones
@@ -154,84 +145,79 @@ module Callrail
     def update_company(opts = {})
       params = set_params(opts) 
       path = "/" + @account_id + "/companies/" + opts[:company_id].to_s + ".json"
-      response = parse_json(RestClient.put(@url+path, params, :Authorization => @auth))      
+      return parse_json(RestClient.put(@url+path, params, :Authorization => @auth)).body      
     end
 
     def disable_company( opts = {})
       path = "/" + @account_id + "/companies/" + opts[:company_id].to_s
-      response = parse_json(RestClient.delete(@url+path, :Authorization => @auth))
+      return parse_json(RestClient.delete(@url+path, :Authorization => @auth))
     end
 
 # User Calls
     def get_users( opts={} )
       opts[:path] = (opts[:user_id]) ? "/" + @account_id + "/users/" + opts[:user_id].to_s + ".json" : "/" + @account_id + "/users.json"
       opts[:data] = "users" unless opts[:user_id]
-      results = get_responses(opts)
-      return results
+      return get_responses(opts)
     end
 
     def create_user( opts = {})
       params = set_params(opts)
       path = "/" + @account_id + "/users.json"
-      response = parse_json(RestClient.post(@url+path, params ,:Authorization => @auth))
-      return response 
+      return parse_json(RestClient.post(@url+path, params ,:Authorization => @auth))
     end
 
     def update_user(opts = {})
       params = set_params(opts) 
       path =  "/" + @account_id + "/users/" + opts[:user_id].to_s + ".json"
-      response = parse_json(RestClient.put(@url+path, params, :Authorization => @auth))      
+      return parse_json(RestClient.put(@url+path, params, :Authorization => @auth))      
     end
 
 # Tracker Calls    
     def get_trackers(opts={})
       opts[:path] = (opts[:tracker_id]) ? "/" + @account_id + "/trackers/" + opts[:tracker_id].to_s + ".json" : "/" + @account_id + "/trackers.json"
       opts[:data] = "trackers" unless opts[:tracker_id]
-      results = get_responses(opts)
+      return get_responses(opts)
     end
 
     def create_tracker(opts={})
       opts[:path] = "/" + @account_id + "/trackers.json"
       params = set_params(opts)
-      response = parse_json(RestClient.post(@url+opts[:path], params ,:Authorization => @auth))
-      return response 
+      return parse_json(RestClient.post(@url+opts[:path], params ,:Authorization => @auth))
     end
 
     def update_tracker(opts={})
       opts[:path] = "/" + @account_id + "/trackers/" + opts[:tracker_id] + ".json"
       params = set_params(opts)
-      response = parse_json(RestClient.put(@url+path, params, :Authorization => @auth))  
+      return parse_json(RestClient.put(@url+path, params, :Authorization => @auth))  
     end
 
     def disable_tracker(opts={})
       path = "/" + @account_id + "/trackers/" + opts[:tracker_id] + ".json"
-      response = parse_json(RestClient.delete(@url+path, :Authorization => @auth))
+      return parse_json(RestClient.delete(@url+path, :Authorization => @auth))
     end
   
   # Integrations
     def get_integrations(opts ={})
       opts[:path] = (opts[:integration_id]) ? "/" + @account_id + "/integrations/" + opts[:integration_id].to_s + ".json" : "/" + @account_id + "/integrations.json"
       opts[:data] = "integrations" unless opts[:integration_id]
-      results = get_responses(opts)
-      return results
+      return get_responses(opts)
     end
 
     def create_integration(opts ={})
       opts[:path] = "/" + @account_id + "/integrations.json"
       params = set_params(opts)
-      response = parse_json(RestClient.post(@url+opts[:path], params ,:Authorization => @auth))
-      return response
+      return parse_json(RestClient.post(@url+opts[:path], params ,:Authorization => @auth))
     end
 
     def update_integration(opts = {})
       params = set_params(opts) 
       path = "/" + @account_id + "/integrations/" + opts[:integration_id].to_s + ".json"
-      response = parse_json(RestClient.put(@url+path, params, :Authorization => @auth))      
+      return parse_json(RestClient.put(@url+path, params, :Authorization => @auth))      
    end
 
    def disable_integration(opts={})
       path = "/" + @account_id + "/integrations/" + opts[:integration_id].to_s + ".json"
-      response = parse_json(RestClient.delete(@url+path, :Authorization => @auth))
+      return parse_json(RestClient.delete(@url+path, :Authorization => @auth))
    end
 
   end

data/lib/callrail/version.rb

@@ -1,3 +1,3 @@
 module Callrail
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: callrail
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Michael Hoskison