dekiru 0.1.4 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa88f3d2cf47df7ed8a071acc0dbb0b86fa20e42c5ad3e72b3f23fb8c6f593b5
-  data.tar.gz: ddabf00fc5c3dfcfb8a22f9103f7a8d90ea5e92b6c158bd2b4ea1936d48ebc81
+  metadata.gz: 1a97b022b934401c9a7bb4ada03bda713299e5ee8a59acc93e8e8397a6c2b529
+  data.tar.gz: 2adfa51b5b92c008f2a7099d863f385093a41a18f64c4123c15130c4dd29ad7f
 SHA512:
-  metadata.gz: 02ed8451df03137d882758e3adb2fb06f7d8aa3b9e240ec84cd0e59a3bf460945f18919717010c44f58f13abbd6f468d39a33d37a29c9ad809334385ecbd6adc
-  data.tar.gz: be1798f99193883c7bb7978f52b9e52e40bcd2e01e1b041159f110c1be6517922b7a6067978a423e3c9315bf9a870bceb465fae1234b2929a318d191d486066c
+  metadata.gz: 2329153068a4faa166d61d7c08ee43cec421bf93b9205c7ceed4104bd0b8cd5f1a81998a62623106e0f093c689adfa6ecce7a935b4e456d0d438080993dcf3ed
+  data.tar.gz: 63012279c77d3896c1e9b5a9e35587c95eeb5c0ae07a72645786bf223cd028093c938e67d75bf253ee6c1de64679e1e175bb924305adaa2dc5da272d75f70f00

data/.ruby-version

@@ -1 +1 @@
-2.5.1
+2.7.1

data/.travis.yml

@@ -1,7 +1,8 @@
 rvm:
-  - 2.3.3
-  - 2.4.4
-  - 2.5.1
+  - 2.4.6
+  - 2.5.5
+  - 2.6.3
+  - 2.7.1
 
 # NOTE: https://github.com/travis-ci/travis-ci/issues/8978
 before_install:

data/README.md

@@ -113,7 +113,7 @@ Rake::Task['db:migrate'].enhance(['db:migrate:check_conflict']) if Rails.env.dev
 
 以下の設定をすると、宛先を指定しないメールを配信しようとした時に`Dekiru::MailSecurityInterceptor::NoToAdreessError`例外を発生させる。
 
