rpush 2.3.2-java → 2.4.0-java

data/lib/rpush/daemon/interruptible_sleep.rb

@@ -3,60 +3,15 @@ require 'monitor'
 module Rpush
   module Daemon
     class InterruptibleSleep
-      def initialize(duration)
-        @duration = duration
-        @stop = false
-
-        @wakeup_obj = Object.new
-        @wakeup_obj.extend(MonitorMixin)
-        @wakeup_condition = @wakeup_obj.new_cond
-
-        @sleep_obj = Object.new
-        @sleep_obj.extend(MonitorMixin)
-        @sleep_condition = @sleep_obj.new_cond
-      end
-
-      def sleep
-        return if @stop
-        goto_sleep
-        wait_for_wakeup
-      end
-
-      def start
-        @stop = false
-
-        @thread = Thread.new do
-          loop do
-            wait_for_sleeper
-            break if @stop
-            Kernel.sleep(@duration)
-            wakeup
-          end
-        end
+      def sleep(duration)
+        @thread = Thread.new { Kernel.sleep duration }
+        Thread.pass
+        @thread.join
       end
 
       def stop
-        @stop = true
-        wakeup
         @thread.kill if @thread
-      end
-
-      def wakeup
-        @wakeup_obj.synchronize { @wakeup_condition.signal }
-      end
-
-      private
-
-      def goto_sleep
-        @sleep_obj.synchronize { @sleep_condition.signal }
-      end
-
-      def wait_for_wakeup
-        @wakeup_obj.synchronize { @wakeup_condition.wait(@duration * 2) }
-      end
-
-      def wait_for_sleeper
-        @sleep_obj.synchronize { @sleep_condition.wait }
+      rescue StandardError # rubocop:disable Lint/HandleExceptions
       end
     end
   end

data/lib/rpush/daemon/proc_title.rb

@@ -2,7 +2,8 @@ module Rpush
   module Daemon
     class ProcTitle
       def self.update
-        $0 = proc_title
+        return if Rpush.config.embedded || Rpush.config.push
+        Process.respond_to?(:setproctitle) ? Process.setproctitle(proc_title) : $0 = proc_title
       end
 
       def self.proc_title

data/lib/rpush/daemon/store/active_record.rb

@@ -169,6 +169,10 @@ module Rpush
           ready_for_delivery.count
         end
 
+        def translate_integer_notification_id(id)
+          id
+        end
+
         private
 
         def create_gcm_like_notification(notification, attrs, data, registration_ids, deliver_after, app) # rubocop:disable ParameterLists

data/lib/rpush/daemon/store/interface.rb

@@ -8,7 +8,7 @@ module Rpush
                           :create_gcm_notification, :create_adm_notification, :update_app,
                           :update_notification, :release_connection,
                           :all_apps, :app, :mark_ids_failed, :mark_ids_retryable,
-                          :reopen_log, :pending_delivery_count]
+                          :reopen_log, :pending_delivery_count, :translate_integer_notification_id]
 
         def self.check(klass)
           missing = PUBLIC_METHODS - klass.instance_methods.map(&:to_sym)

data/lib/rpush/daemon/store/mongoid.rb

