file_char_licker 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3b866c0fa7744a9271df7c9f32968b8ea2737d7
-  data.tar.gz: 914c17b71accea0fe80eb1af1bc0763d7115d673
+  metadata.gz: bf3b8c9a367c2d28f48e5adde7f0c04e7b20af6c
+  data.tar.gz: 5d6475d1a9d874f29e4cf66ca3cf5a1853277cf7
 SHA512:
-  metadata.gz: 39c34431afbe701713ed8616430d4e25ee3583ed2953c784c28c2a0212871cea95c013858880bab9415e6d529bf486b4fcbfcf3a0d1fdefe6064dfbb9a0fd624
-  data.tar.gz: cd3d7d859f29780d5e19e6a63d85b062b3696d7602108f9c9038c2f897c63ebccc4c3b1c24f83e759331a2cd52a72595f4eb2244fdb9aa395a44127fa8901a50
+  metadata.gz: 2214067d8af2c76c1764183a344c57090026529b7bbd0dad61d9d15cdf15a0ee3c15cc689e44be12ee94afea5dafaa337f54423f6f911f6db59932e140751acf
+  data.tar.gz: e422469995a70ed487854316b545dc3fe6e6ca7c078ca131bee52192ea3e4a18b82db0841a8e7cbeb039f0e1cbfa3c5028bb34137c50a1d4005befe136921370

data/README.ja.md

@@ -92,9 +92,7 @@ file.scan_contiguous_min(needle)
 
 移動成功時、そのポインタ位置を格納した Integer オブジェクトを返します。正しく移動できなかった場合 (前方に一致する行がなかった場合) 、 nil が返ります。
 
-実行時のファイルポインタは、行頭を想定しています。
-
-### seek_contiguous_max(*args)
+### seek_contiguous_max
 
 ```ruby
 file.scan_contiguous_min(needle)
@@ -104,8 +102,6 @@ file.scan_contiguous_min(needle)
 
 移動成功時、そのポインタ位置を格納した Integer オブジェクトを返します。正しく移動できなかった場合 (後方に一致する行がなかった場合) 、 nil が返ります。
 
-実行時のファイルポインタは、行頭を想定しています。
-
 ### seek_line_head
 
 ```ruby

data/README.md

@@ -93,9 +93,7 @@ move the position of file pointer to the start of line that matched the _needle_
 
 return Integer object for the position of file pointer if succeed to move. else return nil.
 
-I assume that the position of file pointer is start of line in run.
-
-### seek_contiguous_max(*args)
+### seek_contiguous_max
 
 ```ruby
 file.scan_contiguous_min(needle)
@@ -105,8 +103,6 @@ move the position of file pointer to the end of line that matched the _needle_ a
 
 return Integer object for the position of file pointer if succeed to move. else return nil.
 
-I assume that the position of file pointer is start of line in run.
-
 ### seek_line_head
 
 ```ruby
@@ -117,4 +113,4 @@ move the position of file pointer to the head of line.
 
 ## Author
 
-[indeep-xyz](http://indeep.xyz/)
+[indeep-xyz](http://indeep.xyz/) (Japanese language)

data/lib/file_char_licker/licker/licker.rb

@@ -31,11 +31,19 @@ module FileCharLicker
       file.seek(pos)
       max = seek_contiguous_max(needle) || pos
 
+      # for debug
+      # p [
+      #     pos: pos,
+      #     min: min,
+      #     max: max
+      #   ].to_s
+      # sleep 0.05
+
       # read
       # - require succeed scan processes
       if max > min
         file.seek(min)
-        result = file.read(max - min).chomp
+        result = file.read(max - min)
       end
 
       result
@@ -77,13 +85,17 @@ module FileCharLicker
 
         char = backward_char
 
-        break if char.nil?
+        if char.nil?
+          file.rewind
+          break
+        end
 
         # backward pos as bytesize of char
         file.seek(-(char.bytesize), IO::SEEK_CUR)
 
-        result.insert(0, char)
         break if char.match(reg) && result.scan(reg).size > size
+
+        result.insert(0, char)
       end
 
       result
@@ -131,6 +143,9 @@ module FileCharLicker
       file     = @file
       max      = nil
 
+      # move to head of line
+      seek_line_head
+
       loop do
 
         # file#pos before #forward_lines
@@ -141,9 +156,9 @@ module FileCharLicker
 
         # for debug
         # p [
-        #   lines: lines,
+        #       lines: lines,
         #   lines_pos: lines_pos,
-        #   file_pos: file.pos
+        #    file_pos: file.pos
         #   ].to_s
         # sleep 0.05
 
@@ -153,17 +168,28 @@ module FileCharLicker
 
         lines_end_pos = str_byte_index(lines, /(\r\n|\r|\n)+?/, lines_pos)
 
-        if file.eof?
-          max = (lines_end_pos.nil?) ? file.size : pos_old + lines_end_pos
+        if lines_end_pos.nil?
+          max = file.size if file.eof?
           break
-        else
-          max = pos_old + lines_end_pos
-
-          break if lines_end_pos < lines.bytesize - 1
         end
 
+        max = pos_old + lines_end_pos
+
+        # for debug
+        # p [
+        #           lines: lines,
+        # lines_bytesize: lines.bytesize,
+        #       lines_pos: lines_pos,
+        #   lines_end_pos: lines_end_pos,
+        #        file_pos: file.pos
+        #   ].to_s
+        # sleep 0.05
+
+        break if file.eof?
+        break if lines_end_pos < lines.size - 1
       end
 
+      file.seek(max) unless max.nil?
       max
     end
 
@@ -182,6 +208,9 @@ module FileCharLicker
       file = @file
       min  = nil
 
+      # move to head of line
+      seek_line_head
+
       loop do
 
         lines     = backward_lines(step_lines)
@@ -200,11 +229,16 @@ module FileCharLicker
           break
         else
 
-          min = file_pos + lines_pos
+          min  = file_pos + lines_pos
+
+          # if not first line, add 1 to result
+          min += 1 if file_pos > 0
+
           break if lines_pos > 0 || file_pos < 1
         end
       end
 
+      file.seek(min) unless min.nil?
       min
     end
 

data/lib/file_char_licker/licker/mb_licker.rb

@@ -16,6 +16,9 @@ module FileCharLicker
     def around_lines(*args)
 
       lines = super(*args)
+      # p @nkf_option
+      # p NKF.nkf('-w', lines)
+      # p lines
       NKF.nkf(@nkf_option, lines)
     end
 
@@ -82,7 +85,13 @@ module FileCharLicker
       mb_idx = haystack.index(needle, offset)
 
       unless mb_idx.nil?
-        result = haystack.slice(0..mb_idx).bytesize - 1
+
+        if mb_idx < 1
+          result = 0
+        else
+          matched = haystack.slice(0..mb_idx)
+          result  = matched.bytesize - matched[-1].bytesize
+        end
       end
 
       result

data/lib/file_char_licker/version.rb

@@ -1,3 +1,3 @@
 module FileCharLicker
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: file_char_licker
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - indeep-xyz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-08 00:00:00.000000000 Z
+date: 2014-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler