device_cloud 0.0.11 → 0.1.0

data/lib/device_cloud/push_notification/base_notification.rb

@@ -25,8 +25,12 @@ module DeviceCloud
       @file_data.file_name
     end
 
+    def raw_data
+      @file_data.fdData
+    end
+
     def mac_address
-      return '' unless device_id.size > 0
+      return '' unless device_id
       device_id.sub(/\Am:/, '').scan(/.{2}|.+/).join(':')
     end
 

data/lib/device_cloud/push_notification/data_notification.rb

@@ -1,10 +1,5 @@
 module DeviceCloud
   class PushNotification::DataNotification < PushNotification::BaseNotification
-
-    def raw_data
-      @file_data.fdData
-    end
-
     def handle!
       DeviceCloud.data_notification_handler.call(self)
     end

data/lib/device_cloud/version.rb

@@ -1,3 +1,3 @@
 module DeviceCloud
-  VERSION = "0.0.11"
+  VERSION = "0.1.0"
 end

data/spec/device_cloud/push_notification/base_notification_spec.rb

@@ -1,32 +1,35 @@
 require 'spec_helper'
 
 describe DeviceCloud::PushNotification::BaseNotification do
-  let(:data) do
+  let(:data_string) { "{\"value\": {}, \"class\": \"alert\", \"queued_dt\": \"2013-06-24T14:47:47Z\", \"type\": \"foo\", \"id\": \"0966595cdcdd11e2abf50013950e6012\", \"device_id\": \"m:0013950E6012\"}" }
+  let(:raw_file_data) do
     {
-      'id' => '1234',
-      'device_id' => 'm:1392301029',
-      'type' => 'some type',
-      'queued_dt' => '2013-06-24T14:52:55.421Z',
-      'value' => {'this' => 'is a value'}
+      "id" => {
+        "fdPath" => " /db/4044_MadGlory_Interactive/00000000-00000000-001395FF-FF0E6012/alert/",
+        "fdName" => "foo-0966595cdcdd11e2abf50013950e6012.json"
+      },
+      "fdLastModifiedDate" => "2013-06-24T14:52:55.421Z",
+      "fdSize" => 156,
+      "fdContentType" => "application/json",
+      "fdData" => Base64.encode64(data_string),
+      "fdArchive" => false,
+      "cstId" => 4044,
+      "fdType" => "file",
+      "fdCreatedDate" => "2013-06-24T14:52:55.421Z"
     }
   end
-  let(:file_data) do
-    OpenStruct.new(
-      full_path: '/some/place/file_name.json',
-      data: data,
-      file_name: 'file_name.json'
-    )
-  end
+
+  let(:file_data) { DeviceCloud::PushNotification::Message::FileData.new raw_file_data }
 
   subject { DeviceCloud::PushNotification::BaseNotification.new file_data }
 
   describe "attributes" do
-    its(:id) { should eq data['id'] }
-    its(:full_path) { should eq file_data.full_path }
-    its(:device_id) { should eq data['device_id'] }
-    its(:type) { should eq data['type'] }
-    its(:queued_at) { should eq data['queued_dt'] }
-    its(:value) { should eq data['value'] }
+    its(:id) { should eq file_data.data['id'] }
+    its(:full_path) { should eq(raw_file_data['id']['fdPath'] + raw_file_data['id']['fdName']) }
+    its(:device_id) { should eq file_data.data['device_id'] }
+    its(:type) { should eq file_data.data['type'] }
+    its(:queued_at) { should eq file_data.data['queued_dt'] }
+    its(:value) { should eq file_data.data['value'] }
   end
 
   describe "#data" do
@@ -41,21 +44,27 @@ describe DeviceCloud::PushNotification::BaseNotification do
 
   describe "#mac_address" do
     context "when device_id present" do
-      its(:mac_address) { should eq('13:92:30:10:29') }
+      its(:mac_address) { should eq('00:13:95:0E:60:12') }
     end
 
     context 'when device_id blank' do
-      before(:each) do
-        data['device_id'] = ''
-      end
+      let(:data_string) { "{\"value\": {}, \"class\": \"alert\", \"queued_dt\": \"2013-06-24T14:47:47Z\", \"type\": \"foo\", \"id\": \"0966595cdcdd11e2abf50013950e6012\", \"device_id\": \"\"}" }
+
+      its(:mac_address) { should eq '' }
+    end
+
+    context "when device_id is not present" do
+      let(:data_string) { "{\"value\": {}, \"class\": \"alert\", \"queued_dt\": \"2013-06-24T14:47:47Z\", \"type\": \"foo\", \"id\": \"0966595cdcdd11e2abf50013950e6012\"}" }
 
       its(:mac_address) { should eq '' }
     end
   end
 
   describe "#file_name" do
-    context 'when id is present' do
-      its(:file_name) { should eq file_data.file_name}
-    end
+    its(:file_name) { should eq file_data.file_name}
+  end
+
+  describe "#raw_data" do
+    its(:raw_data) { should eq raw_file_data['fdData'] }
   end
 end

data/spec/device_cloud/push_notification/data_notification_spec.rb

@@ -32,8 +32,4 @@ describe DeviceCloud::PushNotification::DataNotification do
       expect(handled_data).to eq subject
     end
   end
-
-  describe "#raw_data" do
-    its(:raw_data) { should eq raw_file_data['fdData'] }
-  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.0.11'
+    DeviceCloud::VERSION.should == '0.1.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: device_cloud
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-15 00:00:00.000000000 Z
+date: 2013-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler