month 1.7.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6f2cb49e56df71efa50a5d0b1d0defa911997bb7b1f064ce4820cbb171d64b7
-  data.tar.gz: 3d16daecccc4d6b4a8287e870f6114d51e148478aa7f26bf295a805020f9b670
+  metadata.gz: 4eae90e4553fd130639c8f35f5feda52af6a7a4d56ec8631981fd0cadaa1895a
+  data.tar.gz: 76fb1049ecc66fdd30f145f7623ce978ea8606cd415dca8c20b63978af991b42
 SHA512:
-  metadata.gz: 9dcaed88e8f32858f302b14369a7f095bbe5e237d89599ed74bd430956946e3297c52eba4f639b94b17b7f8b9060e7b208d4360d3f8812f2ab2fc41a7970dc62
-  data.tar.gz: 6d0627f52ef61f665be335c66734cf9e0fcce5d0751bf9bf08c07aaf195b6209fb970cf0696625d3667dce68350fcc7c55e34fbb7b2c7ba45bdf13acc14a5de0
+  metadata.gz: 6d6ee334ce0de8c6162fb51ea14950e1d18fe085ce3818f290ab2a578a383853193c2f1606c16886dd978ee1bed750308d90a7eced6a24d7b62c3a1ed69cc71d
+  data.tar.gz: 15a1e39f3722c920152f3ae36301a149ddf520f7dce91b6591ed6b4c25cdcf5a2f46f6e2221651d8ff82007d93d4f1b46036d4d5fbb527006d646250e9324a47

data/CHANGES.md

@@ -1,3 +1,15 @@
+# 2.0.0
+
+* Changed required_ruby_version to >= 2.6.0
+
+* Fixed Month#next_month and Month#prev_month methods
+
+* Added functionality for parsing strings like '2014 JAN'
+
+* Added functionality for parsing strings like 'January 2014'
+
+* Removed Month.today method in favour of Month.now method
+
 # 1.7.1
 
 * Added CHANGES.md to gem files

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2014-2020 TIMCRAFT
+Copyright (c) 2014-2022 TIMCRAFT
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

data/README.md

@@ -1,7 +1,7 @@
 # month
 
 ![Gem Version](https://badge.fury.io/rb/month.svg)
-![Build Status](https://github.com/readysteady/month/workflows/Test/badge.svg)
+![Test Status](https://github.com/readysteady/month/actions/workflows/test.yml/badge.svg)
 
 
 Ruby gem for working with months.

data/lib/month.rb

@@ -32,7 +32,7 @@ class Month
   alias_method :month, :number
 
   def to_s
-    "#@year-#{@number.to_s.rjust(2, '0')}"
+    "#{@year}-#{@number.to_s.rjust(2, '0')}"
   end
 
   alias_method :iso8601, :to_s
@@ -77,18 +77,20 @@ class Month
 
   alias_method :succ, :next
 
+  alias_method :next_month, :next
+
+  def prev_month
+    self - 1
+  end
+
   def >>(n)
     self + n
   end
 
-  alias_method :next_month, :>>
-
   def <<(n)
     self - n
   end
 
-  alias_method :prev_month, :<<
-
   def step(limit, step = 1)
     raise ArgumentError if step.zero?
 
@@ -135,8 +137,8 @@ class Month
     end
   end
 
-  def include?(date)
-    @year == date.year && @number == date.month
+  def include?(time)
+    @year == time.year && @number == time.month
   end
 
   alias_method :===, :include?
@@ -159,13 +161,38 @@ class Month
 end
 
 class Month
-  REGEXP = /\A(\d{4})-(\d{2})\z/
+  ABBREVIATIONS = {
+    'JAN' => 1,
+    'FEB' => 2,
+    'MAR' => 3,
+    'APR' => 4,
+    'MAY' => 5,
+    'JUN' => 6,
+    'JUL' => 7,
+    'AUG' => 8,
+    'SEP' => 9,
+    'OCT' => 10,
+    'NOV' => 11,
+    'DEC' => 12,
+  }
+
+  REGEXP1 = /\A(\d{4})-(\d{2})\z/
+  REGEXP2 = /\A(\d{4}) (#{ABBREVIATIONS.keys.join('|')})\z/
+  REGEXP3 = /\A(#{Date::MONTHNAMES.compact.join('|')}) (\d{4})\z/
 
-  private_constant :REGEXP
+  private_constant :ABBREVIATIONS
+  private_constant :REGEXP1
+  private_constant :REGEXP2
+  private_constant :REGEXP3
 
   def self.parse(string)
-    if string =~ REGEXP
+    case string
+    when REGEXP1
       Month.new($1.to_i, $2.to_i)
+    when REGEXP2
+      Month.new($1.to_i, ABBREVIATIONS.fetch($2))
+    when REGEXP3
+      Month.new($2.to_i, Date::MONTHNAMES.index($1))
     else
       raise ArgumentError, 'invalid month'
     end
@@ -183,10 +210,6 @@ def Month(object)
   end
 end
 
-def Month.today
-  Month(Date.today)
-end
-
 def Month.now
   Month(Time.now)
 end

data/month.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'month'
-  s.version = '1.7.1'
+  s.version = '2.0.0'
   s.license = 'MIT'
   s.platform = Gem::Platform::RUBY
   s.authors = ['Tim Craft']
@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.description = 'Ruby gem for working with months'
   s.summary = 'See description'
   s.files = Dir.glob('lib/**/*.rb') + %w[CHANGES.md LICENSE.txt README.md month.gemspec]
-  s.required_ruby_version = '>= 1.9.3'
+  s.required_ruby_version = '>= 2.6.0'
   s.require_path = 'lib'
   s.metadata = {
     'homepage' => 'https://github.com/readysteady/month',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: month
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Tim Craft
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-03 00:00:00.000000000 Z
+date: 2022-01-24 00:00:00.000000000 Z
 dependencies: []
 description: Ruby gem for working with months
 email:
@@ -39,14 +39,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: See description