apn_on_rails 0.5.0 → 0.5.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    apn_on_rails (0.5.0)
+    apn_on_rails (0.5.1)
       actionpack
       activerecord
       configatron
@@ -62,7 +62,7 @@ GEM
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (!= 1.3.0, ~> 1.1)
-    sqlite3-ruby (1.3.2)
+    sqlite3 (1.3.5)
     tilt (1.3.3)
     tzinfo (0.3.31)
     yamler (0.1.0)
@@ -77,4 +77,4 @@ DEPENDENCIES
   rake
   rcov
   rspec
-  sqlite3-ruby
+  sqlite3

data/README.textile

@@ -123,18 +123,33 @@ Rake tasks that ship with APN on Rails:
   end
 </pre></code>
 
+You now need to run the APN generator to create the migration files.
+
+<pre><code>
+ruby script/rails generate apn_on_rails:install
+</pre></code>
+
 Now, to create the tables you need for APN on Rails, run the following task:
 
 <pre><code>
-  $ ruby script/generate apn_migrations
+  $  rake db:migrate
 </pre></code>
 
 APN on Rails uses the Configatron gem, http://github.com/markbates/configatron/tree/master, 
-to configure itself. (With the change to multi-app support, the certifications are stored in the 
-database rather than in the config directory, however, it is still possible to use the default "app" and the certificates
+to configure itself. With the change to multi-app support, the certifications are stored in the 
+database rather than in the config directory.
+
+However, it is still possible to use the default "app" and the certificates
 stored in the config directory.  For this setup, the following configurations apply.)
-APN on Rails has the following default configurations that you change as you
-see fit:
+APN on Rails has the following default configurations that you change for your setup.  
+
+To generate the files that will be used here, run 
+
+<pre><code>
+script/rails generate configatron:install
+</pre></code>
+
+Then customize the config/configatron files that were generated to your settings.
 
 <pre><code>
   # development (delivery):
@@ -165,7 +180,7 @@ h3. Upgrade Notes:
 If you are upgrading to a new version of APN on Rails you should always run:
 
 <pre><code>
-  $ ruby script/generate apn_migrations
+ruby script/rails generate apn_on_rails:install
 </pre></code>
 
 That way you ensure you have the latest version of the database tables needed.

data/apn_on_rails.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency('rake')
   s.add_development_dependency('autotest')
-  s.add_development_dependency('sqlite3-ruby')
+  s.add_development_dependency('sqlite3')
   s.add_development_dependency('rspec')
   s.add_development_dependency('bundler')
   s.add_development_dependency('rcov')

data/generators/templates/apn_migrations/003_alter_apn_devices.rb

@@ -9,10 +9,8 @@ class AlterApnDevices < ActiveRecord::Migration # :nodoc:
   def self.up
     add_column :apn_devices, :last_registered_at, :datetime
     
-    APN::Device.all.each do |device|
-      device.last_registered_at = device.created_at
-      device.save!
-    end
+    execute 'update apn_devices set last_registered_at = created_at'
+
     change_column :apn_devices, :token, :string, :size => 100, :null => false
     add_index :apn_devices, :token, :unique => true
   end

data/generators/templates/apn_migrations/004_create_apn_apps.rb

@@ -1,4 +1,11 @@
 class CreateApnApps < ActiveRecord::Migration # :nodoc:
+
+  module APN # :nodoc:
+    class Device < ActiveRecord::Base # :nodoc:
+      set_table_name 'apn_devices'
+    end
+  end
+
   def self.up
     create_table :apn_apps do |t|
       t.text :apn_dev_cert

data/generators/templates/apn_migrations/010_alter_apn_notifications.rb

@@ -7,15 +7,15 @@ class AlterApnNotifications < ActiveRecord::Migration # :nodoc:
   end
   
   def self.up
-    unless APN::Notification.column_names.include?("custom_properties")
-      add_column :apn_notifications, :custom_properties, :text
-    end
+    # unless APN::Notification.column_names.include?("custom_properties")
+      add_column(:apn_notifications, :custom_properties, :text) rescue nil
+    # end
   end
 
   def self.down
-    if APN::Notification.column_names.include?("custom_properties")
-      remove_column :apn_notifications, :custom_properties
-    end
+    # if APN::Notification.column_names.include?("custom_properties")
+      remove_column(:apn_notifications, :custom_properties) rescue nil
+    # end
   end
   
 end

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

@@ -142,9 +142,9 @@ class APN::App < APN::Base
     end
   end
 
-
   protected
-  def log_connection_exception(ex)
+
+  def self.log_connection_exception(ex)
     STDERR.puts ex.message
     raise ex
   end

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

@@ -1,5 +1,7 @@
 module APN
   class Base < ActiveRecord::Base # :nodoc:
+
+    self.abstract_class = true
     
     def self.table_name # :nodoc:
       self.to_s.gsub("::", "_").tableize

data/lib/apn_on_rails/rails/railtie.rb

@@ -0,0 +1,15 @@
+if defined?(::Rails::Railtie) # backwards compatible
+
+module APN
+  module Rails
+    
+    class Railtie < ::Rails::Railtie
+      rake_tasks do
+        Dir[File.join(File.dirname(__FILE__),'..', 'tasks/*.rake')].each { |f| load f }
+      end
+    end
+    
+  end
+end
+
+end

