device_cloud 0.2.3 → 0.2.4

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MGExNTcxYzU4ZTZiNDdkYjkzODcwNjM5YzA4OTBkYTZiOTQ5ZjI4MA==
+  data.tar.gz: !binary |-
+    YTlkYTdmZjMzMGM5ZWFjZjEwY2FjYjc0M2FkNGNhNDMyOTdjNDBhNw==
+SHA512:
+  metadata.gz: !binary |-
+    YjhiYzU1Mzk3ODhjMWVmMTViODM4OWJkMDNiZjJkOTY1NDRmYTA3ZTU0OWJk
+    YjhhNDU0YTUyMTA5MDdhNzA3NWJkYzczMWNjODc0YmVhNGQ5ZTdkNzBlNDk5
+    MDQxY2QxN2FjMDU3YjExODk0NGIzMDY2MGQ0N2RjNzEwM2MzNzU=
+  data.tar.gz: !binary |-
+    YzE5NThhZmM2NjJiMzdkY2ZjZDllMGYxNzNkNWEzNmNlZGZhNTI5NzNkODY3
+    YzMzOWIwNjYzY2ZiYWU2YmJlMjRjNzU2YjY2NjU1ODk4NmExMzVmNzQ5ZGQz
+    MDFmNzk4ZTRlODA3YWU4MzhiYTZlNmJkYjU1MzU0OGMzMTlkNjE=

data/.ruby-gemset

@@ -0,0 +1 @@
+device_cloud

data/.ruby-version

@@ -1 +1 @@
-1.9.3-p392
+1.9.3-p484

data/README.md

@@ -1,11 +1,15 @@
 # DeviceCloud
 
