dates_from_string 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dcccdda19e565c99699a5f0d8c6fb817d638dac1
-  data.tar.gz: ee541a880654b1303f544ddc3b8daa77a8ee18e2
+  metadata.gz: a7f3aad632d0a54f6bfb007d875bdca1da734c07
+  data.tar.gz: 9db1c2e76db53abd438ffec8824f33640e0112cf
 SHA512:
-  metadata.gz: 4923d3dab2741a944e9850fd705e12734ce8b0a7380f54f7fa29b0cb6c701589cdeb0a450ece7c822c60eba2e4749c82df7d853888ff3fa30526e5feed4d852a
-  data.tar.gz: 3162c55e8fe7585ba3ade3de7646ab8952774f1f34e8e0cde1b6ef39a0af612abbf4071e7642085928fbce3d1c557eb96a39b110486b88f83097078e48390a93
+  metadata.gz: 168000c875ef7203c827689251c722a84c96859bec290086849e05715abd3d16801e269047f05b9f4ee6460322190216c4c392c8d0716a60a510cd6ffed94353
+  data.tar.gz: cd4aba31a3bee5a47f2bf820521c3e5395da30ab1f7184a71a55174970e0b9fb18538db08aaa4e128e66c0b931aada0e37e76c967d71ae5c830fbd9306104bec

data/README.md

@@ -90,11 +90,22 @@ dates_from_string.get_structure(input)
 #
 
 input = 'circa 1960 and full date 07 Jun 1941'
+dates_from_string.get_structure(input)
+
+#=> return
+# [{:type=>:year, :value=>"1960", :distance=>4, :key_words=>[]},
+# {:type=>:day, :value=>"07", :distance=>1, :key_words=>[]},
+# {:type=>:month, :value=>"06", :distance=>1, :key_words=>[]},
+# {:type=>:year, :value=>"1941", :distance=>0, :key_words=>[]}]
+
+obj = DatesFromString.new(['and'])
+input = 'between 1960 and 1965'
+obj.get_structure(input)
+
 #=> return
-#[{:type=>:year, :value=>"1960", :distance=>5, :key_words=>[]},
-#{:type=>:day, :value=>"07", :distance=>1, :key_words=>[]},
-#{:type=>:month, :value=>"06", :distance=>1, :key_words=>[]},
-#{:type=>:year, :value=>"1941", :distance=>0, :key_words=>[]}]
+# [{:type=>:year, :value=>"1960", :distance=>2, :key_words=>['and']},
+# {:type=>:year, :value=>"1965", :distance=>0, :key_words=>[]},]
+
 ```
 
 ## Development

data/lib/dates_from_string.rb

@@ -15,6 +15,7 @@ class DatesFromString
     @main_arr = []
     data_arr = string.split(" ")
     @indexs = []
+    @first_index = []
 
     data_arr.each_with_index do |data, index|
       value_year = get_year(data)
@@ -128,6 +129,7 @@ class DatesFromString
   def add_to_structure (type ,value, index, next_index, data_arr, key_word = nil)
     set_structura
     if value
+      @first_index << index
       @structura[:type] = type
       @structura[:value] = value
     end
@@ -155,6 +157,8 @@ class DatesFromString
     @indexs << index
     if @indexs.count > 1
       result = (index - @indexs[-2])
+    elsif @first_index[0] < index
+      result = (index - @first_index[0])
     else
       result = index
     end

data/lib/dates_from_string/version.rb

@@ -1,3 +1,3 @@
 class DatesFromString
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dates_from_string
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Sergey Chechaev