public_activity 1.6.4 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed14383fee5beb59cc2e6963aec4b151edac0d910dba6ae076f158dce0791ba8
-  data.tar.gz: 2cb71a7c50553cddeb0500c882bf7709a780b3ca8cb60318da8d7e4b6be00e77
+  metadata.gz: 83290b8f83bb4db6127ed0b907380946d30a3d8a91b2ea3d1a835d7dfb36327d
+  data.tar.gz: 2a7e5abad8fae61ff03440747938653eb1624e14f62279fddb28b2d10362b75e
 SHA512:
-  metadata.gz: 57aed9400b411ae43657dea3944be5aa062139356e4c5a686c97f84439369619ea6471e1685946d71c63a8765014250467646f2da37699e4f8b7723ec09e8b64
-  data.tar.gz: '098d249436ad7f6d16e1f7d3dfff28a8da55ee567e480a1030db9bdf0d3a68fe4d8ffcc011ad96fc332d5b98d001186b483ba41f3681cacb74a072a6a8e22ccb'
+  metadata.gz: 502c70c85f62ec2838d592a2eaed2de714e97bbc27dcf0e7677dc27ac21e76e2fa1960c7c8d9fae218ff77ac1b103d0b7228ab4ed9afe2b50e7eb09bd2f6b7fe
+  data.tar.gz: ef18dda98ec4e763311971ec8a3a9382b4ba05a5b00a76c7ee6e3a58a9d4ec80f1c9a11487d9bb2e30c5ca9f0a336136033e2811f9ac52974a9cb8f9c95efa39

data/README.md

@@ -1,37 +1,35 @@
 # PublicActivity [![Build Status](https://secure.travis-ci.org/chaps-io/public_activity.svg)](http://travis-ci.org/chaps-io/public_activity) [![Code Climate](https://codeclimate.com/github/chaps-io/public_activity.svg)](https://codeclimate.com/github/chaps-io/public_activity) [![Gem Version](https://badge.fury.io/rb/public_activity.svg)](http://badge.fury.io/rb/public_activity)
 
 `public_activity` provides easy activity tracking for your **ActiveRecord**, **Mongoid 3** and **MongoMapper** models
-in Rails 3.0 - 5.0. Simply put: it records what has been changed or created and gives you the ability to present those
-recorded activities to users - in a similar way to how GitHub does it.
+in Rails 5.0+. Simply put: it records what has been changed or created and gives you the ability to present those
+recorded activities to users - similarly to how GitHub does it.
 
+## Rails 7
 
-
-
-
-
- 
-## Rails 5
-
-**As of 1.6.0 version, public_activity also supports Rails up to 5.2.**
+**As of version 2.0.0, public_activity also supports Rails up to 7.0.**
 
 ## Table of contents
 
