ken_all 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c4a38011a2ea5df20a281b8cd2c10a6b830d994d95ecd1837eb5209aebaf9de
-  data.tar.gz: 00ff3b1ee9297e427d87c4d48d9263f30336574591dee693cf7141e23b0933d5
+  metadata.gz: 55d4a1ede60427c136f5c6a2cbf2388f8f098f60e0846e53f0847a2abe17307b
+  data.tar.gz: 2a98902d3d74ddfad2d137db398e7e7131fcef7a4d072f91c2dfb67454cd3887
 SHA512:
-  metadata.gz: 10f8e73f52f9cfd0798b6c8b512aee056d051149bf21509946d080151a6e14bfdea23085054e2a0da16dd86d918217168c9bab1ab1d456cdec44d100c0748005
-  data.tar.gz: cb9b7a292108fc89314df139d8d0592b2cdfe8eb56213dc605c64b47851571ff430c5389549aae880389204982a982e6ad67fd97f1cfd04a37134f07e2f71549
+  metadata.gz: 9d00c447625c7906fa08402868c852d7c6f2679cf25007ed0f95bac311c55b33662a9bc3b47b2189437bc38b6fca9142a2b565fa66894bcb58a7ac763fe99723
+  data.tar.gz: b89914e04419fa13ec8e5f979c0af460515f48c499c5ff143763d2cab235f0ba6c89d6540a3ae37ef2dc8d7ea384227015e5e2a81878e373fb6c413382987b0a

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    ken_all (0.3.0)
-      activerecord-import (~> 0.4)
+    ken_all (0.4.0)
+      activerecord-import (>= 0.4)
       curses (~> 1.0)
       rails (>= 3.0.9)
       rubyzip (>= 1.2)
@@ -10,107 +10,107 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.3)
-      actionpack (= 5.2.3)
+    actioncable (5.2.4.2)
+      actionpack (= 5.2.4.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.3)
-      actionpack (= 5.2.3)
-      actionview (= 5.2.3)
-      activejob (= 5.2.3)
+    actionmailer (5.2.4.2)
+      actionpack (= 5.2.4.2)
+      actionview (= 5.2.4.2)
+      activejob (= 5.2.4.2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.3)
-      actionview (= 5.2.3)
-      activesupport (= 5.2.3)
-      rack (~> 2.0)
+    actionpack (5.2.4.2)
+      actionview (= 5.2.4.2)
+      activesupport (= 5.2.4.2)
+      rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.3)
-      activesupport (= 5.2.3)
+    actionview (5.2.4.2)
+      activesupport (= 5.2.4.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.3)
-      activesupport (= 5.2.3)
+    activejob (5.2.4.2)
+      activesupport (= 5.2.4.2)
       globalid (>= 0.3.6)
-    activemodel (5.2.3)
-      activesupport (= 5.2.3)
-    activerecord (5.2.3)
-      activemodel (= 5.2.3)
-      activesupport (= 5.2.3)
+    activemodel (5.2.4.2)
+      activesupport (= 5.2.4.2)
+    activerecord (5.2.4.2)
+      activemodel (= 5.2.4.2)
+      activesupport (= 5.2.4.2)
       arel (>= 9.0)
-    activerecord-import (0.28.2)
+    activerecord-import (1.0.5)
       activerecord (>= 3.2)
-    activestorage (5.2.3)
-      actionpack (= 5.2.3)
-      activerecord (= 5.2.3)
+    activestorage (5.2.4.2)
+      actionpack (= 5.2.4.2)
+      activerecord (= 5.2.4.2)
       marcel (~> 0.3.1)