-TODO:
-- remove any assumptions about Device Cloud FileData contents .. probably should only parse them if asked
-- add code for maintaining monitors 
+[![Gem Version](https://badge.fury.io/rb/device_cloud.png)](http://badge.fury.io/rb/device_cloud)
 
-## Installation
+[![wercker status](https://app.wercker.com/status/88a596a14228b6d5b8e7a57dd5d6db55/m/ "wercker status")](https://app.wercker.com/project/bykey/88a596a14228b6d5b8e7a57dd5d6db55)
+
+#####TODO:
 
+* Add code for maintaining devices
+* Add code for maintaining alarms
+
+## Installation
 Add this line to your application's Gemfile:
 
     gem 'device_cloud'
@@ -20,25 +24,86 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+### Configuration
+
+```ruby
+DeviceCloud.configure do |config|
+  config.username = 'your idigi username'
+  config.password = 'your idigi password'
+end
+# =>
+# {
+#   username: 'your idigi username,
+#   password: 'your idigi password',
+#   root_url: 'https://my.idigi.com',
+#   host: 'my.idigi.com',
+#   alert_notification_handler: nil,
+#   empty_alert_notification_handler: nil,
+#   data_notification_handler: nil,
+#   empty_data_notification_handler: nil,
+#   event_notification_handler: nil,
+#   empty_event_notification_handler: nil,
+#   logger: Logger.new(STDOUT) # default
+# }
+```
+
+
+### Push Notifications
+
+`device_cloud` is currently only able to handle JSON push notifications via http, so your monitor must be set up accordingly. Read more about Monitors below.
+
+When your application receives an HTTP push notification, it can be passed to the DeviceCloud gem using the following:
+
+```ruby
+push_notification = DeviceCloud::PushNotification( http_response_body )
+# where http_response_body is a hash of the parsed JSON body content sent by DeviceCloud
+  
+push_notification.handle_each!
+```
+
+The event will then be handled by one of your defined Notification Handlers.
+
+#### Notification Handlers
+
+Notification handlers take a Proc, and are called with a relevant alert or event object. A list of supported topic handlers are listed as follows:
+
+    alert_notification_handler
+    data_notification_handler
+    event_notification_handler
+
+The following empty notification handlers are also available:
+
+    empty_alert_notification_handler
+    empty_data_notification_handler
+    empty_event_notification_handler
+
+An example definition may look like the following
+
+```ruby
+DeviceCloud.alert_notification_handler = Proc.new do |alert|
+  puts "#{alert.type} Alert: for device #{alert.device_id}"
+  puts "Base 64 encoded data #{alert.raw_data}"
+end
+```
+
+#### Example Push Notification
 
-## Example Push Notification
 
 ```json
 {
   "Document": {
     "Msg": {
       "timestamp": "2013-10-21T19:34:56Z",
-      "topic": "4044/FileData/db/4044_MadGlory_Interactive/00000000-00000000-001395FF-FF0E6017/event/parking_lot_event_exit-0966595cdcdd11e2abf50013950e6017.json",
+      "topic": "device/event/event.json",
       "FileData": {
         "id": {
-          "fdPath": "/db/4044_MadGlory_Interactive/00000000-00000000-001395FF-FF0E6017/event/",
-          "fdName": "parking_lot_event_exit-0966595cdcdd11e2abf50013950e6017.json"
+          "fdPath": "/device/event/",
+          "fdName": "event.json"
         },
         "fdLastModifiedDate": "2013-10-21T19:34:56Z",
         "fdSize": 545,
         "fdContentType": "application/json",
-        "fdData": "eyJ2YWx1ZSI6eyJwbGF0ZSI6Ijk0MUdWVCIsImNvbmZpZGVuY2UiOiI5OSIsImNvdW50cnkiOiJVUyIsInRvd2FyZHNfY2FtZXJhIjoiZmFsc2UiLCJ0aW1lc3RhbXAiOiIyMDEzLTEwLTIxVDE0OjM0OjQwWiIsIm92ZXJ2aWV3X2ltYWdlX2lkIjoibG90X292ZXJ2aWV3X2NhcF8xMF8yMV8yMDEzXzE0MzQ0MC5qcGciLCJzdGF0ZSI6Ik1OIiwicGF0Y2hfaW1hZ2VfaWQiOiJsb3RfcGF0Y2hfY2FwXzEwXzIxXzIwMTNfMTQzNDQwLmpwZyJ9LCJjbGFzcyI6ImV2ZW50IiwicXVldWVkX2R0IjoiMjAxMy0xMC0yMVQxOTozNDo1NloiLCJ0eXBlIjoicGFya2luZ19sb3RfZXZlbnRfZXhpdCIsImlkIjoiZGQ5ZDU3MzYzYTg3MTFlM2E5YmQwMDEzOTUwZTYwMTciLCJkZXZpY2VfaWQiOiJtOjAwMTM5NTBFNjAxNyJ9",
+        "fdData": "eW91IGhhdmUgdG9vIG11Y2ggZnJlZSB0aW1l\n",
         "fdArchive": false,
         "cstId": 4044,
         "fdType": "event",
@@ -52,27 +117,9 @@ TODO: Write usage instructions here
 }
 ```
 
-That notification's unencoded fdData:
+### Monitors
 
-```json
-{
-  "value": {
-    "plate": "941GVT",
-    "confidence": "99",
-    "country": "US",
-    "towards_camera": "false",
-    "timestamp": "2013-10-21T14:34:40Z",
-    "overview_image_id": "lot_overview_cap_10_21_2013_143440.jpg",
-    "state": "MN",
-    "patch_image_id": "lot_patch_cap_10_21_2013_143440.jpg"
-  },
-  "class": "event",
-  "queued_dt": "2013-10-21T19:34:56Z",
-  "type": "parking_lot_event_exit",
-  "id": "dd9d57363a8711e3a9bd0013950e6017",
-  "device_id": "m:0013950E6017"
-}
-```
+TODO: write about Monitor class
 
 ## Contributing
 
@@ -81,3 +128,13 @@ That notification's unencoded fdData:
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+### Development
+
+You can get a pry console by using the `:console` Rake task
+
+    $ rake console
+    
+You can also optionally pass your Device Cloud username and password like so
+
+    $ IDIGI_USERNAME=youruser IDIGI_PASSWORD=yourpass rake console

data/Rakefile

@@ -1 +1,20 @@
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec
+
+desc 'Run a console with device_cloud loaded'
+task :console do
+  require 'device_cloud'
+  require 'pry'
+  require 'awesome_print'
+
+  DeviceCloud.configure do |config|
+    config.username = ENV['IDIGI_USERNAME']
+    config.password = ENV['IDIGI_PASSWORD']
+  end
+
+  Pry.start
+end

data/device_cloud.gemspec

@@ -7,10 +7,10 @@ Gem::Specification.new do |spec|
   spec.name          = "device_cloud"
   spec.version       = DeviceCloud::VERSION
   spec.authors       = ["Erik Straub"]
-  spec.email         = ["erik@madgloryint.com"]
+  spec.email         = ["erik@madglory.com"]
   spec.description   = %q{A Ruby wrapper for the Etherios Device Cloud}
   spec.summary       = %q{A Ruby wrapper for the Etherios Device Cloud}
-  spec.homepage      = "http://github.com/madgloryint/device_cloud"
+  spec.homepage      = "http://github.com/madglory/device_cloud"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)
@@ -20,6 +20,8 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-
   spec.add_development_dependency 'rspec'
-end
+  spec.add_development_dependency 'webmock'
+  spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'awesome_print'
+end

data/lib/device_cloud.rb

@@ -1,6 +1,7 @@
 require 'device_cloud/configuration'
 require 'device_cloud/utils'
 require 'device_cloud/version'
+require 'device_cloud/monitor'
 require 'device_cloud/push_notification'
 require 'device_cloud/push_notification/base_notification'
 require 'device_cloud/push_notification/alert_notification'
@@ -8,8 +9,11 @@ require 'device_cloud/push_notification/event_notification'
 require 'device_cloud/push_notification/data_notification'
 require 'device_cloud/push_notification/message'
 require 'device_cloud/push_notification/message/file_data'
+require 'device_cloud/request'
+require 'device_cloud/response'
 
 module DeviceCloud
   extend Configuration
   extend Utils
-end
+  class Error < StandardError; end
+end

data/lib/device_cloud/configuration.rb

@@ -3,9 +3,6 @@ require 'logger'
 module DeviceCloud
   module Configuration
 
-    # DeviceCloud account root_url
-    attr_writer :root_url
-
     # DeviceCloud account username
     attr_writer :username
 
@@ -53,11 +50,12 @@ module DeviceCloud
     #
     # Example:
     #
-    #   ActivityFeed.configure do |configuration|
+    #   DeviceCloud.configure do |configuration|
     #     configuration.root_url = 'https://example.com'
     #   end
     def configure
       yield self
+      config
     end
 
     def config
@@ -65,6 +63,7 @@ module DeviceCloud
         username: username,
         password: password,
         root_url: root_url,
+        host: host,
         alert_notification_handler: @alert_notification_handler,
         empty_alert_notification_handler: @empty_alert_notification_handler,
         data_notification_handler: @data_notification_handler,
@@ -77,16 +76,23 @@ module DeviceCloud
 
     # DeviceCloud url
     #
-    # @return the DeviceCloud url or the default of 'https://my.idigi.com' if not set.
+    # @return the DeviceCloud url - 'https://my.idigi.com'
     def root_url
-      @root_url ||= 'https://my.idigi.com'
+      'https://my.idigi.com'
+    end
+
+    # DeviceCloud url
+    #
+    # @return the DeviceCloud host - 'my.idigi.com'
+    def host
+      'my.idigi.com'
     end
 
     # DeviceCloud username
     #
     # @return the DeviceCloud username or raises an error
     def username
-      raise 'DeviceCloud username is blank' if @username.blank?
+      raise 'DeviceCloud username is blank' if @username.nil? || @password == ''
       @username
     end
 
@@ -94,7 +100,7 @@ module DeviceCloud
     #
     # @return the DeviceCloud password or raises an error
     def password
-      raise 'DeviceCloud password is blank' if @password.blank?
+      raise 'DeviceCloud password is blank' if @password.nil? || @password == ''
       @password
     end
 
@@ -105,4 +111,4 @@ module DeviceCloud
       @logger ||= Logger.new(STDOUT)
     end
   end
-end
+end

data/lib/device_cloud/monitor.rb

@@ -0,0 +1,140 @@
+module DeviceCloud
+  class Monitor
+    attr_accessor :monId, :cstId, :monLastConnect, :monLastSent, :monTopic, :monTransportType, :monTransportToken, :monTransportUrl, :monFormatType, :monBatchSize, :monCompression, :monStatus, :monBatchDuration, :monAutoReplayOnConnect, :monLastSentUuid
+    attr_reader :error
+
+    DEFAULT_CREATE_OPTIONS = {
+      'monTransportType' => 'http',
+      'monTransportUrl' => "http://www.example.com/push_notifications",
+      'monTransportToken' => "USERNAME:PASSWORD",
+      'monFormatType' => 'json',
+      'monBatchSize' => '1',
+      'monCompression' => 'none',
+      'monBatchDuration' => '0',
+      'monAutoReplayOnConnect' => 'true'
+    }
+
+    class << self
+      def all
+        monitors = DeviceCloud::Request.new(path: '/ws/Monitor/.json').get.to_hash_from_json
+
+        return [] unless monitors['resultSize'].to_i > 0
+
+        monitors['items'].map { |monitor|
+          Monitor.new monitor
+        }
+      end
+
+      def find(monitor_id)
+        monitors = DeviceCloud::Request.new(path: "/ws/Monitor/#{monitor_id}.json").get.to_hash_from_json
+
+        return nil unless monitors['resultSize'].to_i > 0
+
+        Monitor.new monitors['items'].first
+      end
+    end
+
+    def initialize(attributes = {})
+      attributes.each do |name, value|
+        send("#{name}=", value)
+      end
+
+      @error = nil
+
+      set_defaults
+    end
+
+    def persist!
+      @error = nil
+      monId.nil? ? create : update
+    end
+
+    def reset!
+      @error = nil
+      if monId.nil?
+        @error = 'monId is nil'
+        return false
+      else
+        reset_monitor!
+      end
+    end
+
+    def destroy!
+      return false if monId.nil?
+
+      response = DeviceCloud::Request.new(path: "/ws/Monitor/#{monId}").delete
+
+      response.code == '200' ? true : false
+    end
+
+    def attributes
+      {
+        'monTopic' => monTopic,
+        'monTransportType' => monTransportType,
+        'monTransportToken' => monTransportToken,
+        'monTransportUrl' => monTransportUrl,
+        'monFormatType' => monFormatType,
+        'monBatchSize' => monBatchSize,
+        'monCompression' => monCompression,
+        'monBatchDuration' => monBatchDuration,
+        'monAutoReplayOnConnect' => monAutoReplayOnConnect
+      }
+    end
+
+  private
+    def set_defaults
+      DEFAULT_CREATE_OPTIONS.each do |option, value|
+        send("#{option}=", value) if attributes[:option].nil?
+      end
+    end
+
+    def create
+      response = DeviceCloud::Request.new(path: '/ws/Monitor', body: to_xml).post
+      if response.code == '201'
+        self.monId = response.headers['location'][0].sub(/Monitor\//, '')
+        return true
+      else
+        @error = error_from_response_xml(response)
+        return false
+      end
+    end
+
+    def update
+      response = DeviceCloud::Request.new(path: "/ws/Monitor/#{monId}", body: to_xml).put
+
+      if response.code == '200'
+        return true
+      else
+        @error = error_from_response_xml(response)
+        return false
+      end
+    end
+
+    def reset_monitor!
+      response = DeviceCloud::Request.new(path: "/ws/Monitor", body: reset_xml).put
+
+      if response.code == '200'
+        return true
+      else
+        @error = error_from_response_xml(response)
+        return false
+      end
+    end
+
+    def reset_xml
+      "<Monitor><monId>#{monId}</monId></Monitor>"
+    end
+
+    def to_xml
+      xml = '<Monitor>'
+      attributes.each do |key,value|
+        xml << "<#{key}>#{value}</#{key}>"
+      end
+      xml << '</Monitor>'
+    end
+
+    def error_from_response_xml(response)
+      response.body.match(/<error>(.*)<\/error>/)[1]
+    end
+  end
+end

data/lib/device_cloud/push_notification.rb

@@ -2,8 +2,8 @@ module DeviceCloud
   class PushNotification
     attr_reader :messages
 
-    def initialize(raw_messages)
-      @messages = DeviceCloud::PushNotification::Message.parse_raw_messages(raw_messages)
+    def initialize(response_body)
+      @messages = DeviceCloud::PushNotification::Message.parse_raw_messages(response_body)
     end
 
     def handle_each!
@@ -20,4 +20,4 @@ module DeviceCloud
       DeviceCloud.constantize "DeviceCloud::PushNotification::#{class_name.capitalize}Notification"
     end
   end
-end
+end

data/lib/device_cloud/request.rb

@@ -0,0 +1,79 @@
+require 'net/http'
+
+module DeviceCloud
+  # Public: Used to send Net::HTTP requests.
+  #
+  # Examples:
+  #
+  #   get_response = DeviceCloud::Request.new("/ws/FileData").get
+  #   post_response = DeviceCloud::Request.new("/ws/sci").post(data)
+  class Request
+    attr_reader :path, :body
+
+    # Public: Create a new instance of Request.
+    #
+    # path - The path String to use.
+    def initialize(options = {})
+      @path = options[:path]
+      @body = options[:body]
+    end
+
+    # Public: Send a GET request.
+    #
+    # Returns a DeviceCloud::Response instance.
+    def get
+      make_request do
+        Net::HTTP::Get.new request_uri
+      end
+    end
+
+    # Public: Send a POST request.
+    #
+    # body
+    #
+    # Returns a DeviceCloud::Response instance.
+    def post
+      make_request do
+        Net::HTTP::Post.new request_uri
+      end
+    end
+
+    # Public: Send a PUT request.
+    #
+    # body
+    #
+    # Returns a DeviceCloud::Response instance.
+    def put
+      make_request do
+        Net::HTTP::Put.new request_uri
+      end
+    end
+
+    # Public: Send a DELETE request.
+    #
+    # Returns a DeviceCloud::Response instance.
+    def delete
+      make_request do
+        Net::HTTP::Delete.new request_uri
+      end
+    end
+
+  private
+    def request_uri
+      uri.request_uri
+    end
+
+    def uri
+      @uri ||= URI.parse(DeviceCloud.root_url + path)
+    end
+
+    def make_request
+      Net::HTTP.start(uri.host, uri.port, use_ssl: true) do |http|
+        request = yield
+        request.basic_auth DeviceCloud.username, DeviceCloud.password
+
+        DeviceCloud::Response.new http.request(request, body)
+      end
+    end
+  end
+end

data/lib/device_cloud/response.rb

@@ -0,0 +1,17 @@
+module DeviceCloud
+  class Response
+    attr_reader :code, :message, :headers, :body, :original_response
+
+    def initialize(http_response)
+      @original_response = http_response
+      @code = original_response.code
+      @message = original_response.message
+      @headers = original_response.header.to_hash
+      @body = original_response.body
+    end
+
+    def to_hash_from_json
+      JSON.parse(body)
+    end
+  end
+end

data/lib/device_cloud/version.rb

@@ -1,3 +1,3 @@
 module DeviceCloud
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/spec/device_cloud/monitor_spec.rb

@@ -0,0 +1,277 @@
+require 'spec_helper'
+
+describe DeviceCloud::Monitor do
+
+  describe '::all' do
+    before(:each) do
+      stub_request(:get, authenticated_host + '/ws/Monitor/.json').
+               with(:headers => {'Accept'=>'*/*', 'User-Agent'=>'Ruby'}).
+               to_return(:status => 200, :body => monitors_json, :headers => {})
+    end
+
+    subject { DeviceCloud::Monitor.all }
+
+    context 'with results' do
+      let(:monitors_json) do
+        {
+              "resultTotalRows" => "1",
+            "requestedStartRow" => "0",
+                   "resultSize" => "1",
+                "requestedSize" => "1000",
+                "remainingSize" => "0",
+                        "items" => [
+                {
+                                     "monId" => "109012",
+                                     "cstId" => "4044",
+                            "monLastConnect" => "2014-02-05T18:57:49.603Z",
+                               "monLastSent" => "2014-02-11T02:38:46.770Z",
+                                  "monTopic" => "[group=Staging]FileData/*.*",
+                          "monTransportType" => "http",
+                           "monTransportUrl" => "http://example.com/device_cloud/push_notifications",
+                             "monFormatType" => "json",
+                              "monBatchSize" => "1",
+                            "monCompression" => "none",
+                                 "monStatus" => "ACTIVE",
+                          "monBatchDuration" => "0",
+                    "monAutoReplayOnConnect" => "true",
+                           "monLastSentUuid" => "a18afa9d-92c5-11e3-a346-bc764e1023af"
+                }
+            ]
+        }.to_json
+      end
+
+      it { should be_a(Array) }
+      its(:size) { should eq 1 }
+      its(:first) { should be_a(DeviceCloud::Monitor) }
+    end
+
+    context 'with no results' do
+      let(:monitors_json) do
+        {
+          "resultTotalRows"=>"0",
+          "requestedStartRow"=>"0",
+          "resultSize"=>"0",
+          "requestedSize"=>"1000",
+          "remainingSize"=>"0",
+          "items"=>[]
+        }.to_json
+      end
+
+      it { should eq [] }
+    end
+  end
+
+  describe '::find' do
+    before(:each) do
+      stub_request(:get, authenticated_host + '/ws/Monitor/123.json').
+               with(:headers => {'Accept'=>'*/*', 'User-Agent'=>'Ruby'}).
+               to_return(:status => 200, :body => monitor_json, :headers => {})
+    end
+
+    subject { DeviceCloud::Monitor.find 123 }
+
+    context 'with result' do
+      let(:monitor_json) do
+        {"resultTotalRows"=>"1",
+         "requestedStartRow"=>"0",
+         "resultSize"=>"1",
+         "requestedSize"=>"1000",
+         "remainingSize"=>"0",
+         "items"=>
+          [{"monId"=>"109012",
+            "cstId"=>"4044",
+            "monLastConnect"=>"2014-02-05T18:57:49.603Z",
+            "monLastSent"=>"2014-02-11T02:54:07.143Z",
+            "monTopic"=>"[group=Staging]FileData/*.*",
+            "monTransportType"=>"http",
+            "monTransportUrl"=>
+             "http://example.com/device_cloud/push_notifications",
+            "monFormatType"=>"json",
+            "monBatchSize"=>"1",
+            "monCompression"=>"none",
+            "monStatus"=>"ACTIVE",
+            "monBatchDuration"=>"0",
+            "monAutoReplayOnConnect"=>"true",
+            "monLastSentUuid"=>"7b4b2515-92c7-11e3-a346-bc764e1023af"}]}.to_json
+      end
+
+      it { should be_a(DeviceCloud::Monitor) }
+    end
+
+    context 'with no results' do
+      let(:monitor_json) do
+        {"error"=>["GET Monitor error. Error reading Monitor entity id='12123'"]}.to_json
+      end
+
+      it { should be_nil }
+    end
+  end
+
+  describe '#persist!' do
+    context 'when monId is nil' do
+      let(:request_body) { new_monitor.send(:to_xml) }
+      before(:each) do
+        stub_request(:post, authenticated_host + '/ws/Monitor').
+                 with(:body => request_body,
+                      :headers => {'Accept'=>'*/*', 'User-Agent'=>'Ruby'}).
+                 to_return(:status => response_status, :body => response_body, :headers => response_headers)
+      end
+
+      subject { new_monitor }
+
+      context 'when successful' do
+        let(:new_monitor) { DeviceCloud::Monitor.new monTopic: 'AlarmStatus' }
+        let(:response_body) { "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n<result>\n   <location>Monitor/115848</location>\n</result>" }
+        let(:response_status) { 201 }
+        let(:response_headers) do
+          { 'location' => ['Monitor/1234567'] }
+        end
+
+
+        its(:persist!) { should be_true }
+
+        context 'after #persist!' do
+          before(:each) { subject.persist! }
+          its(:monId) { should_not be_nil }
+          its(:error) { should be_nil }
+        end
+      end
+
+      context 'when unsuccessful' do
+        let(:new_monitor) { DeviceCloud::Monitor.new monTopic: 'Invalid' }
+        let(:response_body) { "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n<result>\n   <error>POST Monitor error. Invalid request. Invalid monTopic specified</error>\n</result>" }
+        let(:response_status) { 400 }
+        let(:response_headers) { Hash.new }
+
+        its(:persist!) { should be_false }
+
+        context 'after #persist!' do
+          before(:each) { subject.persist! }
+          its(:monId) { should be_nil }
+          its(:error) { should eq "POST Monitor error. Invalid request. Invalid monTopic specified" }
+        end
+      end
+    end
+
+    context 'when monId is not nil' do
+      let(:request_body) { existing_monitor.send(:to_xml) }
+      before(:each) do
+        stub_request(:put, "https://foouser:barpass@my.idigi.com/ws/Monitor/12345").
+          with(:body => request_body,
+                      :headers => {'Accept'=>'*/*', 'User-Agent'=>'Ruby'}).
+          to_return(:status => response_status, :body => response_body, :headers => {})
+      end
+
+      subject { existing_monitor }
+
+      context 'when successful' do
+        let(:existing_monitor) { DeviceCloud::Monitor.new monTopic: 'FileData', monId: 12345 }
+        let(:response_body) { "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n<result/>" }
+        let(:response_status) { 200 }
+
+        its(:persist!) { should be_true }
+
+        context 'after #persist!' do
+          before(:each) { subject.persist! }
+          its(:error) { should be_nil }
+        end
+      end
+
+      context 'when unsuccessful' do
+        let(:existing_monitor) { DeviceCloud::Monitor.new monTopic: 'Invalid', monId: 12345 }
+        let(:response_body) { "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n<result>\n   <error>PUT Monitor error. Invalid request. Invalid monTopic specified</error>\n</result>" }
+        let(:response_status) { 400 }
+
+        its(:persist!) { should be_false }
+
+        context 'after #persist!' do
+          before(:each) { subject.persist! }
+          its(:error) { should eq "PUT Monitor error. Invalid request. Invalid monTopic specified" }
+        end
+      end
+    end
+  end
+
+  describe '#destroy!' do
+    context 'when monId is nil' do
+      its(:destroy!) { should be_false }
+    end
+
+    context 'when monId is not nil' do
+      let(:existing_monitor) { DeviceCloud::Monitor.new monId: 12345 }
+      before(:each) do
+        stub_request(:delete, "https://foouser:barpass@my.idigi.com/ws/Monitor/12345").
+                 with(:headers => {'Accept'=>'*/*', 'User-Agent'=>'Ruby'}).
+                 to_return(:status => response_status, :body => response_body, :headers => {})
+      end
+
+      subject { existing_monitor.destroy! }
+
+      context 'when successful' do
+        let(:response_body) { "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n<result>\n   <message>1 items deleted</message>\n</result>" }
+        let(:response_status) { 200 }
+
+        it { should be_true }
+      end
+
+      context 'when unsuccessful' do
+        let(:response_body) { "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n<result>\n   <error>DELETE Monitor error. Invalid request. For input string: \"gigo\"</error>\n</result>" }
+        let(:response_status) { 400 }
+
+        it { should be_false }
+      end
+    end
+  end
+
+  describe '#reset!' do
+    context 'when monId is nil' do
+      its(:reset!) { should be_false }
+
+      context 'after #reset!' do
+        before(:each) { subject.reset! }
+
+        its(:error) { should eq 'monId is nil'}
+      end
+    end
+
+    context 'when monId is not nil' do
+      before(:each) do
+        stub_request(:put, "https://foouser:barpass@my.idigi.com/ws/Monitor").
+           with(:body => request_body,
+                :headers => {'Accept'=>'*/*', 'User-Agent'=>'Ruby'}).
+           to_return(:status => response_status, :body => response_body, :headers => {})
+      end
+
+
+      context 'when successful' do
+        subject { DeviceCloud::Monitor.new monId: 12345 }
+        let(:request_body) { '<Monitor><monId>12345</monId></Monitor>'}
+        let(:response_body) { "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n<result/>" }
+        let(:response_status) { 200 }
+
+        its(:reset!) { should be_true }
+
+        context 'after #reset!' do
+          before(:each) { subject.reset! }
+
+          its(:error) { should be_nil }
+        end
+      end
+
+      context 'when unsuccessful' do
+        subject { DeviceCloud::Monitor.new monId: 1 }
+        let(:request_body) { '<Monitor><monId>1</monId></Monitor>' }
+        let(:response_body) { "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n<result>\n   <error>PUT Monitor error. Error reading Monitor entity id='&lt;monId&gt;1&lt;/monId&gt;'</error>\n</result>" }
+        let(:response_status) { 400 }
+
+        its(:reset!) { should be_false }
+
+        context 'after #reset!' do
+          before(:each) { subject.reset! }
+
+          its(:error) { should eq "PUT Monitor error. Error reading Monitor entity id='&lt;monId&gt;1&lt;/monId&gt;'"}
+        end
+      end
+    end
+  end
+end

data/spec/device_cloud/request_spec.rb

@@ -0,0 +1,65 @@
+require 'spec_helper'
+
+describe DeviceCloud::Request do
+  let(:path) { '/the/road/less/travelled' }
+  let(:body) { 'badguts' }
+  let(:request_uri) { authenticated_host + path }
+
+  its(:path) { should be_nil }
+  its(:body) { should be_nil }
+
+  context 'when passed options' do
+    subject { DeviceCloud::Request.new path: '/boom/boom/boom', body: 'HEYO' }
+
+    its(:path) { should eq '/boom/boom/boom' }
+    its(:body) { should eq 'HEYO' }
+  end
+
+  describe '#get' do
+    before(:each) do
+      stub_request(:get, request_uri).
+        with(:headers => {'Accept'=>'*/*', 'User-Agent'=>'Ruby'}).
+        to_return(:status => 200, :body => "", :headers => {})
+    end
+
+    subject { DeviceCloud::Request.new(path: path) }
+
+    its(:get) { should be_a(DeviceCloud::Response) }
+  end
+
+  describe '#post' do
+    before(:each) do
+      stub_request(:post, request_uri).
+        with(:headers => {'Accept'=>'*/*', 'User-Agent'=>'Ruby'}, body: body).
+        to_return(:status => 200, :body => "", :headers => {})
+    end
+
+    subject { DeviceCloud::Request.new(path: path, body: body) }
+
+    its(:post) { should be_a(DeviceCloud::Response) }
+  end
+
+  describe '#put' do
+    before(:each) do
+      stub_request(:put, request_uri).
+        with(:headers => {'Accept'=>'*/*', 'User-Agent'=>'Ruby'}, body: body).
+        to_return(:status => 200, :body => "", :headers => {})
+    end
+
+    subject { DeviceCloud::Request.new(path: path, body: body) }
+
+    its(:put) { should be_a(DeviceCloud::Response) }
+  end
+
+  describe '#delete' do
+    before(:each) do
+      stub_request(:delete, request_uri).
+        with(:headers => {'Accept'=>'*/*', 'User-Agent'=>'Ruby'}).
+        to_return(:status => 200, :body => "", :headers => {})
+    end
+
+    subject { DeviceCloud::Request.new(path: path) }
+
+    its(:delete) { should be_a(DeviceCloud::Response) }
+  end
+end

data/spec/device_cloud/response_spec.rb

@@ -0,0 +1,47 @@
+require 'spec_helper'
+
+describe DeviceCloud::Response do
+  let(:headers_hash) do
+    { 'location' => ['here'] }
+  end
+  let(:header) do
+    OpenStruct.new to_hash: headers_hash
+  end
+  let(:message) { 'OK' }
+  let(:code) { 200 }
+  let(:body) { 'HEYO' }
+  let(:http_response) do
+    OpenStruct.new(
+      code: code,
+      message: message,
+      header: header,
+      body: body
+    )
+  end
+
+  subject { DeviceCloud::Response.new http_response }
+
+  its(:code) { should eq code }
+  its(:message) { should eq message }
+  its(:body) { should eq body }
+  its(:headers) { should eq headers_hash }
+
+  describe '#to_hash_from_json' do
+    context 'when valid JSON' do
+      let(:json) do
+        {
+          'hello' => 'world'
+        }
+      end
+      let(:body) { json.to_json }
+
+      its(:to_hash_from_json) { should eq json }
+    end
+
+    context 'when not valid json' do
+      it 'raises an error' do
+        expect{ subject.to_hash_from_json }.to raise_error(JSON::ParserError)
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,13 +1,28 @@
 require 'device_cloud'
 require 'ostruct'
+require 'webmock/rspec'
+require 'pry'
+require 'awesome_print'
+
+def idigi_username
+  'foouser'
+end
+
+def idigi_password
+  'barpass'
+end
+
+def authenticated_host
+  "https://#{DeviceCloud.username}:#{DeviceCloud.password}@#{DeviceCloud.host}"
+end
 
 RSpec.configure do |config|
   config.mock_with :rspec
 
   config.before(:each) do
     DeviceCloud.configure do |configuration|
-      configuration.username = 'a username'
-      configuration.password = 'a password'
+      configuration.username = idigi_username
+      configuration.password = idigi_password
     end
   end
-end
+end

data/spec/version_spec.rb

@@ -2,6 +2,6 @@ require 'spec_helper'
 
 describe 'DeviceCloud::VERSION' do
   it 'should be the correct version' do
-    DeviceCloud::VERSION.should == '0.2.3'
+    DeviceCloud::VERSION.should == '0.2.4'
   end
-end
+end

data/wercker.yml

@@ -0,0 +1,8 @@
+box: wercker/rvm
+
+build:
+    steps:
+        - bundle-install
+        - script:
+           name: rspec
+           code: bundle exec rspec

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: device_cloud
 version: !ruby/object:Gem::Version
-  version: 0.2.3
-  prerelease: 
+  version: 0.2.4
 platform: ruby
 authors:
 - Erik Straub
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-23 00:00:00.000000000 Z
+date: 2014-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,20 +48,62 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A Ruby wrapper for the Etherios Device Cloud
 email:
-- erik@madgloryint.com
+- erik@madglory.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .ruby-gemset
 - .ruby-version
 - Gemfile
 - LICENSE.txt
@@ -76,6 +112,7 @@ files:
 - device_cloud.gemspec
 - lib/device_cloud.rb
 - lib/device_cloud/configuration.rb
+- lib/device_cloud/monitor.rb
 - lib/device_cloud/push_notification.rb
 - lib/device_cloud/push_notification/alert_notification.rb
 - lib/device_cloud/push_notification/base_notification.rb
@@ -83,8 +120,11 @@ files:
 - lib/device_cloud/push_notification/event_notification.rb
 - lib/device_cloud/push_notification/message.rb
 - lib/device_cloud/push_notification/message/file_data.rb
+- lib/device_cloud/request.rb
+- lib/device_cloud/response.rb
 - lib/device_cloud/utils.rb
 - lib/device_cloud/version.rb
+- spec/device_cloud/monitor_spec.rb
 - spec/device_cloud/push_notification/alert_notification_spec.rb
 - spec/device_cloud/push_notification/base_notification_spec.rb
 - spec/device_cloud/push_notification/data_notification_spec.rb
@@ -92,34 +132,37 @@ files:
 - spec/device_cloud/push_notification/message/file_data_spec.rb
 - spec/device_cloud/push_notification/message_spec.rb
 - spec/device_cloud/push_notification_spec.rb
+- spec/device_cloud/request_spec.rb
+- spec/device_cloud/response_spec.rb
 - spec/spec_helper.rb
 - spec/version_spec.rb
-homepage: http://github.com/madgloryint/device_cloud
+- wercker.yml
+homepage: http://github.com/madglory/device_cloud
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A Ruby wrapper for the Etherios Device Cloud
 test_files:
+- spec/device_cloud/monitor_spec.rb
 - spec/device_cloud/push_notification/alert_notification_spec.rb
 - spec/device_cloud/push_notification/base_notification_spec.rb
 - spec/device_cloud/push_notification/data_notification_spec.rb
@@ -127,5 +170,7 @@ test_files:
 - spec/device_cloud/push_notification/message/file_data_spec.rb
 - spec/device_cloud/push_notification/message_spec.rb
 - spec/device_cloud/push_notification_spec.rb
+- spec/device_cloud/request_spec.rb
+- spec/device_cloud/response_spec.rb
 - spec/spec_helper.rb
 - spec/version_spec.rb