dates_from_string 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da0b2c69885a98e6fa2090b2018496824c5a4c27
-  data.tar.gz: a6f75c319c6bc2da985caad65fcf89d90d502aea
+  metadata.gz: a3a11b4fa95109a8912aeafc2f26059329ab202a
+  data.tar.gz: 82965858f5db7e757f59c052d9efdaa602b38bcf
 SHA512:
-  metadata.gz: 9fab468e5387281f86f93f84edbea73b811a0231be5a729fc2c2924d299a5aa6ffd0167869e116e5398a65c227665940369078b32bb7a9f2d18591c282c341ed
-  data.tar.gz: 22781571803da4d2823c555e42e54441bce8a1c90eb2b49a13c652467484cdf3ebf80522ff728be2aeed676758c11556fb4886d74dffd908e1062e10ec537eb7
+  metadata.gz: 5c6150df8d07c0f8fae1e3c88a9dd2ff1bafeee14c777b865cf81c4263860cbe9014bc0420d5c3d79e3bf0c8abe249effae70febda78c872207d8389bb71d8d8
+  data.tar.gz: 5c22bb5e72c83bb798e5f585c1b17b1971c131c98889fb4c56aec5448f9c117d9ba00bb35500ea615746dd469bc71abbe5b8ef85b7003c19e5eb98ad536c7ad0

data/README.md

@@ -1,8 +1,7 @@
 # DatesFromString
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/dates_from_string`. To experiment with that code, run `bin/console` for an interactive prompt.
+Flexible solution for finding dates in text. After parsing text gem return flexible structure of dates, also you can get array of dates.
 
-TODO: Delete this and the text above, and describe your gem
 
 ## Installation
 
@@ -22,7 +21,74 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+
+```ruby
+text = "1988-1990 and 2000 and one more date 28.04.2015"    # parsing text
+key_words = ['between','-']                                 # you can define special separator
+dates_from_string = DatesFromString.new(key_words)          # define DatesFromString object
+dates_from_string.get_structure(text)                       # parsing text
+
+#=> returns
+#  [{:type=>:year, :value=>"1988", :distance=>0, :key_words=>["-"]},
+#  {:type=>:year, :value=>"1990", :distance=>2, :key_words=>[]},
+#  {:type=>:year, :value=>"2000", :distance=>5, :key_words=>[]},
+#  {:type=>:year, :value=>"2015", :distance=>0, :key_words=>[]},
+#  {:type=>:month, :value=>"04", :distance=>0, :key_words=>[]},
+#  {:type=>:day, :value=>"28", :distance=>0, :key_words=>[]}]
+
+:type       # type of date year, month or day
+:value      # value of date
+:distance   # distance for next date type
+:key_words  # special words, symbols that separate dates
+```
+
+Examples:
+
+```ruby
+input = '1988 between 1990'
+key_words = ['between']
+dates_from_string = DatesFromString.new(key_words)
+dates_from_string.get_structure(input)
+
+#=> return
+#  [{:type=>:year, :value=>"1988", :distance=>2, :key_words=>["between"]},
+#  {:type=>:year, :value=>"1990", :distance=>0, :key_words=>[]}]
+
+input = '2013/07/09 one date and he born in 1990'
+dates_from_string.get_structure(input)
+
+#=> return
+#  [{:type=>:year, :value=>"2013", :distance=>0, :key_words=>[]},
+#  {:type=>:month, :value=>"07", :distance=>0, :key_words=>[]},
+#  {:type=>:day, :value=>"09", :distance=>7, :key_words=>[]},
+#  {:type=>:year, :value=>"1990", :distance=>0, :key_words=>[]}]
+
+input = '1990 1988 year 2013 bla bla bla 2015 a b c d i f g qwe 2016'
+dates_from_string.get_structure(input)
+
+#=> return
+#  [{:type=>:year, :value=>"1990", :distance=>1, :key_words=>[]},
+#  {:type=>:year, :value=>"1988", :distance=>2, :key_words=>[]},
+#  {:type=>:year, :value=>"2013", :distance=>4, :key_words=>[]},
+#  {:type=>:year, :value=>"2015", :distance=>9, :key_words=>[]},
+#  {:type=>:year, :value=>"2016", :distance=>0, :key_words=>[]}]
+
+input = 'August 1961'
+dates_from_string.get_structure(input)
+
+#=> return
+#  [{:type=>:month, :value=>"08", :distance=>1, :key_words=>[]},
+#  {:type=>:year, :value=>"1961", :distance=>0, :key_words=>[]}]
+
+input = '10 April 1948'
+dates_from_string.get_structure(input)
+
+#=> return
+# [{:type=>:day, :value=>"10", :distance=>1, :key_words=>[]},
+# {:type=>:month, :value=>"04", :distance=>1, :key_words=>[]},
+# {:type=>:year, :value=>"1948", :distance=>0, :key_words=>[]}]
+#
+```
 
 ## Development
 

data/lib/dates_from_string.rb

@@ -21,6 +21,9 @@ class DatesFromString
       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
@@ -41,6 +44,14 @@ class DatesFromString
       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
 
     return @main_arr
@@ -67,11 +78,22 @@ class DatesFromString
       string.split("/")
     elsif string =~ (/\d{2}\/\d{2}\/\d{4}/)
       string.split("/").reverse
+    # elsif string =~(/\d{2}\s{1}(Jan|Feb|Mar|Apr|May|Jun|Jul|Apr|Sep|Oct|Nov|Dec)\s{1}\d{4}/)
+    #   string.to_date.to_s.split("-")
+    else
+      nil
+    end
+  end
+
+  def get_day(string)
+    if string =~ (/^\d{2}$/)
+      string
     else
       nil
     end
   end
 
+
   def get_dash_data(string)
     if string =~ (/\d{4}-\d{4}/)
       string.split("-")
@@ -83,11 +105,24 @@ class DatesFromString
   def get_month_by_list(string)
     month = ['January','February','March','April','May','June','July','August','September','October','November','December']
     index = month.index(string)
+
     if index
       sprintf('%02d',(index+1))
     else
       nil
     end
+
+  end
+
+  def get_short_month(string)
+    short_month = ['Jan','Feb','Mar','Apr','May','Jun','Jul','Apr','Sep','Oct','Nov','Dec']
+    short_index = short_month.index(string)
+
+    if short_index
+      sprintf('%02d',(short_index+1))
+    else
+      nil
+    end
   end
 
   def add_to_structure (type ,value, index, next_index, data_arr, key_word = nil)

data/lib/dates_from_string/version.rb

@@ -1,3 +1,3 @@
 class DatesFromString
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: dates_from_string
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Sergey Chechaev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-04-28 00:00:00.000000000 Z
+date: 2015-04-29 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: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Find dates in string and return array of dates
@@ -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
@@ -82,17 +82,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.0.14
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Flexible solution for finding all formats of dates in text