snapcher 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b63b524d6c12c6b843aef00a31e77caabb2a062756436081c2e4ff9547641298
-  data.tar.gz: 92229c5917db69a6b26e38a5534ad59c41c3667fa1ff035634a74f612c9bf73b
+  metadata.gz: 494c49faf14017fbe5f13d5fd7f657a7b2fad2b78ac9264c83497217a70c7977
+  data.tar.gz: 6bc6340796e5344951ee7dbf02362978a512a5ca9230acb1d68c9e7293a7362d
 SHA512:
-  metadata.gz: faf6771a883ea8d1bca2cb5667e822111d94e697ae53985eda8f044cb100d271e2e8f365214cfa9b490d87b1608d698ff34e0589a2536c2738d61ee2cf7bfaab
-  data.tar.gz: 7bd7be8ce9f9032d77d6e1b5f908ec4d7ce76deb83635814f79ac767f0b9379a522f10fa03b2854badb788d4085f47901200c9751df8f46d4c24328077720d52
+  metadata.gz: 91d9af61604cd3a0693c832f32ccf7e92c963e913b9800cebf7a6a4094646edca7b559a61b207a5f10f0f1e2149e2e833e156d1d192ca67df6b32a08cb9fe737
+  data.tar.gz: 5e734b6997ef32f8f7fda3f2f23a9267ffa3ef01fa5268fe3303b222d9e20036f71925b2463ed526b62dd34a5fe5a89b74e57b000f07aaefa9c91b36ad51bae9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    snapcher (0.1.4)
+    snapcher (0.1.5)
 
 GEM
   remote: https://rubygems.org/
@@ -72,7 +72,6 @@ GEM
       minitest (>= 5.1)
       tzinfo (~> 2.0)
     ast (2.4.2)
-    base64 (0.1.1)
     builder (3.2.4)
     concurrent-ruby (1.2.2)
     crass (1.0.6)
@@ -185,8 +184,7 @@ GEM
       rspec-mocks (~> 3.12)
       rspec-support (~> 3.12)
     rspec-support (3.12.1)
-    rubocop (1.57.1)
-      base64 (~> 0.1.1)
+    rubocop (1.57.2)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -197,7 +195,7 @@ GEM
       rubocop-ast (>= 1.28.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.29.0)
+    rubocop-ast (1.30.0)
       parser (>= 3.2.1.0)
     rubocop-capybara (2.19.0)
       rubocop (~> 1.41)

data/lib/generators/snapcher/migration.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Snapcher
+  module Generators
+    module Migration
+      # Implement the required interface for Rails::Generators::Migration.
+      def next_migration_number(dirname) # :nodoc:
+        next_migration_number = current_migration_number(dirname) + 1
+        if timestamped_migrations?
+          [Time.now.utc.strftime("%Y%m%d%H%M%S"), "%.14d" % next_migration_number].max
+        else
+          "%.3d" % next_migration_number
+        end
+      end
+
+      private
+
+      def timestamped_migrations?
+        (Rails.gem_version >= Gem::Version.new("7.0")) ?
+          ::ActiveRecord.timestamped_migrations :
+          ::ActiveRecord::Base.timestamped_migrations
+      end
+    end
+  end
+end

data/lib/generators/snapcher/migration_helper.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Snapcher
+  module Generators
+    module MigrationHelper
+      def migration_parent
+        "ActiveRecord::Migration[#{ActiveRecord::Migration.current_version}]"
+      end
+    end
+  end
+end

data/lib/generators/snapcher/templates/add_user_id_to_scannings.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class <%= migration_class_name %> < <%= migration_parent %>
+  def self.up
+    add_column :scannings, :user_id, :<%= options[:snapcher_user_id_column_type] %>, after: :action
+
+    add_index :scannings, [:user_id], name: index_name
+  end
+
+  def self.down
+    remove_column :scannings, :user_id
+    remove_index :scannings, name: index_name
+  end
+
+  private
+
+  def index_name
+    'snapcher_user_index'
+  end
+end

data/lib/generators/snapcher/templates/install.rb

@@ -10,7 +10,6 @@ class <%= migration_class_name %> < <%= migration_parent %>
       t.column :before_params, :string
       t.column :after_params, :string
       t.column :action, :string
-      t.column :created_at, :datetime
       t.timestamps null: false
     end
   end

data/lib/generators/snapcher/upgrade_generator.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require "rails/generators"
+require "rails/generators/migration"
+require "active_record"
+require "rails/generators/active_record"
+require "generators/snapcher/migration"
+require "generators/snapcher/migration_helper"
+
+module Snapcher
+  module Generators
+    class UpgradeGenerator < Rails::Generators::Base
+      include Rails::Generators::Migration
+      include Snapcher::Generators::MigrationHelper
+      extend Snapcher::Generators::Migration
+
+      class_option :snapcher_user_id_column_type, type: :string, default: "integer", required: false
+
+      source_root File.expand_path("../templates", __FILE__)
+
+      def copy_templates
+        migration_template "add_user_id_to_scannings.rb", "db/migrate/add_user_id_to_scannings.rb"
+      end
+    end
+  end
+end