@@ -0,0 +1,157 @@
+module Rpush
+  module Daemon
+    module Store
+      class Mongoid
+        DEFAULT_MARK_OPTIONS = { persist: true }
+
+        def app(app_id)
+          Rpush::Client::Mongoid::App.find(app_id)
+        end
+
+        def all_apps
+          Rpush::Client::Mongoid::App.all
+        end
+
+        def deliverable_notifications(limit)
+          relation = ready_for_delivery.limit(limit)
+          claim_notifications(relation)
+        end
+
+        def mark_delivered(notification, time, opts = {})
+          opts = DEFAULT_MARK_OPTIONS.dup.merge(opts)
+          notification.delivered = true
+          notification.delivered_at = time
+          notification.save!(validate: false) if opts[:persist]
+        end
+
+        def mark_batch_delivered(notifications)
+          return if notifications.empty?
+
+          now = Time.now
+          ids = []
+          notifications.each do |n|
+            mark_delivered(n, now, persist: false)
+            ids << n.id
+          end
+          Rpush::Client::Mongoid::Notification.in(id: ids).update_all(processing: false, delivered: true, delivered_at: now)
+        end
+
+        def mark_failed(notification, code, description, time, opts = {})
+          opts = DEFAULT_MARK_OPTIONS.dup.merge(opts)
+          notification.delivered = false
+          notification.delivered_at = nil
+          notification.failed = true
+          notification.failed_at = time
+          notification.error_code = code
+          notification.error_description = description
+          notification.save!(validate: false) if opts[:persist]
+        end
+
+        def mark_batch_failed(notifications, code, description)
+          now = Time.now
+          ids = []
+          notifications.each do |n|
+            mark_failed(n, code, description, now, persist: false)
+            ids << n.id
+          end
+          mark_ids_failed(ids, code, description, now)
+        end
+
+        def mark_ids_failed(ids, code, description, time)
+          return if ids.empty?
+
+          Rpush::Client::Mongoid::Notification.in(id: ids).update_all(processing: false, delivered: false, delivered_at: nil, failed: true, failed_at: time, error_code: code, error_description: description)
+        end
+
+        def mark_retryable(notification, deliver_after, opts = {})
+          opts = DEFAULT_MARK_OPTIONS.dup.merge(opts)
+          notification.delivered = false
+          notification.delivered_at = nil
+          notification.failed = false
+          notification.failed_at = nil
+          notification.retries += 1
+          notification.deliver_after = deliver_after
+
+          return unless opts[:persist]
+
+          notification.save!(validate: false)
+        end
+
+        def mark_batch_retryable(notifications, deliver_after)
+          ids = []
+          notifications.each do |n|
+            mark_retryable(n, deliver_after, persist: false)
+            ids << n.id
+          end
+          mark_ids_retryable(ids, deliver_after)
+        end
+
+        def mark_ids_retryable(ids, deliver_after)
+          return if ids.empty?
+
+          Rpush::Client::Mongoid::Notification.in(id: ids).update_all(processing: false, delivered: false, delivered_at: nil, failed: false, failed_at: nil, deliver_after: deliver_after, '$inc' => { retries: 1 })
+        end
+
+        def create_apns_feedback(failed_at, device_token, app)
+          Rpush::Client::Mongoid::Apns::Feedback.create!(failed_at: failed_at, device_token: device_token, app: app)
+        end
+
+        def create_gcm_notification(attrs, data, registration_ids, deliver_after, app) # rubocop:disable ParameterLists
+          notification = Rpush::Client::Mongoid::Gcm::Notification.new
+          create_gcm_like_notification(notification, attrs, data, registration_ids, deliver_after, app)
+        end
+
+        def create_adm_notification(attrs, data, registration_ids, deliver_after, app) # rubocop:disable ParameterLists
+          notification = Rpush::Client::Mongoid::Adm::Notification.new
+          create_gcm_like_notification(notification, attrs, data, registration_ids, deliver_after, app)
+        end
+
+        def update_app(app)
+          app.save!
+        end
+
+        def update_notification(notification)
+          notification.save!
+        end
+
+        def release_connection
+        end
+
+        def reopen_log
+        end
+
+        def pending_delivery_count
+          ready_for_delivery.count
+        end
+
+        def translate_integer_notification_id(id)
+          Rpush::Client::Mongoid::Notification.find_by(integer_id: id).id
+        end
+
+        private
+
+        def ready_for_delivery
+          Rpush::Client::Mongoid::Notification.where(processing: false, delivered: false, failed: false).or({ deliver_after: nil }, :deliver_after.lt => Time.now)
+        end
+
+        def claim_notifications(relation)
+          ids = relation.map(:id)
+          relation.where('$isolated' => 1).in(id: ids).update_all(processing: true, processing_pid: Process.pid)
+          Rpush::Client::Mongoid::Notification.where(processing: true, processing_pid: Process.pid).in(id: ids).asc('created_at')
+        end
+
+        def create_gcm_like_notification(notification, attrs, data, registration_ids, deliver_after, app) # rubocop:disable ParameterLists
+          notification.assign_attributes(attrs)
+          notification.data = data
+          notification.registration_ids = registration_ids
+          notification.deliver_after = deliver_after
+          notification.app = app
+          notification.save!
+          notification
+        end
+      end
+    end
+  end
+end
+
+Rpush::Daemon::Store::Interface.check(Rpush::Daemon::Store::Mongoid)

data/lib/rpush/daemon/store/redis.rb

@@ -49,7 +49,7 @@ module Rpush
         end
 
         def mark_ids_failed(ids, code, description, time)
