dates_from_string 0.9.7 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83bfa65e4f0d7901c31904095176ea3a38f159a5
-  data.tar.gz: ffa288a432eff1afb3494466dc9153c3f3c7869f
+  metadata.gz: 7a15baf7f399df239e4e2497649b6d4394d07e85
+  data.tar.gz: bdf8b4537603763030136f63815e8fb13634f1f5
 SHA512:
-  metadata.gz: 741dc8c86493e3c006a378e2b9e1af61bc2574427199111d039a1e01ee75a06897c750bd79d44728147b59d8d1c4f1783286de49f1341a24764cdaac0470d54a
-  data.tar.gz: d4619ed1d86312786684240cabcd0b8ba8bc7d0cc680c8aad69b6b6ea808b64ec0a6f95bd4d6db472464c3d617784ffb93c4c612163de0cfe3b5703ac0d5da0b
+  metadata.gz: b4a4151bbcbe1b5339934ac38d3665f9306299c700dbc7979cb5001a99afa41294b61618266183565ed456f5ef3e5c565f811e51b202f40c62433a6e3e83c0c5
+  data.tar.gz: 3df4a1d46c9f11da278f1c0f0a8281637fd94f2ac2a9a9d475e59a162b746dfa953726dfbe202e1b13f1422388763c495f6681c125ac80d0795bd346c9afd17d

data/README.md

@@ -23,25 +23,38 @@ Or install it yourself as:
 
 
 ```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
+text = "1988-1990 and 2000 and one more date 04.04.2015"        # parsing text
+key_words = ['between','-']                                     # you can define special separator
+date_format = {date_format: :usa}                               # year,day,month by default year,month,day
+dates_from_string = DatesFromString.new(key_words,date_format)  # 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=>:day, :value=>"04", :distance=>0, :key_words=>[]},
+#  {:type=>:month, :value=>"04", :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
+
+# find date in structure
+text = "забрать машину из ремонта 2015-02-02 23:00:10"
+dates_from_string = DatesFromString.new
+dates_from_string.find_date(text)
+
+#=> return
+#  ["2015-02-02 23:00:10"]
 ```
 
+
+
+
+
 Examples:
 
 ```ruby
@@ -106,11 +119,11 @@ obj.get_structure(input)
 # [{:type=>:year, :value=>"1960", :distance=>2, :key_words=>['and']},
 # {:type=>:year, :value=>"1965", :distance=>0, :key_words=>[]},]
 
-input = "In September 2011, following a change in the law extending 
-         the presidential term from four years to six,[5] Putin announced 
-         that he would seek a third, non-consecutive term as President in 
-         the 2012 presidential election, an announcement which led to 
-         large-scale protests in many Russian cities. In March 2012 he won the election, 
+input = "In September 2011, following a change in the law extending
+         the presidential term from four years to six,[5] Putin announced
+         that he would seek a third, non-consecutive term as President in
+         the 2012 presidential election, an announcement which led to
+         large-scale protests in many Russian cities. In March 2012 he won the election,
          which was criticized for procedural irregularities, and is serving a six-year term"
 dates_from_string.get_structure(input)
 

data/dates_from_string.gemspec

@@ -26,6 +26,8 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
+  # Only with ruby 2.0.x
+  spec.required_ruby_version = '~> 2.0'
 
   spec.add_development_dependency "bundler", "~> 1.9"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/dates_from_string/version.rb

@@ -1,3 +1,3 @@
 class DatesFromString
-  VERSION = "0.9.7"
+  VERSION = "1.0.0"
 end

data/lib/dates_from_string.rb

@@ -31,8 +31,14 @@ class DatesFromString
     ] => -> string { string.to_s.split("/").reverse },
   }
 
-  def initialize(key_words = [])
+  DATE_COUNTRY_FORMAT = {
+    default: -> {[:year,:month,:day]},
+    usa: -> {[:year,:day,:month]}
+  }
+
+  def initialize(key_words = [], date_format: :default)
     @key_words = key_words
+    @date_format = date_format_by_country(date_format)
   end
 
   def find_date(string)
@@ -44,6 +50,10 @@ class DatesFromString
     @clear_text.strip
   end
 
+  def date_format_by_country(date_format)
+    DATE_COUNTRY_FORMAT[date_format.to_sym].call
+  end
+
   def get_structure(string)
     unless string.nil? || string.empty?
       @main_arr = []
@@ -72,13 +82,13 @@ class DatesFromString
           if @main_arr.size == 0
             index = 0
           end
-          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)
+          add_to_structure(@date_format[0], value_full_date[0], index, next_index, data_arr)
+          add_to_structure(@date_format[1], value_full_date[1], index, next_index, data_arr)
+          add_to_structure(@date_format[2], 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(: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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dates_from_string
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 1.0.0
 platform: ruby
 authors:
 - Sergey Chechaev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-08 00:00:00.000000000 Z
+date: 2016-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -83,9 +83,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="