public_activity 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6103bac0cace649e4ff37f4532b180c928ea40ad
-  data.tar.gz: 88f9f4141aead30d2cb486f87a3aea85180a81f3
+  metadata.gz: 133186d2fb5149e6b12c499d588cafb173fa840c
+  data.tar.gz: 9dfa82ab740c143daa9d3c833bc15d2c7efd4604
 SHA512:
-  metadata.gz: 6d56975f27da92972716721fcaaca43a5425eca1a2388785f2eb5e8f5ae43fe8135858bc74c5b0b9be0b0a46ecb83da4bb550fed87dd2f925661d73258228e69
-  data.tar.gz: b809c0267587d603f5e54435bbacb9c81bb715caae7f993bc0ff39c1d59500427b75b434adcfc02752a8beac5344fee69f52714a09f1b0072c460bed2ecd8048
+  metadata.gz: dada05aea04f8bc8f20e9d474317bffff945d38da725c579feb960498bb7c12990ffd81d58b58448c177a7b20f1ac289b294cd5ef322c499ab9b09e5b8db4532
+  data.tar.gz: b0d35c25b9f8834fbb6f0fa9f6b3cde6936e3fdeba387b8c3eb2c595fc0ae886dce19e786a862588f2f3008117f75c0044dbdef17055b9d9dc088f12f2e5c043

data/lib/public_activity/orm/active_record/activity.rb

@@ -9,10 +9,12 @@ module PublicActivity
 
         # Define polymorphic association to the parent
         belongs_to :trackable, :polymorphic => true
-        # Define ownership to a resource responsible for this activity
-        belongs_to :owner, :polymorphic => true
-        # Define ownership to a resource targeted by this activity
-        belongs_to :recipient, :polymorphic => true
+        with_options(::ActiveRecord::VERSION::MAJOR >= 5 ? { :required => false } : { }) do
+          # Define ownership to a resource responsible for this activity
+          belongs_to :owner, :polymorphic => true
+          # Define ownership to a resource targeted by this activity
+          belongs_to :recipient, :polymorphic => true
+        end
         # Serialize parameters Hash
         serialize :parameters, Hash
 

data/lib/public_activity/utility/store_controller.rb

@@ -26,7 +26,12 @@ module PublicActivity
     extend ActiveSupport::Concern
 
     included do
-      before_filter :store_controller_for_public_activity
+      # use :before_action instead of deprecated before_filter
+      if respond_to? :before_action
+        before_action :store_controller_for_public_activity
+      else
+        before_filter :store_controller_for_public_activity
+      end
     end
 
     # Before filter executed to remember current controller

data/lib/public_activity/version.rb

@@ -1,4 +1,4 @@
 module PublicActivity
   # A constant with gem's version
-  VERSION = '1.4.2'
+  VERSION = '1.4.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: public_activity
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - Piotrek Okoński
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-19 00:00:00.000000000 Z
+date: 2016-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -255,7 +255,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Easy activity tracking for ActiveRecord models