dekiru 0.0.18 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f97baa96504654fe776c451e96095e3aefceada
-  data.tar.gz: fc7c0193f69f5973868908717b5dbadbcd4c489e
+  metadata.gz: 3f9b1e7e918814bcf4e4437eb398e239dc6af8da
+  data.tar.gz: c61905cf2a569b572bd2d712b0184ef0e1c1f74c
 SHA512:
-  metadata.gz: 6c9e98a6fda416583fd5835d0e23747053362cdb499c68ad241bf2045a05a9bd376f657912a1ea8c5e5a7131c3369793f364cde56a154b005ff2adfce94e1af3
-  data.tar.gz: 2dbba93f090592b4130180a6b4f1de2f9ffa2b93516a89df16c6cf9e46ec74f9c653a20c40bdb66e02f19811c784e216132c469269516ee17ad8f7b8c1a7288e
+  metadata.gz: 757e6e5d2fc1ecb642bcc8110a9be1980dc3014b1b1393934f784a243ebead80f46d1aacc439d694f775552b6a8d6da2f4c8fd81f4fa27f4abc10aa973b97ee3
+  data.tar.gz: 9a0c4a2a6ef0698adcb7c6e043e03a06b1eeda46c40dd0c3a72f49bd115ca9b5183fe0302843486846e479f47b486ddd5027eab3e10e18d1c8662a5297079611

data/.ruby-version

@@ -1 +1 @@
-2.2.4
+2.3.3

data/.travis.yml

@@ -1,7 +1,6 @@
 rvm:
-  - 2.0
-  - 2.1
-  - 2.2
+  - 2.2.6
+  - 2.3.3
 
 sudo: false
 cache: bundler

data/README.md

@@ -50,6 +50,33 @@ task_with_monitor job: :environment, estimate_time: 10 do
 end
 ```
 
+## Capybara Helpers
+
+以下の設定をすると Capybara 用のヘルパーメソッドが使えるようになる。
+
+```ruby
+require 'dekiru/capybara/helpers'
+RSpec.configure do |config|
+  config.include Dekiru::Capybara::Helpers, type: :feature
+end
+```
+
+### examples
+
+```ruby
+# Ajax処理の終了待ち
+click_link 'Ajax link!'
+wait_for_ajax
+expect(page).to have_content 'created element!'
+
+# Bootstrap3 のモーダルの出現終了待ち(待たないとモーダル内のノードのクリックに失敗することがある)
+wait_for_event('shown.bs.modal') do
+  click_link 'Open bootstrap3 modal'
+end
+click_on 'Button in modal'
+```
+
+
 
 ## Contributing
 

data/dekiru.gemspec

@@ -21,5 +21,6 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'faraday_middleware'
   gem.add_development_dependency 'rake', [">= 0"]
   gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'rubocop'
   gem.add_development_dependency 'webmock', ['>= 1.19.0']
 end

data/lib/dekiru.rb

@@ -1,14 +1,12 @@
-require "dekiru/version"
-require "dekiru/railtie" if defined?(::Rails)
-require "dekiru/helper"
-require "dekiru/controller_additions"
+require 'dekiru/version'
+require 'dekiru/railtie' if defined?(::Rails)
+require 'dekiru/helper'
+require 'dekiru/controller_additions'
 
 require 'active_support'
 require 'active_support/all'
-require 'faraday'
-require 'faraday_middleware'
 
 module Dekiru
 end
 
-require_relative "dekiru/configure"
+require_relative 'dekiru/configure'

data/lib/dekiru/capybara/helpers.rb

@@ -0,0 +1,42 @@
+module Dekiru
+  module Capybara
+    module Helpers
+      class Error < StandardError; end
+
+      def wait_for_event(event)
+        page.execute_script(<<~"EOS")
+          (function(){
+            var eventName = '#{event}';
+            window._dekiruCapybaraWaitEvents = window._dekiruCapybaraWaitEvents || {};
+            window._dekiruCapybaraWaitEvents[eventName] = 1;
+            jQuery(document).one(eventName, function(){window._dekiruCapybaraWaitEvents[eventName] = 0;});
+          })();
+        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
+        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
+      end
+
+      def finished_all_ajax_requests?
+        page.evaluate_script('jQuery.active').zero?
+      end
+    end
+  end
+end

data/lib/dekiru/controller_additions.rb

@@ -1,4 +1,4 @@
-require "http_accept_language"
+require 'http_accept_language'
 
 module Dekiru
   module ControllerAdditions

data/lib/dekiru/helper.rb

@@ -5,7 +5,7 @@ module Dekiru
       html_options, options, name = options, name, block if block_given?
 
       classes = html_options.try(:delete, :li_class).try(:split, ' ') || []
-      classes << "active" if current_page?(options)
+      classes << 'active' if current_page?(options)
 
       obj = [options].flatten.last
       if obj.is_a?(ActiveRecord::Base)
@@ -25,7 +25,7 @@ module Dekiru
     alias nl null_check_localization
 
     def facebook_like(url = url_for(only_path: false), app_id = nil, width = 140)
-      facebook_app_id = app_id || ENV["FACEBOOK_APP_ID"]
+      facebook_app_id = app_id || ENV['FACEBOOK_APP_ID']
       html = %Q(<iframe src="//www.facebook.com/plugins/like.php?href=#{u(url)}&amp;send=false&amp;layout=button_count&amp;width=140&amp;show_faces=false&amp;action=like&amp;colorscheme=light&amp;font=arial&amp;height=21&amp;appId=#{facebook_app_id}" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:#{width}px; height:21px;" allowTransparency="true"></iframe>)
       html.html_safe
     end
@@ -47,7 +47,7 @@ EOF
     end
 
     def google_analytics(code, options = {})
-      if code.present? && ::Rails.env == "production"
+      if code.present? && ::Rails.env == 'production'
         multi_subdomain = if options[:domain]
                             "_gaq.push(['_setDomainName', '#{options[:domain]}']);"
                           end

data/lib/dekiru/job_mon_client.rb

@@ -0,0 +1,58 @@
+require 'faraday'
+require 'faraday_middleware'
+
+module Dekiru
+  class JobMonClient
+    def host
+      'https://job-mon.herokuapp.com'
+    end
+
+    def conn
+      @conn ||= Faraday.new(:url => host) do |faraday|
+        faraday.request  :url_encoded
+        faraday.request  :json
+        faraday.response :json
+        faraday.adapter  Faraday.default_adapter
+      end
+    end
+
+    def api_key
+      Dekiru.configure.monitor_api_key
+    end
+
+    def job_start(task, estimate_time, monitor_email)
+      body = {
+        job: {
+          name: task.name,
+          end_time: Time.current.since(estimate_time),
+          email: monitor_email
+        }
+      }
+      response = conn.post "/api/apps/#{api_key}/jobs.json", body
+      response.body['id']
+    rescue => e
+      Dekiru.configure.error_handle.call(e)
+      nil
+    end
+
+    def job_end(job_id)
+      if job_id
+        conn.put "/api/apps/#{api_key}/jobs/#{job_id}/finished.json"
+      end
+    end
+
+    def send_queue_log(count)
+      body = {
+        queue_log: {
+          count: count,
+          rails_env: Rails.env,
+        }
+      }
+      response = conn.post "/api/apps/#{api_key}/queue_logs.json", body
+      response.body['id']
+    rescue => e
+      Dekiru.configure.error_handle.call(e)
+      nil
+    end
+  end
+end

data/lib/dekiru/railtie.rb

@@ -11,8 +11,9 @@ module Dekiru
     end
 
     rake_tasks do
-      load "dekiru/tasks/smtp_check.rake"
-      load "dekiru/tasks/delayed_job_queue_check.rake"
+      load 'dekiru/tasks/smtp_check.rake'
+      load 'dekiru/tasks/delayed_job_queue_check.rake'
+      load 'dekiru/tasks/delayed_job_queue_monitor.rake'
     end
   end
 end

data/lib/dekiru/rake_monitor.rb

@@ -1,3 +1,5 @@
+require 'dekiru/job_mon_client'
+
 module Dekiru
   module RakeMonitor
     def resolve_args(args)
@@ -5,50 +7,20 @@ module Dekiru
       [args, estimate_time]
     end
 
-    def conn
-      @conn ||= Faraday.new(:url => 'https://job-mon.herokuapp.com') do |faraday|
-        faraday.request  :url_encoded
-        faraday.request  :json
-        faraday.response :json
-        faraday.adapter  Faraday.default_adapter
-      end
-    end
-
-    def api_key
-      Dekiru.configure.monitor_api_key
+    def client
+      @client ||= JobMonClient.new
     end
 
     def monitor_email
       Dekiru.configure.monitor_email
     end
 
-    def job_start(task, estimate_time)
-      body = {
-        job: {
-          name: task.name,
-          end_time: Time.current.since(estimate_time),
-          email: monitor_email
-        }
-      }
-      response = conn.post "/api/apps/#{api_key}/jobs.json", body
-      response.body["id"]
-    rescue => e
-      Dekiru.configure.error_handle.call(e)
-      nil
-    end
-
-    def job_end(job_id)
-      if job_id
-        response = conn.put "/api/apps/#{api_key}/jobs/#{job_id}/finished.json", nil
-      end
-    end
-
     def task_with_monitor(*args, &block)
       args, estimate_time = resolve_args(args)
       task *args do |t|
-        job_id = job_start(t, estimate_time)
+        job_id = client.job_start(t, estimate_time, monitor_email)
         block.call
-        job_end(job_id)
+        client.job_end(job_id)
       end
     end
   end

data/lib/dekiru/smtp_check_mailer.rb

@@ -10,7 +10,7 @@ module Dekiru
       Rails.logger.error "ENV['SMTP_CHECKER_TO_ADDR'] undefined!" if smtp_checker_to_addr.blank?
 
       Rails.logger.info "checkmail send start #{smtp_checker_to_addr} key:#{app_key}"
-      subject = "[SMTP Checker] SMTP Check Mail"
+      subject = '[SMTP Checker] SMTP Check Mail'
       mail to: smtp_checker_to_addr, subject: subject do |format|
         format.text { render text: app_key }
       end

data/lib/dekiru/tasks/delayed_job_queue_check.rake

@@ -1,7 +1,8 @@
 namespace :dekiru do
-  desc 'Ops check for Delayed::Job queue'
+  desc '[Deprecated] Ops check for Delayed::Job queue'
   task delayed_job_queue_check: :environment do
     Rails.logger.info "[INFO] Start dekiru:delayed_job_queue_check env:#{Rails.env}"
+    Rails.logger.warn '[WARNING] Use dekiru:delayed_job_queue_monitor'
     if defined?(Delayed::Job)
       if (count = Delayed::Job.where('run_at < ? or last_error IS NOT NULL', 30.seconds.since).count) > 0
         message = "There are #{count} jobs that are not running for Delayed::Job. Check job list!"

data/lib/dekiru/tasks/delayed_job_queue_monitor.rake

@@ -0,0 +1,13 @@
+require 'dekiru/job_mon_client'
+
+namespace :dekiru do
+  desc 'Ops monitor for Delayed::Job queue for job-mon'
+  task delayed_job_queue_monitor: :environment do
+    Rails.logger.info "[INFO] Start dekiru:delayed_job_queue_monitor env:#{Rails.env}"
+    if defined?(Delayed::Job)
+      count = Delayed::Job.where('run_at < ? or last_error IS NOT NULL', 30.seconds.since).count
+      Dekiru::JobMonClient.new.send_queue_log(count)
+    end
+    Rails.logger.info "[INFO] End dekiru:delayed_job_queue_monitor env:#{Rails.env}"
+  end
+end

data/lib/dekiru/version.rb

@@ -1,3 +1,3 @@
 module Dekiru
-  VERSION = "0.0.18"
+  VERSION = '0.0.19'
 end

data/lib/generators/dekiru/dekiru_generator.rb

@@ -1,5 +1,6 @@
 require 'rails/generators'
-require 'faraday'
+require 'dekiru/job_mon_client'
+
 class DekiruGenerator < Rails::Generators::Base
   source_root File.expand_path('../templates', __FILE__)
 
@@ -16,23 +17,18 @@ end
     end
   end
 
+  def client
+    @client ||= Dekiru::JobMonClient.new
+  end
+
   private
 
   def fetch_api_key
-    res = api_conn.post '/api/apps.json', { app: { name: fetch_app_name } }
+    res = client.conn.post '/api/apps.json', app: { name: fetch_app_name }
     res.body['api_key']
   end
 
   def fetch_app_name
     File.basename(Rails.root)
   end
-
-  def api_conn
-    @conn ||= Faraday.new(url: 'https://job-mon.herokuapp.com') do |faraday|
-      faraday.request  :url_encoded
-      faraday.request  :json
-      faraday.response :json
-      faraday.adapter  Faraday.default_adapter
-    end
-  end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dekiru
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
 platform: ruby
 authors:
 - Akihiro Matsumura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-12 00:00:00.000000000 Z
+date: 2017-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http_accept_language
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  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: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -124,13 +138,16 @@ files:
 - Rakefile
 - dekiru.gemspec
 - lib/dekiru.rb
+- lib/dekiru/capybara/helpers.rb
 - lib/dekiru/configure.rb
 - lib/dekiru/controller_additions.rb
 - lib/dekiru/helper.rb
+- lib/dekiru/job_mon_client.rb
 - lib/dekiru/railtie.rb
 - lib/dekiru/rake_monitor.rb
 - lib/dekiru/smtp_check_mailer.rb
 - lib/dekiru/tasks/delayed_job_queue_check.rake
+- lib/dekiru/tasks/delayed_job_queue_monitor.rake
 - lib/dekiru/tasks/smtp_check.rake
 - lib/dekiru/version.rb
 - lib/generators/dekiru/dekiru_generator.rb
@@ -155,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Usefull helper methods for Ruby on Rails