file_crawler 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56b1c0421bfe77a692ac4fe8cce0fc983efbdffb
-  data.tar.gz: 98bd4a1017ee31dc96e7292a562db54e350dcd89
+  metadata.gz: 4e77bb0b7e6727a74e536b0c5f6acaf24b69d9ec
+  data.tar.gz: ca8781f50a9fc79273f8de5170bb4e40d36f7c3c
 SHA512:
-  metadata.gz: 756de8dbc1e566231d4865785ac34e2b151157e4c19df0c1e40f5f4769baaa695acc58a774aa010683e55a1427c5784f201ca46d40096b8092414c1d7e4b2f44
-  data.tar.gz: 2046ac2818fac0e19b00b3d853b6dae4f42b2e85cffdeb41bc124a4d848a6d08eea8db7603b9f059d754bcd7c3591fa8de84951b7482e19f26135bbd19cb1dc4
+  metadata.gz: 754443d6750b069567be5988e6c54603ab0d34bedb1b38c2336412de1c192bda2f3010a689090321358020119f60f9bbc8708a24deb774e7eac074d8e1704ca1
+  data.tar.gz: 25e8ee3a47612156cf55e6cd1c9213b9519483e591fbd8b312594af6ba22693ddb7ed05c55146602c645edab2141d837b782137500d96a20bd6bc7a133c36b96

data/lib/file_crawler/finder.rb

@@ -77,6 +77,12 @@ module FileCrawler
     }.flatten
 
     finder = FileCrawler::Finder.new
+    unless conditions[:regexs].nil?
+      conditions[:regexs].each {|regex|
+        finder.regexs << regex
+      }
+    end
+
     finder.collect(files, conditions)
   end
 

data/lib/file_crawler/finder/command/collect.rb

@@ -1,22 +1,46 @@
 module FileCrawler
+  class Regex
+    attr_accessor :regexp_start, :regexp_end
+
+    def initialize(regexp_start, regexp_end)
+      @regexp_start = regexp_start
+      @regexp_end = regexp_end
+    end
+
+    def pattern
+      /#{Regexp.escape(regexp_start)}(.+)#{Regexp.escape(regexp_end)}/
+    end
+
+    def to_s
+      "#<#{self.class.name}: start='#{regexp_start}', end='#{regexp_end}'"
+    end
+  end
+
   class Finder
     module Command
       module Collect
 
+        attr_accessor :regexs
+
+        def regexs
+          @regexs ||= []
+        end
+
         def collect(file_paths, conditions = {})
           collection = collect_into_filename(file_paths)
 
-          case
-          when !conditions[:unique].nil?
-            collection = unique_in_collection(collection)
-          end
-
           collection
         end
 
-        def split_for_collect(string)
-          pattern = /[\p{Hiragana}|\p{Katakana}|\p{Han}|[a-zA-Z0-9]ー]+/
-          return string.scan(pattern)
+        def decide_index_for_collect(string)
+          if !regexs.empty?
+            regexs.each {|regex|
+              return $1 unless regex.pattern.match(string).nil?
+            }
+          end
+
+          pattern = /[\p{Hiragana}|\p{Katakana}|\p{Han}|[a-zA-Z0-9]ー 　]+/
+          return string.strip.scan(pattern).first
         end
 
         def collect_into_filename(file_paths)
@@ -24,23 +48,9 @@ module FileCrawler
 
           file_paths.each {|file_path|
             filename = File.basename(file_path)
-            split_for_collect(filename).each {|term|
-              hash[term] ||= []
-              hash[term] << file_path
-            }
-          }
-
-          hash
-        end
-
-        def unique_in_collection(collection)
-          hash = {}
-
-          collection.sort {|(k1, v1), (k2, v2)|
-            v2.size <=> v1.size && k1 <=> k2
-          }.each {|term, file_paths|
-            selection = file_paths.select {|v| !hash.values.flatten.include?(v) }
-            hash[term] = selection unless selection.empty?
+            term = decide_index_for_collect(filename)
+            hash[term] ||= []
+            hash[term] << file_path
           }
 
           hash

data/lib/file_crawler/version.rb

@@ -1,3 +1,3 @@
 module FileCrawler
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: file_crawler
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Hirohisa Kawasaki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-28 00:00:00.000000000 Z
+date: 2016-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler