pushkin-library 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d63bca932152d5300789620e58aed1cb32a6f29d
-  data.tar.gz: 6489241bb5b0632c53c315b9e6b007924c6b1593
+SHA256:
+  metadata.gz: 94132d3c11d5c6cff117e5c83b3d9bfbac99aeec8e91d2217b684be8216fbe93
+  data.tar.gz: 00ad79e22c5e20725a36806e7d85a883e304f189eabaa9f14a7329cf23fc2fbe
 SHA512:
-  metadata.gz: 54261e0229655d0e8956d7c527cb571e8cef7fdbbdb4c465bfa519aa6dcd36154377ba5ca670c5f56b7c44a3f02a1eb5afe864c35ac770d7dfe9db0d6a5e6c75
-  data.tar.gz: 61d1a58a89713a33bb07da65d8b4622d82d3967ce265696af6fe0e5a86562ceb36f46daed3508c54563ece57e6871fcad2f592fe1d9670339acc18e4b37aacc7
+  metadata.gz: 7604eca1d8badc7b1fb3f799e2577bf9bcf43b1ae1602ff854292f54b58cc0d9c17a238e99456054032cb15a0fed4026252ce6a08126bfbb968e490be577081b
+  data.tar.gz: c0c212881e6e93f37aa35f2e3ba646958d88295091e6023f06c382445c82a113df4b50076c9b5469f11cc82efab02fba238f63cea9323a9112e135f80d9332e5

data/app/models/pushkin/token.rb

@@ -2,7 +2,9 @@
 module Pushkin
   class Token < ApplicationRecord
 
-    belongs_to :user, optional: true
+    belongs_to :user,
+               optional: true,
+               class_name: Pushkin::Configuration.instance.user_class_name
 
     validates :token, presence: true, uniqueness: { scope: :platform }
     validates :platform, presence: true
@@ -11,6 +13,7 @@ module Pushkin
     enum platform: [:android, :ios, :web]
 
     scope :active, -> { self.where(is_active: true) }
+    scope :with_not_active, -> { self.unscope(where: :is_active) }
 
     # По умолчанию нужно работать только с активными устройствами.
     default_scope { self.active }

data/app/models/pushkin/token_result.rb

@@ -6,7 +6,7 @@ module Pushkin
     STATUS_ERROR = "error"
 
     belongs_to :push_sending_result, optional: true
-    belongs_to :token
+    belongs_to :token, -> { with_not_active }
 
     scope :invalid, -> { self.where(status: STATUS_INVALID) }
 

data/app/models/pushkin/tokens_provider_user.rb

@@ -3,7 +3,8 @@ module Pushkin
   class TokensProviderUser < ApplicationRecord
 
     # Ссылка на пользователя
-    belongs_to :user
+    belongs_to :user,
+               class_name: Pushkin::Configuration.instance.user_class_name
 
     # Ссылка на провайдер (Связывает уведомление и пользователей, которым нужно отправить уведомление)
     belongs_to :tokens_provider, optional: true

data/lib/generators/pushkin/setup_generator.rb

@@ -13,7 +13,9 @@ module Pushkin
     def setup_application
       file_name = "tokens_controller.rb"
       copy_file file_name, "app/controllers/pushkin/api/v1/#{file_name}"
-      migration_template "create_pushkin_tables.rb", "db/migrate/create_pushkin_tables.rb"
+      migration_template "create_pushkin_tables.rb",
+                         "db/migrate/create_pushkin_tables1.rb",
+                         migration_version: migration_version
 
       route "namespace :pushkin do\n" +
             "    namespace :api do\n" +
@@ -23,5 +25,9 @@ module Pushkin
             "    end\n" +
             "  end\n"
     end
+
+    def migration_version
+      "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
+    end
   end
 end

data/lib/generators/pushkin/templates/create_pushkin_tables.rb

@@ -1,4 +1,4 @@
-class CreatePushkinTables < ActiveRecord::Migration[5.1]
+class CreatePushkinTables < ActiveRecord::Migration<%= migration_version %>
   def change
     create_table :pushkin_tokens do |t|
       t.integer :user_id

data/lib/pushkin/configuration.rb

@@ -3,11 +3,15 @@ module Pushkin
 
     include Singleton
 
-    attr_accessor :fcm_server_key
+    attr_accessor :fcm_server_key, :user_class_name
 
     def fcm_server_key
       @fcm_server_key ||= ENV["FCM_SERVER_KEY"]
     end
 
+    def user_class_name
+      @user_class_name ||= "User"
+    end
+
   end
 end

data/lib/pushkin/version.rb

@@ -1,3 +1,3 @@
 module Pushkin
-  VERSION = '0.1.5'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pushkin-library
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Bazov Peter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-26 00:00:00.000000000 Z
+date: 2020-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -19,7 +19,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
         version: '0.12'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: '0.12'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '2'
 description: Library for planning and sending Push-Notifications on iOS, Android and
   Web
 email:
@@ -121,8 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Push-Notifications Library