cassia-ruby 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d229db9bae35ba77cf6fb4602c2d84fdc24de4f1492f123efffb4f498b97e11
-  data.tar.gz: b7f499a5a965da624cf360374924be9d0f48511677dcaec2d85ccd786fc6b560
+  metadata.gz: 67cf9d7de85d1b13bac64ce5531e38c5e6073ae833ff23b1fe6921c7d3495ed3
+  data.tar.gz: a463007325aa41a42d533beca800f4daecdcb70b623264f836320b7f89297cf2
 SHA512:
-  metadata.gz: 2b9c21b633672555da4a1ea7a1db12d91d6147010e608ea879b962455189e64ecad39b0cd8f5733eed5b7a249b837d3f5455bab6370567810c26bdeee3f9973d
-  data.tar.gz: 990cf7d2d97cc891c138f4a94a50a1b4c02b11c78c58777c27fdb8024d66be5dcddf45c5905652373f087243a6f8d2c16d991ff3938a051cf0081a4d71de65f4
+  metadata.gz: 3d57ddf288d141da8e9851d1699abb696ba8c45ff6b614d86a468dbfc41b2783d6d8bee0c25843b891177d49c5a2296c80b14271cd7c7942e47921b4e99bb1c6
+  data.tar.gz: 9fb9ccea39859e9c25fd7c5cf29306ec1132fd38fc0b28d1b57113c455e59f2f8baca4441786b356d014f9a2b4b480e0bb9877f4ec949a440f4547ff8fb85932

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cassia-ruby (1.0.0)
+    cassia-ruby (1.0.1)
       faraday
       faraday_middleware
       ld-eventsource
@@ -21,16 +21,16 @@ GEM
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.3)
-    dotenv (2.7.2)
+    dotenv (2.7.5)
     equalizer (0.0.11)
-    faraday (0.15.4)
+    faraday (0.17.0)
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.13.1)
       faraday (>= 0.7.4, < 1.0)
     hitimes (1.3.1)
     http_tools (0.4.5)
     ice_nine (0.11.2)
-    ld-eventsource (1.0.0)
+    ld-eventsource (1.0.1)
       concurrent-ruby (~> 1.0)
       http_tools (~> 0.4.5)
       socketry (~> 0.5.1)
@@ -39,20 +39,20 @@ GEM
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    rake (10.5.0)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.4)
+    rake (13.0.0)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.0)
+      rspec-support (~> 3.9.0)
+    rspec-expectations (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.2)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.0)
     socketry (0.5.1)
       hitimes (~> 1.2)
     thread_safe (0.3.6)
@@ -71,7 +71,7 @@ DEPENDENCIES
   cassia-ruby!
   dotenv
   pry
-  rake (~> 10.0)
+  rake (~> 13.0)
   rspec
   vcr
 

data/README.md

