merch_calendar 0.3.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13a41aecf0152a0c3bffeed5ecf51f15dd5d6927
-  data.tar.gz: 482637d57739642817b9c8729f6598fdd4ba4ff7
+  metadata.gz: 0325ba6521496a2043a1abacc779ab8fee857ba0
+  data.tar.gz: 13621f1cde48c5097e07debf1f46e43becf3f7b7
 SHA512:
-  metadata.gz: cee1f7ae6cf8817c0616eb46eb572f3a39cf6deb087ed6515335ad693030ae5106353915199be23b471d53e494a7f190ba7ccf021523c66674fd96e52ac71085
-  data.tar.gz: c49c4924295a06b57a71c164a2f6c57a6b433ef25b0eb3359e42da3cec27f8b3f25affc94009c57337cf4d872747deddff78585a4a95c65e57b3093aa7bd6e03
+  metadata.gz: ee990e81e979a167c5ef882280d9c9be11eae652e6d7c437db6d306caee28230c7fb3f4e36864ba912f65329d90a779319e69e6210ca941fa2d46746fd7d481f
+  data.tar.gz: b0cdff703e3e26cced58d342cce2297b4c94a5dc9147581ac3a445c99208f125f1f7f12d671f08be65f8bf1d6437a940cbbbf88b74c12c1074057da54c876e19

data/.ruby-version

@@ -1 +1 @@
-2.3.0
+2.4.1

data/.travis.yml

@@ -1,9 +1,11 @@
 language: ruby
 rvm:
-  - 2.1.0
   - 2.0.0
-  - 2.2.0
-  - 1.9.3
+  - 2.1.10
+  - 2.2.7
+  - 2.3.5
+  - 2.4.1
+  - ruby-head
 notifications:
   email: false
   

data/Gemfile.lock

@@ -1,50 +1,50 @@
 PATH
   remote: .
   specs:
-    merch_calendar (0.3.0)
+    merch_calendar (1.0.0)
 
 GEM
   remote: https://www.rubygems.org/
   specs:
-    coderay (1.1.1)
-    coveralls (0.8.13)
-      json (~> 1.8)
-      simplecov (~> 0.11.0)
+    coderay (1.1.2)
+    coveralls (0.8.21)
+      json (>= 1.8, < 3)
+      simplecov (~> 0.14.1)
       term-ansicolor (~> 1.3)
-      thor (~> 0.19.1)
-      tins (~> 1.6.0)
-    diff-lcs (1.2.5)
+      thor (~> 0.19.4)
+      tins (~> 1.6)
+    diff-lcs (1.3)
     docile (1.1.5)
-    json (1.8.3)
+    json (2.1.0)
     method_source (0.8.2)
     pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rake (10.5.0)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.3)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
+    rake (12.1.0)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.1)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
-    simplecov (0.11.2)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
+    simplecov (0.14.1)
       docile (~> 1.1.0)
-      json (~> 1.8)
+      json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
+    simplecov-html (0.10.2)
     slop (3.6.0)
-    term-ansicolor (1.3.2)
+    term-ansicolor (1.6.0)
       tins (~> 1.0)
-    thor (0.19.1)
-    tins (1.6.0)
+    thor (0.19.4)
+    tins (1.15.0)
 
 PLATFORMS
   ruby
@@ -58,4 +58,4 @@ DEPENDENCIES
   simplecov
 
 BUNDLED WITH
-   1.15.3
+   1.15.4

data/README.md

