dekiru 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 494f40b2837d03839b7d9602f7bcd3f3c0d47196
-  data.tar.gz: 70aff4c1bbba2c7c600233735954e72954105b5f
+SHA256:
+  metadata.gz: b715602bf9f53b9d6abba728f17c8bdc2b295e96127c7a0623045801f9a11e0c
+  data.tar.gz: 3cf3fa34a75e486df3db5bbeb882f1de6172624bd1f4e06d6acf55d12339b5df
 SHA512:
-  metadata.gz: 0e41ca1c9e1f95eaf56f1a16af2fde9f7b4af77d8e47db9cd2d9539df1ffee34317a58734429e4a443b470524f59f7776883af4396185ada670d73743f725035
-  data.tar.gz: d2281d2ccaac6a60f9ce1db85fe47dd097b84f6af635836ee40c8d8af05c8cd0d684e26447a31e82e3a6f0adf7d1c9f448ead2565365cf0076902007d2e582fc
+  metadata.gz: 1b4a8bf6efb8052718f21e4d29495f9e6149c0681fe64a15c234801d4e0a4036c697ecb27c2a7b73757f7f3f8624191390b7d2b1341ac6d6f0fc3b7b3d110710
+  data.tar.gz: 654d3c85c7a65deb7af1bdb243e716d49ecb77e8bb710d0e5b8bfabf94d65ed0e7670c3e012879358c9267db8e79cb4f8a1e9f63c8681af73864595d387b9100

data/.ruby-version

@@ -1 +1 @@
-2.3.3
+2.5.1

data/.travis.yml

@@ -1,6 +1,11 @@
 rvm:
-  - 2.2.6
   - 2.3.3
+  - 2.4.4
+  - 2.5.1
+
+# NOTE: https://github.com/travis-ci/travis-ci/issues/8978
+before_install:
+  - gem update --system --no-document
 
 sudo: false
 cache: bundler

data/README.md

@@ -48,6 +48,42 @@ end
 click_on 'Button in modal'
 ```
 
+## Rake Task
+
+以下の設定をすると Rake タスクの実行前後にログ出力されるようになる。(Ruby2.4 以降が必要)
+
+In Rakefile:
+
+```ruby
+require_relative 'config/application'
+require 'dekiru/task_with_logger'
+
+Rails.application.load_tasks
+```
+
+In myapp.rake:
+
+```ruby
+using TaskWithLogger
+
+namespace :myapp do
+  desc 'dekiru'
+  task dekiru: :environment do
+    puts 'dekiru'
+  end
+end
+```
+
+以下の設定をすると db:migrate タスクの実行前に競合がチェックされる。
+
+In Rakefile:
+
+```ruby
+require_relative 'config/application'
+
+Rails.application.load_tasks
+Rake::Task['db:migrate'].enhance(['db:migrate:check_confrict']) if Rails.env.development?
+```
 
 ## Contributing
 

data/Rakefile

@@ -1,5 +1,5 @@
 #!/usr/bin/env rake
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 
 task :default => :spec

data/lib/dekiru.rb

@@ -2,6 +2,7 @@ require 'dekiru/version'
 require 'dekiru/railtie' if defined?(::Rails)
 require 'dekiru/helper'
 require 'dekiru/controller_additions'
+require 'dekiru/validators/existence'
 
 require 'active_support'
 require 'active_support/all'

data/lib/dekiru/capybara/helpers.rb

@@ -13,30 +13,38 @@ module Dekiru
           })();
         EOS
         yield
-        Timeout.timeout(::Capybara.default_max_wait_time) do
-          script = <<~"EOS"
-            (function(){
-              var eventName = '#{event}';
-              return window._dekiruCapybaraWaitEvents && window._dekiruCapybaraWaitEvents[eventName];
-            })();
-          EOS
-          begin
-            result = page.evaluate_script(script)
-            raise Error, 'wait_for_event: Missing context. probably moved to another page.' if result.nil?
-          end while result == 1
+
+        script = <<~"EOS"
+          (function(){
+            var eventName = '#{event}';
+            return window._dekiruCapybaraWaitEvents && window._dekiruCapybaraWaitEvents[eventName];
+          })();
+        EOS
+        wait_until do
+          result = page.evaluate_script(script)
+          raise Error, 'wait_for_event: Missing context. probably moved to another page.' if result.nil?
+          result == 0
         end
       end
 
       # https://robots.thoughtbot.com/automatically-wait-for-ajax-with-capybara
       def wait_for_ajax
-        Timeout.timeout(::Capybara.default_max_wait_time) do
-          loop until finished_all_ajax_requests?
-        end
+        wait_until { finished_all_ajax_requests? }
       end
 
       def finished_all_ajax_requests?
         page.evaluate_script('jQuery.active').zero?
       end
+
+      def wait_until(timeout: ::Capybara.default_max_wait_time, interval: 0.2, **opts, &block)
+        if defined?(Selenium::WebDriver::Wait)
+          Selenium::WebDriver::Wait.new(opts.merge(timeout: timeout, interval: interval)).until { yield }
+        else
+          Timeout.timeout(timeout) do
+            sleep(interval) until yield
+          end
+        end
+      end
     end
   end
 end

data/lib/dekiru/railtie.rb

@@ -12,6 +12,7 @@ module Dekiru
 
     rake_tasks do
       load 'dekiru/tasks/smtp_check.rake'
+      load 'dekiru/tasks/db.rake'
     end
   end
 end

data/lib/dekiru/task_with_logger.rb

@@ -0,0 +1,20 @@
+module TaskWithLogger
+  refine Rake::DSL do
+    private
+
+      def task(*args, &block)
+        scope_path = Rake.application.current_scope.path
+        new_block = proc do
+          __echo__ "[START] #{scope_path}: #{args.inspect} (#{Time.current})"
+          yield
+          __echo__ "[END] #{scope_path}: #{args.inspect} (#{Time.current})"
+        end
+        super(*args, &new_block)
+      end
+
+      def __echo__(str)
+        Rails.logger.info(str)
+        puts(str)
+      end
+  end
+end

data/lib/dekiru/tasks/db.rake

@@ -0,0 +1,18 @@
+namespace :db do
+  namespace :migrate do
+    desc 'Check migrate confrict'
+    task check_confrict: :environment do
+      migrations_status =
+        if ActiveRecord::Base.connection.respond_to?(:migration_context)
+          ActiveRecord::Base.connection.migration_context.migrations_status
+        else
+          paths = ActiveRecord::Tasks::DatabaseTasks.migrations_paths
+          ActiveRecord::Migrator.migrations_status(paths)
+        end
+
+      if migrations_status.map(&:third).any? { |name| name.include?('NO FILE') }
+        abort 'Migration conflict!'
+      end
+    end
+  end
+end

data/lib/dekiru/validators/existence.rb

@@ -0,0 +1,25 @@
+#   class Post < ActiveRecord::Base
+#     belongs_to :company
+#     belongs_to :user
+#     validates :user_id, presence: true, existence: { in: -> { company.users } }
+#   end
+
+module ActiveModel
+  module Validations
+    class ExistenceValidator < EachValidator
+      def validate_each(record, attribute, value)
+        unless exists?(record, value)
+          record.errors.add(attribute, :existence, options.except(:in).merge!(value: value))
+        end
+      end
+
+      def exists?(record, value)
+        unless options[:in].respond_to?(:call)
+          raise ArgumentError, '`in` option should be proc'
+        end
+        collection = record.instance_exec(&options[:in])
+        collection.exists?(value)
+      end
+    end
+  end
+end

data/lib/dekiru/version.rb

@@ -1,3 +1,3 @@
 module Dekiru
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/spec/dekiru/helper_spec.rb

@@ -12,7 +12,7 @@ describe Dekiru::Helper do
   end
   describe "#menu_link_to" do
     before do
-      helper.stub(:current_page?).and_return(true)
+      allow(helper).to receive(:current_page?).and_return(true)
     end
     context "一番シンプルな呼び出し" do
       it "動くこと" do
@@ -34,7 +34,7 @@ describe Dekiru::Helper do
     end
     context "今のページじゃない" do
       before do
-        helper.stub(:current_page?).and_return(false)
+        allow(helper).to receive(:current_page?).and_return(false)
       end
       it "動くこと" do
         expect(helper.menu_link_to("テキスト", "/some_path", class: "some_class")).to eq("<li class=\"\"><a class=\"some_class\" href=\"/some_path\">テキスト</a></li>")

data/spec/dekiru/validators/existence_spec.rb

@@ -0,0 +1,51 @@
+require 'spec_helper'
+
+describe ActiveModel::Validations::ExistenceValidator do
+  let(:user_class) do
+    Class.new do
+      def self.exists?(id)
+        %w[valid_id].member?(id)
+      end
+    end
+  end
+  let(:model_class) do
+    _options = options
+
+    Struct.new(:user_id, :users) do
+      include ActiveModel::Validations
+
+      def self.name
+        'DummyModel'
+      end
+
+      validates :user_id, existence: _options
+    end
+  end
+
+  describe 'validate' do
+    subject(:valid?) do
+      model_class.new(user_id, user_class).valid?
+    end
+
+    context 'with exists id' do
+      let(:user_id) { 'valid_id' }
+      let(:options) { { in: -> { users } } }
+
+      it { is_expected.to eq true }
+    end
+
+    context 'with exists not id' do
+      let(:user_id) { 'invalid_id' }
+      let(:options) { { in: -> { users } } }
+
+      it { is_expected.to eq false }
+    end
+
+    context 'with invalid option' do
+      let(:user_id) { 'valid_id' }
+      let(:options) { { in: user_class } }
+
+      it { expect { valid? }.to raise_error(ArgumentError) }
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dekiru
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Akihiro Matsumura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-05 00:00:00.000000000 Z
+date: 2018-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http_accept_language
@@ -115,9 +115,13 @@ files:
 - lib/dekiru/helper.rb
 - lib/dekiru/railtie.rb
 - lib/dekiru/smtp_check_mailer.rb
+- lib/dekiru/task_with_logger.rb
+- lib/dekiru/tasks/db.rake
 - lib/dekiru/tasks/smtp_check.rake
+- lib/dekiru/validators/existence.rb
 - lib/dekiru/version.rb
 - spec/dekiru/helper_spec.rb
+- spec/dekiru/validators/existence_spec.rb
 - spec/spec_helper.rb
 homepage: ''
 licenses: []
@@ -138,10 +142,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Usefull helper methods for Ruby on Rails
 test_files:
 - spec/dekiru/helper_spec.rb
+- spec/dekiru/validators/existence_spec.rb
 - spec/spec_helper.rb