-    activesupport (5.2.3)
+    activesupport (5.2.4.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     arel (9.0.0)
-    builder (3.2.3)
-    concurrent-ruby (1.1.5)
-    crass (1.0.5)
-    curses (1.3.1)
+    builder (3.2.4)
+    concurrent-ruby (1.1.6)
+    crass (1.0.6)
+    curses (1.3.2)
     diff-lcs (1.3)
     erubi (1.9.0)
     ffi (1.11.1)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    i18n (1.7.0)
+    i18n (1.8.2)
       concurrent-ruby (~> 1.0)
     listen (3.2.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.3.0)
+    loofah (2.5.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
-    method_source (0.9.2)
-    mimemagic (0.3.3)
+    method_source (1.0.0)
+    mimemagic (0.3.5)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    minitest (5.12.2)
+    minitest (5.14.1)
     nio4r (2.5.2)
-    nokogiri (1.10.4)
+    nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
-    rack (2.0.7)
+    rack (2.2.2)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.2.3)
-      actioncable (= 5.2.3)
-      actionmailer (= 5.2.3)
-      actionpack (= 5.2.3)
-      actionview (= 5.2.3)
-      activejob (= 5.2.3)
-      activemodel (= 5.2.3)
-      activerecord (= 5.2.3)
-      activestorage (= 5.2.3)
-      activesupport (= 5.2.3)
+    rails (5.2.4.2)
+      actioncable (= 5.2.4.2)
+      actionmailer (= 5.2.4.2)
+      actionpack (= 5.2.4.2)
+      actionview (= 5.2.4.2)
+      activejob (= 5.2.4.2)
+      activemodel (= 5.2.4.2)
+      activerecord (= 5.2.4.2)
+      activestorage (= 5.2.4.2)
+      activesupport (= 5.2.4.2)
       bundler (>= 1.3.0)
-      railties (= 5.2.3)
+      railties (= 5.2.4.2)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    railties (5.2.3)
-      actionpack (= 5.2.3)
-      activesupport (= 5.2.3)
+    railties (5.2.4.2)
+      actionpack (= 5.2.4.2)
+      activesupport (= 5.2.4.2)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
-    rake (13.0.0)
+    rake (13.0.1)
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
       ffi (~> 1.0)
@@ -131,7 +131,7 @@ GEM
       rspec-mocks (~> 3.9.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.0)
-    rubyzip (2.0.0)
+    rubyzip (2.3.0)
     sprockets (4.0.0)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -140,9 +140,9 @@ GEM
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     sqlite3 (1.4.1)
-    thor (0.20.3)
+    thor (1.0.1)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
     websocket-driver (0.7.1)
       websocket-extensions (>= 0.1.0)
@@ -154,7 +154,7 @@ PLATFORMS
 DEPENDENCIES
   ken_all!
   listen
-  rails (~> 5.2)
+  rails (= 5.2.4.2)
   rspec-rails
   sqlite3
 

data/ken_all.gemspec

@@ -20,12 +20,12 @@ Gem::Specification.new do |s|
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ['lib']
 
-  s.add_dependency "activerecord-import","~> 0.4"
+  s.add_dependency "activerecord-import",">= 0.4"
   s.add_dependency "rails", ">= 3.0.9"
   s.add_dependency "rubyzip", '>= 1.2'
   s.add_dependency "curses", '~> 1.0'
   s.add_development_dependency 'listen'
   s.add_development_dependency "sqlite3"
   s.add_development_dependency "rspec-rails"
-  s.add_development_dependency 'rails', '~> 5.2'
+  s.add_development_dependency 'rails', '5.2.4.2'
 end

data/lib/ken_all/import.rb

@@ -7,18 +7,18 @@ module KenAll
   class Import
     URI = "http://www.post.japanpost.jp/zipcode/dl/kogaki/zip/ken_all.zip"
 
-    def initialize(opt = {visualize: true})
+    def initialize(opt = { visualize: true })
       @visualizer = KenAll::Visualizer.new(opt[:visualize])
-      if old_schema?
-        error = <<EOS
-KenAll Error.
-This project is using old schema information.
-Type First.
-$ rake ken_all:install:migrations
-$ rake db:migrate
-EOS
-        raise KenAll::OldSchemaException.new(error)
-      end
+      return unless old_schema?
+
+      error = <<~ERROR
+        KenAll Error.
+        This project is using old schema information.
+        Type First.
+        $ rake ken_all:install:migrations
+        $ rake db:migrate
+      ERROR
+      raise KenAll::OldSchemaException.new(error)
     end
 
     def from_net
@@ -97,9 +97,11 @@ EOS
       end
     end
 
-    def old_schema?
-      column = KenAll::PostalCode.columns.select{|v| v.name == 'address1'}.first
-      !(column.sql_type =~ /text/)
-    end
+    private
+
+      def old_schema?
+        column = KenAll::PostalCode.columns.find { |v| v.name == 'address1' }
+        column.sql_type !~ /text/
+      end
   end
 end

data/lib/ken_all/version.rb

@@ -1,3 +1,3 @@
 module KenAll
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/spec/lib/ken_all_spec.rb

@@ -97,7 +97,7 @@ EOS
   context 'スキーマ情報が古い場合' do
     let(:column){ double('Column', sql_type: 'varchar(255)') }
     before do
-      allow(KenAll::PostalCode.columns).to receive(:select) { [column] }
+      allow(KenAll::PostalCode.columns).to receive(:find) { column }
     end
     it '例外が発生すること' do
       expect {KenAll::Import.new}.to raise_error(KenAll::OldSchemaException)

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: ken_all
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Yamamoto Kazuhisa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-16 00:00:00.000000000 Z
+date: 2020-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-import
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.4'
 - !ruby/object:Gem::Dependency
@@ -112,16 +112,16 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: 5.2.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: 5.2.4.2
 description: Japanese postal code tools.
 email:
 - ak.hisashi@gmail.com