data/lib/snapcher/junker.rb

@@ -32,6 +32,7 @@ module Snapcher
         run_scanning(action: "create",
                      column_name: snapcher_options[:column_name],
                      after_params: snapcher_attributes[snapcher_options[:column_name]],
+                     user_id: snapcher_attributes["user_id"],
                      table_name: self.class.table_name)
       end
 
@@ -41,6 +42,7 @@ module Snapcher
         run_scanning(action: "update",
                      column_name: snapcher_options[:column_name],
                      table_name: self.class.table_name,
+                     user_id: snapcher_attributes["user_id"],
                      before_params: snapcher_changes[:before_params],
                      after_params: snapcher_changes[:after_params])
       end
@@ -48,8 +50,10 @@ module Snapcher
       def scanning_destroy
         return if new_record?
 
-        run_scanning(action: "destroy", column_name: snapcher_options[:column_name],
-                     table_name: self.class.table_name)
+        run_scanning(action: "destroy",
+                     column_name: snapcher_options[:column_name],
+                     table_name: self.class.table_name,
+                     user_id: snapcher_attributes["user_id"])
       end
 
       # List of attributes that are snapcher.

data/lib/snapcher/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Snapcher
-  VERSION = "0.1.4"
+  VERSION = "0.2.0"
 end

data/lib/snapcher.rb

@@ -6,8 +6,12 @@ module Snapcher
   class Error < StandardError; end
   # Your code goes here...
 
+  class RequestStore < ActiveSupport::CurrentAttributes
+    attribute :snapcher_store
+  end
+
   class << self
-    attr_accessor :column_name
+    attr_accessor :column_name, :current_user
     attr_writer :scanning_class
 
     def scanning_class
@@ -17,7 +21,13 @@ module Snapcher
       @scanning_class = @scanning_class.safe_constantize if @scanning_class.is_a?(String)
       @scanning_class ||= Snapcher::Scanning
     end
+
+    def store
+      RequestStore.snapcher_store ||= {}
+    end
   end
+
+  @current_user_method = :current_user
 end
 
 require "snapcher/junker"

data/sample-app/Gemfile.lock

@@ -1,75 +1,76 @@
 PATH
   remote: ..
   specs:
