dekiru 0.1.7 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52638cf1b48eda2cccf9bc53435a8c361e17a43a3145457eba5fbfdd68b5f9ac
-  data.tar.gz: 5ced1fe987c0999fdff91eeef663cd664c3bdafd58a466dd40dd21c6e8b64bda
+  metadata.gz: b41d118d14b7e96272667d7a6dfe0d9fc5fb6e77765f9d2add4b47290f5b2b6d
+  data.tar.gz: 88ba004a68df6e0b3b30b99f5f67715f9fbd45743567b53f58d3db27f95eb0fd
 SHA512:
-  metadata.gz: 2dc00bbe336a2381355d72b5da39a398a36640af30a425696c9f145773b1c7c0fe3844d985d533af8f2336dc2e0591cc1cb2f6980fddbacfa587e1b50c759d94
-  data.tar.gz: 0f81e7e83a43ac4a335b89e42a5c08cf5f3573792a4afd958aa5744fe3ef3b59546ba82195c36e60f2ec420f52b5bc7dd484c41747e908dc81ff7274f7402027
+  metadata.gz: 355332f2520250b85cdd76f71931959dc414aa58b6471e1ce8eb6091c518bf6264592874b63fd656e65ca5d27ebd6d9c375abff39a6792aaad6e99e971246d7b
+  data.tar.gz: fc17816184e72d8ce6e22582b741a9142492eb03c15747a2e96b9b600ea65dea1d91c9d58b08110b93bbfac1e0a753e478a5ba6d4191d7020e8aaceb99b9f1c0

data/.github/workflows/rspec.yml

@@ -0,0 +1,28 @@
+name: Ruby
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+
+jobs:
+  rspec:
+    runs-on: ubuntu-latest
+    env:
+      BUNDLE_JOBS: 4
+      BUNDLE_RETRY: 3
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ["2.6", "2.7", "3.0"]
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - name: Run rspec
+        run: bundle exec rspec

data/README.md