@@ -19,6 +19,16 @@ Add the following line to your `Gemfile`:
 gem "merch_calendar"
 ```
 
+## Ruby Version Compatibility
+This gem has been tested against Ruby 2.0 - 2.4.
+
+Support for Ruby 1.9.3 was discontinued as of version 0.3.0 of this gem.  If you're on Ruby 1.9.3, you'll want to 
+install the gem like so:
+
+```ruby
+gem "merch_calendar", "0.3.0"
+```
+
 ## Usage
 
 For converting a date into a `MerchWeek` object.

data/lib/merch_calendar/merch_week.rb

@@ -36,15 +36,15 @@ module MerchCalendar
     #
     # @overload find(year, julian_month, week_number=nil, options)
     #   Returns an array of +MerchWeek+s for a given month
-    #   @param year [Fixnum] the merch year to locate
-    #   @param julian_month [Fixnum] the month to find merch months for
+    #   @param year [Integer] the merch year to locate
+    #   @param julian_month [Integer] the month to find merch months for
     #   @param week_number [Nil] set week_number to nil
     #   @param options [Hash] options to set your calendar, if none it will default to RetailCalendar
     #   @return [Array<MerchWeek>]
     # @overload find(year, julian_month, week_number)
-    #   @param year [Fixnum] the merch year to locate
-    #   @param julian_month [Fixnum] the month to find merch months for
-    #   @param week_number [Fixnum] the specific week number.
+    #   @param year [Integer] the merch year to locate
+    #   @param julian_month [Integer] the month to find merch months for
+    #   @param week_number [Integer] the specific week number.
     #   @param options [Hash] options to set your calendar, if none it will default to RetailCalendar
     #   @return [MerchWeek] the specific merch week based on the week number
     def self.find(year, julian_month, week_number=nil, options={})
@@ -87,7 +87,7 @@ module MerchCalendar
 
     # What week it is within the year from 1-53
     #
-    # @return [Fixnum] The week number of the year, from 1-53
+    # @return [Integer] The week number of the year, from 1-53
     def year_week
       @year_week ||= (((date-start_of_year)+1)/7.0).ceil
     end
@@ -96,7 +96,7 @@ module MerchCalendar
     # Month 1 is Feb for the retail calendar
     # Month 1 is August for the fiscal calendar
     #
-    # @return [Fixnum]
+    # @return [Integer]
     def merch_month
       # TODO: This is very inefficient, but less complex than strategic guessing
       # maybe switch to a binary search or something
@@ -108,21 +108,21 @@ module MerchCalendar
 
     # Returns the Merch year depending whether it is from the Retail or Fiscal calendar
     #
-    # @return [Fixnum]
+    # @return [Integer]
     def year
       @year ||= calendar.merch_year_from_date(date)
     end
 
     # Returns julian month where the merch week falls
     #
-    # @return [Fixnum]
+    # @return [Integer]
     def month
       @month ||= calendar.merch_to_julian(merch_month)
     end
 
     # Returns the quarter that this merch week falls
     #
-    # @return [Fixnum]
+    # @return [Integer]
     def quarter
       @quarter ||= calendar.quarter(merch_month)
     end
@@ -144,7 +144,7 @@ module MerchCalendar
     # The number of the week within the given merch month
     # will be between 1 and 5
     #
-    # @return [Fixnum]
+    # @return [Integer]
     def week
       @week ||= (((date-start_of_month)+1)/7.0).ceil
     end

data/lib/merch_calendar/retail_calendar.rb

@@ -13,7 +13,7 @@ module MerchCalendar
     
     # The the first date of the retail year
     #
-    # @param year [Fixnum] the retail year
+    # @param year [Integer] the retail year
     # @return [Date] the first date of the retail year
     def end_of_year(year)
       year_end = Date.new((year + 1), 1, -1) # Jan 31st
@@ -29,7 +29,7 @@ module MerchCalendar
 
     # The last date of the retail year
     #
-    # @param year [Fixnum] the retail year
+    # @param year [Integer] the retail year
     # @return [Date] the last date of the retail year
     def start_of_year(year)
       end_of_year(year - 1) + 1
@@ -37,8 +37,8 @@ module MerchCalendar
 
     # The starting date of the given merch month
     #
-    # @param year [Fixnum] the retail year
-    # @param merch_month [Fixnum] the nth merch month of the retail calendar
+    # @param year [Integer] the retail year
+    # @param merch_month [Integer] the nth merch month of the retail calendar
     # @return [Date] the start date of the merch month
     def start_of_month(year, merch_month)
       # 91 = number of days in a single 4-5-4 set 
@@ -59,8 +59,8 @@ module MerchCalendar
 
     # The ending date of the given merch month
     #
-    # @param year [Fixnum] the retail year
-    # @param merch_month [Fixnum] the nth merch month of the retail calendar
+    # @param year [Integer] the retail year
+    # @param merch_month [Integer] the nth merch month of the retail calendar
     # @return [Date] the end date of the merch month
     def end_of_month(year, merch_month)
       if merch_month == 12
@@ -72,9 +72,9 @@ module MerchCalendar
 
     # Returns the date that corresponds to the first day in the merch week
     #
-    # @param year [Fixnum] the retail year
-    # @param month [Fixnum] the nth merch month of the retail calendar
-    # @param merch_week [Fixnum] the nth week of the merch month
+    # @param year [Integer] the retail year
+    # @param month [Integer] the nth merch month of the retail calendar
+    # @param merch_week [Integer] the nth week of the merch month
     # @return [Date] the start date of the merch week
     def start_of_week(year, month, merch_week)
       start_of_month(year, month) + ((merch_week - 1) * 7)
@@ -82,9 +82,9 @@ module MerchCalendar
 
     # Returns the date that corresponds to the last day in the merch week
     #
-    # @param year [Fixnum] the retail year
-    # @param month [Fixnum] the nth merch month of the retail calendar
-    # @param merch_week [Fixnum] the nth week of the merch month
+    # @param year [Integer] the retail year
+    # @param month [Integer] the nth merch month of the retail calendar
+    # @param merch_week [Integer] the nth week of the merch month
     # @return [Date] the end date of the merch week
     def end_of_week(year, month, merch_week)
       start_of_month(year, month) + (6 + ((merch_week - 1) * 7))
@@ -92,8 +92,8 @@ module MerchCalendar
 
     # Return the starting date for a particular quarter
     #
-    # @param year [Fixnum] the retail year
-    # @param quarter [Fixnum] the quarter of the year, a number from 1 - 4
+    # @param year [Integer] the retail year
+    # @param quarter [Integer] the quarter of the year, a number from 1 - 4
     # @return [Date] the start date of the quarter
     def start_of_quarter(year, quarter)
       case quarter
@@ -112,8 +112,8 @@ module MerchCalendar
 
     # Return the ending date for a particular quarter
     #
-    # @param year [Fixnum] the retail year
-    # @param quarter [Fixnum] the quarter of the year, a number from 1 - 4
+    # @param year [Integer] the retail year
+    # @param quarter [Integer] the quarter of the year, a number from 1 - 4
     # @return [Date] the end date of the quarter
     def end_of_quarter(year, quarter)
       case quarter
@@ -132,7 +132,7 @@ module MerchCalendar
     
     # Returns the quarter that the merch month falls in
     #
-    # @param merch_month [Fixnum] merch month
+    # @param merch_month [Integer] merch month
     # @return [Date] the quarter that the merch_month falls in
     def quarter(merch_month)
       case merch_month
@@ -151,7 +151,7 @@ module MerchCalendar
     
     #Returns the season given for the merch_month
     #
-    # @param merch_month [Fixnum] the nth month of the retail calendar
+    # @param merch_month [Integer] the nth month of the retail calendar
     # @return [String] the season that the merch_month falls under
     def season(merch_month)
       case merch_month
@@ -166,8 +166,8 @@ module MerchCalendar
 
     # Returns the number of weeks in the retail year
     #
-    # @param year [Fixnum] the retail year
-    # @return [Fixnum] the number of weeks within the retail year
+    # @param year [Integer] the retail year
+    # @return [Integer] the number of weeks within the retail year
     def weeks_in_year(year)
       ((start_of_year(year + 1) - start_of_year(year)) / 7).to_i
     end
@@ -175,7 +175,7 @@ module MerchCalendar
     # Given any julian date it will return what retail year it belongs to
     #
     # @param date [Date] the julian date to convert to its Retail Year
-    # @return [Fixnum] the retail year that the julian date falls into
+    # @return [Integer] the retail year that the julian date falls into
     def merch_year_from_date(date)
       date_end_of_year = end_of_year(date.year)
       date_start_of_year = start_of_year(date.year) 
@@ -189,8 +189,8 @@ module MerchCalendar
     
     # Converts a merch month to the correct julian month
     #
-    # @param merch_month [Fixnum] the merch month to convert
-    # @return [Fixnum] the julian month
+    # @param merch_month [Integer] the merch month to convert
+    # @return [Integer] the julian month
     def merch_to_julian(merch_month)
       if merch_month > 12 || merch_month <= 0
         raise ArgumentError
@@ -205,8 +205,8 @@ module MerchCalendar
     
     # Converts a julian month to a merch month
     #
-    # @param julian_month [Fixnum] the julian month to convert
-    # @return [Fixnum] the merch month
+    # @param julian_month [Integer] the julian month to convert
+    # @return [Integer] the merch month
     def julian_to_merch(julian_month)
       if julian_month > 12 || julian_month <= 0
         raise ArgumentError
@@ -240,8 +240,8 @@ module MerchCalendar
     
     # Returns an array of Merch Weeks that pertains to the Julian Month of a Retail Year
     #
-    # @param year [Fixnum] the Retail year
-    # @param month_param [Fixnum] the julian month
+    # @param year [Integer] the Retail year
+    # @param month_param [Integer] the julian month
     # @return [Array] Array of MerchWeeks 
     def weeks_for_month(year, month_param)
       merch_month = get_merch_month_param(month_param)
@@ -266,7 +266,7 @@ module MerchCalendar
     private
 
     def get_merch_month_param(param)
-      if param.is_a? Fixnum
+      if param.is_a? Integer
         return julian_to_merch(param)
       elsif param.is_a? Hash
         julian_month = param.delete(:julian_month) || param.delete(:month)

data/lib/merch_calendar/stitch_fix_fiscal_year_calendar.rb

@@ -11,7 +11,7 @@ module MerchCalendar
 
     # The date of the first day of the fiscal year
     #
-    # @param year [Fixnum] the fiscal year
+    # @param year [Integer] the fiscal year
     # @return [Date] the first date of the fiscal year
     def start_of_year(year)
       end_of_year(year - 1) + 1
@@ -19,7 +19,7 @@ module MerchCalendar
 
     # The date of the last day of the fiscal year
     #
-    # @param year [Fixnum] the fiscal year
+    # @param year [Integer] the fiscal year
     # @return [Date] the last date of the fiscal year
     def end_of_year(year)
       year_end = Date.new((year), 7, -1) # Jul 31st
@@ -35,8 +35,8 @@ module MerchCalendar
 
     # Return the starting date for a particular quarter
     #
-    # @param year [Fixnum] the fiscal year
-    # @param quarter [Fixnum] the quarter of the year, a number from 1 - 4
+    # @param year [Integer] the fiscal year
+    # @param quarter [Integer] the quarter of the year, a number from 1 - 4
     # @return [Date] the start date of the quarter
     def start_of_quarter(year, quarter)
       case quarter
@@ -55,7 +55,7 @@ module MerchCalendar
     
     # Returns the quarter that the merch month falls in
     #
-    # @param merch_month [Fixnum] merch month
+    # @param merch_month [Integer] merch month
     # @return [Date] the quarter that the merch_month falls in
     def quarter(merch_month)
       case merch_month
@@ -74,8 +74,8 @@ module MerchCalendar
 
     # Return the ending date for a particular quarter
     #
-    # @param year [Fixnum] the fiscal year
-    # @param quarter [Fixnum] the quarter of the year, a number from 1 - 4
+    # @param year [Integer] the fiscal year
+    # @param quarter [Integer] the quarter of the year, a number from 1 - 4
     # @return [Date] the end date of the quarter
     def end_of_quarter(year, quarter)
       case quarter
@@ -94,7 +94,7 @@ module MerchCalendar
 
     #Returns the season given for the merch_month
     #
-    # @param  merch_month [Fixnum] the nth merch month of the retail calendar
+    # @param  merch_month [Integer] the nth merch month of the retail calendar
     # @return [String] the season that the merch month falls under
     def season(merch_month)
       case merch_month
@@ -109,8 +109,8 @@ module MerchCalendar
 
     # The starting date of the given merch month
     #
-    # @param year [Fixnum] the fiscal year
-    # @param merch_month [Fixnum] the nth merch month of the fiscal calendar
+    # @param year [Integer] the fiscal year
+    # @param merch_month [Integer] the nth merch month of the fiscal calendar
     # @return [Date] the start date of the merch month
     def start_of_month(year, merch_month)
       # 91 = number of days in a single 4-5-4 set 
@@ -131,8 +131,8 @@ module MerchCalendar
 
     # The ending date of the given merch month
     #
-    # @param year [Fixnum] the fiscal year
-    # @param merch_month [Fixnum] the nth merch month of the fiscal calendar
+    # @param year [Integer] the fiscal year
+    # @param merch_month [Integer] the nth merch month of the fiscal calendar
     # @return [Date] the end date of the merch month
     def end_of_month(year, merch_month)
       if merch_month == 12
@@ -144,9 +144,9 @@ module MerchCalendar
 
     # Returns the date that corresponds to the first day in the merch week
     #
-    # @param year [Fixnum] the fiscal year
-    # @param merch_month [Fixnum] the nth month of the fiscal calendar
-    # @param merch_week [Fixnum] the nth week of the merch month
+    # @param year [Integer] the fiscal year
+    # @param merch_month [Integer] the nth month of the fiscal calendar
+    # @param merch_week [Integer] the nth week of the merch month
     # @return [Date] the start date of the merch week
     def start_of_week(year, month, merch_week)
       start_of_month(year, month) + ((merch_week - 1) * 7)
@@ -154,9 +154,9 @@ module MerchCalendar
 
     # Returns the date that corresponds to the last day in the merch week
     #
-    # @param  year [Fixnum] the fiscal year
-    # @param  merch_month [Fixnum] the nth merch month of the fiscal calendar
-    # @param  merch_week [Fixnum] the nth week of the merch month
+    # @param  year [Integer] the fiscal year
+    # @param  merch_month [Integer] the nth merch month of the fiscal calendar
+    # @param  merch_week [Integer] the nth week of the merch month
     # @return [Date] the end date of the merch week
     def end_of_week(year, month, merch_week)
       start_of_month(year, month) + (6 + ((merch_week - 1) * 7))
@@ -164,8 +164,8 @@ module MerchCalendar
 
     # Returns the number of weeks in the fiscal year
     #
-    # @param year [Fixnum] the fiscal year
-    # @return [Fixnum] the number of weeks within the fiscal year
+    # @param year [Integer] the fiscal year
+    # @return [Integer] the number of weeks within the fiscal year
     def weeks_in_year(year)
       ((start_of_year(year + 1) - start_of_year(year)) / 7).to_i
     end
@@ -173,7 +173,7 @@ module MerchCalendar
     # Given any julian date it will return what Fiscal Year it belongs to
     #
     # @param date [Date] the julian date to convert to its Fiscal Year
-    # @return [Fixnum] the fiscal year that the julian date falls into
+    # @return [Integer] the fiscal year that the julian date falls into
     def merch_year_from_date(date)
       if end_of_year(date.year) >= date
         return date.year
@@ -184,8 +184,8 @@ module MerchCalendar
 
     # Converts a merch month to the correct julian month
     #
-    # @param merch_month [Fixnum] the merch month to convert
-    # @return [Fixnum] the julian month
+    # @param merch_month [Integer] the merch month to convert
+    # @return [Integer] the julian month
     def merch_to_julian(merch_month)
       if merch_month > 12 || merch_month <= 0
         raise ArgumentError
@@ -200,8 +200,8 @@ module MerchCalendar
 
     # Converts a julian month to a fiscal month
     #
-    # @param julian_month [Fixnum] the julian month to convert
-    # @return [Fixnum] the merch month
+    # @param julian_month [Integer] the julian month to convert
+    # @return [Integer] the merch month
     def julian_to_merch(julian_month)
       if julian_month > 12 || julian_month <= 0
         raise ArgumentError
@@ -226,8 +226,8 @@ module MerchCalendar
 
     # Returns an array of Merch Weeks that pertains to the Julian Month of a Fiscal Year
     #
-    # @param year [Fixnum] the fiscal year
-    # @param month_param [Fixnum] the julian month
+    # @param year [Integer] the fiscal year
+    # @param month_param [Integer] the julian month
     # @return [Array] Array of MerchWeeks that falls within that julian month
     def weeks_for_month(year, month_param)
       merch_month = julian_to_merch(month_param)

data/lib/merch_calendar/util.rb

@@ -8,9 +8,9 @@ module MerchCalendar
 
     # The start date of the week
     #
-    # @param year [Fixnum] the merch year
-    # @param month [Fixnum] an integer specifying the julian month.
-    # @param week [Fixnum] an integer specifying the merch week.
+    # @param year [Integer] the merch year
+    # @param month [Integer] an integer specifying the julian month.
+    # @param week [Integer] an integer specifying the merch week.
     #
     # @return [Date] the starting date of the specified week
     def start_of_week(year, month, week)
@@ -19,9 +19,9 @@ module MerchCalendar
 
     # The end date of the week
     #
-    # @param year [Fixnum] the merch year
-    # @param month [Fixnum] an integer specifying the julian month.
-    # @param week [Fixnum] an integer specifying the merch week.
+    # @param year [Integer] the merch year
+    # @param month [Integer] an integer specifying the julian month.
+    # @param week [Integer] an integer specifying the merch week.
     #
     # @return [Date] the ending date of the specified week
     def end_of_week(year, month, week)
@@ -37,11 +37,11 @@ module MerchCalendar
     #  MerchCalendar.start_of_month(2015, julian_month: 5)
     #  MerchCalendar.start_of_month(2015, merch_month: 4)
     #
-    # @param year [Fixnum] the merch year
-    # @param month_param [Fixnum,Hash] an integer specifying the julian month. This can also be a named hash
-    # @option month_param [Fixnum] :month the julian month
-    # @option month_param [Fixnum] :julian_month the julian month
-    # @option month_param [Fixnum] :merch_month the MERCH month
+    # @param year [Integer] the merch year
+    # @param month_param [Integer,Hash] an integer specifying the julian month. This can also be a named hash
+    # @option month_param [Integer] :month the julian month
+    # @option month_param [Integer] :julian_month the julian month
+    # @option month_param [Integer] :merch_month the MERCH month
     #
     # @return [Date] the starting date of the specified month
     def start_of_month(year, month_param)
@@ -51,7 +51,7 @@ module MerchCalendar
 
     # The end date of the month
     #
-    # @param year [Fixnum] the merch year
+    # @param year [Integer] the merch year
     # @param month_param [Hash] month hash
     #
     # @see #start_of_month The start_of_month method for examples using month_param
@@ -64,7 +64,7 @@ module MerchCalendar
 
     # The start date of the year
     #
-    # @param year [Fixnum] the merch year
+    # @param year [Integer] the merch year
     #
     # @return [Date] the starting date of the specified year
     def start_of_year(year)
@@ -73,7 +73,7 @@ module MerchCalendar
 
     # The end date of the year
     #
-    # @param year [Fixnum] the merch year
+    # @param year [Integer] the merch year
     #
     # @return [Date] the ending date of the specified year
     def end_of_year(year)
@@ -83,8 +83,8 @@ module MerchCalendar
 
     # The start date of the quarter
     #
-    # @param year [Fixnum] the merch year
-    # @param quarter [Fixnum] the quarter
+    # @param year [Integer] the merch year
+    # @param quarter [Integer] the quarter
     #
     # @return [Date] the starting date of the specified quarter
     def start_of_quarter(year, quarter)
@@ -93,8 +93,8 @@ module MerchCalendar
 
     # The end date of the quarter
     #
-    # @param year [Fixnum] the merch year
-    # @param quarter [Fixnum] the quarter
+    # @param year [Integer] the merch year
+    # @param quarter [Integer] the quarter
     #
     # @return [Date] the ending date of the specified quarter
     def end_of_quarter(year, quarter)
@@ -104,9 +104,9 @@ module MerchCalendar
 
     # Returns the number of weeks in a given merch year
     #
-    # @param year [Fixnum] the merch year
+    # @param year [Integer] the merch year
     #
-    # @return [Fixnum] number of weeks
+    # @return [Integer] number of weeks
     def weeks_in_year(year)
       retail_calendar.weeks_in_year(year)
     end
@@ -125,8 +125,8 @@ module MerchCalendar
 
     # Converts a merch month to the correct julian month
     #
-    # @param merch_month [Fixnum] the merch month to convert
-    # @return [Fixnum] the julian month
+    # @param merch_month [Integer] the merch month to convert
+    # @return [Integer] the julian month
     def merch_to_julian(merch_month)
       if merch_month == 12
         1
@@ -138,8 +138,8 @@ module MerchCalendar
 
     # Converts a julian month to a merch month
     #
-    # @param julian_month [Fixnum] the julian month to convert
-    # @return [Fixnum] the merch month
+    # @param julian_month [Integer] the julian month to convert
+    # @return [Integer] the merch month
     def julian_to_merch(julian_month)
       if julian_month == 1
         12
@@ -151,7 +151,7 @@ module MerchCalendar
 
     # An array of merch weeks in a given month
     #
-    # @param year [Fixnum] the merch year
+    # @param year [Integer] the merch year
     # @param month_param [Hash] month hash
     #
     # @see #start_of_month The start_of_month method for examples using month_param
@@ -185,7 +185,7 @@ module MerchCalendar
     # Reads the provided parameter and converts the value
     # to a MERCH MONTH
     def get_merch_month_param(param)
-      if param.is_a? Fixnum
+      if param.is_a?(Integer)
         return julian_to_merch(param)
       elsif param.is_a? Hash
         julian_month = param.delete(:julian_month) || param.delete(:month)

data/lib/merch_calendar/version.rb

@@ -1,3 +1,3 @@
 module MerchCalendar
-  VERSION = '0.3.0'
+  VERSION = '1.0.0'
 end

data/spec/merch_calendar/retail_calendar_spec.rb

@@ -250,7 +250,7 @@ RSpec.describe MerchCalendar::RetailCalendar do
       expect(weeks.size).to eq 4
     end
 
-    it "raises an ArgumentError if the param is not a hash with a key we care about or Fixnum" do
+    it "raises an ArgumentError if the param is not a hash with a key we care about or Integer" do
       expect { subject.weeks_for_month(2018, "3") }.to raise_error ArgumentError
       expect { subject.weeks_for_month(2018, some_month: 4) }.to raise_error ArgumentError
     end

data/spec/spec_helper.rb

@@ -1,9 +1,10 @@
 require "simplecov"
 require "coveralls"
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([
   SimpleCov::Formatter::HTMLFormatter,
   Coveralls::SimpleCov::Formatter
-]
+])
 SimpleCov.start { add_filter "/spec/" }
 
 require "pry"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: merch_calendar
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Mitch Dempsey
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-30 00:00:00.000000000 Z
+date: 2017-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Utility for manipulating dates within a 4-5-4 retail calendar