data/lib/apn_on_rails/version.rb

@@ -1,3 +1,3 @@
 module ApnOnRails
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/spec/active_record/setup_ar.rb

@@ -1,5 +1,7 @@
 require 'rubygems'
 require 'active_record'
+require 'logger'
+
 
 logger = Logger.new(STDOUT)
 logger.level = Logger::INFO
@@ -7,7 +9,6 @@ ActiveRecord::Base.logger = logger
 
 db_file = File.join(File.dirname(__FILE__), 'test.db')
 FileUtils.rm(db_file) if File.exists?(db_file)
-# File.open(db_file, 'w')
 
 ActiveRecord::Base.establish_connection({
   :adapter => 'sqlite3',

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

@@ -5,7 +5,8 @@ describe APN::Device do
   describe 'token' do
     
     it 'should be unique' do
-      device = DeviceFactory.new(:token => APN::Device.first.token)
+      t = APN::Device.first.token
+      device = DeviceFactory.new(:token => t)
       device.should_not be_valid
       device.errors['token'].should include('has already been taken')
       

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
+require 'rubygems'
 require 'rspec'
 require 'action_view'
 
@@ -9,9 +10,17 @@ require File.join(File.dirname(__FILE__), 'active_record', 'setup_ar.rb')
 
 require File.join(File.dirname(__FILE__), '..', 'lib', 'apn_on_rails')
 
-Dir.glob(File.join(File.dirname(__FILE__), 'factories', '*.rb')).sort.each do |f|
-  require f
-end
+# Dir.glob(File.join(File.dirname(__FILE__), 'factories', '*.rb')).sort.each do |f|
+#   require f
+# end
+
+require File.join(File.dirname(__FILE__), 'factories', 'app_factory.rb')
+require File.join(File.dirname(__FILE__), 'factories', 'device_factory.rb')
+require File.join(File.dirname(__FILE__), 'factories', 'group_factory.rb')
+require File.join(File.dirname(__FILE__), 'factories', 'device_grouping_factory.rb')
+require File.join(File.dirname(__FILE__), 'factories', 'group_notification_factory.rb')
+require File.join(File.dirname(__FILE__), 'factories', 'notification_factory.rb')
+require File.join(File.dirname(__FILE__), 'factories', 'pull_notification_factory.rb')
 
 configatron.apn.cert = File.expand_path(File.join(File.dirname(__FILE__), 'rails_root', 'config', 'apple_push_notification_development.pem'))
 

metadata

@@ -1,158 +1,123 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: apn_on_rails
-version: !ruby/object:Gem::Version 
-  hash: 11
+version: !ruby/object:Gem::Version
+  version: 0.5.1
   prerelease: 
-  segments: 
-  - 0
-  - 5
-  - 0
-  version: 0.5.0
 platform: ruby
-authors: 
+authors:
 - markbates
 - Rebecca Nesson
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-27 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+date: 2012-01-30 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: configatron
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &2156745720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: activerecord
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: actionpack
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2156745720
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: &2156744820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: rake
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2156744820
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: &2156743580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: autotest
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  type: :development
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *2156743580
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &2156742540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: sqlite3-ruby
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: rspec
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  version_requirements: *2156742540
+- !ruby/object:Gem::Dependency
+  name: autotest
+  requirement: &2156741880 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *2156741880
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &2156741220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: bundler
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: *2156741220
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2156740580 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *2156740580
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &2156739880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2156739880
+- !ruby/object:Gem::Dependency
   name: rcov
-  version_requirements: *id009
-description: "APN on Rails is a Ruby on Rails gem that allows you to\n  easily add Apple Push Notification (iPhone) support to your Rails application.\n  "
+  requirement: &2156682140 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2156682140
+description: ! "APN on Rails is a Ruby on Rails gem that allows you to\n  easily add
+  Apple Push Notification (iPhone) support to your Rails application.\n  "
 email: tech-team@prx.org
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - .specification
@@ -162,7 +127,6 @@ files:
 - README
 - README.textile
 - Rakefile
-- VERSION
 - apn_on_rails.gemspec
 - autotest/discover.rb
 - generators/apn_migrations_generator.rb
@@ -190,6 +154,7 @@ files:
 - lib/apn_on_rails/app/models/apn/pull_notification.rb
 - lib/apn_on_rails/libs/connection.rb
 - lib/apn_on_rails/libs/feedback.rb
+- lib/apn_on_rails/rails/railtie.rb
 - lib/apn_on_rails/tasks/apn.rake
 - lib/apn_on_rails/tasks/db.rake
 - lib/apn_on_rails/version.rb
@@ -230,38 +195,35 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/PRX/apn_on_rails
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 3151093610939357091
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 3151093610939357091
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Apple Push Notifications on Rails
-test_files: 
+test_files:
 - spec/active_record/setup_ar.rb
 - spec/apn_on_rails/app/models/apn/app_spec.rb
 - spec/apn_on_rails/app/models/apn/device_spec.rb

data/VERSION

@@ -1 +0,0 @@
-0.4.2