apn_on_rails 0.4.1 → 0.4.2

data/Gemfile

@@ -11,9 +11,9 @@ group :development do
   gem 'autotest'
   gem 'sqlite3-ruby'
   gem "rspec", ">= 2.0.0"
-  gem "bundler", ">= 1.0.0.rc.5"
-  gem "jeweler", "~> 1.5.0.pre2"
+  gem "bundler", "~> 1.0.0"
+  gem "jeweler", "~> 1.5.0"
   gem "rcov", ">= 0"
-  gem "actionpack", '~> 2.3.8'
-  gem 'activerecord', "~> 2.3.8", :require => 'active_record'
+  gem "actionpack", '~> 2.3.0'
+  gem 'activerecord', "~> 2.3.0", :require => 'active_record'
 end

data/Gemfile.lock

@@ -1,47 +1,47 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionpack (2.3.9)
-      activesupport (= 2.3.9)
+    ZenTest (4.4.2)
+    actionpack (2.3.10)
+      activesupport (= 2.3.10)
       rack (~> 1.1.0)
-    activerecord (2.3.9)
-      activesupport (= 2.3.9)
-    activesupport (2.3.9)
-    autotest (4.3.2)
+    activerecord (2.3.10)
+      activesupport (= 2.3.10)
+    activesupport (2.3.10)
+    autotest (4.4.6)
+      ZenTest (>= 4.4.1)
     configatron (2.6.4)
       yamler (>= 0.1.0)
     diff-lcs (1.1.2)
     git (1.2.5)
-    jeweler (1.5.0.pre3)
+    jeweler (1.5.2)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
     rack (1.1.0)
     rake (0.8.7)
     rcov (0.9.9)