-※ toに空文字や空配列を指定してメールを配信しようとすると、bcc内のアドレスがtoに転記されるといった問題がある。これを未然に防ぐことができる。
+※ to に空文字や空配列を指定してメールを配信しようとすると、bcc 内のアドレスが to に転記されるといった問題がある。これを未然に防ぐことができる。
 
 ```ruby
 # config/initializer/dekiru.rb
@@ -154,6 +154,48 @@ 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
+
+```ruby
+using Dekiru::CamelizeHash
+
+{ dekiru_rails: true }.camelize_keys(:lower)
+# => { dekiruRails: true }
+
+{ dekiru_rails: { dekiru_rails: true } }.deep_camelize_keys(:lower)
+# => { dekiruRails: { dekiruRails: true } }
+```
+
 ## Contributing
 
 1.  Fork it

data/dekiru.gemspec

@@ -15,6 +15,8 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Dekiru::VERSION
 
+  gem.required_ruby_version = '>= 2.4.0'
+
   gem.add_dependency 'http_accept_language', [">= 2.0.0"]
   gem.add_dependency 'rails'
   gem.add_dependency 'ruby-progressbar'

data/lib/dekiru.rb

@@ -5,6 +5,7 @@ require 'dekiru/controller_additions'
 require 'dekiru/validators/existence'
 require 'dekiru/data_migration_operator'
 require 'dekiru/mail_security_interceptor'
+require 'dekiru/camelize_hash'
 
 require 'active_support'
 require 'active_support/all'

data/lib/dekiru/camelize_hash.rb

@@ -0,0 +1,25 @@
+module Dekiru
+  module CamelizeHash
+    refine ::Hash do
+      def camelize_keys(first_letter = :upper)
+        transform_keys do |k|
+          if k.is_a?(Symbol)
+            k.to_s.camelize(first_letter).to_sym
+          else
+            k.camelize(first_letter)
+          end
+        end
+      end
+
+      def deep_camelize_keys(first_letter = :upper)
+        deep_transform_keys do |k|
+          if k.is_a?(Symbol)
+            k.to_s.camelize(first_letter).to_sym
+          else
+            k.camelize(first_letter)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/dekiru/capybara/matchers.rb

@@ -2,14 +2,14 @@ module Dekiru
   module Capybara
     module Matchers
       class JsNoErrorMatcher
-        def matches?(page)
-          errors = page.driver.browser.manage.logs.get(:browser)
-          errors.find_all { |error| error.level == 'WARNING' }.each do |error|
+        def matches?(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 error.message
+            STDERR.puts log.message
           end
 
-          @severe_errors = errors.find_all { |error| error.level == 'SEVERE' }
+          @severe_errors = logs.find_all { |log| log.level == 'SEVERE' }
           @severe_errors.empty?
         end
 

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) do
-        instance_eval(&block)
+      @result = ActiveRecord::Base.transaction(requires_new: true, joinable: false) do
+        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/helper.rb

@@ -19,8 +19,8 @@ module Dekiru
       end
     end
 
-    def null_check_localization(*args)
-      localize(*args) if args.try(:first).present?
+    def null_check_localization(object, **options)
+      localize(object, **options) if object.present?
     end
     alias nl null_check_localization
 

data/lib/dekiru/version.rb

@@ -1,3 +1,3 @@
 module Dekiru
-  VERSION = '0.1.4'
+  VERSION = '0.1.9'
 end

data/spec/dekiru/camelize_hash_spec.rb

@@ -0,0 +1,64 @@
+require "spec_helper"
+
+describe Dekiru::CamelizeHash do
+  using Dekiru::CamelizeHash
+
+  let(:hash) do
+    hash = {
+      dekiru_rails: {
+         dekiru_rails: 'dekiru'
+      },
+      'dekiru_ruby' => {
+        'dekiru_ruby' => 'dekiru'
+      }
+    }
+  end
+
+  describe '#camelize_keys' do
+    it '一階層目のキーがキャメルケースに変換される' do
+      expect(hash.camelize_keys(:lower)).to match({
+        dekiruRails: {
+           dekiru_rails: 'dekiru'
+        },
+        'dekiruRuby' => {
+          'dekiru_ruby' => 'dekiru'
+        }
+      })
+    end
+
+    it '一階層目のキーがアッパーキャメルケースに変換される' do
+      expect(hash.camelize_keys).to match({
+        DekiruRails: {
+           dekiru_rails: 'dekiru'
+        },
+        'DekiruRuby' => {
+          'dekiru_ruby' => 'dekiru'
+        }
+      })
+    end
+  end
+
+  describe '#deep_camelize_keys' do
+    it '2階層目以降のキーもキャメルケースに変換される' do
+      expect(hash.deep_camelize_keys(:lower)).to match({
+        dekiruRails: {
+           dekiruRails: 'dekiru'
+        },
+        'dekiruRuby' => {
+          'dekiruRuby' => 'dekiru'
+        }
+      })
+    end
+
+    it '2階層目以降のキーもアッパーキャメルケースに変換される' do
+      expect(hash.deep_camelize_keys).to match({
+        DekiruRails: {
+           DekiruRails: 'dekiru'
+        },
+        'DekiruRuby' => {
+          'DekiruRuby' => 'dekiru'
+        }
+      })
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dekiru
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.9
 platform: ruby
 authors:
 - Akihiro Matsumura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-01 00:00:00.000000000 Z
+date: 2020-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http_accept_language
@@ -124,6 +124,7 @@ files:
 - Rakefile
 - dekiru.gemspec
 - lib/dekiru.rb
+- lib/dekiru/camelize_hash.rb
 - lib/dekiru/capybara/helpers.rb
 - lib/dekiru/capybara/matchers.rb
 - lib/dekiru/controller_additions.rb
@@ -137,6 +138,7 @@ files:
 - lib/dekiru/tasks/smtp_check.rake
 - lib/dekiru/validators/existence.rb
 - lib/dekiru/version.rb
+- spec/dekiru/camelize_hash_spec.rb
 - spec/dekiru/data_migration_operator_spec.rb
 - spec/dekiru/helper_spec.rb
 - spec/dekiru/mail_security_interceptor_spec.rb
@@ -155,19 +157,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Usefull helper methods for Ruby on Rails
 test_files:
+- spec/dekiru/camelize_hash_spec.rb
 - spec/dekiru/data_migration_operator_spec.rb
 - spec/dekiru/helper_spec.rb
 - spec/dekiru/mail_security_interceptor_spec.rb