dates_from_string 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 420a88c30d1e4c27226cb513d5f9ff99f31fc4a8
-  data.tar.gz: d1816088a417d53a6b96d334892a0e635a53a6f3
+  metadata.gz: 7bc5d7c7e62118b43b4b0bde6f269aec6cce0f96
+  data.tar.gz: 5a8e089005f5f2aeaa7f77a6c0f51626eb40b090
 SHA512:
-  metadata.gz: c82cb87ad028c5a051a32611fd96925229c4167ec68a20fb726c0b42b46554dd755ba578def4c1ffe347fddfd16e7ae34e3b46c3da7b142dc66c7408ade15433
-  data.tar.gz: be6219215bae79b00287b7f955e3bf6f2d046bcdbbaa13a62888bb4bc601a19f4e3b6e3e943b6c2a5a7fe23f9909c27816e902d7a0ea524addfc1aef3f85421f
+  metadata.gz: 57a72dc0b93afdc6ca1b24f3b480b9ff3f045e3408085364b64d043f72e4df826ea2515909580a386dff7d836e82b7d0edd2e257709cdb19da5704f4d0423434
+  data.tar.gz: 44b00fade2e4936e05b2eb490ea37133a903272b1ce77c9d6a23f3eea6c89c10b8757e550ac6b08537cb9dffdf7d3acdc7a793c7a8439721610bc2b213192961

data/lib/dates_from_string/version.rb

@@ -1,3 +1,3 @@
 class DatesFromString
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

data/lib/dates_from_string.rb

@@ -12,50 +12,60 @@ class DatesFromString
   end
 
   def get_structure(string)
-    @main_arr = []
-    data_arr = string.split(" ")
-    @indexs = []
-    @first_index = []
-
-    data_arr.each_with_index do |data, index|
-      value_year = get_year(data)
-      value_full_date = get_full_date(data)
-      value_dash = get_dash_data(data)
-      value_month = get_month_by_list(data)
-      value_short_month = get_short_month(data)
-
-      value_day = get_day(data)
-      next_index = index + 1
-
-      if value_year
-        add_to_structure(:year ,value_year, index, next_index, data_arr)
+    unless string.nil? || string.empty?
+      @main_arr = []
+      data_arr = string.split(" ")
+      @indexs = []
+      @first_index = []
+
+      data_arr.each_with_index do |data, index|
+        value_year = get_year(data)
+        value_full_date = get_full_date(data)
+        value_month_year_date = get_month_year_date(data)
+        value_dash = get_dash_data(data)
+        value_month = get_month_by_list(data)
+        value_short_month = get_short_month(data)
+
+        value_day = get_day(data)
+        next_index = index + 1
+
+        if value_year
+          add_to_structure(:year ,value_year, index, next_index, data_arr)
+        end
+
+        if value_full_date
+          add_to_structure(:year ,value_full_date[0], index, next_index, data_arr)
+          add_to_structure(:month ,value_full_date[1], index, next_index, data_arr)
+          add_to_structure(:day ,value_full_date[2], index, next_index, data_arr)
+        end
+
+        if value_month_year_date
+          add_to_structure(:year ,value_month_year_date[0], index, next_index, data_arr)
+          add_to_structure(:month ,value_month_year_date[1], index, next_index, data_arr)
+        end
+
+        if value_dash
+          add_to_structure(:year ,value_dash[0], index, next_index, data_arr, '-')
+          add_to_structure(:year ,value_dash[1], index, next_index, data_arr)
+        end
+
+        if value_month
+          add_to_structure(:month ,value_month, index, next_index, data_arr)
+        end
+
+        if value_short_month
+          add_to_structure(:month ,value_short_month, index, next_index, data_arr)
+        end
+
+        if value_day
+          add_to_structure(:day ,value_day, index, next_index, data_arr)
+        end
       end
 
-      if value_full_date
-        add_to_structure(:year ,value_full_date[0], index, next_index, data_arr)
-        add_to_structure(:month ,value_full_date[1], index, next_index, data_arr)
-        add_to_structure(:day ,value_full_date[2], index, next_index, data_arr)
-      end
-
-      if value_dash
-        add_to_structure(:year ,value_dash[0], index, next_index, data_arr, '-')
-        add_to_structure(:year ,value_dash[1], index, next_index, data_arr)
-      end
-
-      if value_month
-        add_to_structure(:month ,value_month, index, next_index, data_arr)
-      end
-
-      if value_short_month
-        add_to_structure(:month ,value_short_month, index, next_index, data_arr)
-      end
-
-      if value_day
-        add_to_structure(:day ,value_day, index, next_index, data_arr)
-      end
+      return @main_arr
+    else
+      nil
     end
-
-    return @main_arr
   end
 
   def get_year(string)
@@ -90,6 +100,16 @@ class DatesFromString
     end
   end
 
+  def get_month_year_date(string)
+    if (result = string.match(/^\d{2}\.\d{4}$/))
+      result.to_s.split(".").reverse
+    elsif (result = string.match(/^\d{4}\.\d{2}$/))
+      result.to_s.split(".")
+    else
+      nil
+    end
+  end
+
   def get_day(string)
     if string =~ (/^\d{2}$/)
       string

metadata

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