-          ids.each { |id| mark_failed(Rpush::Client::Redis::Apns::Notification.find(id), code, description, time) }
+          ids.each { |id| mark_failed(Rpush::Client::Redis::Notification.find(id), code, description, time) }
         end
 
         def mark_retryable(notification, deliver_after, opts = {})
@@ -75,7 +75,7 @@ module Rpush
         end
 
         def mark_ids_retryable(ids, deliver_after)
-          ids.each { |id| mark_retryable(Rpush::Client::Redis::Apns::Notification.find(id), deliver_after) }
+          ids.each { |id| mark_retryable(Rpush::Client::Redis::Notification.find(id), deliver_after) }
         end
 
         def create_apns_feedback(failed_at, device_token, app)
@@ -115,6 +115,10 @@ module Rpush
           end
         end
 
+        def translate_integer_notification_id(id)
+          id
+        end
+
         private
 
         def create_gcm_like_notification(notification, attrs, data, registration_ids, deliver_after, app) # rubocop:disable ParameterLists

data/lib/rpush/deprecatable.rb

@@ -14,8 +14,7 @@ module Rpush
         warning << " #{msg}" if msg
         class_eval(<<-RUBY, __FILE__, __LINE__)
           def #{method_name}(*args, &blk)
-            trace = "\n\nCALLED FROM:\n" + caller.join("\n")
-            Rpush::Deprecation.warn(#{warning.inspect} + trace)
+            Rpush::Deprecation.warn_with_backtrace(#{warning.inspect})
             #{method_name_as_var}_without_warning(*args, &blk)
           end
         RUBY

data/lib/rpush/deprecation.rb

@@ -16,5 +16,11 @@ module Rpush
       return if Rpush::Deprecation.muted?
       STDERR.puts "DEPRECATION WARNING: #{msg}"
     end
+
+    def self.warn_with_backtrace(msg)
+      return if Rpush::Deprecation.muted?
+      trace = "\n\nCALLED FROM:\n" + caller.join("\n")
+      warn(msg + trace)
+    end
   end
 end

data/lib/rpush/embed.rb

@@ -2,6 +2,11 @@ module Rpush
   def self.embed(options = {})
     require 'rpush/daemon'
 
+    unless options.empty?
+      warning = "Passing configuration options directly to Rpush.embed is deprecated and will be removed from Rpush 2.5.0. Please setup configuration using Rpush.configure { |config| ... } before calling embed."
+      Rpush::Deprecation.warn_with_backtrace(warning)
+    end
+
     if @embed_thread
       STDERR.puts 'Rpush.embed can only be run once inside this process.'
     end

data/lib/rpush/logger.rb

@@ -3,12 +3,9 @@ module Rpush
     attr_reader :internal_logger
 
     def initialize
-      if Rpush.config.logger
-        @internal_logger = Rpush.config.logger
-      else
-        @internal_logger = setup_logger(open_logfile)
-      end
-    rescue Errno::ENOENT, Errno::EPERM => e
+      @internal_logger = Rpush.config.logger || setup_logger(open_logfile)
+      @internal_logger.level = Rpush.config.log_level
+    rescue SystemCallError => e
       @internal_logger = nil
       error(e)
       error('Logging disabled.')
@@ -46,11 +43,11 @@ module Rpush
 
     def setup_logger(log)
       if ActiveSupport.const_defined?('BufferedLogger')
-        logger = ActiveSupport::BufferedLogger.new(log, Rpush.config.log_level)
+        logger = ActiveSupport::BufferedLogger.new(log)
         logger.auto_flushing = auto_flushing
         logger
       else
-        ActiveSupport::Logger.new(log, Rpush.config.log_level)
+        ActiveSupport::Logger.new(log)
       end
     end
 

data/lib/rpush/push.rb

@@ -2,6 +2,11 @@ module Rpush
   def self.push(options = {})
     require 'rpush/daemon'
 
+    unless options.empty?
+      warning = "Passing configuration options directly to Rpush.push is deprecated and will be removed from Rpush 2.5.0. Please setup configuration using Rpush.configure { |config| ... } before calling push."
+      Rpush::Deprecation.warn_with_backtrace(warning)
+    end
+
     config = Rpush::ConfigurationWithoutDefaults.new
     options.each { |k, v| config.send("#{k}=", v) }
     config.push = true

data/lib/rpush/version.rb

@@ -1,3 +1,3 @@
 module Rpush
-  VERSION = '2.3.2'
+  VERSION = '2.4.0'
 end

data/lib/tasks/quality.rake

@@ -3,7 +3,7 @@ begin
 
   desc 'Run cane to check quality metrics'
   Cane::RakeTask.new(:cane_quality) do |cane|
-    cane.add_threshold 'coverage/covered_percent', :>=, 95
+    cane.add_threshold 'coverage/covered_percent', :>=, 80
     cane.no_style = false
     cane.style_measure = 1000
     cane.no_doc = true

data/lib/tasks/test.rake

@@ -7,6 +7,11 @@ def cmd(str, clean_env = true)
   retval
 end
 
+def add_ruby_dot_files
+  cmd("echo '#{RUBY_ENGINE}-#{RUBY_VERSION}' > .ruby-version")
+  cmd("echo 'rpush_test' > .ruby-gemset")
+end
+
 desc 'Build Rails app bundled with Rpush'
 task :build_rails do
   rpush_root = Dir.pwd
@@ -20,10 +25,10 @@ task :build_rails do
 
   begin
     Dir.chdir(path)
+    add_ruby_dot_files
     cmd('echo "gem \'rake\'" >> Gemfile')
     cmd('echo "gem \'pg\'" >> Gemfile')
-    cmd("echo \"gem 'rpush', :path => '#{rpush_root}'\" >> Gemfile")
-    cmd('bundle install')
+    cmd("echo \"gem 'rpush', path: '#{rpush_root}'\" >> Gemfile")
 
     File.open('config/database.yml', 'w') do |fd|
       fd.write(<<-YML)
@@ -51,11 +56,11 @@ task :build_standalone do
 
   begin
     Dir.chdir(path)
+    add_ruby_dot_files
     cmd('echo "source \'https://rubygems.org\'" >> Gemfile')
     cmd('echo "gem \'rake\'" >> Gemfile')
     cmd('echo "gem \'rpush-redis\'" >> Gemfile')
-    cmd("echo \"gem 'rpush', :path => '#{rpush_root}'\" >> Gemfile")
-    cmd('bundle install')
+    cmd("echo \"gem 'rpush', path: '#{rpush_root}'\" >> Gemfile")
   ensure
     Dir.chdir(pwd)
   end

data/spec/functional/apns_spec.rb

@@ -55,7 +55,8 @@ describe 'APNs' do
   end
 
   def fail_notification(notification)
-    allow(ssl_socket).to receive_messages(read: [8, 4, notification.id].pack('ccN'))
+    id = (defined?(Mongoid) && notification.is_a?(Mongoid::Document)) ? notification.integer_id : notification.id
+    allow(ssl_socket).to receive_messages(read: [8, 4, id].pack('ccN'))
     enable_io_select
   end
 

data/spec/functional_spec_helper.rb

@@ -11,12 +11,12 @@ RSpec.configure do |config|
   config.before(:each) do
     Modis.with_connection do |redis|
       redis.keys('rpush:*').each { |key| redis.del(key) }
-    end
+    end if redis?
 
     Rpush.config.logger = ::Logger.new(STDOUT) if functional_example?(self.class.metadata)
   end
 
   config.after(:each) do
-    DatabaseCleaner.clean if functional_example?(self.class.metadata)
+    DatabaseCleaner.clean if active_record? && functional_example?(self.class.metadata)
   end
 end

data/spec/spec_helper.rb

@@ -1,5 +1,7 @@
 ENV['RAILS_ENV'] = 'test'
-client = (ENV['CLIENT'] || :active_record).to_sym
+def client
+  (ENV['CLIENT'] || :active_record).to_sym
+end
 
 require 'bundler/setup'
 Bundler.require(:default)
@@ -21,7 +23,20 @@ require 'rpush/client/active_record'
 require 'rpush/daemon/store/active_record'
 require 'rpush/daemon/store/redis'
 
-require 'support/active_record_setup'
+def active_record?
+  client == :active_record
+end
+
+def redis?
+  client == :redis
+end
+
+def mongoid?
+  client == :mongoid
+end
+
+require 'support/mongoid_setup' if mongoid?
+require 'support/active_record_setup' if active_record?
 
 RPUSH_ROOT = '/tmp/rails_root'
 
@@ -31,10 +46,6 @@ end
 
 RPUSH_CLIENT = Rpush.config.client
 
-def active_record?
-  Rpush.config.client == :active_record
-end
-
 path = File.join(File.dirname(__FILE__), 'support')
 TEST_CERT = File.read(File.join(path, 'cert_without_password.pem'))
 TEST_CERT_WITH_PASSWORD = File.read(File.join(path, 'cert_with_password.pem'))
@@ -43,7 +54,7 @@ def after_example_cleanup
   Rpush.logger = nil
   Rpush::Daemon.store = nil
   Rpush::Deprecation.muted do
-    Rpush.config.set_defaults if Rpush.config.is_a?(Rpush::Configuration)
+    Rpush.config = nil
     Rpush.config.client = RPUSH_CLIENT
   end
   Rpush.plugins.values.each(&:unload)

data/spec/support/config/mongoid.yml

@@ -0,0 +1,69 @@
+development:
+  # Configure available database sessions. (required)
+  sessions:
+    # Defines the default session. (required)
+    default:
+      # Defines the name of the default database that Mongoid can connect to.
+      # (required).
+      database: rpush_development
+      # Provides the hosts the default session can connect to. Must be an array
+      # of host:port pairs. (required)
+      hosts:
+        - localhost:27017
+      options:
+        # Change the default write concern. (default = { w: 1 })
+        # write:
+        # w: 1
+
+        # Change the default consistency model to primary, secondary.
+        # 'secondary' will send reads to secondaries, 'primary' sends everything
+        # to master. (default: primary)
+        # read: secondary_preferred
+
+        # How many times Moped should attempt to retry an operation after
+        # failure. (default: The number of nodes in the cluster)
+        # max_retries: 20
+
+        # The time in seconds that Moped should wait before retrying an
+        # operation on failure. (default: 0.25)
+        # retry_interval: 0.25
+  # Configure Mongoid specific options. (optional)
+  options:
+    # Includes the root model name in json serialization. (default: false)
+    # include_root_in_json: false
+
+    # Include the _type field in serialization. (default: false)
+    # include_type_for_serialization: false
+
+    # Preload all models in development, needed when models use
+    # inheritance. (default: false)
+    # preload_models: false
+
+    # Protect id and type from mass assignment. (default: true)
+    # protect_sensitive_fields: true
+
+    # Raise an error when performing a #find and the document is not found.
+    # (default: true)
+    # raise_not_found_error: true
+
+    # Raise an error when defining a scope with the same name as an
+    # existing method. (default: false)
+    # scope_overwrite_exception: false
+
+    # Use Active Support's time zone in conversions. (default: true)
+    # use_activesupport_time_zone: true
+
+    # Ensure all times are UTC in the app side. (default: false)
+    # use_utc: false
+test:
+  sessions:
+    default:
+      database: rpush_test
+      hosts:
+        - localhost:27017
+      options:
+        read: primary
+        # In the test environment we lower the retries and retry interval to
+        # low amounts for fast failures.
+        max_retries: 1
+        retry_interval: 0

data/spec/support/mongoid_setup.rb

@@ -0,0 +1,10 @@
+require 'mongoid'
+
+mongoid_yml = File.expand_path("config/mongoid.yml", File.dirname(__FILE__))
+Mongoid.load!(mongoid_yml)
+
+RSpec.configure do |config|
+  config.before(:each) do
+    Mongoid.purge!
+  end
+end

data/spec/unit/client/active_record/adm/app_spec.rb

@@ -55,4 +55,4 @@ describe Rpush::Client::ActiveRecord::Adm::App do
       expect(subject.access_token_expired?).to eq(false)
     end
   end
-end
+end if active_record?

data/spec/unit/client/active_record/adm/notification_spec.rb

@@ -40,4 +40,4 @@ describe Rpush::Client::ActiveRecord::Adm::Notification do
     notification.expiry = 100
     expect(notification.as_json['expiresAfter']).to eq 100
   end
-end
+end if active_record?

data/spec/unit/client/active_record/apns/app_spec.rb

@@ -26,4 +26,4 @@ describe Rpush::Client::ActiveRecord::App do
     app.valid?
     expect(app.errors[:certificate]).to eq ['value must contain a certificate and a private key.']
   end
-end
+end if active_record?

data/spec/unit/client/active_record/apns/feedback_spec.rb

@@ -6,4 +6,4 @@ describe Rpush::Client::ActiveRecord::Apns::Feedback do
     expect(notification.valid?).to be_falsey
     expect(notification.errors[:device_token]).to include('is invalid')
   end
-end
+end if active_record?