@@ -154,6 +154,34 @@ Finished successfully: Demo migration
 Total time: 6.35 sec
 ```
 
+また`warning_side_effects: true`オプションを付けて実行することで、データ移行作業で発生した副作用が表示されるようになります。
+
+```ruby
+Dekiru::DataMigrationOperator.execute('Demo migration', warning_side_effects: true) do
+  # ...
+end
+```
+
+```
+$ bin/rails r scripts/demo.rb
+Start: Demo migration at 2019-05-24 18:29:57 +0900
+
+all targets count: 30
+Time: 00:00:00 |=================>>| 100% Progress
+updated user count: 30
+
+Write Queries!!
+30 call: Update "users" SET ...
+
+Enqueued Jobs!!
+10 call: NotifyJob
+
+Deliverd Mailers!!
+10 call: UserMailer
+
+Are you sure to commit? (yes/no) > yes
+```
+
 ## Refinements
 
 ### Dekiru::CamelizeHash

data/lib/dekiru/capybara/matchers.rb

@@ -3,7 +3,7 @@ module Dekiru
     module Matchers
       class JsNoErrorMatcher
         def matches?(page_or_logs)
-          logs = page_or_logs.respond_to?(:driver) ? page.driver.browser.manage.logs.get(:browser) : page_or_logs
+          logs = page_or_logs.respond_to?(:driver) ? page_or_logs.driver.browser.manage.logs.get(:browser) : page_or_logs
           logs.find_all { |log| log.level == 'WARNING' }.each do |log|
             STDERR.puts 'WARN: javascript warning'
             STDERR.puts log.message

data/lib/dekiru/data_migration_operator.rb

@@ -10,18 +10,22 @@ module Dekiru
 
     def initialize(title, options = {})
       @title = title
-      @stream = options[:output] || $stdout
-    end
-
-    def log(message)
-      stream.puts(message)
+      @options = options
+      @stream = @options[:output] || $stdout
+      @side_effects = Hash.new do |hash, key|
+        hash[key] = Hash.new(0)
+      end
     end
 
     def execute(&block)
       @started_at = Time.current
       log "Start: #{title} at #{started_at}\n\n"
       @result = ActiveRecord::Base.transaction(requires_new: true, joinable: false) do
-        instance_eval(&block)
+        if @options[:warning_side_effects]
+          warning_side_effects(&block)
+        else
+          instance_eval(&block)
+        end
         confirm?("\nAre you sure to commit?")
       end
       log "Finished successfully: #{title}" if @result == true
@@ -56,6 +60,12 @@ module Dekiru
       pb.finish
     end
 
+    private
+
+    def log(message)
+      stream.puts(message)
+    end
+
     def confirm?(message = 'Are you sure?')
       loop do
         stream.print "#{message} (yes/no) > "
@@ -78,5 +88,34 @@ module Dekiru
       log "Canceled: #{title}"
       raise ActiveRecord::Rollback
     end
+
+    def handle_notification(*args)
+      event = ActiveSupport::Notifications::Event.new(*args)
+
+      increment_side_effects(:enqueued_jobs, event.payload[:job].class.name)  if event.payload[:job]
+      increment_side_effects(:deliverd_mailers, event.payload[:mailer]) if event.payload[:mailer]
+
+      if event.payload[:sql] && /\A\s*(insert|update|delete)/i.match?(event.payload[:sql])
+        increment_side_effects(:write_queries, event.payload[:sql])
+      end
+    end
+
+    def increment_side_effects(type, value)
+      @side_effects[type][value] += 1
+    end
+
+    def warning_side_effects(&block)
+      ActiveSupport::Notifications.subscribed(method(:handle_notification), /^(sql|enqueue|deliver)/) do
+        instance_eval(&block)
+      end
+
+      @side_effects.each do |name, items|
+        newline
+        log "#{name.to_s.titlecase}!!"
+        items.sort_by { |v, c| c }.reverse.slice(0, 20).each do |value, count|
+          log "#{count} call: #{value}"
+        end
+      end
+    end
   end
 end

data/lib/dekiru/task_with_logger.rb

@@ -4,16 +4,17 @@ module TaskWithLogger
 
       def task(*args, &block)
         new_block = proc do |_task, _args|
-          __echo__ "[START] #{_task.name} #{_args.to_h} (#{Time.current})"
+          TaskWithLogger.echo("[START] #{_task.name} #{_args.to_h} (#{Time.current})")
           yield(_task, _args)
-          __echo__ "[END] #{_task.name} #{_args.to_h} (#{Time.current})"
+          TaskWithLogger.echo("[END] #{_task.name} #{_args.to_h} (#{Time.current})")
         end
         super(*args, &new_block)
       end
+  end
 
-      def __echo__(str)
-        Rails.logger.info(str)
-        puts(str)
-      end
+  def echo(str)
+    Rails.logger.info(str)
+    puts(str)
   end
+  module_function :echo
 end

data/lib/dekiru/validators/existence.rb

@@ -9,7 +9,7 @@ module ActiveModel
     class ExistenceValidator < EachValidator
       def validate_each(record, attribute, value)
         unless exists?(record, value)
-          record.errors.add(attribute, :existence, options.except(:in).merge!(value: value))
+          record.errors.add(attribute, :existence, **options.except(:in).merge!(value: value))
         end
       end
 

data/lib/dekiru/version.rb

@@ -1,3 +1,3 @@
 module Dekiru
-  VERSION = '0.1.7'
+  VERSION = '0.1.11'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dekiru
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.11
 platform: ruby
 authors:
 - Akihiro Matsumura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-05 00:00:00.000000000 Z
+date: 2021-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http_accept_language
@@ -115,9 +115,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/rspec.yml"
 - ".gitignore"
 - ".ruby-version"
-- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md

data/.travis.yml

@@ -1,12 +0,0 @@
-rvm:
-  - 2.4.6
-  - 2.5.5
-  - 2.6.3
-  - 2.7.1
-
-# NOTE: https://github.com/travis-ci/travis-ci/issues/8978
-before_install:
-  - gem update --system --no-document
-
-sudo: false
-cache: bundler