russian_workdays 2.5.0 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77d756d31ba85d4d09a36690b10855a72b6ec9cc1f50d4ad4d3e8632ee1ce95e
-  data.tar.gz: 1feec99816452ec603ad8ad93602817cc67c4b2ea5e27facb0fd3b1bde83f2c4
+  metadata.gz: 202f95e7558fdf25ad74f1c2b22af5802bb0e2c44c51a6522f262127a7a13179
+  data.tar.gz: e025d8cd63eb3c63f8b34d6209c1470fce148f4f5af64155399777e9244f4563
 SHA512:
-  metadata.gz: e03ac919260e654a9154cf9ed37818bd57a3d3c2826dfcfb9254884a8d36c37e3cc3f4546da77d6ea8c596ad949e34539ee6c17fc39c50811ce3a8857511a356
-  data.tar.gz: e844e85e0756b30015aaba2fdf4172cee586809005e871a11aa6c697a0063b73b76ee922f4f93d5cf25aab5dfb3ca6502608d072780c6fefc978edcd38ce955b
+  metadata.gz: d2d0c957efda7da66731790c28931ae96d693089dbb1ce4a0c810b6e37f026e06ab1b98351762199eb76207a36a789694b2385c24226c653297cede860b9ad28
+  data.tar.gz: 7a96dfcaebb479bfe423121ba739178897b5ddf7a8f1309d5a40169f0dcfe8cf9e2d4f862b42dc48168b1302b41fb2c957740ca96a69b58ccd5915a0bd9cc960

data/.rubocop.yml

@@ -1,155 +1,8 @@
 AllCops:
-  TargetRubyVersion: 2.5
-  # RuboCop has a bunch of cops enabled by default. This setting tells RuboCop
-  # to ignore them, so only the ones explicitly set in this file are enabled.
-  DisabledByDefault: true
-
-# Prefer &&/|| over and/or.
-Style/AndOr:
-  Enabled: true
-
-# Do not use braces for hash literals when they are the last argument of a
-# method call.
-Style/BracesAroundHashParameters:
-  Enabled: true
-  EnforcedStyle: context_dependent
-
-# Align `when` with `case`.
-Layout/CaseIndentation:
-  Enabled: true
-
-# Align comments with method definitions.
-Layout/CommentIndentation:
-  Enabled: true
-
-Layout/ElseAlignment:
-  Enabled: true
-
-# Align `end` with the matching keyword or starting expression except for
-# assignments, where it should be aligned with the LHS.
-Layout/EndAlignment:
-  Enabled: true
-  EnforcedStyleAlignWith: variable
-  AutoCorrect: true
-
-Layout/EmptyLineAfterMagicComment:
-  Enabled: true
-
-# In a regular class definition, no empty lines around the body.
-Layout/EmptyLinesAroundClassBody:
-  Enabled: true
-
-# In a regular method definition, no empty lines around the body.
-Layout/EmptyLinesAroundMethodBody:
-  Enabled: true
-
-# In a regular module definition, no empty lines around the body.
-Layout/EmptyLinesAroundModuleBody:
-  Enabled: true
-
-Layout/FirstParameterIndentation:
-  Enabled: true
-
-# Use Ruby >= 1.9 syntax for hashes. Prefer { a: :b } over { :a => :b }.
-Style/HashSyntax:
-  Enabled: true
-
-# Method definitions after `private` or `protected` isolated calls need one
-# extra level of indentation.
-Layout/IndentationConsistency:
-  Enabled: true
-  EnforcedStyle: rails
-
-# Two spaces, no tabs (for indentation).
-Layout/IndentationWidth:
-  Enabled: true
-
-Layout/LeadingCommentSpace:
-  Enabled: true
-
-Layout/SpaceAfterColon:
-  Enabled: true
-
-Layout/SpaceAfterComma:
-  Enabled: true
-
-Layout/SpaceAroundEqualsInParameterDefault:
-  Enabled: true
-
-Layout/SpaceAroundKeyword:
-  Enabled: true
-
-Layout/SpaceAroundOperators:
-  Enabled: true
-
-Layout/SpaceBeforeComma:
-  Enabled: true
-
-Layout/SpaceBeforeFirstArg:
-  Enabled: true
-
-Style/DefWithParentheses:
-  Enabled: true
-
-# Defining a method with parameters needs parentheses.
-Style/MethodDefParentheses:
-  Enabled: true
-
-Style/FrozenStringLiteralComment:
-  Enabled: true
-  EnforcedStyle: always
-
-# Use `foo {}` not `foo{}`.
-Layout/SpaceBeforeBlockBraces:
-  Enabled: true
-
-# Use `foo { bar }` not `foo {bar}`.
-Layout/SpaceInsideBlockBraces:
-  Enabled: true
-
-# Use `{ a: 1 }` not `{a:1}`.
-Layout/SpaceInsideHashLiteralBraces:
-  Enabled: true
-
-Layout/SpaceInsideParens:
-  Enabled: true
-
-# Check quotes usage according to lint rule below.
-Style/StringLiterals:
-  Enabled: true
-  EnforcedStyle: double_quotes
-
-# Detect hard tabs, no hard tabs.
-Layout/Tab:
-  Enabled: true
-
-# Blank lines should not have any spaces.
-Layout/TrailingBlankLines:
-  Enabled: true
-
-# No trailing whitespace.
-Layout/TrailingWhitespace:
-  Enabled: true
-
-# Use quotes for string literals when they are enough.
-Style/UnneededPercentQ:
-  Enabled: true
-
-# Use my_method(my_arg) not my_method( my_arg ) or my_method my_arg.
-Lint/RequireParentheses:
-  Enabled: true
-
-Lint/StringConversionInInterpolation:
-  Enabled: true
-
-Style/RedundantReturn:
-  Enabled: true
-  AllowMultipleReturnValues: true
-
-Style/Semicolon:
-  Enabled: true
-  AllowAsExpressionSeparator: true
-
-# Prefer Foo.method over Foo::method
-Style/ColonMethodCall:
-  Enabled: true
+  TargetRubyVersion: 2.6
+Documentation:
+  Enabled: false
+Lint/MissingSuper:
+  Enabled: false
+Metrics/BlockLength:
+  AllowedMethods: ['describe', 'context']

