rpush 1.0.0-java → 2.0.0-java

data/lib/rpush/client/active_record/apns/feedback.rb

@@ -0,0 +1,22 @@
+module Rpush
+  module Client
+    module ActiveRecord
+      module Apns
+        class Feedback < ::ActiveRecord::Base
+          self.table_name = 'rpush_feedback'
+
+          if Rpush.attr_accessible_available?
+            attr_accessible :device_token, :failed_at, :app_id
+          end
+
+          belongs_to :app, class_name: 'Rpush::Client::ActiveRecord::App'
+
+          validates :device_token, presence: true
+          validates :failed_at, presence: true
+
+          validates_with Rpush::Client::ActiveModel::Apns::DeviceTokenFormatValidator
+        end
+      end
+    end
+  end
+end

data/lib/rpush/client/active_record/apns/notification.rb

@@ -0,0 +1,46 @@
+module Rpush
+  module Client
+    module ActiveRecord
+      module Apns
+        class Notification < Rpush::Client::ActiveRecord::Notification
+          include Deprecatable
+          include Rpush::Client::ActiveModel::Apns::Notification
+
+          alias_method :attributes_for_device=, :data=
+          alias_method :attributes_for_device, :data
+
+          deprecated(:attributes_for_device, '2.1.0', 'Use :data instead.')
+          deprecated(:attributes_for_device=, '2.1.0', 'Use :data instead.')
+
+          def alert=(alert)
+            if alert.is_a?(Hash)
+              write_attribute(:alert, multi_json_dump(alert))
+              self.alert_is_json = true if has_attribute?(:alert_is_json)
+            else
+              write_attribute(:alert, alert)
+              self.alert_is_json = false if has_attribute?(:alert_is_json)
+            end
+          end
+
+          def alert
+            string_or_json = read_attribute(:alert)
+
+            if has_attribute?(:alert_is_json)
+              if alert_is_json?
+                multi_json_load(string_or_json)
+              else
+                string_or_json
+              end
+            else
+              begin
+                multi_json_load(string_or_json)
+              rescue StandardError
+                string_or_json
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rpush/client/active_record/app.rb

@@ -0,0 +1,17 @@
+module Rpush
+  module Client
+    module ActiveRecord
+      class App < ::ActiveRecord::Base
+        self.table_name = 'rpush_apps'
+
+        if Rpush.attr_accessible_available?
+          attr_accessible :name, :environment, :certificate, :password, :connections, :auth_key, :client_id, :client_secret
+        end
+
+        has_many :notifications, class_name: 'Rpush::Client::ActiveRecord::Notification', dependent: :destroy
+
+        validates :name, presence: true, uniqueness: { scope: [:type, :environment] }
+      end
+    end
+  end
+end

data/lib/rpush/client/active_record/gcm/app.rb

@@ -0,0 +1,11 @@
+module Rpush
+  module Client
+    module ActiveRecord
+      module Gcm
+        class App < Rpush::Client::ActiveRecord::App
+          include Rpush::Client::ActiveModel::Gcm::App
+        end
+      end
+    end
+  end
+end

data/lib/rpush/client/active_record/gcm/notification.rb

@@ -0,0 +1,11 @@
+module Rpush
+  module Client
+    module ActiveRecord
+      module Gcm
+        class Notification < Rpush::Client::ActiveRecord::Notification
+          include Rpush::Client::ActiveModel::Gcm::Notification
+        end
+      end
+    end
+  end
+end

data/lib/rpush/client/active_record/notification.rb

@@ -0,0 +1,38 @@
+module Rpush
+  module Client
+    module ActiveRecord
+      class Notification < ::ActiveRecord::Base
+        include Rpush::MultiJsonHelper
+        include Rpush::Client::ActiveModel::Notification
+
+        self.table_name = 'rpush_notifications'
+
+        # TODO: Dump using multi json.
+        serialize :registration_ids
+
+        belongs_to :app, class_name: 'Rpush::Client::ActiveRecord::App'
+
+        if Rpush.attr_accessible_available?
+          attr_accessible :badge, :device_token, :sound, :alert, :data, :expiry, :delivered,
+                          :delivered_at, :failed, :failed_at, :error_code, :error_description, :deliver_after,
+                          :alert_is_json, :app, :app_id, :collapse_key, :delay_while_idle, :registration_ids, :uri
+        end
+
+        def data=(attrs)
+          return unless attrs
+          fail ArgumentError, "must be a Hash" unless attrs.is_a?(Hash)
+          write_attribute(:data, multi_json_dump(attrs.merge(data || {})))
+        end
+
+        def registration_ids=(ids)
+          ids = [ids] if ids && !ids.is_a?(Array)
+          super
+        end
+
+        def data
+          multi_json_load(read_attribute(:data)) if read_attribute(:data)
+        end
+      end
+    end
+  end
+end

data/lib/rpush/client/active_record/wpns/app.rb

@@ -0,0 +1,11 @@
+module Rpush
+  module Client
+    module ActiveRecord
+      module Wpns
+        class App < Rpush::Client::ActiveRecord::App
+          include Rpush::Client::ActiveModel::Wpns::App
+        end
+      end
+    end
+  end
+end

data/lib/rpush/client/active_record/wpns/notification.rb

@@ -0,0 +1,11 @@
+module Rpush
+  module Client
+    module ActiveRecord
+      module Wpns
+        class Notification < Rpush::Client::ActiveRecord::Notification
+          include Rpush::Client::ActiveModel::Wpns::Notification
+        end
+      end
+    end
+  end
+end

data/lib/rpush/client/active_record.rb

@@ -0,0 +1,19 @@
+require 'active_record'
+
+require 'rpush/client/active_model'
+
+require 'rpush/client/active_record/notification'
+require 'rpush/client/active_record/app'
+
+require 'rpush/client/active_record/apns/notification'
+require 'rpush/client/active_record/apns/feedback'
+require 'rpush/client/active_record/apns/app'
+
+require 'rpush/client/active_record/gcm/notification'
+require 'rpush/client/active_record/gcm/app'
+
+require 'rpush/client/active_record/wpns/notification'
+require 'rpush/client/active_record/wpns/app'
+
+require 'rpush/client/active_record/adm/notification'
+require 'rpush/client/active_record/adm/app'

data/lib/rpush/client/redis/adm/app.rb

@@ -0,0 +1,14 @@
+module Rpush
+  module Client
+    module Redis
+      module Adm
+        class App < Rpush::Client::Redis::App
+          include Rpush::Client::ActiveModel::Adm::App
+
+          attribute :access_token, :string
+          attribute :access_token_expiration, :timestamp
+        end
+      end
+    end
+  end
+end

data/lib/rpush/client/redis/adm/notification.rb

@@ -0,0 +1,11 @@
+module Rpush
+  module Client
+    module Redis
+      module Adm
+        class Notification < Rpush::Client::Redis::Notification
+          include Rpush::Client::ActiveModel::Adm::Notification
+        end
+      end
+    end
+  end
+end

data/lib/rpush/client/redis/apns/app.rb

@@ -0,0 +1,11 @@
+module Rpush
+  module Client
+    module Redis
+      module Apns
+        class App < Rpush::Client::Redis::App
+          include Rpush::Client::ActiveModel::Apns::App
+        end
+      end
+    end
+  end
+end

data/lib/rpush/client/redis/apns/feedback.rb

@@ -0,0 +1,20 @@
+module Rpush
+  module Client
+    module Redis
+      module Apns
+        class Feedback
+          include Modis::Model
+
+          attribute :app_id, :integer
+          attribute :device_token, :string
+          attribute :failed_at, :timestamp
+
+          validates :device_token, presence: true
+          validates :failed_at, presence: true
+
+          validates_with Rpush::Client::ActiveModel::Apns::DeviceTokenFormatValidator
+        end
+      end
+    end
+  end
+end

data/lib/rpush/client/redis/apns/notification.rb

@@ -0,0 +1,11 @@
+module Rpush
+  module Client
+    module Redis
+      module Apns
+        class Notification < Rpush::Client::Redis::Notification
+          include Rpush::Client::ActiveModel::Apns::Notification
+        end
+      end
+    end
+  end
+end

data/lib/rpush/client/redis/app.rb

@@ -0,0 +1,24 @@
+module Rpush
+  module Client
+    module Redis
+      class App
+        include Modis::Model
+        self.namespace = 'apps'
+
+        attribute :name, :string
+        attribute :environment, :string
+        attribute :certificate, :string
+        attribute :password, :string
+        attribute :connections, :integer, default: 1
+        attribute :auth_key, :string
+        attribute :client_id, :string
+        attribute :client_secret, :string
+
+        index :name
+
+        validates :name, presence: true
+        validates_numericality_of :connections, greater_than: 0, only_integer: true
+      end
+    end
+  end
+end

data/lib/rpush/client/redis/gcm/app.rb

@@ -0,0 +1,11 @@
+module Rpush
+  module Client
+    module Redis
+      module Gcm
+        class App < Rpush::Client::Redis::App
+          include Rpush::Client::ActiveModel::Gcm::App
+        end
+      end
+    end
+  end
+end

data/lib/rpush/client/redis/gcm/notification.rb

@@ -0,0 +1,11 @@
+module Rpush
+  module Client
+    module Redis
+      module Gcm
+        class Notification < Rpush::Client::Redis::Notification
+          include Rpush::Client::ActiveModel::Gcm::Notification
+        end
+      end
+    end
+  end
+end

data/lib/rpush/client/redis/notification.rb

