device_cloud 0.0.5 → 0.0.6

data/lib/device_cloud/configuration.rb

@@ -16,14 +16,20 @@ module DeviceCloud
     attr_writer :logger
 
     # Proc that will be called for handling
-    # DeviceCloud::PushNotification::Event objects
-    # Proc will be called with the event object
-    attr_accessor :push_notification_event_handler
+    # DeviceCloud::PushNotification::EventNotification objects
+    # Proc will be called with the event notification object
+    attr_accessor :event_notification_handler
 
     # Proc that will be called for handling
-    # DeviceCloud::PushNotification::Alert objects
-    # Proc will be called with the alert object
-    attr_accessor :push_notification_alert_handler
+    # DeviceCloud::PushNotification::AlertNotification objects
+    # Proc will be called with the alert notification object
+    attr_accessor :alert_notification_handler
+
+    # Proc that will be called for handling
+    # DeviceCloud::PushNotification::DataNotification objects
+    # Proc will be called with the data notification object
+    attr_accessor :data_notification_handler
+
 
     # Yield self to be able to configure ActivityFeed with
     # block-style configuration.

data/lib/device_cloud/push_notification/alert_notification.rb

@@ -0,0 +1,7 @@
+module DeviceCloud
+  class PushNotification::AlertNotification < PushNotification::BaseNotification
+    def handle!
+      DeviceCloud.alert_notification_handler.call(self)
+    end
+  end
+end

data/lib/device_cloud/push_notification/{base.rb → base_notification.rb}

@@ -1,5 +1,5 @@
 module DeviceCloud
-  class PushNotification::Base
+  class PushNotification::BaseNotification
     attr_reader :id, :full_path, :device_id, :value, :queued_at, :type
     
     def self.handle!(file_data)

data/lib/device_cloud/push_notification/data_notification.rb

@@ -0,0 +1,7 @@
+module DeviceCloud
+  class PushNotification::DataNotification < PushNotification::BaseNotification
+    def handle!
+      DeviceCloud.data_notification_handler.call(self)
+    end
+  end
+end

data/lib/device_cloud/push_notification/event_notification.rb

@@ -0,0 +1,7 @@
+module DeviceCloud
+  class PushNotification::EventNotification < PushNotification::BaseNotification
+    def handle!
+      DeviceCloud.event_notification_handler.call(self)
+    end
+  end
+end

data/lib/device_cloud/push_notification/message.rb

@@ -2,7 +2,7 @@ module DeviceCloud
   class PushNotification::Message
     attr_accessor :timestamp, :topic, :file_data, :operation, :group, :replay
 
-    ALLOWED_TOPICS = %w{alert event}
+    ALLOWED_TOPICS = %w{alert event data}
 
     def self.parse_raw_messages(raw_message_data)
       if raw_message_data.is_a? Array

data/lib/device_cloud/push_notification.rb

@@ -17,7 +17,7 @@ module DeviceCloud
     end
   private
     def class_type(class_name)
-      DeviceCloud.constantize "DeviceCloud::PushNotification::#{class_name.capitalize}"
+      DeviceCloud.constantize "DeviceCloud::PushNotification::#{class_name.capitalize}Notification"
     end
   end
 end

data/lib/device_cloud/version.rb

@@ -1,3 +1,3 @@
 module DeviceCloud
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/device_cloud.rb

@@ -2,9 +2,10 @@ require 'device_cloud/configuration'
 require 'device_cloud/utils'
 require 'device_cloud/version'
 require 'device_cloud/push_notification'
-require 'device_cloud/push_notification/base'
-require 'device_cloud/push_notification/alert'
-require 'device_cloud/push_notification/event'
+require 'device_cloud/push_notification/base_notification'
+require 'device_cloud/push_notification/alert_notification'
+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'
 

data/spec/device_cloud/push_notification/{alert_spec.rb → alert_notification_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe DeviceCloud::PushNotification::Alert do
+describe DeviceCloud::PushNotification::AlertNotification do
   describe "#handle!" do
     let(:data) do
       {
@@ -13,11 +13,11 @@ describe DeviceCloud::PushNotification::Alert do
     end
     let(:file_data) { OpenStruct.new(data: data, full_path: '/foo/bar/baz.json') }
 
-    subject { DeviceCloud::PushNotification::Alert.new file_data }
+    subject { DeviceCloud::PushNotification::AlertNotification.new file_data }
 
-    it "should call the DeviceCloud.push_notification_alert_handler with self" do
+    it "should call the DeviceCloud.alert_notification_handler with self" do
       handled_alert = nil
-      DeviceCloud.push_notification_alert_handler = ->(alert) { handled_alert = alert }
+      DeviceCloud.alert_notification_handler = ->(alert) { handled_alert = alert }
 
       subject.handle!
       expect(handled_alert).to eq subject

data/spec/device_cloud/push_notification/{base_spec.rb → base_notification_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe DeviceCloud::PushNotification::Base do
+describe DeviceCloud::PushNotification::BaseNotification do
   let(:data) do
     {
       'id' => '1234',
@@ -18,7 +18,7 @@ describe DeviceCloud::PushNotification::Base do
     )
   end
 
-  subject { DeviceCloud::PushNotification::Base.new file_data }
+  subject { DeviceCloud::PushNotification::BaseNotification.new file_data }
 
   describe "attributes" do
     its(:id) { should eq data['id'] }

data/spec/device_cloud/push_notification/data_notification_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe DeviceCloud::PushNotification::DataNotification do
+  describe "#handle!" do
+    let(:data) do
+      {
+        'id' => 1234,
+        'device_id' => 'm:1392301029',
+        'type' => 'some type',
+        'queued_dt' => '2013-06-24T14:52:55.421Z',
+        'value' => {'this' => 'is a value'}
+      }
+    end
+    let(:file_data) { OpenStruct.new(data: data, full_path: '/foo/bar/baz.json') }
+
+    subject { DeviceCloud::PushNotification::DataNotification.new file_data }
+
+    it "should call the DeviceCloud.data_notification_handler with self" do
+      handled_data = nil
+      DeviceCloud.data_notification_handler = ->(data) { handled_data = data }
+
+      subject.handle!
+      expect(handled_data).to eq subject
+    end
+  end
+end

data/spec/device_cloud/push_notification/{event_spec.rb → event_notification_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe DeviceCloud::PushNotification::Event do
+describe DeviceCloud::PushNotification::EventNotification do
   describe "#handle!" do
     let(:data) do
       {
@@ -13,11 +13,11 @@ describe DeviceCloud::PushNotification::Event do
     end
     let(:file_data) { OpenStruct.new(data: data, full_path: '/foo/bar/baz.json') }
 
-    subject { DeviceCloud::PushNotification::Event.new file_data }
+    subject { DeviceCloud::PushNotification::EventNotification.new file_data }
 
-    it "should call the DeviceCloud.push_notification_event_handler with self" do
+    it "should call the DeviceCloud.event_notification_handler with self" do
       handled_event = nil
-      DeviceCloud.push_notification_event_handler = ->(event) { handled_event = event }
+      DeviceCloud.event_notification_handler = ->(event) { handled_event = event }
 
       subject.handle!
       expect(handled_event).to eq subject

data/spec/device_cloud/push_notification_spec.rb

@@ -4,7 +4,8 @@ describe DeviceCloud::PushNotification do
   let(:raw_messages) do
     [
       { 'topic_type' => 'an alert' },
-      { 'topic_type' => 'an event' }
+      { 'topic_type' => 'an event' },
+      { 'topic_type' => 'a piece of data' }
     ]
   end
   let(:valid_parsed_messages) do
@@ -20,6 +21,12 @@ describe DeviceCloud::PushNotification do
         valid_parsed_file_data?: true,
         topic_type: 'event',
         parsed_file_data: 'the event data'
+      ),
+      OpenStruct.new(
+        valid?: true,
+        valid_parsed_file_data?: true,
+        topic_type: 'data',
+        parsed_file_data: 'the data data'
       )
     ]
   end
@@ -41,9 +48,11 @@ describe DeviceCloud::PushNotification do
     context "all valid" do
 
       it "should call handle! on each of the message's topic_type classes" do
-        DeviceCloud::PushNotification::Alert.should_receive(:handle!).with(valid_parsed_messages[0].parsed_file_data)
+        DeviceCloud::PushNotification::AlertNotification.should_receive(:handle!).with(valid_parsed_messages[0].parsed_file_data)
+
+        DeviceCloud::PushNotification::EventNotification.should_receive(:handle!).with(valid_parsed_messages[1].parsed_file_data)
 
-        DeviceCloud::PushNotification::Event.should_receive(:handle!).with(valid_parsed_messages[1].parsed_file_data)
+        DeviceCloud::PushNotification::DataNotification.should_receive(:handle!).with(valid_parsed_messages[2].parsed_file_data)
 
         subject.handle_each!
 
@@ -59,9 +68,10 @@ describe DeviceCloud::PushNotification do
           parsed_file_data: 'the alert data'
         )
 
-        DeviceCloud::PushNotification::Alert.should_not_receive(:handle!)
+        DeviceCloud::PushNotification::AlertNotification.should_not_receive(:handle!)
 
-        DeviceCloud::PushNotification::Event.should_receive(:handle!)
+        DeviceCloud::PushNotification::EventNotification.should_receive(:handle!)
+        DeviceCloud::PushNotification::DataNotification.should_receive(:handle!)
 
         subject.handle_each!
       end
@@ -76,9 +86,10 @@ describe DeviceCloud::PushNotification do
           parsed_file_data: 'the alert data'
         )
 
-        DeviceCloud::PushNotification::Alert.should_not_receive(:handle!)
+        DeviceCloud::PushNotification::AlertNotification.should_not_receive(:handle!)
 
-        DeviceCloud::PushNotification::Event.should_receive(:handle!)
+        DeviceCloud::PushNotification::EventNotification.should_receive(:handle!)
+        DeviceCloud::PushNotification::DataNotification.should_receive(:handle!)
 
         subject.handle_each!
       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.0.5'
+    DeviceCloud::VERSION.should == '0.0.6'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: device_cloud
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-08 00:00:00.000000000 Z
+date: 2013-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -77,16 +77,18 @@ files:
 - lib/device_cloud.rb
 - lib/device_cloud/configuration.rb
 - lib/device_cloud/push_notification.rb
-- lib/device_cloud/push_notification/alert.rb
-- lib/device_cloud/push_notification/base.rb
-- lib/device_cloud/push_notification/event.rb
+- lib/device_cloud/push_notification/alert_notification.rb
+- lib/device_cloud/push_notification/base_notification.rb
+- lib/device_cloud/push_notification/data_notification.rb
+- 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/utils.rb
 - lib/device_cloud/version.rb
-- spec/device_cloud/push_notification/alert_spec.rb
-- spec/device_cloud/push_notification/base_spec.rb
-- spec/device_cloud/push_notification/event_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
+- spec/device_cloud/push_notification/event_notification_spec.rb
 - 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
@@ -118,9 +120,10 @@ signing_key:
 specification_version: 3
 summary: A Ruby wrapper for the Etherios Device Cloud
 test_files:
-- spec/device_cloud/push_notification/alert_spec.rb
-- spec/device_cloud/push_notification/base_spec.rb
-- spec/device_cloud/push_notification/event_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
+- spec/device_cloud/push_notification/event_notification_spec.rb
 - 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

data/lib/device_cloud/push_notification/alert.rb

@@ -1,7 +0,0 @@
-module DeviceCloud
-  class PushNotification::Alert < PushNotification::Base
-    def handle!
-      DeviceCloud.push_notification_alert_handler.call(self)
-    end
-  end
-end

data/lib/device_cloud/push_notification/event.rb

@@ -1,7 +0,0 @@
-module DeviceCloud
-  class PushNotification::Event < PushNotification::Base
-    def handle!
-      DeviceCloud.push_notification_event_handler.call(self)
-    end
-  end
-end