-1. [Example](#example)
-  * [Demo](#online-demo)
-  * [Screencast](#screencast)
-  * **[Common examples](#common-examples)**
-2. [Setup](#setup)
-  1. [Gem installation](#gem-installation)
-  2. [Database setup](#database-setup)
-  3. [Model configuration](#model-configuration)
-  4. [Custom activities](#custom-activities)
-  5. [Displaying activities](#displaying-activities)
-    1. [Activity views](#activity-views)
-    2. [i18n](#i18n)
-3. [Testing](#testing)
-4. [Documentation](#documentation)
-5. **[Help](#help)**
-6. [Upgrading](https://github.com/pokonski/public_activity/wiki/Upgrading-from-pre-0.4.0-versions)
+- [Rails 7](#rails-7)
+- [Table of contents](#table-of-contents)
+- [Example](#example)
+  - [Online demo](#online-demo)
+- [Screencast](#screencast)
+- [Setup](#setup)
+  - [Gem installation](#gem-installation)
+  - [Database setup](#database-setup)
+  - [Model configuration](#model-configuration)
+    - [Custom activities](#custom-activities)
+  - [Displaying activities](#displaying-activities)
+    - [Layouts](#layouts)
+    - [Locals](#locals)
+    - [Activity views](#activity-views)
+    - [I18n](#I18n)
+- [Testing](#testing)
+- [Documentation](#documentation)
+- [Common examples](#common-examples)
+- [Help](#help)
+- [License](#license)
 
 ## Example
 
@@ -197,7 +195,7 @@ For example, if you have an activity with `:key` set to `"activity.user.changed_
 
 If a view file does not exist, then p_a falls back to the old behaviour and tries to translate the activity `:key` using `I18n#translate` method (see the section below).
 
-#### i18n
+#### I18n
 
 Translations are used by the `#text` method, to which you can pass additional options in form of a hash. `#render` method uses translations when view templates have not been provided. You can render pure i18n strings by passing `{display: :i18n}` to `#render_activity` or `#render`.
 
@@ -224,7 +222,7 @@ require 'public_activity/testing'
 PublicActivity.enabled = false
 ```
 
-In your specs you can then blockwise decide wether to turn `public_activity` on
+In your specs you can then blockwise decide whether to turn `public_activity` on
 or off.
 
 ```ruby

data/lib/generators/public_activity/migration/templates/migration.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
+require 'migrations_base'
+
 # Migration responsible for creating a table with activities
-class CreateActivities < (ActiveRecord.version.release() < Gem::Version.new('5.2.0') ? ActiveRecord::Migration : ActiveRecord::Migration[5.2])
-  # Create table
+class CreateActivities < MigrationsBase
   def self.up
     create_table :activities do |t|
       t.belongs_to :trackable, :polymorphic => true

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

@@ -33,7 +33,7 @@ module PublicActivity
           belongs_to :owner, :polymorphic => true
           # Define ownership to a resource targeted by this activity
           belongs_to :recipient, :polymorphic => true
-        when 5..6
+        when 5..7
           with_options(:required => false) do
             # Define ownership to a resource responsible for this activity
             belongs_to :owner, :polymorphic => true
@@ -49,9 +49,9 @@ module PublicActivity
           else
             warn("[WARN] table #{name} doesn't exist. Skipping PublicActivity::Activity#parameters's serialization")
           end
-        rescue ::ActiveRecord::NoDatabaseError => e
+        rescue ::ActiveRecord::NoDatabaseError
           warn("[WARN] database doesn't exist. Skipping PublicActivity::Activity#parameters's serialization")
-        rescue ::PG::ConnectionBad => e
+        rescue ::PG::ConnectionBad
           warn("[WARN] couldn't connect to database. Skipping PublicActivity::Activity#parameters's serialization")
         rescue Mysql2::Error::ConnectionError
           warn("[WARN] couldn't connect to database. Skipping PublicActivity::Activity#parameters's serialization")

data/lib/public_activity/renderable.rb

@@ -12,7 +12,8 @@ module PublicActivity
       k.unshift('activity') if k.first != 'activity'
       k = k.join('.')
 
-      I18n.t(k, parameters.merge(params) || {})
+      translate_params = parameters.merge(params) || {}
+      I18n.t(k, **translate_params)
     end
 
     # Renders activity from views.
@@ -142,7 +143,7 @@ module PublicActivity
     def prepare_layout(root, layout)
       if layout
         path = layout.to_s
-        unless path.starts_with?(root) || path.starts_with?("/")
+        unless path.start_with?(root) || path.start_with?("/")
           return File.join(root, path)
         end
       end

data/lib/public_activity/version.rb

@@ -2,5 +2,5 @@
 
 module PublicActivity
   # A constant with gem's version
-  VERSION = '1.6.4'
+  VERSION = '2.0.0'
 end

data/test/migrations/001_create_activities.rb

@@ -1 +1 @@
-test/migrations/../../lib/generators/public_activity/migration/templates/migration.rb
+../../lib/generators/public_activity/migration/templates/migration.rb

data/test/migrations/002_create_articles.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'migrations_base.rb'
+require 'migrations_base'
 
 class CreateArticles < MigrationsBase
   def self.up

data/test/migrations/003_create_users.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'migrations_base.rb'
+require 'migrations_base'
 
 class CreateUsers < MigrationsBase
   def self.up

data/test/migrations_base.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-MigrationsBase = if ActiveRecord.version.release() < Gem::Version.new('5.2.0')
+MigrationsBase = if ActiveRecord.version.release() < Gem::Version.new('5.1.0')
   ActiveRecord::Migration
 else
-  ActiveRecord::Migration[5.2]
+  ActiveRecord::Migration[5.1]
 end

data/test/test_generators.rb

@@ -4,21 +4,9 @@ if ENV["PA_ORM"] == "active_record"
 
   require 'test_helper'
   require 'rails/generators/test_case'
-  require 'generators/public_activity/activity/activity_generator'
   require 'generators/public_activity/migration/migration_generator'
   require 'generators/public_activity/migration_upgrade/migration_upgrade_generator'
 
-  class TestActivityGenerator < Rails::Generators::TestCase
-    tests PublicActivity::Generators::ActivityGenerator
-    destination File.expand_path("../tmp", File.dirname(__FILE__))
-    setup :prepare_destination
-
-    def test_generating_activity_model
-      run_generator
-      assert_file "app/models/activity.rb"
-    end
-  end
-
   class TestMigrationGenerator < Rails::Generators::TestCase
     tests PublicActivity::Generators::MigrationGenerator
     destination File.expand_path("../tmp", File.dirname(__FILE__))

data/test/test_helper.rb

@@ -29,11 +29,15 @@ when :active_record
   ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
 
   migrations_path = File.expand_path('../migrations', __FILE__)
+  active_record_version = ActiveRecord.version.release()
 
-  if ActiveRecord.version.release() < Gem::Version.new('5.2.0')
-    ActiveRecord::Migrator.migrate(migrations_path)
-  else
+  if active_record_version >= Gem::Version.new('6.0.0')
+    schema_path = File.expand_path("../tmp/schema.rb", File.dirname(__FILE__))
+    ActiveRecord::MigrationContext.new(migrations_path, ActiveRecord::SchemaMigration).migrate
+  elsif active_record_version >= Gem::Version.new('5.2.0')
     ActiveRecord::MigrationContext.new(migrations_path).migrate
+  else # active_record_version < Gem::Version.new('5.2.0')
+    ActiveRecord::Migrator.migrate(migrations_path)
   end
 
   $stdout = STDOUT

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: public_activity
 version: !ruby/object:Gem::Version
-  version: 1.6.4
+  version: 2.0.0
 platform: ruby
 authors:
 - Piotrek Okoński
 - Kuba Okoński
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-09-30 00:00:00.000000000 Z
+date: 2022-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -17,28 +17,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -59,84 +59,98 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.7
+        version: 1.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.7
+        version: 1.4.1
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.8
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.8
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.7.5
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.7.5
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -155,16 +169,16 @@ dependencies:
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.11
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.11
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -192,8 +206,6 @@ files:
 - README.md
 - Rakefile
 - lib/generators/public_activity.rb
-- lib/generators/public_activity/activity/activity_generator.rb
-- lib/generators/public_activity/activity/templates/activity.rb
 - lib/generators/public_activity/migration/migration_generator.rb
 - lib/generators/public_activity/migration/templates/migration.rb
 - lib/generators/public_activity/migration_upgrade/migration_upgrade_generator.rb
@@ -255,7 +267,7 @@ homepage: https://github.com/pokonski/public_activity
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -263,16 +275,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
-signing_key: 
+rubygems_version: 3.3.13
+signing_key:
 specification_version: 4
 summary: Easy activity tracking for ActiveRecord models
 test_files:

data/lib/generators/public_activity/activity/activity_generator.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-require 'generators/public_activity'
-require 'rails/generators/active_record'
-
-module PublicActivity
-  module Generators
-    # Activity generator that creates activity model file from template
-    class ActivityGenerator < ActiveRecord::Generators::Base
-      extend Base
-
-      argument :name, :type => :string, :default => 'activity'
-      # Create model in project's folder
-      def generate_files
-        copy_file 'activity.rb', "app/models/#{name}.rb"
-      end
-    end
-  end
-end

data/lib/generators/public_activity/activity/templates/activity.rb

@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-# Activity model for customisation & custom methods
-class Activity < PublicActivity::Activity
-end