flexyear 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c675039dfb05f1a30e363fc530c26494f0ba16a4
-  data.tar.gz: 5b64c416f727efb0a6e6e7626f06329dcc924e85
+  metadata.gz: 6c016a8105451d1e6531aad3a1a414c29e96ea58
+  data.tar.gz: 30c971747ad7fa88e014ce3a398b1acc0736cf4a
 SHA512:
-  metadata.gz: 648190b1135fad334615fff61b97bdf6f9e628839b9191adb3da2ba157d54d315b8e82bf0cc4ca224ee947e85ec735d0182348376bfa7c3c6a15d69851b47a9a
-  data.tar.gz: 8d9810c0aab0b64d1883008a0714b93061c695e6de2ea9f295f2a3a7ed33755be873c55d567401b6b2996cf8aa1cb2bb58ebae9d57d3f0dd2ab5872e9e9ec1fa
+  metadata.gz: 216677db5ea78483ff7b8f0f4b03b7945fc71eefd3ef9de8578a7671da6aa4e7d62f29bc8a92aa59f15ef96fcd9718b198999b2fce3e3ae8989575911fa9239a
+  data.tar.gz: c6435aaf570feb823d3c14f0c747b8768a9d2cac8e203227e587a2c8b3f70ed212bf0e81b3fbec38440c63d947d8a54ab8dad8a8776cfd6e5d9087b4ff753589

data/.gitignore

@@ -3,6 +3,7 @@
 .bundle
 .config
 .yardoc
+.ruby-*
 Gemfile.lock
 InstalledFiles
 _yardoc

data/lib/flexyear.rb

@@ -1,4 +1,5 @@
 require 'flexyear/range_parsers/range_parser'
+require 'flexyear/range_parsers/asterisk_parser'
 require 'flexyear/range_parsers/early_parser'
 require 'flexyear/range_parsers/mid_parser'
 require 'flexyear/range_parsers/late_parser'
@@ -54,13 +55,15 @@ class FlexYear
   end
 
   def parse_year
-    if @year_string =~ /(\d+)\s*-\s*(\d+)/ && $1 && $2
+    if @year_string =~ range_regex && $1 && $2
       @year_low = centuryize($1).to_i
       @year_low, @year_high = [@year_low, centuryize($2, @year_low).to_i].sort
     else
-      if @year_string =~ /(\d+).*s$/
+      if @year_string =~ decade_regex
         @base_year = centuryize($1).to_i
-      elsif @year_string =~ /^\w+\s+(\d+)/
+      elsif @year_string =~ asterisk_regex
+        @base_year = centuryize($1).to_i * 10
+      elsif @year_string =~ starts_with_word_regex
         @base_year = centuryize($1).to_i
       else
         @base_year = @year_string.gsub(/\D+/,'').to_i
@@ -75,6 +78,22 @@ class FlexYear
     end
   end
 
+  def range_regex
+    /(\d+)\s*-\s*(\d+)/
+  end
+
+  def asterisk_regex
+    /(\d+).*\*$/
+  end
+
+  def decade_regex
+    /(\d+).*s$/
+  end
+
+  def starts_with_word_regex
+    /^\w+\s+(\d+)/
+  end
+
   # Represents a flexible year entry that must be in the past.
   class Historical < FlexYear
     private

data/lib/flexyear/range_parsers/asterisk_parser.rb

@@ -0,0 +1,11 @@
+class FlexYear
+  class AsteriskParser < RangeParser
+    def self.can_parse?(string)
+      string.end_with?('*')
+    end
+
+    def parse
+      [0, 9]
+    end
+  end
+end

data/lib/flexyear/version.rb

@@ -1,3 +1,3 @@
 class FlexYear
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/spec/flexyear_spec.rb

@@ -32,6 +32,12 @@ describe FlexYear do
       its(:year_high) { should eq(1979) }
     end
 
+    context 'given 197*' do
+      subject { flexyear_class.new('197*') }
+      its(:year_low) { should eq(1970) }
+      its(:year_high) { should eq(1979) }
+    end
+
     context "given 1970s" do
       subject { flexyear_class.new("1970s") }
       its(:year_low) { should eq(1970) }
@@ -49,13 +55,13 @@ describe FlexYear do
       its(:year_low) { should eq(2005) }
       its(:year_high) { should eq(2007) }
     end
-    
+
     context 'given before 1973' do
       subject { FlexYear.new('before 1973') }
       its(:year_low) { should be_nil }
       its(:year_high) { should eq(1973) }
     end
-    
+
     context 'given after 1973' do
       subject { FlexYear.new('after 1973') }
       its(:year_low) { should eq(1973) }

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: flexyear
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Dan Melnick & Yan Pritzker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-01 00:00:00.000000000 Z
+date: 2014-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   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'
 - !ruby/object:Gem::Dependency
   name: rspec
   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: Parse common year range formats like '1973-75' or natural language ranges
@@ -60,7 +60,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- ".ruby-gemset"
+- ".ruby-version"
 - CHANGELOG
 - Gemfile
 - LICENSE.txt
@@ -69,6 +71,7 @@ files:
 - flexyear.gemspec
 - lib/flexyear.rb
 - lib/flexyear/range_parsers/after_parser.rb
+- lib/flexyear/range_parsers/asterisk_parser.rb
 - lib/flexyear/range_parsers/before_parser.rb
 - lib/flexyear/range_parsers/circa_parser.rb
 - lib/flexyear/range_parsers/decade_parser.rb
@@ -90,17 +93,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.0
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Natural language year range parser