data/CHANGELOG.md

@@ -0,0 +1,6 @@
+## [2.7.0] - 2025-02-03
+
+- Исправлены ошибки данных для 2023 года
+- Добавлены данные для 2024 года
+- Добавлены данные для 2025 года
+- Отрефакторен код гема

data/Gemfile

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 gemspec

data/Rakefile

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 # Default directory to look in is `/specs`
 # Run with `rake spec`

data/bin/console

@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'russian_workdays'
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require 'irb'
+IRB.start(__FILE__)

data/bin/setup

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/lib/{russian_workdays/dates.yml → dates.yml}

@@ -435,4 +435,71 @@
   :preholidays:
   - 2022-02-22
   - 2022-03-05
-  - 2022-11-03
+  - 2022-11-03
+---
+2023:
+  :holidays:
+  - 2023-01-02
+  - 2023-01-03
+  - 2023-01-04
+  - 2023-01-05
+  - 2023-01-06
+  - 2023-02-23
+  - 2023-02-24
+  - 2023-03-08
+  - 2023-05-01
+  - 2023-05-08
+  - 2023-05-09
+  - 2023-06-12
+  - 2023-11-06
+  :preholidays:
+  - 2023-02-22
+  - 2023-03-07
+  - 2023-11-03
+2024:
+  :holidays:
+  - 2024-01-01
+  - 2024-01-02
+  - 2024-01-03
+  - 2024-01-04
+  - 2024-01-05
+  - 2024-01-08
+  - 2024-02-23
+  - 2024-03-08
+  - 2024-04-29
+  - 2024-04-30
+  - 2024-05-01
+  - 2024-05-09
+  - 2024-05-10
+  - 2024-06-12
+  - 2024-11-04
+  - 2024-12-30
+  - 2024-12-31
+  :preholidays:
+  - 2024-02-22
+  - 2024-03-07
+  - 2024-05-08
+  - 2024-06-11
+  - 2024-11-02
+2025:
+  :holidays:
+  - 2025-01-01
+  - 2025-01-02
+  - 2025-01-03
+  - 2025-01-06
+  - 2025-01-07
+  - 2025-01-08
+  - 2025-05-01
+  - 2025-05-02
+  - 2025-05-08
+  - 2025-05-09
+  - 2025-06-12
+  - 2025-06-13
+  - 2025-11-03
+  - 2025-11-04
+  - 2025-12-31
+  :preholidays:
+  - 2025-03-07
+  - 2025-04-30
+  - 2025-06-11
+  - 2025-11-01