@@ -1,8 +1,8 @@
+[![Maintainability](https://api.codeclimate.com/v1/badges/dd4bf18bcdf6b2bdc860/maintainability)](https://codeclimate.com/github/iteratelabs/cassia-ruby/maintainability) [![CircleCI](https://circleci.com/gh/iteratelabs/cassia-ruby/tree/master.svg?style=svg)](https://circleci.com/gh/iteratelabs/cassia-ruby/tree/master)
 # Cassia::Ruby
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/cassia/ruby`. To experiment with that code, run `bin/console` for an interactive prompt.
+This gem was created in order to allow Ruby developers to interact with the Cassia Bluetooth Gateway API's https://www.cassianetworks.com/download/docs/Cassia_SDK_Implementation_Guide.pdf.
 
-TODO: Delete this and the text above, and describe your gem
 
 ## Installation
 
@@ -23,11 +23,15 @@ Or install it yourself as:
 ## Configuration
 Here is a list of the available configuration options and their default values
 
-| Option          | Description                       |
-|-----------------|:---------------------------------:|
-| `ac_url`        | The URL of your AC server address | 
-| `client_id`     | Your Cassia API Developer Key     |                
-| `secret`        | Your Cassia API Developer Secret  |
+| Option          | Description                       | Optional|
+|-----------------|:---------------------------------:|---------|
+| `ac_url`        | The URL of your AC server address | No      |
+| `client_id`     | Your Cassia API Developer Key     | No      |
+| `secret`        | Your Cassia API Developer Secret  | No      |
+| `client_cert`   | Your SSL client cert              | Yes     |
+| `client_key`    | Your SSL client key               | Yes     |
+| `ca_file`       | Your SSL CA file                  | Yes     |
+| `ca_path`       | The path to your SSL CA files     | Yes     |
 
 ### Setting your configuration
 
@@ -45,7 +49,7 @@ end
 
 ### AccessControllers
 
-In the following context, `access_controller` is a `Cassia::AccessController` object which contains attributes and structures of a Cassia access controller. 
+In the following context, `access_controller` is a `Cassia::AccessController` object which contains attributes and structures of a Cassia access controller.
 
 #### Retrieve An Access Token From the Cassia API
 ```ruby
@@ -53,7 +57,7 @@ access_controller.get_token
 access_controller.access_token
 ```
 
-`get_token` will make a request from `access_controller` to generate an access token encoded from `config.client_id` and `config.secret` using base64. 
+`get_token` will make a request from `access_controller` to generate an access token encoded from `config.client_id` and `config.secret` using base64.
 
 `access_token` will return the access token of `access_controller`.
 
@@ -88,7 +92,7 @@ access_controller.open_scan(aps: ["CC:1B:E0:E7:FE:F8",  "CC:1B:E0:E7:FE:F8", "CC
 ```ruby
 access_controller.close_scan(aps: ["CC:1B:E0:E7:FE:F8",  "CC:1B:E0:E7:FE:F8", "CC:1B:E0:E7:FE:F8"])
 ```
- 
+
 `aps` is an array of one or multiple router's MAC address.
 
 #### Connect A Device to An Automatically Selected Router from the router list
@@ -147,7 +151,7 @@ access_controller.close_ap_state
 #### Create One Combined SSE Connection
 ```ruby
 access_controller.combined_sse do |client|
-  client.on_event do |event| 
+  client.on_event do |event|
     puts "I received an event: #{event.type}, #{event.data}"
    # put code here to act on events
   end
@@ -366,7 +370,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/cassia-ruby. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/iteratelabs/cassia-ruby. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 ## License
 
@@ -374,4 +378,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## Code of Conduct
 
-Everyone interacting in the Cassia::Ruby project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/cassia-ruby/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the Cassia::Ruby project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/iteratelabs/cassia-ruby/blob/master/CODE_OF_CONDUCT.md).

data/bin/console

@@ -12,6 +12,9 @@ Cassia.configure do |config|
   config.ac_url = ENV['CASSIA_AC_URL']
   config.client_id = ENV['CASSIA_CLIENT_ID']
   config.secret = ENV['CASSIA_SECRET']
+  config.client_cert = ENV['CASSIA_CLIENT_CERT']
+  config.client_key = ENV['CASSIA_CLIENT_KEY']
+  config.ca_file = ENV['CASSIA_CA_FILE']
 end
 
 IRB.start(__FILE__)

data/cassia-ruby.gemspec

@@ -6,8 +6,8 @@ require "cassia/ruby/version"
 Gem::Specification.new do |spec|
   spec.name          = "cassia-ruby"
   spec.version       = Cassia::Ruby::VERSION
-  spec.authors       = ["adelinewang679"]
-  spec.email         = ["adelinewang679@gmail.com"]
+  spec.authors       = ["Adeline Wang", "James Russo"]
+  spec.email         = ["adelinewang679@gmail.com", "jdrusso1020@gmail.com"]
 
   spec.summary       = "a ruby api client for the cassia router api"
   spec.description   = "a ruby api client for the cassia router api"
@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "ld-eventsource"
 
   spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "dotenv"

data/lib/cassia.rb

@@ -8,6 +8,7 @@ require "ld-eventsource"
 require "cassia/api"
 require "cassia/configuration"
 require "cassia/default_logger"
+require "cassia/descriptor"
 require "cassia/characteristic"
 require "cassia/service"
 require "cassia/device"

data/lib/cassia/access_controller.rb

@@ -3,6 +3,7 @@ module Cassia
     include Virtus.model
 
     attribute :access_token, String
+    attribute :access_token_expiration, Time, default: Time.now.getutc + 100 # default for tests when we pass in access token
     attribute :error, String
     attribute :error_description, String
     attribute :autoselect_switch, Integer, default: 0
@@ -11,7 +12,8 @@ module Cassia
     attribute :sse
 
     def get_token
-      Cassia::Requests::GetToken.new(self).perform
+      Cassia::Requests::GetToken.new(self).perform if access_token.nil? || Time.now.getutc > access_token_expiration
+      access_token
     end
 
     def get_all_routers_status
@@ -89,7 +91,7 @@ module Cassia
     def discover_all_services_and_chars(router: , device_mac: )
       Cassia::Requests::DiscoverAllServicesAndChars.new(self, router: router, device_mac: device_mac).perform
     end
-    
+
     def write_char_by_handle(router: , device_mac:, handle: , value: )
       Cassia::Requests::WriteCharByHandle.new(self, router: router, device_mac: device_mac, handle: handle, value: value).perform
     end
@@ -97,7 +99,7 @@ module Cassia
     def open_char_notification(router: , device_mac: , handle: )
       Cassia::Requests::WriteCharByHandle.new(self, router: router, device_mac: device_mac, handle: handle, value: "0100").perform
     end
-    
+
     def close_char_notification(router: , device_mac: , handle: )
       Cassia::Requests::WriteCharByHandle.new(self, router: router, device_mac: device_mac, handle: handle, value: "0000").perform
     end

data/lib/cassia/api.rb

@@ -12,7 +12,7 @@ module Cassia
       connection.get do |req|
         req.url request.path
         req.headers = request.headers
-      end 
+      end
     end
 
     def delete(request)
@@ -21,7 +21,7 @@ module Cassia
         req.headers = request.headers
       end
     end
-    
+
     private
 
     def connection
@@ -29,11 +29,31 @@ module Cassia
         faraday.response :logger, Cassia.logger, bodies: true
         faraday.response :json, :content_type => /\bjson$/
         faraday.adapter Faraday.default_adapter
+        faraday.ssl.client_cert = OpenSSL::X509::Certificate.new(client_cert)if client_cert
+        faraday.ssl.client_key = OpenSSL::PKey::RSA.new(client_key) if client_key
+        faraday.ssl.ca_file = ca_file if ca_file
+        faraday.ssl.ca_path = ca_path if ca_path
       end
     end
 
     def ac_url
       Cassia.configuration.ac_url
     end
+
+    def client_cert
+      Cassia.configuration.client_cert
+    end
+
+    def client_key
+      Cassia.configuration.client_key
+    end
+
+    def ca_file
+      Cassia.configuration.ca_file
+    end
+
+    def ca_path
+      Cassia.configuration.ca_path
+    end
   end
 end

data/lib/cassia/characteristic.rb

@@ -4,7 +4,7 @@ module Cassia
     attribute :uuid, String
     attribute :properties, Integer
     attribute :handle, Integer
-    attribute :descriptors, Array
+    attribute :descriptors, Array[Cassia::Descriptor]
     attribute :notification_on, Boolean
 
     def ==(other)

data/lib/cassia/configuration.rb

@@ -1,7 +1,10 @@
 module Cassia
   class Configuration
-    attr_accessor :client_id, :secret, :ac_url
- 
+    attr_accessor :client_id, :secret,
+      :ac_url, :client_cert,
+      :client_key, :ca_file,
+      :ca_path
+
     def ac_url
     	@ac_url ||= "http://demo.cassia.pro"
     end

data/lib/cassia/descriptor.rb

@@ -0,0 +1,11 @@
+module Cassia
+  class Descriptor
+    include Virtus.model
+    attribute :uuid, String
+    attribute :handle, Integer
+
+    def ==(other)
+      return self.uuid == other.uuid && self.handle == other.handle
+    end
+  end
+end

data/lib/cassia/requests/close_ap_state.rb

@@ -11,7 +11,7 @@ module Cassia
 
       def headers
         {
-          'Authorization' => "Bearer #{access_token}",
+          'Authorization' => "Bearer #{@access_controller.get_token}",
           'Content-Type' => "application/json"
         }
       end
@@ -19,13 +19,6 @@ module Cassia
       def perform
         Cassia::ResponseHandlers::CloseApState.new(@access_controller).handle(Cassia.api.get(self))
       end
-
-      private
-
-      def access_token
-        @access_controller.get_token if @access_controller.access_token.nil?
-        @access_controller.access_token
-      end
     end
   end
 end

data/lib/cassia/requests/close_connection_state.rb

@@ -18,7 +18,7 @@ module Cassia
 
       def headers
         {
-          'Authorization' => "Bearer #{access_token}",
+          'Authorization' => "Bearer #{@access_controller.get_token}",
           'Content-Type' => "application/json"
         }
       end
@@ -26,13 +26,6 @@ module Cassia
       def perform
         Cassia::ResponseHandlers::CloseConnectionState.new(@access_controller, aps: @aps).handle(Cassia.api.post(self))
       end
-
-      private
-
-      def access_token
-        @access_controller.get_token if @access_controller.access_token.nil?
-        @access_controller.access_token
-      end
     end
   end
 end

data/lib/cassia/requests/close_notify.rb

@@ -18,7 +18,7 @@ module Cassia
 
       def headers
         {
-          'Authorization' => "Bearer #{access_token}",
+          'Authorization' => "Bearer #{@access_controller.get_token}",
           'Content-Type' => "application/json"
         }
       end
@@ -26,13 +26,6 @@ module Cassia
       def perform
         Cassia::ResponseHandlers::CloseNotify.new(@access_controller, aps: @aps).handle(Cassia.api.post(self))
       end
-
-      private
-
-      def access_token
-        @access_controller.get_token if @access_controller.access_token.nil?
-        @access_controller.access_token
-      end
     end
   end
 end

data/lib/cassia/requests/close_scan.rb

@@ -18,7 +18,7 @@ module Cassia
 
       def headers
         {
-          'Authorization' => "Bearer #{access_token}",
+          'Authorization' => "Bearer #{@access_controller.get_token}",
           'Content-Type' => "application/json"
         }
       end
@@ -26,13 +26,6 @@ module Cassia
       def perform
         Cassia::ResponseHandlers::CloseScan.new(@access_controller, aps: @aps).handle(Cassia.api.post(self))
       end
-
-      private
-
-      def access_token
-        @access_controller.get_token if @access_controller.access_token.nil?
-        @access_controller.access_token
-      end
     end
   end
 end

data/lib/cassia/requests/combined_sse.rb

@@ -11,17 +11,10 @@ module Cassia
 
       def headers
         {
-          'Authorization' => "Bearer #{access_token}",
+          'Authorization' => "Bearer #{@access_controller.get_token}",
           'Content-Type' => "application/json"
         }
       end
-
-      private
-
-      def access_token
-        @access_controller.get_token if @access_controller.access_token.nil?
-        @access_controller.access_token
-      end
     end
   end
 end

data/lib/cassia/requests/connect_device.rb

@@ -18,7 +18,7 @@ module Cassia
 
       def headers
         {
-          'Authorization' => "Bearer #{access_token}",
+          'Authorization' => "Bearer #{@access_controller.get_token}",
           'Content-Type' => "application/json"
         }
       end
@@ -26,13 +26,6 @@ module Cassia
       def perform
         Cassia::ResponseHandlers::ConnectDevice.new(@access_controller).handle(Cassia.api.post(self))
       end
-
-      private
-
-      def access_token
-        @access_controller.get_token if @access_controller.access_token.nil?
-        @access_controller.access_token
-      end
     end
   end
 end

data/lib/cassia/requests/connect_local.rb

@@ -24,7 +24,7 @@ module Cassia
 
       def headers
         {
-          'Authorization' => "Bearer #{access_token}",
+          'Authorization' => "Bearer #{@access_controller.get_token}",
           'Content-Type' => "application/json"
         }
       end
@@ -32,13 +32,6 @@ module Cassia
       def perform
         Cassia::ResponseHandlers::ConnectLocal.new(@access_controller, router: @router, device_mac: @device_mac).handle(Cassia.api.post(self))
       end
-
-      private
-
-      def access_token
-        @access_controller.get_token if @access_controller.access_token.nil?
-        @access_controller.access_token
-      end
     end
   end
 end

data/lib/cassia/requests/disconnect_device.rb

@@ -16,7 +16,7 @@ module Cassia
 
       def headers
         {
-          'Authorization' => "Bearer #{access_token}",
+          'Authorization' => "Bearer #{@access_controller.get_token}",
           'Content-Type' => "application/json"
         }
       end
@@ -24,13 +24,6 @@ module Cassia
       def perform
         Cassia::ResponseHandlers::DisconnectDevice.new(@access_controller).handle(Cassia.api.post(self))
       end
-
-      private
-
-      def access_token
-        @access_controller.get_token if @access_controller.access_token.nil?
-        @access_controller.access_token
-      end
     end
   end
 end

data/lib/cassia/requests/disconnect_local.rb

@@ -13,7 +13,7 @@ module Cassia
 
       def headers
         {
-          'Authorization' => "Bearer #{access_token}",
+          'Authorization' => "Bearer #{@access_controller.get_token}",
           'Content-Type' => "application/json"
         }
       end
@@ -21,13 +21,6 @@ module Cassia
       def perform
         Cassia::ResponseHandlers::DisconnectLocal.new(@access_controller, router: @router, device_mac: @device_mac).handle(Cassia.api.delete(self))
       end
-
-      private
-
-      def access_token
-        @access_controller.get_token if @access_controller.access_token.nil?
-        @access_controller.access_token
-      end
     end
   end
 end

data/lib/cassia/requests/discover_all_char.rb

@@ -13,7 +13,7 @@ module Cassia
 
       def headers
         {
-          'Authorization' => "Bearer #{access_token}",
+          'Authorization' => "Bearer #{@access_controller.get_token}",
           'Content-Type' => "application/json"
         }
       end
@@ -21,13 +21,6 @@ module Cassia
       def perform
         Cassia::ResponseHandlers::DiscoverAllChar.new(@access_controller, router: @router, device_mac: @device_mac).handle(Cassia.api.get(self))
       end
-
-      private
-
-      def access_token
-        @access_controller.get_token if @access_controller.access_token.nil?
-        @access_controller.access_token
-      end
     end
   end
 end

data/lib/cassia/requests/discover_all_services.rb

@@ -13,7 +13,7 @@ module Cassia
 
       def headers
         {
-          'Authorization' => "Bearer #{access_token}",
+          'Authorization' => "Bearer #{@access_controller.get_token}",
           'Content-Type' => "application/json"
         }
       end
@@ -21,13 +21,6 @@ module Cassia
       def perform
         Cassia::ResponseHandlers::DiscoverAllServices.new(@access_controller, router: @router, device_mac: @device_mac).handle(Cassia.api.get(self))
       end
-
-      private
-
-      def access_token
-        @access_controller.get_token if @access_controller.access_token.nil?
-        @access_controller.access_token
-      end
     end
   end
 end

data/lib/cassia/requests/discover_all_services_and_chars.rb

@@ -13,7 +13,7 @@ module Cassia
 
       def headers
         {
-          'Authorization' => "Bearer #{access_token}",
+          'Authorization' => "Bearer #{@access_controller.get_token}",
           'Content-Type' => "application/json"
         }
       end
@@ -21,13 +21,6 @@ module Cassia
       def perform
         Cassia::ResponseHandlers::DiscoverAllServicesAndChars.new(@access_controller, router: @router, device_mac: @device_mac).handle(Cassia.api.get(self))
       end
-
-      private
-
-      def access_token
-        @access_controller.get_token if @access_controller.access_token.nil?
-        @access_controller.access_token
-      end
     end
   end
 end

data/lib/cassia/requests/discover_char_of_service.rb

@@ -14,7 +14,7 @@ module Cassia
 
       def headers
         {
-          'Authorization' => "Bearer #{access_token}",
+          'Authorization' => "Bearer #{@access_controller.get_token}",
           'Content-Type' => "application/json"
         }
       end
@@ -22,13 +22,6 @@ module Cassia
       def perform
         Cassia::ResponseHandlers::DiscoverCharOfService.new(@access_controller, router: @router, device_mac: @device_mac, service_uuid: @service_uuid).handle(Cassia.api.get(self))
       end
-
-      private
-
-      def access_token
-        @access_controller.get_token if @access_controller.access_token.nil?
-        @access_controller.access_token
-      end
     end
   end
 end

data/lib/cassia/requests/discover_descriptor_of_char.rb

@@ -14,7 +14,7 @@ module Cassia
 
       def headers
         {
-          'Authorization' => "Bearer #{access_token}",
+          'Authorization' => "Bearer #{@access_controller.get_token}",
           'Content-Type' => "application/json"
         }
       end
@@ -22,13 +22,6 @@ module Cassia
       def perform
         Cassia::ResponseHandlers::DiscoverDescriptorOfChar.new(@access_controller, router: @router, device_mac: @device_mac, char_uuid: @char_uuid).handle(Cassia.api.get(self))
       end
-
-      private
-
-      def access_token
-        @access_controller.get_token if @access_controller.access_token.nil?
-        @access_controller.access_token
-      end
     end
   end
 end

data/lib/cassia/requests/get_all_routers_status.rb

@@ -13,7 +13,7 @@ module Cassia
 
       def headers
         {
-          'Authorization' => "Bearer #{access_token}",
+          'Authorization' => "Bearer #{@access_controller.get_token}",
           'Content-Type' => "application/json"
         }
       end
@@ -21,13 +21,6 @@ module Cassia
       def perform
         Cassia::ResponseHandlers::GetAllRoutersStatus.new(@access_controller).handle(Cassia.api.get(self))
       end
-
-      private
-
-      def access_token
-        @access_controller.get_token if @access_controller.access_token.nil?
-        @access_controller.access_token
-      end
     end
   end
 end

data/lib/cassia/requests/get_connected_devices_router.rb

@@ -14,7 +14,7 @@ module Cassia
 
       def headers
         {
-          'Authorization' => "Bearer #{access_token}",
+          'Authorization' => "Bearer #{@access_controller.get_token}",
           'Content-Type' => "application/json"
         }
       end
@@ -22,13 +22,6 @@ module Cassia
       def perform
         Cassia::ResponseHandlers::GetConnectedDevicesRouter.new(@access_controller, router: @router).handle(Cassia.api.get(self))
       end
-
-      private
-
-      def access_token
-        @access_controller.get_token if @access_controller.access_token.nil?
-        @access_controller.access_token
-      end
     end
   end
 end

data/lib/cassia/requests/open_ap_state.rb

@@ -11,7 +11,7 @@ module Cassia
 
       def headers
         {
-          'Authorization' => "Bearer #{access_token}",
+          'Authorization' => "Bearer #{@access_controller.get_token}",
           'Content-Type' => "application/json"
         }
       end
@@ -19,13 +19,6 @@ module Cassia
       def perform
         Cassia::ResponseHandlers::OpenApState.new(@access_controller).handle(Cassia.api.get(self))
       end
-
-      private
-
-      def access_token
-        @access_controller.get_token if @access_controller.access_token.nil?
-        @access_controller.access_token
-      end
     end
   end
 end

data/lib/cassia/requests/open_connection_state.rb

@@ -18,7 +18,7 @@ module Cassia
 
       def headers
         {
-          'Authorization' => "Bearer #{access_token}",
+          'Authorization' => "Bearer #{@access_controller.get_token}",
           'Content-Type' => "application/json"
         }
       end
@@ -26,13 +26,6 @@ module Cassia
       def perform
         Cassia::ResponseHandlers::OpenConnectionState.new(@access_controller, aps: @aps).handle(Cassia.api.post(self))
       end
-
-      private
-
-      def access_token
-        @access_controller.get_token if @access_controller.access_token.nil?
-        @access_controller.access_token
-      end
     end
   end
 end

data/lib/cassia/requests/open_notify.rb

@@ -18,7 +18,7 @@ module Cassia
 
       def headers
         {
-          'Authorization' => "Bearer #{access_token}",
+          'Authorization' => "Bearer #{@access_controller.get_token}",
           'Content-Type' => "application/json"
         }
       end
@@ -26,13 +26,6 @@ module Cassia
       def perform
         Cassia::ResponseHandlers::OpenNotify.new(@access_controller, aps: @aps).handle(Cassia.api.post(self))
       end
-
-      private
-
-      def access_token
-        @access_controller.get_token if @access_controller.access_token.nil?
-        @access_controller.access_token
-      end
     end
   end
 end

data/lib/cassia/requests/open_scan.rb

@@ -30,7 +30,7 @@ module Cassia
 
       def headers
         {
-          'Authorization' => "Bearer #{access_token}",
+          'Authorization' => "Bearer #{@access_controller.get_token}",
           'Content-Type' => "application/json"
         }
       end
@@ -38,13 +38,6 @@ module Cassia
       def perform
         Cassia::ResponseHandlers::OpenScan.new(@access_controller, aps: @aps).handle(Cassia.api.post(self))
       end
-
-      private
-
-      def access_token
-        @access_controller.get_token if @access_controller.access_token.nil?
-        @access_controller.access_token
-      end
     end
   end
 end

data/lib/cassia/requests/switch_autoselect.rb

@@ -17,7 +17,7 @@ module Cassia
 
       def headers
         {
-          'Authorization' => "Bearer #{access_token}",
+          'Authorization' => "Bearer #{@access_controller.get_token}",
           'Content-Type' => "application/json"
         }
       end
@@ -25,13 +25,6 @@ module Cassia
       def perform
         Cassia::ResponseHandlers::SwitchAutoselect.new(@access_controller).handle(Cassia.api.post(self))
       end
-
-      private
-
-      def access_token
-        @access_controller.get_token if @access_controller.access_token.nil?
-        @access_controller.access_token
-      end
     end
   end
 end

data/lib/cassia/requests/write_char_by_handle.rb

@@ -15,7 +15,7 @@ module Cassia
 
       def headers
         {
-          'Authorization' => "Bearer #{access_token}",
+          'Authorization' => "Bearer #{@access_controller.get_token}",
           'Content-Type' => "application/json"
         }
       end
@@ -23,13 +23,6 @@ module Cassia
       def perform
         Cassia::ResponseHandlers::WriteCharByHandle.new(@access_controller, router: @router, device_mac: @device_mac, handle: @handle, value: @value).handle(Cassia.api.get(self))
       end
-
-      private
-
-      def access_token
-        @access_controller.get_token if @access_controller.access_token.nil?
-        @access_controller.access_token
-      end
     end
   end
 end

data/lib/cassia/response_handlers/get_token.rb

@@ -18,6 +18,9 @@ module Cassia
 
       def handle_success(response)
         @access_controller.access_token = response.body["access_token"]
+        # set the token expiration for 3500 seconds from now, the actual expiration is 3600
+        # but this gives some buffer
+        @access_controller.access_token_expiration = Time.now.getutc + 3500
       end
 
       def handle_failure(response)

data/lib/cassia/response_handlers/write_char_by_handle.rb

@@ -10,8 +10,17 @@ module Cassia
       end
 
       def handle(response)
+        if response.success?
+          return handle_success
+        else
+          handle_failure(response)
+        end
+        response.success?
+      end
+
+      def handle_success
         device = @router.connected_devices.detect {|device| device.mac == @device_mac}
-        char = device.characteristics.detect {|char| char.handle == @handle}
+        char = device.characteristics.detect {|char| char.handle == @handle || !char.descriptors.detect {|d| d.handle == @handle }.nil? }
         if char
           if @value == "0100"
             char.notification_on = true
@@ -23,6 +32,10 @@ module Cassia
         end
         !(char.nil?)
       end
+
+      def handle_failure(response)
+        @access_controller.error = response.body
+      end
     end
   end
 end

data/lib/cassia/ruby/version.rb

@@ -1,5 +1,5 @@
 module Cassia
   module Ruby
-    VERSION = "1.0.0"
+    VERSION = "1.0.1"
   end
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: cassia-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
-- adelinewang679
+- Adeline Wang
+- James Russo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-15 00:00:00.000000000 Z
+date: 2019-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -86,14 +87,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -153,6 +154,7 @@ dependencies:
 description: a ruby api client for the cassia router api
 email:
 - adelinewang679@gmail.com
+- jdrusso1020@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -176,6 +178,7 @@ files:
 - lib/cassia/characteristic.rb
 - lib/cassia/configuration.rb
 - lib/cassia/default_logger.rb
+- lib/cassia/descriptor.rb
 - lib/cassia/device.rb
 - lib/cassia/requests/close_ap_state.rb
 - lib/cassia/requests/close_connection_state.rb