activity_notification 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20341262e3b9f892cd609a69a7f5130155592a5b3e43d8d905ec6210b31db68f
-  data.tar.gz: 4f8f627d667e712420b9ed1e2dccaaaa3fe00e74be3a7c84770a1aecbec39143
+  metadata.gz: f21c6ee444304e1291b2f032fe3d8bc485741a89c73123b781ba6f69a883c3d9
+  data.tar.gz: 6b80e107e1c256c8fa4acdbe08ba7b62d96b9b6d61f0f912186aac73db720535
 SHA512:
-  metadata.gz: f82266c7341114ac6e39aca9d7daee5734a204d7f4f0948d7f8ace6fa047ce1edc3ff3041b776ed32cf38cca343e6f0919b94a348b9c740e1efd4d5b82253e61
-  data.tar.gz: 725129b9714995fd1b70866e737b535cf2bca972d77ab12353bd1e7f9a11c752313f13d3f4a0d1c9699e60d70a192020b2948b717b38b6912445eb5f90178f6a
+  metadata.gz: 1d4a6f4da5491d589d7f0b4433323f270465e35edd758122b5e58fcd30a30e9cada9cc7a5b129246ba114b755940dea5e6550d7e5b7d00ff23d8673bbceafbcf
+  data.tar.gz: f240f26d35c835babf447d4b22d2b7acdb1853970a2b50967e9fc3131ec52f73a6dfad86875dc191d69c4993bdca41133dc0005ffcc7f1e6ca8c995ab003d912

data/CHANGELOG.md

@@ -1,7 +1,16 @@
+## 2.1.2 / 2020-02-24
+[Full Changelog](http://github.com/simukappu/activity_notification/compare/v2.1.1...v2.1.2)
+
+Bug Fixes:
+
+* Fix scope of uniqueness validation in subscription model with mongoid - [#126](https://github.com/simukappu/activity_notification/issues/126) [#128](https://github.com/simukappu/activity_notification/pull/128)
+* Fix uninitialized constant DeviseTokenAuth when *config.eager_load = true* - [#129](https://github.com/simukappu/activity_notification/issues/129)
+
 ## 2.1.1 / 2020-02-11
 [Full Changelog](http://github.com/simukappu/activity_notification/compare/v2.1.0...v2.1.1)
 
 Bug Fixes:
+
 * Fix eager_load by autoloading VERSION - [#124](https://github.com/simukappu/activity_notification/issues/124) [#125](https://github.com/simukappu/activity_notification/pull/125)
 
 ## 2.1.0 / 2020-02-04

data/app/controllers/activity_notification/notifications_api_with_devise_controller.rb

@@ -1,7 +1,7 @@
 module ActivityNotification
   # Controller to manage notifications API with Devise authentication.
   class NotificationsApiWithDeviseController < NotificationsApiController
-    include DeviseTokenAuth::Concerns::SetUserByToken
+    include DeviseTokenAuth::Concerns::SetUserByToken if defined?(DeviseTokenAuth)
     include DeviseAuthenticationController
   end
 end

data/app/controllers/activity_notification/subscriptions_api_with_devise_controller.rb

@@ -1,7 +1,7 @@
 module ActivityNotification
   # Controller to manage subscriptions API with Devise authentication.
   class SubscriptionsApiWithDeviseController < SubscriptionsApiController
-    include DeviseTokenAuth::Concerns::SetUserByToken
+    include DeviseTokenAuth::Concerns::SetUserByToken if defined?(DeviseTokenAuth)
     include DeviseAuthenticationController
   end
 end

data/lib/activity_notification/orm/mongoid/subscription.rb

@@ -28,7 +28,7 @@ module ActivityNotification
         field :optional_targets,          type: Hash,    default: {}
 
         validates  :target,               presence: true
-        validates  :key,                  presence: true, uniqueness: { scope: :target }
+        validates  :key,                  presence: true, uniqueness: { scope: [:target_type, :target_id] }
         validates_inclusion_of :subscribing,          in: [true, false]
         validates_inclusion_of :subscribing_to_email, in: [true, false]
         validate   :subscribing_to_email_cannot_be_true_when_subscribing_is_false

data/lib/activity_notification/version.rb

@@ -1,3 +1,3 @@
 module ActivityNotification
-  VERSION = "2.1.1"
+  VERSION = "2.1.2"
 end

data/spec/models/subscription_spec.rb

@@ -11,6 +11,14 @@ describe ActivityNotification::Subscription, type: :model do
       subscription = create(:subscription, target: target)
       expect(subscription.reload.target).to eq(target)
     end
+
+    it "several targets can subscribe to the same key" do
+      target = create(:confirmed_user)
+      target2 = create(:confirmed_user)
+      subscription_1 = create(:subscription, target: target, key: 'key.1')
+      subscription_2 = create(:subscription, target: target2, key: 'key.1')
+      expect(subscription_2).to be_valid
+    end
   end
 
   describe "with validation" do

data/spec/rails_app/config/initializers/copy_it.aws.rb.template

@@ -0,0 +1,6 @@
+# Copy this template file as aws.rb and set your credentials
+unless Rails.env.test?
+  Aws.config.update({
+    credentials: Aws::Credentials.new('your_access_key_id', 'your_secret_access_key')
+  })
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activity_notification
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Shota Yamazaki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-10 00:00:00.000000000 Z
+date: 2020-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -621,6 +621,7 @@ files:
 - spec/rails_app/config/initializers/assets.rb
 - spec/rails_app/config/initializers/backtrace_silencers.rb
 - spec/rails_app/config/initializers/cookies_serializer.rb
+- spec/rails_app/config/initializers/copy_it.aws.rb.template
 - spec/rails_app/config/initializers/devise.rb
 - spec/rails_app/config/initializers/devise_token_auth.rb
 - spec/rails_app/config/initializers/filter_parameter_logging.rb
@@ -839,6 +840,7 @@ test_files:
 - spec/rails_app/config/initializers/assets.rb
 - spec/rails_app/config/initializers/backtrace_silencers.rb
 - spec/rails_app/config/initializers/cookies_serializer.rb
+- spec/rails_app/config/initializers/copy_it.aws.rb.template
 - spec/rails_app/config/initializers/devise.rb
 - spec/rails_app/config/initializers/devise_token_auth.rb
 - spec/rails_app/config/initializers/filter_parameter_logging.rb