tops_connect 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88806cf795346b8b63cbf0ea928fed4f6605b5df
-  data.tar.gz: 1dc68fd22180ba05ec4b12ddabe2d480149fd8ae
+  metadata.gz: 5867e71a798feb5d737263d749fb3b4dd009a19f
+  data.tar.gz: b5510fb2c07a486eac402485f78fdbba12f02134
 SHA512:
-  metadata.gz: e46fe7e62ec1b245523965b72f1d87ad8f4e8b72e9fbc9843b649b4bf84ed4d017734d825cf7429801f2144f0a0a94272d4b0552aef04f1541de52d28c7553dd
-  data.tar.gz: 56e3910e297e441ecf19430ad9c35a364f546e32afdf6e04628c46de0204c9fd46c3a4d6528fbff0e2d5474974b68520d36ebff6da85d1806238c6da94abd32f
+  metadata.gz: 80f5fb0f17b286f461ad626600ad4555693955a6b2dd7b1d3c30ab728766ac2c005c86a5335f2c86f068b5bed496c96d22c29c345101ffc8b1adb8bb70ecd589
+  data.tar.gz: 1a57806bd996195daba9aa889c64644558c949f53283f167b21135928d5375c9c4b20edae8a529ea63d2eb6d8c559ee93b2157ec69a217279ba20daa0a966cd5

data/README.md

@@ -25,15 +25,12 @@ TopsConnect.configure do |config|
   config.subscription_key = '0123456789abcdef0123456789abcdef'
   config.client_id = '00000000-1111-2222-3333-444444444444'
   config.software_key = '55555555-6666-7777-8888-999999999999'
-  config.community_api_key = 'AAAAAAAA-BBBB-CCCC-DDDD-EEEEEEEEEEEE'
   config.zone = :broad
 end
 
-tops = TopsConnect::Client.new
+tops = TopsConnect::Client.new(6, 'AAAAAAAA-BBBB-CCCC-DDDD-EEEEEEEEEEEE')
 
-tops.communities.each do |community|
-  puts community['Name']
-end
+puts "Loaded #{tops.community.name}"
 ```
 
 ## Development

data/lib/tops_connect/base.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 module TopsConnect
   class Base
-    class << self
-      attr_accessor :client
+    def initialize(client)
+      @client = client
     end
 
     def get(*args)
-      TopsConnect::Base.client.get(*args)
+      @client.get(*args)
     end
   end
 end

data/lib/tops_connect/client.rb

@@ -5,31 +5,31 @@ module TopsConnect
     include TopsConnect::Communities
     include TopsConnect::Owners
 
+    attr_reader :community_id, :community_api_key
+
     headers 'Content-Type' => 'application/json'
     headers 'api-version' => '1'
 
     base_uri 'https://topsconnectapi.azure-api.net'
 
-    def initialize
+    def initialize(community_id, community_api_key)
       authorization = Base64.strict_encode64 [
         TopsConnect.configuration.client_id,
         TopsConnect.configuration.software_key
       ].join(':')
 
-      self.class.headers(
-        'authorization' => "Basic #{authorization}",
-        'community-api-key' => TopsConnect.configuration.community_api_key
-      )
+      self.class.headers('authorization' => "Basic #{authorization}")
 
       @subscription_key = TopsConnect.configuration.subscription_key
-
-      TopsConnect::Base.client = self
+      @community_id = community_id
+      @community_api_key = community_api_key
     end
 
-    def get(endpoint, parameters = {})
+    def get(endpoint, headers: {}, query: {})
       response = self.class.get(
         "/#{TopsConnect.configuration.zone}/api#{endpoint}",
-        query: parameters.merge('subscription-key' => @subscription_key)
+        query: query.merge('subscription-key' => @subscription_key),
+        headers: headers.merge('community-api-key' => @community_api_key)
       )
 
       case response.code

data/lib/tops_connect/communities.rb

@@ -3,16 +3,16 @@ module TopsConnect
   module Communities
     # Method: GET
     # Endpoint: Community_GetList
+    # Returns: Array<Hash>
     def communities
-      get('/community').map do |community|
-        TopsConnect::Community.new community['CommunityKey'], community
-      end
+      get('/community')
     end
 
     # Method: GET
     # Endpoint: Community_Get
-    def community(community_id)
-      TopsConnect::Community.new community_id
+    # Returns: TopsConnect::Community
+    def community
+      TopsConnect::Community.new self
     end
   end
 end

data/lib/tops_connect/community.rb

@@ -3,9 +3,10 @@ module TopsConnect
   class Community < Base
     attr_reader :id
 
-    def initialize(id, data = nil)
-      @id = id.to_i
+    def initialize(client, data = nil)
       @data = data
+
+      super client
     end
 
     def data
@@ -13,7 +14,7 @@ module TopsConnect
     end
 
     def reload!
-      @data = get "/community/#{@id}"
+      @data = get "/community/#{@client.community_id}"
     end
 
     def code

data/lib/tops_connect/configuration.rb

@@ -1,8 +1,7 @@
 # frozen_string_literal: true
 module TopsConnect
   class Configuration
-    attr_reader :subscription_key, :client_id, :software_key,
-                :community_api_key, :zone
+    attr_reader :subscription_key, :client_id, :software_key, :zone
 
     def initialize
     end
@@ -31,14 +30,6 @@ module TopsConnect
       @software_key = key.upcase
     end
 
-    def community_api_key=(key)
-      unless key =~ /\A\h{8}-\h{4}-\h{4}-\h{4}-\h{12}\z/
-        raise 'Invalid TOPS Community API Key. Expected a GUID.'
-      end
-
-      @community_api_key = key.upcase
-    end
-
     def zone=(new_zone)
       unless %i(broad limited sandbox).include?(new_zone.to_sym)
         raise 'Invalid TOPS Zone. Accepted values are broad, limited, sandbox.'

data/lib/tops_connect/owner.rb

@@ -3,9 +3,11 @@ module TopsConnect
   class Owner < Base
     attr_reader :id
 
-    def initialize(id, data = nil)
+    def initialize(client, id, data = nil)
       @id = id.to_i
       @data = data
+
+      super client
     end
 
     def data

data/lib/tops_connect/owners.rb

@@ -4,17 +4,17 @@ module TopsConnect
     # Method: GET
     # Endpoint: Owner_Get
     def owner(owner_id)
-      TopsConnect::Owner.new owner_id
+      TopsConnect::Owner.new self, owner_id, get("/owner/#{owner_id}")
     end
 
     # Method: GET
     # Endpoint: Owner_GetList
     def owners(property_id = nil)
-      parameters = {}
-      parameters['PropertyKey'] = property_id.to_i if property_id
+      query = {}
+      query['PropertyKey'] = property_id.to_i if property_id
 
-      get('/owner', parameters).map do |owner|
-        TopsConnect::Owner.new owner['OwnerKey'], owner
+      get('/owner', query: query).map do |owner|
+        TopsConnect::Owner.new self, owner['OwnerKey'], owner
       end
     end
   end

data/lib/tops_connect/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module TopsConnect
-  VERSION = '0.1.4'
+  VERSION = '0.2.0'
 end

data/tops_connect.gemspec

@@ -21,9 +21,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler', '~> 1.10'
-  spec.add_development_dependency 'rake', '>= 10'
-  spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'webmock'
+  spec.add_development_dependency 'rake', '~> 10'
+  spec.add_development_dependency 'rspec', '~> 3.4'
+  spec.add_development_dependency 'webmock', '~> 2.0'
 
   spec.add_dependency 'httparty', '~> 0.13'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tops_connect
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Steven Hoffman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-11 00:00:00.000000000 Z
+date: 2016-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,44 +28,44 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement