houston 2.0.2 → 2.1.0

data/houston.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.add_dependency "commander", "~> 4.1"
   s.add_dependency "json"
 
-  s.add_development_dependency "rspec"
+  s.add_development_dependency "rspec", "~> 2.0"
   s.add_development_dependency "rake"
   s.add_development_dependency "simplecov"
 

data/lib/houston/client.rb

@@ -29,7 +29,7 @@ module Houston
       @feedback_uri = ENV['APN_FEEDBACK_URI']
       @certificate = ENV['APN_CERTIFICATE']
       @passphrase = ENV['APN_CERTIFICATE_PASSPHRASE']
-      @timeout = ENV['APN_TIMEOUT'] || 0.5
+      @timeout = Float(ENV['APN_TIMEOUT'] || 0.5)
     end
 
     def push(*notifications)
@@ -78,18 +78,23 @@ module Houston
       end
     end
 
-    def devices
+    def unregistered_devices
       devices = []
 
       Connection.open(@feedback_uri, @certificate, @passphrase) do |connection|
         while line = connection.read(38)
           feedback = line.unpack('N1n1H140')
+          timestamp = feedback[0]
           token = feedback[2].scan(/.{0,8}/).join(' ').strip
-          devices << token if token
+          devices << {token: token, timestamp: timestamp} if token && timestamp
         end
       end
 
       devices
     end
+
+    def devices
+      unregistered_devices.collect{|device| device[:token]}
+    end
   end
 end

data/lib/houston/version.rb

@@ -1,3 +1,3 @@
 module Houston
-  VERSION = "2.0.2"
+  VERSION = "2.1.0"
 end

data/spec/client_spec.rb

@@ -0,0 +1,101 @@
+require 'spec_helper'
+
+describe Houston::Client do
+  subject { Houston::Client.development }
+
+  before(:each) do
+    stub_const("Houston::Connection", MockConnection)
+  end
+
+  context '#development' do
+    subject { Houston::Client.development }
+
+    describe '#gateway_uri' do
+      subject { super().gateway_uri }
+      it { should == Houston::APPLE_DEVELOPMENT_GATEWAY_URI}
+    end
+
+    describe '#feedback_uri' do
+      subject { super().feedback_uri }
+      it { should == Houston::APPLE_DEVELOPMENT_FEEDBACK_URI}
+    end
+  end
+
+  context '#production' do
+    subject { Houston::Client.production }
+
+    describe '#gateway_uri' do
+      subject { super().gateway_uri }
+      it { should == Houston::APPLE_PRODUCTION_GATEWAY_URI}
+    end
+
+    describe '#feedback_uri' do
+      subject { super().feedback_uri }
+      it { should == Houston::APPLE_PRODUCTION_FEEDBACK_URI}
+    end
+  end
+
+  context '#new' do
+    context 'passing options through ENV' do
+      ENV['APN_GATEWAY_URI'] = "apn://gateway.example.com"
+      ENV['APN_FEEDBACK_URI'] = "apn://feedback.example.com"
+      ENV['APN_CERTIFICATE'] = "path/to/certificate"
+      ENV['APN_CERTIFICATE_PASSPHRASE'] = "passphrase"
+      ENV['APN_TIMEOUT'] = "10.0"
+
+      subject do
+        Houston::Client.new
+      end
+
+      describe '#gateway_uri' do
+        subject { super().gateway_uri }
+        it { should == ENV['APN_GATEWAY_URI'] }
+      end
+
+      describe '#feedback_uri' do
+        subject { super().feedback_uri }
+        it { should == ENV['APN_FEEDBACK_URI'] }
+      end
+
+      describe '#certificate' do
+        subject { super().certificate }
+        it { should == ENV['APN_CERTIFICATE'] }
+      end
+
+      describe '#passphrase' do
+        subject { super().passphrase }
+        it { should == ENV['APN_CERTIFICATE_PASSPHRASE'] }
+      end
+
+      describe '#timeout' do
+        subject { super().timeout }
+        it { should be_a(Float) }
+        it { should == Float(ENV['APN_TIMEOUT']) }
+      end
+    end
+
+    describe '#push' do
+      it 'should accept zero arguments' do
+        expect(Houston::Client.development.push()).to be_nil()
+      end
+    end
+  end
+
+  describe '#unregistered_devices' do
+    it 'should correctly parse the feedback response and create a dictionary of unregistered devices with timestamps' do
+      subject.unregistered_devices.should == [
+        {:token=>"ce8be627 2e43e855 16033e24 b4c28922 0eeda487 9c477160 b2545e95 b68b5969", :timestamp=>443779200},
+        {:token=>"ce8be627 2e43e855 16033e24 b4c28922 0eeda487 9c477160 b2545e95 b68b5970", :timestamp=>1388678223}
+      ]
+    end
+  end
+
+  describe '#devices' do
+    it 'should correctly parse the feedback response and create an array of unregistered devices' do
+      subject.devices.should == [
+        "ce8be627 2e43e855 16033e24 b4c28922 0eeda487 9c477160 b2545e95 b68b5969",
+        "ce8be627 2e43e855 16033e24 b4c28922 0eeda487 9c477160 b2545e95 b68b5970"
+      ]
+    end
+  end
+end

data/spec/notification_spec.rb

@@ -19,15 +19,50 @@ describe Houston::Notification do
 
   subject { Houston::Notification.new(notification_options) }
 
-  its(:token) { should == '<ce8be627 2e43e855 16033e24 b4c28922 0eeda487 9c477160 b2545e95 b68b5969>' }
-  its(:alert) { should == 'Houston, we have a problem.' }
-  its(:badge) { should == 2701 }
-  its(:sound) { should == 'sosumi.aiff' }
-  its(:expiry) { should == 1234567890 }
-  its(:id) { should == 42 }
-  its(:priority) { should == 10 }
-  its(:content_available) { should be_true }
-  its(:custom_data) { should == { key1: 1, key2: 'abc' } }
+  describe '#token' do
+    subject { super().token }
+    it { should == '<ce8be627 2e43e855 16033e24 b4c28922 0eeda487 9c477160 b2545e95 b68b5969>' }
+  end
+
+  describe '#alert' do
+    subject { super().alert }
+    it { should == 'Houston, we have a problem.' }
+  end
+
+  describe '#badge' do
+    subject { super().badge }
+    it { should == 2701 }
+  end
+
+  describe '#sound' do
+    subject { super().sound }
+    it { should == 'sosumi.aiff' }
+  end
+
+  describe '#expiry' do
+    subject { super().expiry }
+    it { should == 1234567890 }
+  end
+
+  describe '#id' do
+    subject { super().id }
+    it { should == 42 }
+  end
+
+  describe '#priority' do
+    subject { super().priority }
+    it { should == 10 }
+  end
+
+  describe '#content_available' do
+    subject { super().content_available }
+    it { should be_true }
+  end
+
+  describe '#custom_data' do
+    subject { super().custom_data }
+    it { should == { key1: 1, key2: 'abc' } }
+  end
 
   context 'using :device instead of :token' do
     subject do
@@ -36,12 +71,15 @@ describe Houston::Notification do
       Houston::Notification.new(notification_options)
     end
 
-    its(:device) { '<ce8be627 2e43e855 16033e24 b4c28922 0eeda487 9c477160 b2545e95 b68b5969>' }
+    describe '#device' do
+      subject { super().device }
+      it { should == '<ce8be627 2e43e855 16033e24 b4c28922 0eeda487 9c477160 b2545e95 b68b5969>' }
+    end
   end
 
   describe '#payload' do
     it 'should create a compliant dictionary' do
-      subject.payload.should == {
+      expect(subject.payload).to eq({
         'aps' => {
           'alert' => 'Houston, we have a problem.',
           'badge' => 2701,
@@ -50,75 +88,75 @@ describe Houston::Notification do
         },
         :key1 => 1,
         :key2 => 'abc'
-      }
+      })
     end
 
     it 'should create a dictionary of only custom data and empty aps' do
-      Houston::Notification.new(key1: 123, key2: 'xyz').payload.should == {
+      expect(Houston::Notification.new(key1: 123, key2: 'xyz').payload).to eq({
         'aps' => {},
         :key1 => 123,
         :key2 => 'xyz'
-      }
+      })
     end
 
     it 'should create a dictionary only with alerts' do
-      Houston::Notification.new(alert: 'Hello, World!').payload.should == {
+      expect(Houston::Notification.new(alert: 'Hello, World!').payload).to eq({
         'aps' => { 'alert' => 'Hello, World!' }
-      }
+      })
     end
 
     it 'should create a dictionary only with badges' do
-      Houston::Notification.new(badge: '123').payload.should == {
+      expect(Houston::Notification.new(badge: '123').payload).to eq({
         'aps' => { 'badge' => 123 }
-      }
+      })
     end
 
     it 'should create a dictionary only with sound' do
-      Houston::Notification.new(sound: 'ring.aiff').payload.should == {
+      expect(Houston::Notification.new(sound: 'ring.aiff').payload).to eq({
         'aps' => { 'sound' => 'ring.aiff' }
-      }
+      })
     end
 
     it 'should create a dictionary only with content-available' do
-      Houston::Notification.new(content_available: true).payload.should == {
+      expect(Houston::Notification.new(content_available: true).payload).to eq({
         'aps' => { 'content-available' => 1 }
-      }
+      })
     end
 
     it 'should allow custom data inside aps key' do
       notification_options = { :badge => 567, 'aps' => { 'loc-key' => 'my-key' } }
-      Houston::Notification.new(notification_options).payload.should == {
+      expect(Houston::Notification.new(notification_options).payload).to eq({
         'aps' => { 'loc-key' => 'my-key', 'badge' => 567 }
-      }
+      })
     end
   end
 
   describe '#sent?' do
     it 'should be false initially' do
-      subject.sent?.should be_false
+      expect(subject.sent?).to be_false
     end
 
     it 'should be true after marking as sent' do
       subject.mark_as_sent!
-      subject.sent?.should be_true
+      expect(subject.sent?).to be_true
     end
 
     it 'should be false after marking as unsent' do
       subject.mark_as_sent!
       subject.mark_as_unsent!
-      subject.sent?.should be_false
+      expect(subject.sent?).to be_false
     end
   end
 
   describe '#message' do
     it 'should create a message with command 2' do
       command, _1, _2 = subject.message.unpack('cNa*')
-      command.should == 2
+      expect(command).to eq(2)
     end
 
     it 'should create a message with correct frame length' do
       _1, length, _2 = subject.message.unpack('cNa*')
-      length.should == 182
+      expect(length).to eq(182)
     end
 
     def parse_items(items_stream)
@@ -133,37 +171,37 @@ describe Houston::Notification do
 
     it 'should include five items' do
       _1, _2, items_stream = subject.message.unpack('cNa*')
-      parse_items(items_stream).should have(5).items
+      expect(parse_items(items_stream).size).to eq(5)
     end
 
     it 'should include an item #1 with the token as hexadecimal' do
       _1, _2, items_stream = subject.message.unpack('cNa*')
       items = parse_items(items_stream)
-      items.should include([1, 32, ['ce8be6272e43e85516033e24b4c289220eeda4879c477160b2545e95b68b5969'].pack('H*')])
+      expect(items).to include([1, 32, ['ce8be6272e43e85516033e24b4c289220eeda4879c477160b2545e95b68b5969'].pack('H*')])
     end
 
     it 'should include an item #2 with the payload as JSON' do
       _1, _2, items_stream = subject.message.unpack('cNa*')
       items = parse_items(items_stream)
-      items.should include([2, 126, '{"key1":1,"key2":"abc","aps":{"alert":"Houston, we have a problem.","badge":2701,"sound":"sosumi.aiff","content-available":1}}'])
+      expect(items).to include([2, 126, '{"key1":1,"key2":"abc","aps":{"alert":"Houston, we have a problem.","badge":2701,"sound":"sosumi.aiff","content-available":1}}'])
     end
 
     it 'should include an item #3 with the identifier' do
       _1, _2, items_stream = subject.message.unpack('cNa*')
       items = parse_items(items_stream)
-      items.should include([3, 4, [42].pack('N')])
+      expect(items).to include([3, 4, [42].pack('N')])
     end
 
     it 'should include an item #4 with the expiry' do
       _1, _2, items_stream = subject.message.unpack('cNa*')
       items = parse_items(items_stream)
-      items.should include([4, 4, [1234567890].pack('N')])
+      expect(items).to include([4, 4, [1234567890].pack('N')])
     end
 
     it 'should include an item #4 with the priority' do
       _1, _2, items_stream = subject.message.unpack('cNa*')
       items = parse_items(items_stream)
-      items.should include([5, 1, [10].pack('c')])
+      expect(items).to include([5, 1, [10].pack('c')])
     end
 
     it 'might be missing the identifier item' do
@@ -172,8 +210,8 @@ describe Houston::Notification do
       msg = notification.message
       _1, _2, items_stream = notification.message.unpack('cNa*')
       items = parse_items(items_stream)
-      items.should have(4).items
-      items.find { |item| item[0] == 3 }.should be_nil
+      expect(items.size).to eq(4)
+      expect(items.find { |item| item[0] == 3 }).to be_nil
     end
 
     it 'might be missing the expiry item' do
@@ -182,8 +220,8 @@ describe Houston::Notification do
       msg = notification.message
       _1, _2, items_stream = notification.message.unpack('cNa*')
       items = parse_items(items_stream)
-      items.should have(4).items
-      items.find { |item| item[0] == 4 }.should be_nil
+      expect(items.size).to eq(4)
+      expect(items.find { |item| item[0] == 4 }).to be_nil
     end
 
     it 'might be missing the priority item' do
@@ -192,8 +230,8 @@ describe Houston::Notification do
       msg = notification.message
       _1, _2, items_stream = notification.message.unpack('cNa*')
       items = parse_items(items_stream)
-      items.should have(4).items
-      items.find { |item| item[0] == 5 }.should be_nil
+      expect(items.size).to eq(4)
+      expect(items.find { |item| item[0] == 5 }).to be_nil
     end
   end
 end

data/spec/spec_helper.rb

@@ -8,3 +8,24 @@ end
 
 require 'houston'
 require 'rspec'
+
+class MockConnection
+  class << self
+    def open(uri, certificate, passphrase)
+      yield self.new
+    end
+  end
+
+  def initialize
+    @unregistered_devices = [
+      [443779200, 32, "ce8be6272e43e85516033e24b4c289220eeda4879c477160b2545e95b68b5969"],
+      [1388678223, 32, "ce8be6272e43e85516033e24b4c289220eeda4879c477160b2545e95b68b5970"]
+    ]
+  end
+
+  def read(bytes)
+    return nil if @unregistered_devices.empty?
+
+    @unregistered_devices.shift.pack('N1n1H*')
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: houston
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0
 platform: ruby
 authors:
 - Mattt Thompson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-16 00:00:00.000000000 Z
+date: 2014-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -42,16 +42,16 @@ dependencies:
   name: rspec
   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: rake
   requirement: !ruby/object:Gem::Requirement
@@ -88,11 +88,49 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ./coverage/assets/0.7.1/application.css
+- ./coverage/assets/0.7.1/application.js
+- ./coverage/assets/0.7.1/fancybox/blank.gif
+- ./coverage/assets/0.7.1/fancybox/fancy_close.png
+- ./coverage/assets/0.7.1/fancybox/fancy_loading.png
+- ./coverage/assets/0.7.1/fancybox/fancy_nav_left.png
+- ./coverage/assets/0.7.1/fancybox/fancy_nav_right.png
+- ./coverage/assets/0.7.1/fancybox/fancy_shadow_e.png
+- ./coverage/assets/0.7.1/fancybox/fancy_shadow_n.png
+- ./coverage/assets/0.7.1/fancybox/fancy_shadow_ne.png
+- ./coverage/assets/0.7.1/fancybox/fancy_shadow_nw.png
+- ./coverage/assets/0.7.1/fancybox/fancy_shadow_s.png
+- ./coverage/assets/0.7.1/fancybox/fancy_shadow_se.png
+- ./coverage/assets/0.7.1/fancybox/fancy_shadow_sw.png
+- ./coverage/assets/0.7.1/fancybox/fancy_shadow_w.png
+- ./coverage/assets/0.7.1/fancybox/fancy_title_left.png
+- ./coverage/assets/0.7.1/fancybox/fancy_title_main.png
+- ./coverage/assets/0.7.1/fancybox/fancy_title_over.png
+- ./coverage/assets/0.7.1/fancybox/fancy_title_right.png
+- ./coverage/assets/0.7.1/fancybox/fancybox-x.png
+- ./coverage/assets/0.7.1/fancybox/fancybox-y.png
+- ./coverage/assets/0.7.1/fancybox/fancybox.png
+- ./coverage/assets/0.7.1/favicon_green.png
+- ./coverage/assets/0.7.1/favicon_red.png
+- ./coverage/assets/0.7.1/favicon_yellow.png
+- ./coverage/assets/0.7.1/loading.gif
+- ./coverage/assets/0.7.1/magnify.png
+- ./coverage/assets/0.7.1/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
+- ./coverage/assets/0.7.1/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
+- ./coverage/assets/0.7.1/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
+- ./coverage/assets/0.7.1/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
+- ./coverage/assets/0.7.1/smoothness/images/ui-bg_glass_75_dadada_1x400.png
+- ./coverage/assets/0.7.1/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
+- ./coverage/assets/0.7.1/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
+- ./coverage/assets/0.7.1/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
+- ./coverage/assets/0.7.1/smoothness/images/ui-icons_222222_256x240.png
+- ./coverage/assets/0.7.1/smoothness/images/ui-icons_2e83ff_256x240.png
+- ./coverage/assets/0.7.1/smoothness/images/ui-icons_454545_256x240.png
+- ./coverage/assets/0.7.1/smoothness/images/ui-icons_888888_256x240.png
+- ./coverage/assets/0.7.1/smoothness/images/ui-icons_cd0a0a_256x240.png
+- ./coverage/index.html
 - ./Gemfile
 - ./Gemfile.lock
-- ./houston-0.3.1.gem
-- ./houston-2.0.0.gem
-- ./houston-2.0.1.gem
 - ./houston.gemspec
 - ./lib/houston/client.rb
 - ./lib/houston/connection.rb
@@ -102,6 +140,7 @@ files:
 - ./LICENSE
 - ./Rakefile
 - ./README.md
+- spec/client_spec.rb
 - spec/notification_spec.rb
 - spec/spec_helper.rb
 - bin/apn
@@ -130,5 +169,6 @@ signing_key:
 specification_version: 4
 summary: Send Apple Push Notifications
 test_files:
+- spec/client_spec.rb
 - spec/notification_spec.rb
 - spec/spec_helper.rb