-    rspec (2.0.1)
-      rspec-core (~> 2.0.1)
-      rspec-expectations (~> 2.0.1)
-      rspec-mocks (~> 2.0.1)
-    rspec-core (2.0.1)
-    rspec-expectations (2.0.1)
-      diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.1)
-      rspec-core (~> 2.0.1)
-      rspec-expectations (~> 2.0.1)
-    sqlite3-ruby (1.3.1)
+    rspec (2.4.0)
+      rspec-core (~> 2.4.0)
+      rspec-expectations (~> 2.4.0)
+      rspec-mocks (~> 2.4.0)
+    rspec-core (2.4.0)
+    rspec-expectations (2.4.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.4.0)
+    sqlite3-ruby (1.3.2)
     yamler (0.1.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  actionpack (~> 2.3.8)
-  activerecord (~> 2.3.8)
+  actionpack (~> 2.3.0)
+  activerecord (~> 2.3.0)
   autotest
-  bundler (>= 1.0.0.rc.5)
+  bundler (~> 1.0.0)
   configatron
-  jeweler (~> 1.5.0.pre2)
+  jeweler (~> 1.5.0)
   rcov
   rspec (>= 2.0.0)
   sqlite3-ruby

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/apn_on_rails.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{apn_on_rails}
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["markbates", "Rebecca Nesson"]
-  s.date = %q{2010-11-09}
+  s.date = %q{2011-01-04}
   s.description = %q{APN on Rails is a Ruby on Rails gem that allows you to
 easily add Apple Push Notification (iPhone) support to your Rails application.
 }
@@ -20,7 +20,6 @@ easily add Apple Push Notification (iPhone) support to your Rails application.
     "README.textile"
   ]
   s.files = [
-    ".gitignore",
     ".rspec",
     ".specification",
     "Gemfile",
@@ -44,6 +43,7 @@ easily add Apple Push Notification (iPhone) support to your Rails application.
     "generators/templates/apn_migrations/009_create_pull_notifications.rb",
     "generators/templates/apn_migrations/010_alter_apn_notifications.rb",
     "generators/templates/apn_migrations/011_make_device_token_index_nonunique.rb",
+    "generators/templates/apn_migrations/012_add_launch_notification_to_apn_pull_notifications.rb",
     "lib/apn_on_rails.rb",
     "lib/apn_on_rails/apn_on_rails.rb",
     "lib/apn_on_rails/app/models/apn/app.rb",
@@ -113,32 +113,32 @@ easily add Apple Push Notification (iPhone) support to your Rails application.
       s.add_development_dependency(%q<autotest>, [">= 0"])
       s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 2.0.0"])
-      s.add_development_dependency(%q<bundler>, [">= 1.0.0.rc.5"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.0.pre2"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.5.0"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
-      s.add_development_dependency(%q<actionpack>, ["~> 2.3.8"])
-      s.add_development_dependency(%q<activerecord>, ["~> 2.3.8"])
+      s.add_development_dependency(%q<actionpack>, ["~> 2.3.0"])
+      s.add_development_dependency(%q<activerecord>, ["~> 2.3.0"])
     else
       s.add_dependency(%q<configatron>, [">= 0"])
       s.add_dependency(%q<autotest>, [">= 0"])
       s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 2.0.0"])
-      s.add_dependency(%q<bundler>, [">= 1.0.0.rc.5"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.0.pre2"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.5.0"])
       s.add_dependency(%q<rcov>, [">= 0"])
-      s.add_dependency(%q<actionpack>, ["~> 2.3.8"])
-      s.add_dependency(%q<activerecord>, ["~> 2.3.8"])
+      s.add_dependency(%q<actionpack>, ["~> 2.3.0"])
+      s.add_dependency(%q<activerecord>, ["~> 2.3.0"])
     end
   else
     s.add_dependency(%q<configatron>, [">= 0"])
     s.add_dependency(%q<autotest>, [">= 0"])
     s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 2.0.0"])
-    s.add_dependency(%q<bundler>, [">= 1.0.0.rc.5"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.0.pre2"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.5.0"])
     s.add_dependency(%q<rcov>, [">= 0"])
-    s.add_dependency(%q<actionpack>, ["~> 2.3.8"])
-    s.add_dependency(%q<activerecord>, ["~> 2.3.8"])
+    s.add_dependency(%q<actionpack>, ["~> 2.3.0"])
+    s.add_dependency(%q<activerecord>, ["~> 2.3.0"])
   end
 end
 

data/generators/templates/apn_migrations/012_add_launch_notification_to_apn_pull_notifications.rb

@@ -0,0 +1,9 @@
+class AddLaunchNotificationToApnPullNotifications < ActiveRecord::Migration
+  def self.up
+    add_column :apn_pull_notifications, :launch_notification, :boolean
+  end
+
+  def self.down
+    remove_column :apn_pull_notifications, :launch_notification
+  end
+end

data/lib/apn_on_rails/app/models/apn/app.rb

@@ -31,8 +31,8 @@ class APN::App < APN::Base
     apps.each do |app|
       app.send_notifications
     end
-    global_cert = File.read(configatron.apn.cert)
-    if global_cert
+    if !configatron.apn.cert.blank?
+      global_cert = File.read(configatron.apn.cert)
       send_notifications_for_cert(global_cert, nil)
     end
   end
@@ -54,7 +54,8 @@ class APN::App < APN::Base
             end
           end
         end
-      rescue
+      rescue Exception => e
+        log_connection_exception(e)
       end
     # end   
   end
@@ -123,8 +124,8 @@ class APN::App < APN::Base
     apps.each do |app|
       app.process_devices
     end
-    global_cert = File.read(configatron.apn.cert)
-    if global_cert
+    if !configatron.apn.cert.blank?
+      global_cert = File.read(configatron.apn.cert)
       APN::App.process_devices_for_cert(global_cert)
     end
   end
@@ -140,5 +141,11 @@ class APN::App < APN::Base
       end
     end 
   end
+  
+  
+  protected
+  def log_connection_exception(ex)
+    puts ex.message
+  end
     
 end

data/lib/apn_on_rails/app/models/apn/pull_notification.rb

@@ -4,12 +4,25 @@ class APN::PullNotification < APN::Base
   validates_presence_of :app_id
 
   def self.latest_since(app_id, since_date=nil)
-    conditions = if since_date
-                   ["app_id = ? AND created_at > ?", app_id, since_date]
-                 else
-                   ["app_id = ?", app_id]
-                 end
-
-    first(:order => "created_at DESC", :conditions => conditions)
+    if since_date
+      res = first(:order => "created_at DESC", 
+                  :conditions => ["app_id = ? AND created_at > ? AND launch_notification = ?", app_id, since_date, false])
+    else
+      res = first(:order => "created_at DESC", 
+                  :conditions => ["app_id = ? AND launch_notification = ?", app_id, true])
+      res = first(:order => "created_at DESC", 
+                  :conditions => ["app_id = ? AND launch_notification = ?", app_id, false]) unless res
+    end
+    res
+  end
+  
+  def self.all_since(app_id, since_date=nil)
+    if since_date
+      res = all(:order => "created_at DESC", 
+                :conditions => ["app_id = ? AND created_at > ? AND launch_notification = ?", app_id, since_date, false])
+    else 
+      res = all(:order => "created_at DESC", 
+                :conditions => ["app_id = ? AND launch_notification = ?", app_id, false])
+    end
   end
 end

data/lib/apn_on_rails/libs/feedback.rb

@@ -13,10 +13,9 @@ module APN
       def devices(cert, &block)
         devices = []
         return if cert.nil? 
-        APN::Connection.open_for_feedback({:cert => cert}) do |conn, sock|
-          while line = sock.gets   # Read lines from the socket
-            line.strip!
-            feedback = line.unpack('N1n1H140')
+        APN::Connection.open_for_feedback({:cert => cert}) do |conn, sock|          
+          while line = conn.read(38)   # Read 38 bytes from the SSL socket
+            feedback = line.unpack('N1n1H140')            
             token = feedback[2].scan(/.{0,8}/).join(' ').strip
             device = APN::Device.find(:first, :conditions => {:token => token})
             if device

data/spec/apn_on_rails/app/models/apn/pull_notification_spec.rb

@@ -21,12 +21,14 @@ describe APN::PullNotification do
       noty1 = PullNotificationFactory.create({:app_id => app.id})
       noty1.created_at = Time.now + 1.week
       noty1.save
-      APN::PullNotification.latest_since(app.id,Time.now - 1.week).should == noty1 
+      latest = APN::PullNotification.latest_since(app.id,Time.now - 1.week)
+      puts "latest is #{latest}"
+      latest.should == noty1 
     end
 
   end
   
-  describe 'latest_since_with_no_date' do 
+  describe 'latest_since_with_no_date_when_there_is_no_launch_notification' do 
     it 'should return the most recent pull notification because no date is given' do 
       app = APN::App.first
       noty1 = APN::PullNotification.find(:first, :order => "created_at DESC")
@@ -34,4 +36,65 @@ describe APN::PullNotification do
     end
   end
   
+  describe 'latest_since_with_no_date_when_there_is_a_launch_notification' do
+    it 'should return the launch notification even though there is a more recent notification' do
+      app = APN::App.first
+      noty_launch = PullNotificationFactory.create({:app_id => app.id, :launch_notification => true})
+      noty_launch.created_at = Time.now - 1.week
+      noty_launch.save
+      noty_nonlaunch = PullNotificationFactory.create({:app_id => app.id})
+      APN::PullNotification.latest_since(app.id).should == noty_launch
+    end
+  end
+  
+  describe 'older_non_launch_noty_with_newer_launch_noty' do 
+    it 'should return the older non launch notification even though a newer launch notification exists' do
+      APN::PullNotification.all.each { |n| n.destroy }
+      app = APN::App.first
+      noty_launch = PullNotificationFactory.create({:app_id => app.id, :launch_notification => true})
+      puts "noty_launch id is #{noty_launch.id}"
+      noty_nonlaunch = PullNotificationFactory.create({:app_id => app.id})
+      noty_nonlaunch.created_at = Time.now - 1.week
+      noty_nonlaunch.save
+      puts "noty_nonlaunch id is #{noty_nonlaunch.id}"
+      APN::PullNotification.latest_since(app.id, Time.now - 2.weeks).should == noty_nonlaunch
+    end
+  end
+  
+  describe 'all_since_date_with_date_given' do 
+    it 'should return all the non-launch notifications after the given date but not the ones before it' do 
+      APN::PullNotification.all.each { |n| n.destroy }
+      app = APN::App.first
+      noty_launch = PullNotificationFactory.create({:app_id => app.id, :launch_notification => true})
+      noty_launch.created_at = Time.now - 2.weeks
+      noty_launch.save
+      old_noty = PullNotificationFactory.create({:app_id => app.id})
+      old_noty.created_at = Time.now - 2.weeks
+      old_noty.save
+      new_noty_one = PullNotificationFactory.create({:app_id => app.id})
+      new_noty_one.created_at = Time.now - 1.day
+      new_noty_one.save
+      new_noty_two = PullNotificationFactory.create({:app_id => app.id})
+      APN::PullNotification.all_since(app.id, Time.now - 1.week).should == [new_noty_two,new_noty_one]
+    end
+  end
+  
+  describe 'all_since_with_no_since_date_given' do 
+    it 'should return all of the non-launch notifications' do 
+      APN::PullNotification.all.each { |n| n.destroy }
+      app = APN::App.first
+      noty_launch = PullNotificationFactory.create({:app_id => app.id, :launch_notification => true})
+      noty_launch.created_at = Time.now - 2.weeks
+      noty_launch.save
+      old_noty = PullNotificationFactory.create({:app_id => app.id})
+      old_noty.created_at = Time.now - 2.weeks
+      old_noty.save
+      new_noty_one = PullNotificationFactory.create({:app_id => app.id})
+      new_noty_one.created_at = Time.now - 1.day
+      new_noty_one.save
+      new_noty_two = PullNotificationFactory.create({:app_id => app.id})
+      APN::PullNotification.all_since(app.id, Time.now - 3.weeks).should == [new_noty_two,new_noty_one,old_noty]
+    end
+  end
+  
 end

data/spec/apn_on_rails/libs/feedback_spec.rb

@@ -9,14 +9,12 @@ describe APN::Feedback do
       @device = DeviceFactory.create
       @cert = mock('cert_mock')
       
-      @data_mock = mock('data_mock')
-      @data_mock.should_receive(:strip!)
+      @data_mock = mock('data_mock')      
       @data_mock.should_receive(:unpack).with('N1n1H140').and_return([@time.to_i, 12388, @device.token.delete(' ')])
       
-      @ssl_mock = mock('ssl_mock')
+      @ssl_mock = mock('ssl_mock')      
+      @ssl_mock.should_receive(:read).with(38).twice.and_return(@data_mock, nil)
       @sock_mock = mock('sock_mock')
-      @sock_mock.should_receive(:gets).twice.and_return(@data_mock, nil)
-      
     end
     
     it 'should an Array of devices that need to be processed' do

data/spec/factories/pull_notification_factory.rb

@@ -5,7 +5,7 @@ module PullNotificationFactory
     def new(options = {})
       app = APN::App.first
       options = {:app_id => app.id, :title => 'Pull Notification Title', 
-                 :content => 'blah blah blah', :link => 'http://www.prx.org'}.merge(options)
+                 :content => 'blah blah blah', :link => 'http://www.prx.org', :launch_notification => false}.merge(options)
       return APN::PullNotification.new(options)
     end
     

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: apn_on_rails
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - markbates
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-09 00:00:00 -05:00
+date: 2011-01-04 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -83,16 +83,14 @@ dependencies:
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15424063
+        hash: 23
         segments: 
         - 1
         - 0
         - 0
-        - rc
-        - 5
-        version: 1.0.0.rc.5
+        version: 1.0.0
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -103,13 +101,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: -1876988199
+        hash: 3
         segments: 
         - 1
         - 5
         - 0
-        - pre2
-        version: 1.5.0.pre2
+        version: 1.5.0
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -134,12 +131,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 3
         segments: 
         - 2
         - 3
-        - 8
-        version: 2.3.8
+        - 0
+        version: 2.3.0
   type: :development
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
@@ -150,12 +147,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 3
         segments: 
         - 2
         - 3
-        - 8
-        version: 2.3.8
+        - 0
+        version: 2.3.0
   type: :development
   version_requirements: *id009
 description: |
@@ -172,7 +169,6 @@ extra_rdoc_files:
 - README
 - README.textile
 files: 
-- .gitignore
 - .rspec
 - .specification
 - Gemfile
@@ -196,6 +192,7 @@ files:
 - generators/templates/apn_migrations/009_create_pull_notifications.rb
 - generators/templates/apn_migrations/010_alter_apn_notifications.rb
 - generators/templates/apn_migrations/011_make_device_token_index_nonunique.rb
+- generators/templates/apn_migrations/012_add_launch_notification_to_apn_pull_notifications.rb
 - lib/apn_on_rails.rb
 - lib/apn_on_rails/apn_on_rails.rb
 - lib/apn_on_rails/app/models/apn/app.rb

data/.gitignore

@@ -1,17 +0,0 @@
-*.log
-.DS_Store
-doc
-tmp
-pkg
-*.gem
-*.pid
-coverage
-coverage.data
-build/*
-*.pbxuser
-*.mode1v3
-.svn
-profile
-spec/active_record/test.db
-.bundle
-**/.svn