dekiru 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53ac90388f6a6f6d56a8e61897f62c4963e78250731f004f9a8eb21105b20c0d
-  data.tar.gz: d6b94ccc5a44ef605c652aa78a28c40ef72da2262f3024471f325da851f65cf7
+  metadata.gz: dbfeff250b0e1ec21cc8ed1f4ccf284ac5430ad41be129f0f04a6fa73b6f36b7
+  data.tar.gz: dc7557d4f6a91491fad5cd70d938a0050e8b98405ded870825564ee037401156
 SHA512:
-  metadata.gz: a367514ad2e6d1f761f9b8f69893b25cbe785596be1ee3c978e9e31842d448cbc77a8ae37888a3306fab83c6d6b122b5898c54e90fd8326708ea2eb7c10a30f2
-  data.tar.gz: 2c2f24e2d8419d073563fd46f42da3df0d265c6c92d9de1fc5477c9d75ba6539968672519a00de7d699b56b267cdb10b990106bf68438cff00cca060e9b42286
+  metadata.gz: 447ab174db16c187dab03db7ecef25d217036ea688442c5594dd0d82382cde3bf2ce10e6e7fb27382b6f9702d4c7292fe01c583f7055cd365921f1bf97d4f1ed
+  data.tar.gz: 723725e05e52c1beef024d39787c2dd5c834b14e1c5c7d18374c0dea57c4bf6441c1e618d8287c5bb44210865ea9b7d63eb554486f5293fa19c78f9a7e280d92

data/lib/dekiru/helper.rb

@@ -1,82 +1,8 @@
 module Dekiru
   module Helper
-    def menu_link_to(name = nil, options = nil, html_options = nil, &block)
-      ActiveSupport::Deprecation.warn('`menu_link_to` is deprecated and will be removed in v0.4.')
-
-      args = [name, options, html_options]
-      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)
-
-      obj = [options].flatten.last
-      if obj.is_a?(ActiveRecord::Base)
-        content_tag_for(:li, obj, :class => classes.join(' ')) do
-          link_to name, options, html_options, &block
-        end
-      else
-        content_tag(:li, :class => classes.join(' ')) do
-          link_to *args, &block
-        end
-      end
-    end
-
     def null_check_localization(object, **options)
       localize(object, **options) if object.present?
     end
     alias nl null_check_localization
-
-    def facebook_like(url = url_for(only_path: false), app_id = nil, width = 140)
-      ActiveSupport::Deprecation.warn('`facebook_like` is deprecated and will be removed in v0.4.')
-
-      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
-
-    def twitter_tweet
-      ActiveSupport::Deprecation.warn('`twitter_tweet` is deprecated and will be removed in v0.4.')
-
-      html = <<-EOF
-<a href="https://twitter.com/share" class="twitter-share-button">Tweet</a>
-<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script>
-EOF
-      html.html_safe
-    end
-
-    def google_plus
-      ActiveSupport::Deprecation.warn('`google_plus` is deprecated and will be removed in v0.4.')
-
-      html = <<-EOF
-<script type="text/javascript" src="https://apis.google.com/js/plusone.js"></script>
-<g:plusone size="medium"></g:plusone>
-EOF
-      html.html_safe
-    end
-
-    def google_analytics(code, options = {})
-      ActiveSupport::Deprecation.warn('`google_analytics` is deprecated and will be removed in v0.4.')
-
-      if code.present? && ::Rails.env == 'production'
-        multi_subdomain = if options[:domain]
-                            "_gaq.push(['_setDomainName', '#{options[:domain]}']);"
-                          end
-
-        html = <<-EOF
-<script type="text/javascript">
-  var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', '#{code}']);
-    #{multi_subdomain}
-    _gaq.push(['_trackPageview']);
-  (function() {
-    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-  })();
-</script>
-EOF
-        html.html_safe
-      end
-    end
   end
 end

data/lib/dekiru/railtie.rb

@@ -4,10 +4,6 @@ module Dekiru
       ActiveSupport.on_load(:action_view) do
         ::ActionView::Base.send :include, Dekiru::Helper
       end
-
-      ActiveSupport.on_load(:action_controller) do
-        ::ActionController::Base.send :include, Dekiru::ControllerAdditions
-      end
     end
 
     config.after_initialize do
@@ -19,7 +15,6 @@ module Dekiru
     end
 
     rake_tasks do
-      load 'dekiru/tasks/smtp_check.rake'
       load 'dekiru/tasks/db.rake'
     end
   end

data/lib/dekiru/validators/existence.rb

@@ -8,6 +8,8 @@ module ActiveModel
   module Validations
     class ExistenceValidator < EachValidator
       def validate_each(record, attribute, value)
+        ActiveSupport::Deprecation.warn('`ExistenceValidator` is deprecated and will be removed in v0.5. Please use `inclusion: { in: xx }` instead.')
+
         unless exists?(record, value)
           record.errors.add(attribute, :existence, **options.except(:in).merge!(value: value))
         end

data/lib/dekiru/version.rb

@@ -1,3 +1,3 @@
 module Dekiru
-  VERSION = '0.3.3'
+  VERSION = '0.4.0'
 end

data/lib/dekiru.rb

@@ -1,7 +1,6 @@
 require 'dekiru/version'
 require 'dekiru/railtie' if defined?(::Rails)
 require 'dekiru/helper'
-require 'dekiru/controller_additions'
 require 'dekiru/validators/existence'
 require 'dekiru/data_migration_operator'
 require 'dekiru/mail_security_interceptor'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dekiru
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Akihiro Matsumura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-15 00:00:00.000000000 Z
+date: 2022-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http_accept_language
@@ -143,15 +143,12 @@ files:
 - lib/dekiru/capybara/helpers/wait_for_position_stable.rb
 - lib/dekiru/capybara/legacy_helpers.rb
 - lib/dekiru/capybara/matchers.rb
-- lib/dekiru/controller_additions.rb
 - lib/dekiru/data_migration_operator.rb
 - lib/dekiru/helper.rb
 - lib/dekiru/mail_security_interceptor.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
 - lib/generators/maintenance_script/USAGE
@@ -159,7 +156,6 @@ files:
 - lib/generators/maintenance_script/templates/maintenance_script.rb.erb
 - 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
 - spec/dekiru/validators/existence_spec.rb
 - spec/spec_helper.rb
@@ -190,7 +186,6 @@ 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
 - spec/dekiru/validators/existence_spec.rb
 - spec/spec_helper.rb

data/lib/dekiru/controller_additions.rb

@@ -1,25 +0,0 @@
-require 'http_accept_language'
-
-module Dekiru
-  module ControllerAdditions
-    def set_locale
-      ActiveSupport::Deprecation.warn('`set_locale` is deprecated and will be removed in v0.4.')
-
-      I18n.locale = locale_from_params || locale_from_header
-      logger.info "[locale] #{I18n.locale}"
-    end
-
-    def locale_from_params
-      ActiveSupport::Deprecation.warn('`locale_from_params` is deprecated and will be removed in v0.4.')
-
-      (I18n.available_locales & [params[:locale].try(:to_sym)]).first
-    end
-
-    def locale_from_header
-      ActiveSupport::Deprecation.warn('`locale_from_header` is deprecated and will be removed in v0.4.')
-
-      logger.debug "[debug] #{http_accept_language.user_preferred_languages}"
-      http_accept_language.compatible_language_from(I18n.available_locales)
-    end
-  end
-end

data/lib/dekiru/smtp_check_mailer.rb

@@ -1,20 +0,0 @@
-module Dekiru
-  class SmtpCheckMailer < ActionMailer::Base
-    default from: 'smtp-checker@sonicgarden.jp'
-
-    def checkmail
-      app_key = ENV['SMTP_CHECKER_APP_KEY'] || Rails.application.class.parent_name.downcase
-      smtp_checker_to_addr = ENV['SMTP_CHECKER_TO_ADDR'] || 'smtp-alive@sg-ops-mail.sonicgarden.jp'
-
-      Rails.logger.error "ENV['SMTP_CHECKER_APP_KEY'] undefined!" if app_key.blank?
-      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'
-      mail to: smtp_checker_to_addr, subject: subject do |format|
-        format.text { render plain: app_key }
-      end
-      Rails.logger.info "send to #{smtp_checker_to_addr} key:#{app_key}"
-    end
-  end
-end

data/lib/dekiru/tasks/smtp_check.rake

@@ -1,10 +0,0 @@
-require "dekiru/smtp_check_mailer"
-
-namespace :dekiru do
-  desc 'Ops check for smpt alival'
-  task smtp_check: :environment do
-    Rails.logger.info "[INFO] Start task dekiru:smtp_check env:#{Rails.env}"
-    Dekiru::SmtpCheckMailer.checkmail.deliver
-    Rails.logger.info "[INFO] End task dekiru:smtp_check env:#{Rails.env}"
-  end
-end

data/spec/dekiru/helper_spec.rb

@@ -1,49 +0,0 @@
-require "spec_helper"
-
-describe Dekiru::Helper do
-  let(:helper) do
-    class AClass
-      include Dekiru::Helper
-      include ActionView::Helpers::TagHelper
-      include ActionView::Context
-      include ActionView::Helpers::UrlHelper
-    end
-    a = AClass.new
-  end
-  describe "#menu_link_to" do
-    before do
-      allow(helper).to receive(:current_page?).and_return(true)
-    end
-    context "一番シンプルな呼び出し" do
-      it "動くこと" do
-        expect(helper.menu_link_to("テキスト", "/some_path")).to eq("<li class=\"active\"><a href=\"/some_path\">テキスト</a></li>")
-      end
-    end
-    context "blockなし" do
-      it "動くこと" do
-        expect(helper.menu_link_to("テキスト", "/some_path", class: "some_class")).to eq("<li class=\"active\"><a class=\"some_class\" href=\"/some_path\">テキスト</a></li>")
-      end
-    end
-    context "blockあり" do
-      it "動くこと" do
-        html = helper.menu_link_to("/some_path", class: "some_class") do
-          "テキスト"
-        end
-        expect(html).to eq("<li class=\"active\"><a class=\"some_class\" href=\"/some_path\">テキスト</a></li>")
-      end
-    end
-    context "今のページじゃない" do
-      before do
-        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>")
-      end
-    end
-    context "li_class指定あり" do
-      it "動くこと" do
-        expect(helper.menu_link_to("テキスト", "/some_path", class: "some_class", li_class: "li_class")).to eq("<li class=\"li_class active\"><a class=\"some_class\" href=\"/some_path\">テキスト</a></li>")
-      end
-    end
-  end
-end