tag_along 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac25ee81b70b583a4d8abbaceddcb486d842187c
-  data.tar.gz: f9f904f4f64b36993c41d3412e4ede96faa3847c
+  metadata.gz: 3406f54328de2eda446a7267a7a8f40440a67866
+  data.tar.gz: 2281e8cebc82ba0287920ac3f41c5b302c1f63fa
 SHA512:
-  metadata.gz: ab9adeb46b91277bd35da4162e8cb10b4c4c89ad7a531e82d5150add3a3625e1661ecfb810d378a3cede77603f86198d329118b7fb40d3e995cc114da3d46f3a
-  data.tar.gz: 9820e99bad307af498964569c821f933359340bc64188f9badc8a8821dba91a3f79abd8ba1f9d11e7dd7b793597a624dc4f0a912c1122228d4048eeced386b71
+  metadata.gz: 1420f52f09c7d5260abe8ebd6f9cdec024dabf10d3443ff9977149a7ab1cf9473ac1021d713ee9c816fcfff4fe0a2230da3e0875a4f3de7b97f445eae3138916
+  data.tar.gz: ac5192be2da0d9264052945a7b02e0ba1d89470822c711b52ad3893f15d19701b48511016e3c2f9188ad32f9c43a23554c2051d0bacb0216d0ae45154a4fe617

data/CHANGELOG

@@ -1,3 +1,5 @@
+0.7.3 -- removed junk files plus refactoring
+
 0.7.2 -- end of the text preserved
 
 0.7.1 -- offsets can come in any order

data/lib/tag_along/offsets.rb

@@ -42,20 +42,21 @@ class TagAlong
 
     def process_hash
       @offsets.each { |h| symbolize_keys(h) }
-      @offsets = @offsets.map do |o|
-        instantiate(o[@offset_start], 
-                    o[@offset_end],
-                    o[@data_start],
-                    o[@data_end]) 
+      @offsets = @offsets.map do |h|
+        instantiate(h[@offset_start], 
+                    h[@offset_end],
+                    h[@data_start],
+                    h[@data_end]) 
       end
     end
 
     def process_obj
-      @offsets = @offsets.map do |o|
-        instantiate(o.send(@offset_start), 
-                    o.send(@offset_end),
-                    o.send(@data_start),
-                    o.send(@data_end)) 
+      @offsets = @offsets.map do |obj|
+        offset_start = obj.send(@offset_start)
+        offset_end = obj.send(@offset_end)
+        data_start = obj.send(@data_start)
+        data_end = obj.send(@data_end)
+        instantiate(offset_start, offset_end, data_start, data_end) 
       end
     end
     

data/lib/tag_along/version.rb

@@ -1,3 +1,3 @@
 class TagAlong
-  VERSION = '0.7.2'
+  VERSION = '0.7.3'
 end

data/lib/tag_along.rb

@@ -19,60 +19,67 @@ class TagAlong
   end
 
   def tag(open_tag, close_tag)
-    open_tag_subs = open_tag.scan(/%s/).size
-    close_tag_subs = close_tag.scan(/%s/).size
+    opts = {
+      open_tag: open_tag,
+      close_tag: close_tag,
+      open_tag_subs: open_tag.scan(/%s/).size,
+      close_tag_subs: close_tag.scan(/%s/).size,
+    }
     @tagged_text = @split_text.inject([]) do |res, t|
-      if t[:tagged]
-        ot = dyn_tag(open_tag, t[:data_start], open_tag_subs) 
-        ct = dyn_tag(close_tag, t[:data_end], close_tag_subs)
-        [ot, t[:text], ct].each { |text| res << text }
-      else
-        res << t[:text]
-      end
+      process_tag(res, t, opts)
       res
     end.join('')
   end
 
   private
 
+  def process_tag(text_ary, text_fragment, opts)
+    t = text_fragment
+    if t[:tagged]
+      ot = dyn_tag(opts[:open_tag], t[:data_start], opts[:open_tag_subs]) 
+      ct = dyn_tag(opts[:close_tag], t[:data_end], opts[:close_tag_subs])
+      [ot, t[:text], ct].each { |text| text_ary << text }
+    else
+      text_ary << t[:text]
+    end
+  end
+
   def dyn_tag(tag, data, subs_num)
     return tag if subs_num == 0
     tag % data
   end
+  
+  def process_tagged_item(res, item, opts)
+    fragment = []
+    chars_num = item.offset_start - opts[:cursor]
+    chars_num.times { fragment << opts[:text_ary].shift }
+    res << { tagged: false, text: fragment }
+    fragment = []
+    opts[:cursor] = item.offset_start
+    chars_num = item.offset_end + 1 - opts[:cursor]
+    chars_num.times { fragment << opts[:text_ary].shift }
+    res << { tagged:     true, 
+             text:       fragment, 
+             data_start: item.data_start,
+             data_end:   item.data_end}
+    opts[:cursor] = item.offset_end + 1
+  end
 
   def split_text
-    return  if @split_text
-    
-    text_ary = @text.unpack('U*')
-    cursor = 0
-    fragment = []
-    res = []
-    @offsets.each do |item|
-      chars_num = item.offset_start - cursor
-      chars_num.times { fragment << text_ary.shift }
-      res << { tagged: false, text: fragment }
-      fragment = []
-      cursor = item.offset_start
-      chars_num = item.offset_end + 1 - cursor
-      chars_num.times { fragment << text_ary.shift }
-      res << { tagged:     true, 
-               text:       fragment, 
-               data_start: item.data_start,
-               data_end:   item.data_end}
-      fragment = []
-      cursor = item.offset_end + 1
-    end
-    
-    unless text_ary.empty?
-      res << { tagged: false,
-               text: text_ary } 
-    end
-             
+    @split_text ||= create_split_text
+  end
 
-    res.each do |r|
+  def create_split_text
+    opts = { text_ary: @text.unpack('U*'), cursor: 0 }
+
+    @split_text = @offsets.inject([]) do |res, item|
+      process_tagged_item(res, item, opts)
+      res
+    end
+    @split_text << { tagged: false, text: opts[:text_ary] }
+    @split_text.each do |r|
       r[:text] = r[:text].pack('U*')
     end
-    @split_text = res
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tag_along
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Dmitry Mozzherin
@@ -22,7 +22,6 @@ files:
 - .gitignore
 - .ruby-version
 - .travis.yml
-- '1'
 - CHANGELOG
 - Gemfile
 - LICENSE.txt
@@ -32,8 +31,6 @@ files:
 - lib/tag_along/offsets.rb
 - lib/tag_along/version.rb
 - spec/files/spec_data.json
-- spec/files/t
-- spec/files/t_offsets.json
 - spec/spec_helper.rb
 - spec/tag_along/offsets_spec.rb
 - spec/tag_along_spec.rb
@@ -66,8 +63,6 @@ summary: A user who runs a search tool on a text would find  multiple text fragm
   and end offsets. This gem places arbitrary markup tags surrounding the fragments.
 test_files:
 - spec/files/spec_data.json
-- spec/files/t
-- spec/files/t_offsets.json
 - spec/spec_helper.rb
 - spec/tag_along/offsets_spec.rb
 - spec/tag_along_spec.rb

data/1

@@ -1 +0,0 @@
-Ворота монастыря Неопалимой Купины<F8><F8><F8><F8><<F8>

data/spec/files/t

@@ -1,55 +0,0 @@
-1959 
-Newman H. H. Spawmin behavior and sexual dimorphism of Pundulus
-9 5 QS
-heteroclitus and allied fish. Biol. Bull. 12, 1907.
-IV. CIRGULATORY SYSTEM
-P. B. Functional reactions in the embryonic heart accom~
-panying the ingrowth and development of the vagus
-innervation. Jour. Exp. Zool. 58, 1951.
-Brinley, P. J. A Physiological study of the innervation of the
-heart of fish embryos. Physiol. Zool. 5, 1952.
-Reagan, F, P. Experimental studies in the origin of the vascular
-endothelium and of Am. Jour, Anat.
-21, 1917. 
-Shearer, E. M. Studies on the embryology of the circulation in
-fishes, 1. and ll. Am. Jour. Anat. 46, 1950.
-Stockard, C. R. An experimental analysis of the origin of blood
-and vascular endothelium Mem. Wist. Inst. Anat.
-Biol. No. 7, 1915. also Am. Jour, Anat. 18, 1915.
-V. GERM CELLS
-Goodrich, H. B., et al. Germ cells and sex differentiation in
-Lebistes reticulatus. Biol. Bull. 67, 1954.
-Mann, H. W. The history of the germ cells of Cottus Baerdii. Gerard
-Jour. Morph. Physiol. 45, 1927.
-okkelberg, Peter The early history of the germ cells in the brook
-lamprey, Entosphenus wilderi (Gage) up to and in~
-cluding the period of sex differentiation. Jour.
-Morph. 55, 1921. (This paper has a complete bib-
-liography of work on germ cells in other groups.)
-Tichards, A. and Thompson, James I., Migration with primary sex
-cells of Fundulus hetercclitus Biol. Bull. 40, 1921.
-Wolf, L. E. The history of the germ cells in the viviparous
-1 teleost PPlatypoecilus maculatus. Jour. Morph. and
-Physiol. 52, 1951.
-1 VI. EXPERIMENTAL WORK.
-Amberson, W. R, and F. B. The respiratory metabolism
-of Fundulus heteroclitus during embryonic develop-
-mental Jour. Cell. and Comp. Physiol. 2, 1955.
-P. B. The embryonic origin of function in the pronephros
-through differentiation and paren~chyma-vascular
-association. Amer. Jour. Anat. 51, 1952.
-Batallion, Nouveaux essais de Parthenogenere experimentale chez les
-vertibres infesienes Arch. Ent. Mech. 18, 1904.
-Clapp, C. M. The relation of the axis of the embryo to the first
-cleavage plane. Biol Lect. M. B. L. 1898.
-Filatow, D. Entwicklungsmechanishhe Untersuchungen an Embryonen
-von Acipenser guldenstadtti and Acipenbryonen von
-Acipenser guldenstadtii und Acipenser stellatus.
-Arch. Ent. Mech. 122, 1950.
-HinriChS,.M. A. and Genther 1. T. Ultraviolet radiation and the
-production of twins and double monsters. Physiol.
-iZool. 4, 1951.
-Headley, L. 0n the localization of developmental potencies in
-embryo of Fundulus heteroclitus Jour. Exp. Zool.
-52, 1928.
-

data/spec/files/t_offsets.json

@@ -1 +0,0 @@
-[{"pos_start":866,"pos_end":885,"url":"http://eol.org/pages/11081658"},{"pos_start":955,"pos_end":960,"url":"http://eol.org/pages/204556"},{"pos_start":1347,"pos_end":1354,"url":"http://eol.org/pages/207614"},{"pos_start":1604,"pos_end":1624,"url":"http://eol.org/pages/1157172"},{"pos_start":2137,"pos_end":2145,"url":"http://eol.org/pages/15048"},{"pos_start":2211,"pos_end":2229,"url":"http://eol.org/pages/206889"},{"pos_start":2462,"pos_end":2482,"url":"http://eol.org/pages/1157172"},{"pos_start":1085,"pos_end":1103,"url":null},{"pos_start":2183,"pos_end":2205,"url":null}]