trimark 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56f8731b7035d9b019d574e5d266b93e4ead3f42
-  data.tar.gz: 126f6d84058c07f2c70034afddd1ce6abbc2bbdb
+  metadata.gz: a25da3f5fe1a500903894d4a547f6c0f8bce5be1
+  data.tar.gz: 8e1d0de16a18cc90fbcbe4624ae25a0c74802b39
 SHA512:
-  metadata.gz: 141fe50b1bfed392b5014585c5b2b37a5811897d6fe4c69ef483413e04f458784c52b9e890c6d1dc3c127ed319662b0ddce50f84abc8f581ec630e3c52b0abcc
-  data.tar.gz: b398a400e5b7c53542f362f31a1ec8c291c57dd155711404625c9cf8d4cff7e810b41bf45df8e356299c6c9c7c9d0d555ca6890c1be15b50114a1bb09ab313c8
+  metadata.gz: 1ab6548fc9ef668dbdb3ab3bff4ff0c3da474475cd9b12e9c1d2a491619f87be12ce2c9dfca5af2bb04dbfbcf61bc9845a7b195d9dc96c86e844d7d9f1cf34d5
+  data.tar.gz: b38aadb4babf57552931d08f3b444069572d3d3ee0223b43d18d5f359c0b11fee4a3c1ba9f3fc9ad4764a071bf3f7a66da90904b2f5d376c76f961612ee75a3e

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    trimark (0.1.0)
+    trimark (0.1.2)
+      addressable
       faraday
       json
       virtus
@@ -58,13 +59,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.10)
+  bundler (~> 1.9.5)
   minitest
   minitest-reporters
   pry
   rake (~> 10.0)
   trimark!
   webmock
-
-BUNDLED WITH
-   1.10.6

data/bin/console

@@ -9,6 +9,3 @@ require "trimark"
 # (If you use this, don't forget to add pry to your Gemfile!)
 require "pry"
 Pry.start
-
-require "irb"
-IRB.start

data/lib/trimark.rb

@@ -3,4 +3,21 @@ require "trimark/version"
 require "trimark/client"
 
 module Trimark
+  class << self
+    def underscore(str)
+      word = str.dup
+      word.gsub!(/::/, '/')
+      word.gsub!(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
+      word.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
+      word.tr!("-", "_")
+      word.downcase!
+      word
+    end
+
+    def symbolize_keys(params)
+      {}.tap do |hsh|
+        params.keys.each { |k| hsh[underscore(k).to_sym] = params[k] }
+      end
+    end
+  end
 end

data/lib/trimark/client.rb

@@ -5,7 +5,7 @@ require 'trimark/connection'
 require 'trimark/site'
 require 'addressable/template'
 
-module TriMark
+module Trimark
   class AuthError < StandardError; end
   class QueryError < StandardError; end
 
@@ -42,13 +42,17 @@ module TriMark
       end
     end
 
+    def base_url
+      "company/#{company_id}" 
+    end
+
     def site_info_url(site_id)
-      "company/#{company_id}/site/#{site_id}"
+      "#{base_url}/site/#{site_id}"
     end
 
     def site_history_url(site_id, query_hash)
       Addressable::Template.new(
-        "company/#{company_id}/site/#{site_id}/history/{?query*}"
+        "#{site_info_url(site_id)}/history/{?query*}"
       ).expand(query_hash)
     end
 
@@ -69,13 +73,25 @@ module TriMark
       }
     end
 
+    # Gets a list of all the sites for the company
+    #
+    def sites
+      response = conn.get("#{base_url}/site", {}, query_headers)            
+      body = JSON.parse(response.body)
+
+      body.map { |b| Site.new(b) } 
+    rescue JSON::ParserError
+      fail QueryError, "Query Failed! HTTPStatus: #{response.status} - Response: #{body}"
+    end
+
     # Returns site attributes and history data if an optional query_hash is supplied
     # @client.site_query(x) will return the attributes of site x
     # @client.site_query(x, query_hash) will return historical data from site x instrumentation
     def site_query(*args)
-      response = (conn.get url_picker(*args), {}, query_headers)
+      response = conn.get(url_picker(*args), {}, query_headers)
+
       if response.body['SiteId'] || response.body['PointId']
-        return JSON.parse(response.body)
+        JSON.parse(response.body)
       else
         fail QueryError, "Query Failed! HTTPStatus: #{response.status}"
       end

data/lib/trimark/site.rb

@@ -1,4 +1,4 @@
-module TriMark
+module Trimark
   class AuthError < StandardError; end
   class QueryError < StandardError; end
 
@@ -18,7 +18,7 @@ module TriMark
     attribute :location, String
 
     def initialize(params = {})
-      super(params)
+      super(Trimark.symbolize_keys(params))
     end
   end
 end

data/lib/trimark/version.rb

@@ -1,3 +1,3 @@
 module Trimark
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/trimark.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.10"
+  spec.add_development_dependency "bundler", "~> 1.9.5"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "minitest-reporters"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trimark
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Tyler Whitsett
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-26 00:00:00.000000000 Z
+date: 2015-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: 1.9.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: 1.9.5
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement