dates_from_string 0.9.5 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98fe2e3e849f5760bd532ad4c48976cf4164859f
-  data.tar.gz: e716c189b4f6612b5ff9b858c1fbe636d8c07c75
+  metadata.gz: 49288f123d0486bd93b3d756c9275fc9c9f4f690
+  data.tar.gz: 9e50a1e44fbed5e9dfba1b8d5655b27590b224bf
 SHA512:
-  metadata.gz: 974f4f2f5e0d61b4e4cdb499fcfdc0b8c075f09e7dc36d06f15c7883f90eaca3650746f867088886c67e76029bdc81a9cca78ec6cbdb61dc7e45b08c2b40128e
-  data.tar.gz: daeaba06a1e1811f7448988d3e8a64ee81871183284a825b1add5e4c2f75baf702b00f4718a431f29e4ca22e253f12d4a0f7d34e76da5648a61d54a752b05620
+  metadata.gz: b587c7d192b80b5fcccad9e9fd23d5b5c49374d4164d0dc25a10a3392d40142dbd68c1155e42b61cedfb78836b456dec11f4904eeded97d3fb7b9cb63b969deb
+  data.tar.gz: a48c80c4b14be0d710f90a66810d08f598eb3cc5597d22b787957726ffdedecf0305d6b6e8edf042fa81b328ea07feb507784356c07a13bf04ea2f719bf1f56a

data/lib/dates_from_string.rb

@@ -26,6 +26,7 @@ class DatesFromString
         value_dash = get_dash_data(data)
         value_month = get_month_by_list(data)
         value_short_month = get_short_month(data)
+        value_time = get_time(data)
 
         value_day = get_day(data)
         next_index = index + 1
@@ -64,6 +65,11 @@ class DatesFromString
         if value_day
           add_to_structure(:day ,value_day, index, next_index, data_arr)
         end
+
+        if value_time
+           add_to_structure(:time ,value_time, index, next_index, data_arr)
+        end
+
       end
 
       return @main_arr
@@ -72,6 +78,14 @@ class DatesFromString
     end
   end
 
+  def get_time(string)
+    if (result = string.match(/\d{2}:\d{2}:\d{2}/))
+      result.to_s
+    else
+      nil
+    end
+  end
+
   def get_year(string)
     if string =~ /^\d{4}$/
       string

data/lib/dates_from_string/version.rb

@@ -1,3 +1,3 @@
 class DatesFromString
-  VERSION = "0.9.5"
+  VERSION = "0.9.6"
 end

data/lib/parsing_structure.rb

@@ -4,34 +4,83 @@ class ParsingStructure
 
   def initialize(structure)
     @structure = structure
+
+    @array_of_full_data = []
   end
 
   def start
-    array_of_full_data = []
-    year = nil
-    month = nil
-    day = nil
+    if @structure
+      if (@structure.select {|father| father[:type] == :time }).any?
+        get_year_month_day_time
+      else
+        get_year_month_day
+      end
+    end
+
+    return @array_of_full_data
+  end
+
+  def get_year_month_day_time
+    set_year_month_day_time
 
     if @structure
       @structure.each do |item|
-        if item[:type] == :year && item[:distance] == 0
-          year = item[:value]
+        if item[:type] == :year
+          @year = item[:value]
         end
 
-        if item[:type] == :month && item[:distance] == 0
-          month = item[:value]
+        if item[:type] == :month
+          @month = item[:value]
         end
 
-        if item[:type] == :day && item[:distance] == 0
-          day = item[:value]
+        if item[:type] == :day
+          @day = item[:value]
         end
 
-        if year && month && day
-          array_of_full_data << [year,month,day].join("-")
+        if item[:type] == :time
+          @time = item[:value]
+        end
+
+        if @year && @month && @day && @time
+          @array_of_full_data << [[@year,@month,@day].join("-"), @time].join(" ")
         end
       end
     end
 
-    array_of_full_data
+    @array_of_full_data
   end
-end
+
+  def get_year_month_day
+    set_year_month_day_time
+
+    if @structure
+      @structure.each do |item|
+        if item[:type] == :year
+          @year = item[:value]
+        end
+
+        if item[:type] == :month
+          @month = item[:value]
+        end
+
+        if item[:type] == :day
+          @day = item[:value]
+        end
+
+        if @year && @month && @day
+          @array_of_full_data << [@year,@month,@day].join("-")
+        end
+      end
+    end
+
+    @array_of_full_data
+  end
+
+  def set_year_month_day_time
+    @year = nil
+    @month = nil
+    @day = nil
+    @time = nil
+  end
+
+end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: dates_from_string
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors:
 - Sergey Chechaev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-02 00:00:00.000000000 Z
+date: 2015-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.9'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: pry-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Flexible solution for finding all formats of dates in text
@@ -59,9 +59,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -83,17 +83,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Flexible solution for finding all formats of dates in text