rapns 3.3.1-java → 3.3.2-java

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 3.3.2 (June 30, 2013)
+  * Fix Rails 3.0.x compatibility (#138) (@yoppi).
+  * Ensure Rails does not set a default value for text columns (#137).
+  * Fix error in down action for add_gcm migration (#135) (@alexperto).
+
 ## 3.3.1 (June 2, 2013)
   * Fix compatibility with postgres_ext (#104).
   * Add ability to switch the logger (@maxsz).

data/README.md

@@ -166,3 +166,5 @@ Thank you to the following wonderful people for contributing:
 * [@maxsz](https://github.com/maxsz)
 * [@wilg](https://github.com/wilg)
 * [@perezda](https://github.com/perezda)
+* [@alexperto](https://github.com/alexperto)
+* [@yoppi](https://github.com/yoppi)

data/lib/generators/templates/add_gcm.rb

@@ -22,9 +22,9 @@ class AddGcm < ActiveRecord::Migration
     change_column :rapns_notifications, :device_token, :string, { :null => true, :limit => 64 }
     change_column :rapns_notifications, :expiry, :integer, { :null => true, :default => 1.day.to_i }
     change_column :rapns_apps, :environment, :string, :null => true
-    change_column :rapns_apps, :certificate, :text, :null => true
+    change_column :rapns_apps, :certificate, :text, :null => true, :default => nil
 
-    change_column :rapns_notifications, :error_description, :text
+    change_column :rapns_notifications, :error_description, :text, :null => true, :default => nil
     change_column :rapns_notifications, :sound, :string, :default => 'default'
 
     rename_column :rapns_notifications, :attributes_for_device, :data
@@ -65,7 +65,7 @@ class AddGcm < ActiveRecord::Migration
     change_column :rapns_apps, :environment, :string, :null => false
     change_column :rapns_apps, :certificate, :text, :null => false
 
-    change_column :rapns_notifications, :error_description, :string
+    change_column :rapns_notifications, :error_description, :string, :null => true, :default => nil
     change_column :rapns_notifications, :sound, :string, :default => '1.aiff'
 
     rename_column :rapns_notifications, :data, :attributes_for_device
@@ -87,7 +87,6 @@ class AddGcm < ActiveRecord::Migration
       Rapns::Notification.update_all(['app = ?', app.key], ['app_id = ?', app.id])
     end
 
-    change_column :rapns_notifications, :key, :string, :null => false
     remove_column :rapns_notifications, :app_id
 
     remove_index :rapns_notifications, :name => "index_rapns_notifications_multi"

data/lib/rapns/daemon/gcm/delivery.rb

@@ -62,9 +62,9 @@ module Rapns
             errors[i] = result['error'] if result['error']
           end
 
-          if body['success'].to_i == 0 && errors.values.all? { |error| error.in?(UNAVAILABLE_STATES) }
+          if body['success'].to_i == 0 && errors.values.all? { |error| UNAVAILABLE_STATES.include?(error) }
             all_devices_unavailable(response)
-          elsif errors.values.any? { |error| error.in?(UNAVAILABLE_STATES) }
+          elsif errors.values.any? { |error| UNAVAILABLE_STATES.include?(error) }
             some_devices_unavailable(response, errors)
           else
             raise Rapns::DeliveryError.new(nil, @notification.id, describe_errors(errors))
@@ -106,7 +106,7 @@ module Rapns
         end
 
         def some_devices_unavailable(response, errors)
-          unavailable_idxs = errors.find_all { |i, error| error.in?(UNAVAILABLE_STATES) }.map(&:first)
+          unavailable_idxs = errors.find_all { |i, error| UNAVAILABLE_STATES.include?(error) }.map(&:first)
           new_notification = create_new_notification(response, unavailable_idxs)
           raise Rapns::DeliveryError.new(nil, @notification.id,
             describe_errors(errors) + " #{unavailable_idxs.join(', ')} will be retried as notification #{new_notification.id}.")

data/lib/rapns/version.rb

@@ -1,3 +1,3 @@
 module Rapns
-  VERSION = '3.3.1'
+  VERSION = '3.3.2'
 end

data/spec/unit_spec_helper.rb

@@ -26,7 +26,8 @@ if ENV['TRAVIS']
   DATABASE_CONFIG[$adapter]['username'] = 'postgres'
 else
   require 'etc'
-  DATABASE_CONFIG[$adapter]['username'] = Etc.getlogin
+  username = $adapter =~ /mysql/ ? 'root' : Etc.getlogin
+  DATABASE_CONFIG[$adapter]['username'] = username
 end
 
 puts "Using #{$adapter} adapter."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rapns
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.3.2
   prerelease:
 platform: java
 authors:
@@ -9,9 +9,10 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-06-02 00:00:00.000000000 Z
+date: 2013-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: multi_json
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
@@ -24,10 +25,10 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
     none: false
-  type: :runtime
   prerelease: false
-  name: multi_json
+  type: :runtime
 - !ruby/object:Gem::Dependency
+  name: net-http-persistent
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -40,10 +41,10 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
     none: false
-  type: :runtime
   prerelease: false
-  name: net-http-persistent
+  type: :runtime
 - !ruby/object:Gem::Dependency
+  name: jruby-openssl
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -56,10 +57,10 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
     none: false
-  type: :runtime
   prerelease: false
-  name: jruby-openssl
+  type: :runtime
 - !ruby/object:Gem::Dependency
+  name: activerecord-jdbc-adapter
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -72,9 +73,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
     none: false
-  type: :runtime
   prerelease: false
-  name: activerecord-jdbc-adapter
+  type: :runtime
 description: Professional grade APNs and GCM for Ruby
 email:
 - port001@gmail.com
@@ -202,19 +202,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
-      hash: 2
       segments:
       - 0
+      version: '0'
+      hash: 2
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
-      hash: 2
       segments:
       - 0
+      version: '0'
+      hash: 2
   none: false
 requirements: []
 rubyforge_project: