kamome 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 580db2ebe5e52ce51d8014ad886247ef89ae3ab9f8bccb82397a3c3ce0a15e75
-  data.tar.gz: 0605ca8f9f680d15fb87b2396e4f8db0930a8d3984ee18eaa5b3b95d51ec9a8b
+  metadata.gz: 35ffe91d4c66bc1f179e7db9980ecbf6800633de1af8f3de76645dffb926d423
+  data.tar.gz: 5e373d056502af1d4f6b1ca51d0ca44d2adf26daaef07d706e79ca115472fd9a
 SHA512:
-  metadata.gz: 6a2cd80afb342ff0ca2f68ff769a6f11b478dc06e5514d836142763102cff983a9760fa9bea9334d59fd76744a09c766a727cad3a5f79e52719a5c89330b9fa1
-  data.tar.gz: 2e17669f0e652e42ba98f8429ca034d5d770b0b7ba5bd5e0380402b05a7ad7d7d3883aa3c57738cbb638e376722eef40e656fc9f56d92f2e0ce98aa9318194e2
+  metadata.gz: 4b41f5d5424612e149377fd3deff5b29e5cfe5e88addca51f89c49deeabe3a0e50111686a429f1ce0b314239fe5508222fc06f8277fd5adb10095961c8bc9c52
+  data.tar.gz: 759139eb2ce52cd217b576f814fae768e78af52f330a6d78bafee4502270157a34e1a058e438411a227bfd8035276b16ac9a2ce1ee80f6540a67bb8faa6d6c5d

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelogs
 
-## 2018/12/01
+## v0.9.0
 
-First implementation
+* Fixed [Unexpected town value](https://github.com/kengos/kamome/issues/1)
+  * Skip `block.call` in the case of `#ambisous_town` is true and is not a first appearance　model
+* Drop support `type: :hash`
+* Support `throw :break` in passed block
+  ```rb
+  Kamome::import_general_all do |model, lineno|
+    throw :break if lineno > 10
+    # Do not use `break` without `throw`
+    # break if lineno > 10
+  end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kamome (0.8.0)
+    kamome (0.9.0)
       rubyzip (~> 1.2)
 
 GEM

data/README.md

@@ -17,7 +17,7 @@ end
 * 全国一括 (全件, 差分)
 * 事業所(全件, 差分)
 
-各CSVは共通のモデルにマッピングされます(type オプションで詳細なモデル or Hashに変更可能)
+各CSVは共通のモデルにマッピングされます(type オプションで詳細なモデルに変更可能)
 
 詳細は [Kamome::Models::Address](https://github.com/kengos/kamome/blob/master/lib/kamome/models/address.rb) を参照してください
 
@@ -85,12 +85,6 @@ end
 
 ### `Kamome.import_xxx` の model の型を変換したい
 
-#### Hash にする場合
-
-```rb
-Kamome.import_general_all(type: :hash or Kamome::Operation::TYPE_HASH)
-```
-
 #### DetailModel にする場合
 
 ```rb

data/lib/kamome/csv_handler.rb

@@ -11,9 +11,13 @@ module Kamome
     end
 
     def call(csv_path)
+      prev = nil
       ::CSV.foreach(csv_path) do |row|
         obj = transform(row)
-        yield(obj, $INPUT_LINE_NUMBER) if block_given?
+        next if skip?(prev, obj)
+
+        yield(obj, $INPUT_LINE_NUMBER)
+        prev = obj
       end
     end
 
@@ -24,10 +28,7 @@ module Kamome
     end
 
     def transformed_method
-      return :generate_hash if @operation.type_hash?
-      return :generate_detail_model if @operation.type_detail?
-
-      :generate_model
+      @operation.type_detail? ? :generate_detail_model : :generate_model
     end
 
     def transformer
@@ -41,5 +42,12 @@ module Kamome
     def general_transformer
       ::Kamome::Transformations::GeneralCsv.new
     end
+
+    def skip?(previous, current)
+      return false unless previous.respond_to?(:ambiguous_town)
+      return false unless previous.ambiguous_town
+
+      previous.zipcode == current.zipcode
+    end
   end
 end

data/lib/kamome/loader.rb

@@ -10,6 +10,9 @@ module Kamome
       @config = config
     end
 
+    # @params [Operation] Kamome::Operation
+    # @yield [model, lineno] Any logic you want to execute
+    #    Don't pass `-> { break }`, use `-> { throw :break }
     # @return [Array] csv digest
     def call(operation:, &block)
       operation.urls.map do |url|
@@ -29,7 +32,9 @@ module Kamome
     end
 
     def call_csv_handler(operation, csv_path, &block)
-      ::Kamome::CsvHandler.new(operation).call(csv_path, &block)
+      catch(:break) do
+        ::Kamome::CsvHandler.new(operation).call(csv_path, &block)
+      end
       ::Digest::SHA256.file(csv_path).to_s
     ensure
       csv_path.delete if @config.cleanup

data/lib/kamome/models/address.rb

@@ -51,6 +51,12 @@ module Kamome
       #   @return [Integer]
       attr_accessor :state
 
+      # @!attribute [rw] ambiguous_town
+      #   一町域が二以上の郵便番号で表される場合 true
+      #   genre: :general のみ
+      #   @return [Boolean]
+      attr_accessor :ambiguous_town
+
       STATE_NOT_CHANGE = 0
       STATE_UPDATE = 1
       STATE_DELETE = 2
@@ -73,7 +79,8 @@ module Kamome
           street: street,
           company_name: company_name,
           post_office_box: post_office_box,
-          state: state
+          state: state,
+          ambiguous_town: ambiguous_town
         }
       end
 

data/lib/kamome/operation.rb

@@ -2,7 +2,6 @@
 
 module Kamome
   class Operation
-    TYPE_HASH = :hash
     TYPE_DETAIL = :detail
     TYPE_DEFAULT = :default
 
@@ -56,10 +55,6 @@ module Kamome
       @urls = urls
     end
 
-    def type_hash?
-      type == TYPE_HASH
-    end
-
     def type_detail?
       type == TYPE_DETAIL
     end

data/lib/kamome/transformations/general_csv.rb

@@ -66,7 +66,8 @@ module Kamome
           street: '',
           company_name: '',
           post_office_box: '',
-          state: attributes[:state]
+          state: attributes[:state],
+          ambiguous_town: attributes[:ambiguous_town]
         }
       end
     end

data/lib/kamome/transformations/jigyosho_csv.rb

@@ -69,7 +69,8 @@ module Kamome
           street: attributes[:street],
           company_name: attributes[:company_name],
           post_office_box: attributes[:post_office_box],
-          state: convert_state(attributes[:state])
+          state: convert_state(attributes[:state]),
+          ambiguous_town: false
         }
       end
 

data/lib/kamome/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Kamome
-  VERSION = '0.8.0'
+  VERSION = '0.9.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kamome
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - kengos
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-01 00:00:00.000000000 Z
+date: 2018-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -184,5 +184,5 @@ rubyforge_project:
 rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
-summary: kamome-0.8.0
+summary: kamome-0.9.0
 test_files: []