@@ -0,0 +1,68 @@
+module Rpush
+  module Client
+    module Redis
+      class Notification
+        include Rpush::MultiJsonHelper
+        include Modis::Model
+        include Rpush::Client::ActiveModel::Notification
+
+        after_create :register_notification
+
+        self.namespace = 'notifications'
+
+        def self.absolute_pending_namespace
+          "#{absolute_namespace}:pending"
+        end
+
+        def self.absolute_retryable_namespace
+          "#{absolute_namespace}:retryable"
+        end
+
+        attribute :badge, :integer
+        attribute :device_token, :string
+        attribute :sound, :string, default: 'default'
+        attribute :alert, [:string, :hash], strict: false
+        attribute :data, :hash
+        attribute :expiry, :integer, default: 1.day.to_i
+        attribute :delivered, :boolean
+        attribute :delivered_at, :timestamp
+        attribute :failed, :boolean
+        attribute :failed_at, :timestamp
+        attribute :fail_after, :timestamp
+        attribute :retries, :integer, default: 0
+        attribute :error_code, :integer
+        attribute :error_description, :string
+        attribute :deliver_after, :timestamp
+        attribute :alert_is_json, :boolean
+        attribute :app_id, :integer
+        attribute :collapse_key, :string
+        attribute :delay_while_idle, :boolean
+        attribute :registration_ids, :array
+        attribute :uri, :string
+        attribute :priority, :integer
+
+        def app
+          return nil unless app_id
+          @app ||= Rpush::Client::Redis::App.find(app_id)
+        end
+
+        def app=(app)
+          @app = app
+          if app
+            self.app_id = app.id
+          else
+            self.app_id = nil
+          end
+        end
+
+        private
+
+        def register_notification
+          Modis.with_connection do |redis|
+            redis.zadd(self.class.absolute_pending_namespace, id, id)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rpush/client/redis/wpns/app.rb

@@ -0,0 +1,11 @@
+module Rpush
+  module Client
+    module Redis
+      module Wpns
+        class App < Rpush::Client::Redis::App
+          include Rpush::Client::ActiveModel::Wpns::App
+        end
+      end
+    end
+  end
+end

data/lib/rpush/client/redis/wpns/notification.rb

@@ -0,0 +1,11 @@
+module Rpush
+  module Client
+    module Redis
+      module Wpns
+        class Notification < Rpush::Client::Redis::Notification
+          include Rpush::Client::ActiveModel::Wpns::Notification
+        end
+      end
+    end
+  end
+end

data/lib/rpush/client/redis.rb

@@ -0,0 +1,35 @@
+# :nocov:
+begin
+  require 'modis'
+rescue LoadError
+  puts
+  str = "* Please add 'rpush-redis' to your Gemfile to use the Redis client. *"
+  puts "*" * str.size
+  puts str
+  puts "*" * str.size
+  puts
+end
+
+require 'redis'
+
+require 'rpush/client/active_model'
+
+require 'rpush/client/redis/app'
+require 'rpush/client/redis/notification'
+
+require 'rpush/client/redis/apns/app'
+require 'rpush/client/redis/apns/notification'
+require 'rpush/client/redis/apns/feedback'
+
+require 'rpush/client/redis/gcm/app'
+require 'rpush/client/redis/gcm/notification'
+
+require 'rpush/client/redis/adm/app'
+require 'rpush/client/redis/adm/notification'
+
+require 'rpush/client/redis/wpns/app'
+require 'rpush/client/redis/wpns/notification'
+
+Modis.configure do |config|
+  config.namespace = :rpush
+end

data/lib/rpush/configuration.rb

@@ -4,12 +4,28 @@ module Rpush
   end
 
   def self.configure
-    yield config if block_given?
+    if block_given?
+      yield config
+      initialize_client
+    end
+  end
+
+  def self.initialize_client
+    return if @client_initialized
+    require "rpush/client/#{config.client}"
+    client_module = Rpush::Client.const_get(config.client.to_s.camelize)
+    Rpush.send(:include, client_module)
+
+    [:Apns, :Gcm, :Wpns, :Adm].each do |service|
+      Rpush.const_set(service, client_module.const_get(service))
+    end
+
+    @client_initialized = true
   end
 
   CONFIG_ATTRS = [:foreground, :push_poll, :feedback_poll, :embedded,
-    :check_for_errors, :pid_file, :batch_size, :push, :store, :logger,
-    :batch_storage_updates, :wakeup]
+                  :check_for_errors, :pid_file, :batch_size, :push, :client, :logger,
+                  :batch_storage_updates, :log_dir, :environment]
 
   class ConfigurationWithoutDefaults < Struct.new(*CONFIG_ATTRS)
   end
@@ -17,6 +33,11 @@ module Rpush
   class Configuration < Struct.new(*CONFIG_ATTRS)
     include Deprecatable
 
+    deprecated(:batch_storage_updates=, '2.1.0', 'Updates are now always batched by the storage backends.')
+    deprecated(:check_for_errors=, '2.1.0', 'APNs error detection is now performed asynchronously and does not require pauses.')
+
+    delegate :redis_options, :redis_options=, to: :Modis
+
     def initialize
       super
       set_defaults
@@ -60,16 +81,16 @@ module Rpush
 
       self.push_poll = 2
       self.feedback_poll = 60
-      self.check_for_errors = true
       self.batch_size = 100
       self.pid_file = nil
-      self.store = :active_record
+      self.client = :active_record
       self.logger = nil
-      self.batch_storage_updates = true
+      self.log_dir = Rails.root
 
       # Internal options.
       self.embedded = false
       self.push = false
+      self.environment = Rails.env
     end
   end
 end