-    snapcher (0.1.0)
+    snapcher (0.2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.1.1)
-      actionpack (= 7.1.1)
-      activesupport (= 7.1.1)
+    actioncable (7.1.3.2)
+      actionpack (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.1.1)
-      actionpack (= 7.1.1)
-      activejob (= 7.1.1)
-      activerecord (= 7.1.1)
-      activestorage (= 7.1.1)
-      activesupport (= 7.1.1)
+    actionmailbox (7.1.3.2)
+      actionpack (= 7.1.3.2)
+      activejob (= 7.1.3.2)
+      activerecord (= 7.1.3.2)
+      activestorage (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.1.1)
-      actionpack (= 7.1.1)
-      actionview (= 7.1.1)
-      activejob (= 7.1.1)
-      activesupport (= 7.1.1)
+    actionmailer (7.1.3.2)
+      actionpack (= 7.1.3.2)
+      actionview (= 7.1.3.2)
+      activejob (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.2)
-    actionpack (7.1.1)
-      actionview (= 7.1.1)
-      activesupport (= 7.1.1)
+    actionpack (7.1.3.2)
+      actionview (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       nokogiri (>= 1.8.5)
+      racc
       rack (>= 2.2.4)
       rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    actiontext (7.1.1)
-      actionpack (= 7.1.1)
-      activerecord (= 7.1.1)
-      activestorage (= 7.1.1)
-      activesupport (= 7.1.1)
+    actiontext (7.1.3.2)
+      actionpack (= 7.1.3.2)
+      activerecord (= 7.1.3.2)
+      activestorage (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.1.1)
-      activesupport (= 7.1.1)
+    actionview (7.1.3.2)
+      activesupport (= 7.1.3.2)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activejob (7.1.1)
-      activesupport (= 7.1.1)
+    activejob (7.1.3.2)
+      activesupport (= 7.1.3.2)
       globalid (>= 0.3.6)
-    activemodel (7.1.1)
-      activesupport (= 7.1.1)
-    activerecord (7.1.1)
-      activemodel (= 7.1.1)
-      activesupport (= 7.1.1)
+    activemodel (7.1.3.2)
+      activesupport (= 7.1.3.2)
+    activerecord (7.1.3.2)
+      activemodel (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       timeout (>= 0.4.0)
-    activestorage (7.1.1)
-      actionpack (= 7.1.1)
-      activejob (= 7.1.1)
-      activerecord (= 7.1.1)
-      activesupport (= 7.1.1)
+    activestorage (7.1.3.2)
+      actionpack (= 7.1.3.2)
+      activejob (= 7.1.3.2)
+      activerecord (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       marcel (~> 1.0)
-    activesupport (7.1.1)
+    activesupport (7.1.3.2)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -79,34 +80,33 @@ GEM
       minitest (>= 5.1)
       mutex_m
       tzinfo (~> 2.0)
-    base64 (0.1.1)
-    bigdecimal (3.1.4)
+    base64 (0.2.0)
+    bigdecimal (3.1.8)
     bindex (0.8.1)
-    bootsnap (1.16.0)
+    bootsnap (1.18.3)
       msgpack (~> 1.2)
     builder (3.2.4)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.2.3)
     connection_pool (2.4.1)
     crass (1.0.6)
-    date (3.3.3)
-    debug (1.8.0)
-      irb (>= 1.5.0)
-      reline (>= 0.3.1)
-    drb (2.1.1)
-      ruby2_keywords
+    date (3.3.4)
+    debug (1.9.2)
+      irb (~> 1.10)
+      reline (>= 0.3.8)
+    drb (2.2.1)
     erubi (1.12.0)
     globalid (1.2.1)
       activesupport (>= 6.1)
-    i18n (1.14.1)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
-    io-console (0.6.0)
-    irb (1.8.3)
-      rdoc
-      reline (>= 0.3.8)
-    jbuilder (2.11.5)
+    io-console (0.7.2)
+    irb (1.13.1)
+      rdoc (>= 4.0.0)
+      reline (>= 0.4.2)
+    jbuilder (2.12.0)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
-    loofah (2.21.4)
+    loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.8.1)
@@ -114,33 +114,33 @@ GEM
       net-imap
       net-pop
       net-smtp
-    marcel (1.0.2)
+    marcel (1.0.4)
     mini_mime (1.1.5)
-    minitest (5.20.0)
+    minitest (5.22.3)
     msgpack (1.7.2)
-    mutex_m (0.1.2)
-    net-imap (0.4.1)
+    mutex_m (0.2.0)
+    net-imap (0.4.11)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
-    net-protocol (0.2.1)
+    net-protocol (0.2.2)
       timeout
-    net-smtp (0.4.0)
+    net-smtp (0.5.0)
       net-protocol
-    nio4r (2.5.9)
-    nokogiri (1.15.4-aarch64-linux)
+    nio4r (2.7.3)
+    nokogiri (1.16.4-aarch64-linux)
       racc (~> 1.4)
-    nokogiri (1.15.4-arm64-darwin)
+    nokogiri (1.16.4-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.15.4-x86_64-linux)
+    nokogiri (1.16.4-x86_64-linux)
       racc (~> 1.4)
-    psych (5.1.1.1)
+    psych (5.1.2)
       stringio
-    puma (6.4.0)
+    puma (6.4.2)
       nio4r (~> 2.0)
-    racc (1.7.1)
-    rack (3.0.8)
+    racc (1.7.3)
+    rack (3.0.10)
     rack-session (2.0.0)
       rack (>= 3.0.0)
     rack-test (2.1.0)
@@ -148,20 +148,20 @@ GEM
     rackup (2.1.0)
       rack (>= 3)
       webrick (~> 1.8)
-    rails (7.1.1)
-      actioncable (= 7.1.1)
-      actionmailbox (= 7.1.1)
-      actionmailer (= 7.1.1)
-      actionpack (= 7.1.1)
-      actiontext (= 7.1.1)
-      actionview (= 7.1.1)
-      activejob (= 7.1.1)
-      activemodel (= 7.1.1)
-      activerecord (= 7.1.1)
-      activestorage (= 7.1.1)
-      activesupport (= 7.1.1)
+    rails (7.1.3.2)
+      actioncable (= 7.1.3.2)
+      actionmailbox (= 7.1.3.2)
+      actionmailer (= 7.1.3.2)
+      actionpack (= 7.1.3.2)
+      actiontext (= 7.1.3.2)
+      actionview (= 7.1.3.2)
+      activejob (= 7.1.3.2)
+      activemodel (= 7.1.3.2)
+      activerecord (= 7.1.3.2)
+      activestorage (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       bundler (>= 1.15.0)
-      railties (= 7.1.1)
+      railties (= 7.1.3.2)
     rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
@@ -169,20 +169,19 @@ GEM
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    railties (7.1.1)
-      actionpack (= 7.1.1)
-      activesupport (= 7.1.1)
+    railties (7.1.3.2)
+      actionpack (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       irb
       rackup (>= 1.0.0)
       rake (>= 12.2)
       thor (~> 1.0, >= 1.2.2)
       zeitwerk (~> 2.6)
-    rake (13.0.6)
-    rdoc (6.5.0)
+    rake (13.2.1)
+    rdoc (6.6.3.1)
       psych (>= 4.0.0)
-    reline (0.3.9)
+    reline (0.5.5)
       io-console (~> 0.5)
-    ruby2_keywords (0.0.5)
     sprockets (4.2.1)
       concurrent-ruby (~> 1.0)
       rack (>= 2.2.4, < 4)
@@ -190,12 +189,12 @@ GEM
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    sqlite3 (1.6.7-aarch64-linux)
-    sqlite3 (1.6.7-arm64-darwin)
-    sqlite3 (1.6.7-x86_64-linux)
-    stringio (3.0.8)
-    thor (1.3.0)
-    timeout (0.4.0)
+    sqlite3 (1.7.3-aarch64-linux)
+    sqlite3 (1.7.3-arm64-darwin)
+    sqlite3 (1.7.3-x86_64-linux)
+    stringio (3.1.0)
+    thor (1.3.1)
+    timeout (0.4.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     web-console (4.2.1)
@@ -207,7 +206,7 @@ GEM
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    zeitwerk (2.6.12)
+    zeitwerk (2.6.13)
 
 PLATFORMS
   aarch64-linux

data/sample-app/app/models/post.rb

@@ -0,0 +1,5 @@
+class Post < ApplicationRecord
+  scanning column_name: "title"
+
+  belongs_to :user
+end

data/sample-app/db/migrate/20240509025320_add_user_id_to_scannings.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class AddUserIdToScannings < ActiveRecord::Migration[7.1]
+  def self.up
+    add_column :scannings, :user_id, :integer
+
+    add_index :scannings, [:user_id], name: index_name
+  end
+
+  def self.down
+    remove_column :scannings, :user_id
+    remove_index :scannings, name: index_name
+  end
+
+  private
+
+  def index_name
+    'user_index'
+  end
+end

data/sample-app/db/migrate/20240509080448_create_posts.rb

@@ -0,0 +1,11 @@
+class CreatePosts < ActiveRecord::Migration[7.1]
+  def change
+    create_table :posts do |t|
+      t.string :title
+      t.text :body
+      t.references :user, null: false, foreign_key: true
+
+      t.timestamps
+    end
+  end
+end

data/sample-app/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.1].define(version: 2023_10_19_151334) do
+ActiveRecord::Schema[7.1].define(version: 2024_05_09_025320) do
   create_table "scannings", force: :cascade do |t|
     t.integer "scannable_id"
     t.string "scannable_type"
@@ -20,6 +20,8 @@ ActiveRecord::Schema[7.1].define(version: 2023_10_19_151334) do
     t.string "after_params"
     t.string "action"
     t.datetime "created_at"
+    t.integer "user_id"
+    t.index ["user_id"], name: "user_index"
   end
 
   create_table "users", force: :cascade do |t|
@@ -33,4 +35,5 @@ ActiveRecord::Schema[7.1].define(version: 2023_10_19_151334) do
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
   end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: snapcher
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - ryosk7
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-27 00:00:00.000000000 Z
+date: 2024-05-09 00:00:00.000000000 Z
 dependencies: []
 description: |
   Snapcher is an ORM extension that logs changes to specific columns to your model.
@@ -31,8 +31,12 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- lib/generators/snapcher/install/install_generator.rb
+- lib/generators/snapcher/install_generator.rb
+- lib/generators/snapcher/migration.rb
+- lib/generators/snapcher/migration_helper.rb
+- lib/generators/snapcher/templates/add_user_id_to_scannings.rb
 - lib/generators/snapcher/templates/install.rb
+- lib/generators/snapcher/upgrade_generator.rb
 - lib/snapcher.rb
 - lib/snapcher/junker.rb
 - lib/snapcher/railtie.rb
@@ -58,6 +62,7 @@ files:
 - sample-app/app/jobs/application_job.rb
 - sample-app/app/models/application_record.rb
 - sample-app/app/models/concerns/.keep
+- sample-app/app/models/post.rb
 - sample-app/app/models/user.rb
 - sample-app/app/views/layouts/application.html.erb
 - sample-app/bin/bundle
@@ -84,6 +89,8 @@ files:
 - sample-app/config/routes.rb
 - sample-app/db/migrate/20231019150803_create_users.rb
 - sample-app/db/migrate/20231019151334_install_snapcher.rb
+- sample-app/db/migrate/20240509025320_add_user_id_to_scannings.rb
+- sample-app/db/migrate/20240509080448_create_posts.rb
 - sample-app/db/schema.rb
 - sample-app/db/seeds.rb
 - sample-app/lib/assets/.keep