data/lib/russian_workdays/collection.rb

@@ -3,32 +3,52 @@
 module RussianWorkdays
   class Collection
     include Enumerable
-    AVAILABLE_WORK_HOURS_PER_WEEK = [24, 36, 40].freeze
+
+    WORK_HOURS_PER_DAY = {
+      24 => 4.8,
+      36 => 7.2,
+      40 => 8.0
+    }.freeze
+
+    attr_reader :collection
 
     def initialize(collection)
-      unless %w[Array Range].include? collection.class.name
-        raise ArgumentError, "Must be a Array or Range object"
-      end
-      @collection = collection.to_a
+      raise ArgumentError, 'Must be a Array or Range object' unless [Array, Range].include?(collection.class)
+
+      collection.each { |date| raise MissingYearError, date.year unless DATES.key?(date.year) }
+
+      @collection = collection.map { |day| Day.new(day) }
     end
 
-    def each
-      @collection.each { |i| yield(i) }
+    def each(&block)
+      collection.each(&block)
     end
 
     %w[holiday preholiday work].each do |type|
       define_method "#{type}s" do
-        @collection.select { |date| Day.new(date).send("#{type}?") }
+        collection.select { |day| day.send("#{type}?") }.map(&:to_date)
       end
     end
 
-    def work_hours_count(work_hours_per_week = 40)
-      unless AVAILABLE_WORK_HOURS_PER_WEEK.include?(work_hours_per_week)
-        raise ArgumentError, "Unknown work hours count. Must be one of #{AVAILABLE_WORK_HOURS_PER_WEEK}"
+    def work_hours_count(work_hours_per_week = WORK_HOURS_PER_DAY.keys.last)
+      unless WORK_HOURS_PER_DAY.keys.include?(work_hours_per_week)
+        raise ArgumentError, "Unknown work hours count. Must be one of: #{WORK_HOURS_PER_DAY.keys.join(', ')}"
+      end
+
+      collection.sum { |day| calculate_work_hours(day, work_hours_per_week) }.ceil(1)
+    end
+
+    private
+
+    def calculate_work_hours(day, work_hours_per_week)
+      case day.type
+      when :work
+        WORK_HOURS_PER_DAY[work_hours_per_week]
+      when :preholiday
+        WORK_HOURS_PER_DAY[work_hours_per_week] - 1
+      else
+        0
       end
-      work_hours_per_day = (work_hours_per_week / 5.to_f)
-      mapping = { work: work_hours_per_day, preholiday: work_hours_per_day - 1 }
-      @collection.map { |i| mapping.fetch(Day.new(i).type, 0) }.sum.ceil(1)
     end
   end
 end

data/lib/russian_workdays/collection_preset.rb

@@ -1,8 +1,16 @@
 # frozen_string_literal: true
 
-require "forwardable"
+require 'forwardable'
 
-class CollectionPreset
-  extend Forwardable
-  def_delegators :@dates, :holidays, :preholidays, :works, :work_hours_count
+module RussianWorkdays
+  class CollectionPreset
+    extend Forwardable
+    def_delegators :dates, :holidays, :preholidays, :works, :work_hours_count
+
+    private
+
+    def dates
+      Collection.new(range)
+    end
+  end
 end

data/lib/russian_workdays/day.rb

@@ -1,23 +1,26 @@
 # frozen_string_literal: true
 
-require "yaml"
+require_relative 'missing_year_error'
 
 module RussianWorkdays
-  DATES = YAML.load_file(File.join(__dir__, "dates.yml")).freeze
-
   class Day
+    attr_reader :date
+
     def initialize(date)
+      raise ArgumentError, 'Must be a Date object' unless date.is_a?(::Date)
+      raise MissingYearError, date.year unless DATES.key?(date.year)
+
       @date = date
-      raise ArgumentError, "Must be a Date object" unless @date.is_a?(::Date)
-      raise ArgumentError, "Data missing for that year" unless DATES.key?(@date.year)
     end
 
     def holiday?
-      !preholiday? && (weekend? || DATES[@date.year][:holidays].include?(@date))
+      return true if DATES[date.year][:holidays].include?(date)
+
+      !preholiday? && weekend?
     end
 
     def preholiday?
-      DATES[@date.year][:preholidays].include?(@date)
+      DATES[date.year][:preholidays].include?(date)
     end
 
     def work?
@@ -27,13 +30,18 @@ module RussianWorkdays
     def type
       return :holiday if holiday?
       return :preholiday if preholiday?
-      return :work if work?
+
+      :work if work?
+    end
+
+    def to_date
+      date
     end
 
     private
 
-      def weekend?
-        @date.sunday? || @date.saturday?
-      end
+    def weekend?
+      date.sunday? || date.saturday?
+    end
   end
 end

data/lib/russian_workdays/missing_year_error.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module RussianWorkdays
+  class MissingYearError < ArgumentError
+    attr_reader :year
+
+    def initialize(year)
+      super
+      @year = year
+    end
+
+    def to_s
+      "Data missing for that year: #{year}"
+    end
+  end
+end

data/lib/russian_workdays/month.rb

@@ -1,12 +1,24 @@
 # frozen_string_literal: true
 
-require_relative "collection_preset"
+require_relative 'missing_year_error'
+require_relative 'collection_preset'
 
 module RussianWorkdays
   class Month < CollectionPreset
+    attr_reader :year, :month
+
     def initialize(year = Date.today.year, month = 1)
-      raise ArgumentError, "Must be a number between 1 and 12" unless (1..12).include?(month)
-      @dates = Collection.new(Date.new(year, month, 1)..Date.new(year, month, -1))
+      raise MissingYearError, year unless DATES.key?(year)
+      raise ArgumentError, 'Must be a number between 1 and 12' unless (1..12).include?(month)
+
+      @year = year
+      @month = month
+    end
+
+    private
+
+    def range
+      Date.new(year, month, 1)..Date.new(year, month, -1)
     end
   end
 end

data/lib/russian_workdays/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RussianWorkdays
-  VERSION = "2.5.0".freeze
+  VERSION = '2.7.0'
 end

data/lib/russian_workdays/year.rb

@@ -1,11 +1,22 @@
 # frozen_string_literal: true
 
-require_relative "collection_preset"
+require_relative 'missing_year_error'
+require_relative 'collection_preset'
 
 module RussianWorkdays
   class Year < CollectionPreset
+    attr_reader :year
+
     def initialize(year = Date.today.year)
-      @dates = Collection.new(Date.new(year, 1, 1)..Date.new(year, 12, -1))
+      raise MissingYearError, year unless DATES.key?(year)
+
+      @year = year
+    end
+
+    private
+
+    def range
+      Date.new(year, 1, 1)..Date.new(year, 12, -1)
     end
   end
 end

data/lib/russian_workdays.rb

@@ -1,6 +1,15 @@
 # frozen_string_literal: true
 
-require_relative "russian_workdays/collection"
-require_relative "russian_workdays/day"
-require_relative "russian_workdays/month"
-require_relative "russian_workdays/year"
+require 'yaml'
+require 'date'
+require_relative 'russian_workdays/collection'
+require_relative 'russian_workdays/day'
+require_relative 'russian_workdays/month'
+require_relative 'russian_workdays/year'
+
+module RussianWorkdays
+  YAML_FILE = File.read(File.join(__dir__, 'dates.yml')).freeze
+  DATES = YAML.safe_load(YAML_FILE, permitted_classes: [::Date, Symbol]).freeze
+
+  private_constant :YAML_FILE
+end

data/russian_workdays.gemspec

@@ -1,24 +1,27 @@
 # frozen_string_literal: true
 
-lib = File.expand_path("lib", __dir__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require_relative 'lib/russian_workdays/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "russian_workdays"
-  spec.version       = "2.5.0"
-  spec.authors       = ["heckfy"]
-  spec.email         = ["heckfyoz@gmail.com"]
-  spec.summary       = "Russian workdays"
-  spec.description   = "Производственный календарь РФ"
-  spec.homepage      = "https://github.com/heckfy/russian_workdays"
-  spec.license       = "MIT"
+  spec.name          = 'russian_workdays'
+  spec.version       = RussianWorkdays::VERSION
+  spec.authors       = ['heckfy']
+  spec.email         = ['heckfyoz@gmail.com']
+  spec.summary       = 'Russian workdays'
+  spec.description   = 'Производственный календарь РФ'
+  spec.homepage      = 'https://github.com/heckfy/russian_workdays'
+  spec.license       = 'MIT'
+  spec.required_ruby_version = '>= 2.6.0'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", "~> 1.6"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
+  spec.add_development_dependency 'bundler', '~> 2.4'
+  spec.add_development_dependency 'rake', '~> 13.2'
+  spec.add_development_dependency 'rspec', '~> 3.1'
+  spec.add_development_dependency 'rubocop', '~> 1.71.1'
 end

data/spec/lib/collection_spec.rb

@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe RussianWorkdays::Collection do
+  subject(:instance_of_collection) { described_class.new(range) }
+
+  let(:year) { 2014 }
+  let(:month) { 2 }
+  let(:range) { (Date.new(year, month, 20)..Date.new(year, month, -1)) }
+
+  describe '#initialize' do
+    context 'when missing data for that year' do
+      let(:year) { 1990 }
+
+      it 'raise MissingYearError' do
+        expect { instance_of_collection }
+          .to raise_error(RussianWorkdays::MissingYearError, /Data missing for that year: 1990/)
+      end
+    end
+
+    context 'when range is not Array or Range object' do
+      let(:range) { 0 }
+
+      it 'raise ArgumentError' do
+        expect { instance_of_collection }
+          .to raise_error(ArgumentError, /Must be a Array or Range object/)
+      end
+    end
+  end
+
+  describe '#holidays' do
+    let(:expected_array) do
+      [22, 23].map { |day| Date.new(year, month, day) }
+    end
+
+    it 'array of holidays Date' do
+      expect(instance_of_collection.holidays).to eq(expected_array)
+    end
+  end
+
+  describe '#preholidays' do
+    let(:expected_array) do
+      [Date.new(year, month, 24)]
+    end
+
+    it 'array of preholidays Date' do
+      expect(instance_of_collection.preholidays).to eq(expected_array)
+    end
+  end
+
+  describe '#works' do
+    let(:expected_array) do
+      [20, 21, 24, 25, 26, 27, 28].map do |day|
+        Date.new(year, month, day)
+      end
+    end
+
+    it 'array of works Date' do
+      expect(instance_of_collection.works).to eq(expected_array)
+    end
+  end
+
+  describe '#work_hours_count' do
+    context 'when work_hours_per_week is not one of: 24, 36, 40' do
+      it 'raise ArgumentError' do
+        expect { instance_of_collection.work_hours_count(10) }
+          .to raise_error(ArgumentError, /Unknown work hours count. Must be one of: 24, 36, 40/)
+      end
+    end
+
+    context 'when week have 24 work hours' do
+      it { expect(instance_of_collection.work_hours_count(24)).to eq(32.6) }
+    end
+
+    context 'when week have 36 work hours' do
+      it { expect(instance_of_collection.work_hours_count(36)).to eq(49.4) }
+    end
+
+    context 'when week have 40 work hours' do
+      it { expect(instance_of_collection.work_hours_count).to eq(55) }
+    end
+  end
+end

data/spec/lib/day_spec.rb

@@ -0,0 +1,135 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require 'date'
+
+describe RussianWorkdays::Day do
+  subject(:work?) { described_class.new(date).work? }
+
+  let(:work_date) { Date.new(2014, 5, 5) }
+  let(:preholiday_date) { Date.new(2014, 2, 24) }
+  let(:holiday_date) { Date.new(2014, 5, 1) }
+
+  describe '#initialize' do
+    context 'when date is not Date object' do
+      let(:date) { 'string' }
+
+      it 'raise ArgumentError' do
+        expect { described_class.new(date) }.to raise_error(ArgumentError, /Must be a Date object/)
+      end
+    end
+
+    context 'when missing data for that year' do
+      let(:date) { Date.new(1990, 1, 1) }
+
+      it 'raise MissingYearError' do
+        expect { described_class.new(date) }
+          .to raise_error(RussianWorkdays::MissingYearError, /Data missing for that year: 1990/)
+      end
+    end
+  end
+
+  describe '#work?' do
+    context 'when date is work day' do
+      let(:date) { work_date }
+
+      it 'return true' do
+        is_expected.to eq(true)
+      end
+    end
+
+    context 'when date is preholiday' do
+      let(:date) { preholiday_date }
+
+      it 'return true' do
+        is_expected.to eq(true)
+      end
+    end
+
+    context 'when date is holiday' do
+      let(:date) { holiday_date }
+
+      it 'return false' do
+        is_expected.to eq(false)
+      end
+    end
+  end
+
+  describe '#preholiday?' do
+    context 'when date is work day' do
+      let(:date) { work_date }
+
+      it 'return true' do
+        expect(RussianWorkdays::Day.new(date).preholiday?).to eq(false)
+      end
+    end
+
+    context 'when date is preholiday' do
+      let(:date) { preholiday_date }
+
+      it 'return true' do
+        expect(RussianWorkdays::Day.new(date).preholiday?).to eq(true)
+      end
+    end
+
+    context 'when date is holiday' do
+      let(:date) { holiday_date }
+
+      it 'return false' do
+        expect(RussianWorkdays::Day.new(date).preholiday?).to eq(false)
+      end
+    end
+  end
+
+  describe '#holiday?' do
+    context 'when date is work day' do
+      let(:date) { work_date }
+
+      it 'return true' do
+        expect(RussianWorkdays::Day.new(date).holiday?).to eq(false)
+      end
+    end
+
+    context 'when date is preholiday' do
+      let(:date) { preholiday_date }
+
+      it 'return true' do
+        expect(RussianWorkdays::Day.new(date).holiday?).to eq(false)
+      end
+    end
+
+    context 'when date is holiday' do
+      let(:date) { holiday_date }
+
+      it 'return false' do
+        expect(RussianWorkdays::Day.new(date).holiday?).to eq(true)
+      end
+    end
+  end
+
+  describe '#type' do
+    context 'when date is work day' do
+      let(:date) { work_date }
+
+      it 'return :work' do
+        expect(RussianWorkdays::Day.new(date).type).to eq(:work)
+      end
+    end
+
+    context 'when date is preholiday' do
+      let(:date) { preholiday_date }
+
+      it 'return :preholiday' do
+        expect(RussianWorkdays::Day.new(date).type).to eq(:preholiday)
+      end
+    end
+
+    context 'when date is holiday' do
+      let(:date) { holiday_date }
+
+      it 'return :holiday' do
+        expect(RussianWorkdays::Day.new(date).type).to eq(:holiday)
+      end
+    end
+  end
+end

data/spec/lib/month_spec.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe RussianWorkdays::Month do
+  subject(:instance_of_month) { described_class.new(year, month) }
+
+  let(:year) { 2014 }
+  let(:month) { 2 }
+
+  describe '#initialize' do
+    context 'when missing data for that year' do
+      let(:year) { 1990 }
+
+      it 'raise MissingYearError' do
+        expect { instance_of_month }
+          .to raise_error(RussianWorkdays::MissingYearError, /Data missing for that year: 1990/)
+      end
+    end
+
+    context 'when month is not in 1..12' do
+      let(:month) { 0 }
+
+      it 'raise ArgumentError' do
+        expect { instance_of_month }
+          .to raise_error(ArgumentError, /Must be a number between 1 and 12/)
+      end
+    end
+  end
+
+  describe '#holidays' do
+    let(:expected_array) do
+      [1, 2, 8, 9, 15, 16, 22, 23].map { |day| Date.new(year, month, day) }
+    end
+
+    it 'array of holidays Date' do
+      expect(instance_of_month.holidays).to eq(expected_array)
+    end
+  end
+
+  describe '#preholidays' do
+    let(:expected_array) do
+      [Date.new(year, month, 24)]
+    end
+
+    it 'array of preholidays Date' do
+      expect(instance_of_month.preholidays).to eq(expected_array)
+    end
+  end
+
+  describe '#works' do
+    let(:expected_array) do
+      [3, 4, 5, 6, 7, 10, 11, 12, 13, 14, 17, 18, 19, 20, 21, 24, 25, 26, 27, 28].map do |day|
+        Date.new(year, month, day)
+      end
+    end
+
+    it 'array of works Date' do
+      expect(instance_of_month.works).to eq(expected_array)
+    end
+  end
+end

data/spec/lib/year_spec.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe RussianWorkdays::Year do
+  subject(:instance_of_year) { described_class.new(year) }
+
+  let(:year) { 2014 }
+
+  describe '#initialize' do
+    context 'when missing data for that year' do
+      let(:year) { 1990 }
+
+      it 'raise MissingYearError' do
+        expect { instance_of_year }
+          .to raise_error(RussianWorkdays::MissingYearError, /Data missing for that year: 1990/)
+      end
+    end
+  end
+
+  describe '#holidays' do
+    let(:expected_array) do
+      (1..12).flat_map { |month| RussianWorkdays::Month.new(year, month).holidays }
+    end
+
+    it 'array of holidays Date' do
+      expect(instance_of_year.holidays).to eq(expected_array)
+    end
+  end
+
+  describe '#preholidays' do
+    let(:expected_array) do
+      (1..12).flat_map { |month| RussianWorkdays::Month.new(year, month).preholidays }
+    end
+
+    it 'array of preholidays Date' do
+      expect(instance_of_year.preholidays).to eq(expected_array)
+    end
+  end
+
+  describe '#works' do
+    let(:expected_array) do
+      (1..12).flat_map { |month| RussianWorkdays::Month.new(year, month).works }
+    end
+
+    it 'array of works Date' do
+      expect(instance_of_year.works).to eq(expected_array)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "bundler/setup"
+require 'bundler/setup'
 Bundler.setup
 
-require "russian_workdays"
+require 'russian_workdays'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: russian_workdays
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.7.0
 platform: ruby
 authors:
 - heckfy
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-05 00:00:00.000000000 Z
+date: 2025-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,76 +16,94 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.71.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.71.1
 description: Производственный календарь РФ
 email:
 - heckfyoz@gmail.com
-executables: []
+executables:
+- console
+- setup
 extensions: []
 extra_rdoc_files: []
 files:
-- ".codeclimate.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/console
+- bin/setup
+- lib/dates.yml
 - lib/russian_workdays.rb
 - lib/russian_workdays/collection.rb
 - lib/russian_workdays/collection_preset.rb
-- lib/russian_workdays/dates.yml
 - lib/russian_workdays/day.rb
+- lib/russian_workdays/missing_year_error.rb
 - lib/russian_workdays/month.rb
 - lib/russian_workdays/version.rb
 - lib/russian_workdays/year.rb
 - russian_workdays.gemspec
-- spec/collection_spec.rb
-- spec/day_spec.rb
-- spec/month_spec.rb
+- spec/lib/collection_spec.rb
+- spec/lib/day_spec.rb
+- spec/lib/month_spec.rb
+- spec/lib/year_spec.rb
 - spec/spec_helper.rb
-- spec/year_spec.rb
 homepage: https://github.com/heckfy/russian_workdays
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -93,21 +111,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: Russian workdays
 test_files:
-- spec/collection_spec.rb
-- spec/day_spec.rb
-- spec/month_spec.rb
+- spec/lib/collection_spec.rb
+- spec/lib/day_spec.rb
+- spec/lib/month_spec.rb
+- spec/lib/year_spec.rb
 - spec/spec_helper.rb
-- spec/year_spec.rb

data/.codeclimate.yml

@@ -1,16 +0,0 @@
----
-engines:
-  duplication:
-    enabled: true
-    config:
-      languages:
-      - ruby
-  fixme:
-    enabled: true
-  rubocop:
-    enabled: true
-ratings:
-  paths:
-  - "**.rb"
-exclude_paths:
-- spec/

data/.travis.yml

@@ -1,3 +0,0 @@
-language: ruby
-rvm:
-  - 2.1

data/spec/collection_spec.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-describe RussianWorkdays::Collection do
-  before(:all) do
-    @collection = RussianWorkdays::Collection.new((Date.new(2014, 1, 1)..Date.new(2014, 12, -1)))
-    @holidays = %w[2014-01-01 2014-03-22 2014-07-12 2014-09-06 2014-10-26 2014-12-28]
-    @preholidays = %w[2014-02-24 2014-03-07 2014-04-30 2014-05-08 2014-06-11 2014-12-31]
-    @works = %w[2014-01-09 2014-02-03 2014-05-27 2014-07-22 2014-11-11 2014-12-30]
-  end
-
-  it "should return the right preholiday days" do
-    preholidays = @collection.preholidays.map(&:to_s)
-    expect(preholidays).to eq(@preholidays)
-  end
-
-  it "should return the right holydays" do
-    holidays = @collection.holidays.map(&:to_s)
-    expect(holidays).to include(*@holidays)
-  end
-
-  it "should return the right preholiday works" do
-    works = @collection.works.map(&:to_s)
-    expect(works).to include(*@works)
-  end
-end

data/spec/day_spec.rb

@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-require "date"
-
-describe RussianWorkdays::Year do
-  before(:all) do
-    @year = RussianWorkdays::Year.new(2014)
-    @holidays = %w[2014-05-01 2014-05-02 2014-05-03 2014-05-04]
-    @preholidays = %w[2014-02-24 2014-03-07 2014-04-30 2014-05-08 2014-06-11 2014-12-31]
-    @works = %w[2014-05-05 2014-05-06 2014-05-06]
-  end
-
-  it "should return true if date is preholiday day" do
-    @preholidays.each do |date|
-      expect(RussianWorkdays::Day.new(Date.parse(date)).preholiday?).to eq(true)
-    end
-  end
-
-  it "should return true if date is holiday day" do
-    @holidays.each do |date|
-      expect(RussianWorkdays::Day.new(Date.parse(date)).holiday?).to eq(true)
-    end
-  end
-
-  it "should return true if date is work day" do
-    @works.each do |date|
-      expect(RussianWorkdays::Day.new(Date.parse(date)).work?).to eq(true)
-    end
-  end
-end

data/spec/month_spec.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-describe RussianWorkdays::Month do
-  before(:all) do
-    @month = RussianWorkdays::Month.new(2014, 5)
-    @holidays = %w[2014-05-01 2014-05-02 2014-05-03 2014-05-04]
-    @preholidays = %w[2014-05-08]
-    @works = %w[2014-05-05 2014-05-06 2014-05-06]
-  end
-
-  it "should return the right preholiday days" do
-    preholidays = @month.preholidays.map(&:to_s)
-    expect(preholidays).to eq(@preholidays)
-  end
-
-  it "should return the right holydays" do
-    holidays = @month.holidays.map(&:to_s)
-    expect(holidays).to include(*@holidays)
-  end
-
-  it "should return the right preholiday works" do
-    works = @month.works.map(&:to_s)
-    expect(works).to include(*@works)
-  end
-end

data/spec/year_spec.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-describe RussianWorkdays::Year do
-  before(:all) do
-    @year = RussianWorkdays::Year.new(2014)
-    @holidays = %w[2014-05-01 2014-05-02 2014-05-03 2014-05-04]
-    @preholidays = %w[2014-02-24 2014-03-07 2014-04-30 2014-05-08 2014-06-11 2014-12-31]
-    @works = %w[2014-05-05 2014-05-06 2014-05-06]
-  end
-
-  it "should return the right preholiday days" do
-    preholidays = @year.preholidays.map(&:to_s)
-    expect(preholidays).to eq(@preholidays)
-  end
-
-  it "should return the right holydays" do
-    holidays = @year.holidays.map(&:to_s)
-    expect(holidays).to include(*@holidays)
-  end
-
-  it "should return the right preholiday works" do
-    works = @year.works.map(&:to_s)
-    expect(works).to include(*@works)
-  end
-end