russian_workdays 2.6.0 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 615b35e7fbf6a624b93b48e8cd1c958d7f32b8f2e04d131229aaf154479f8588
-  data.tar.gz: b5ac049a0a2ec1e3ddd4f23958193e49f9cc4a5a3a6050e281f1f8b270bb5f88
+  metadata.gz: 202f95e7558fdf25ad74f1c2b22af5802bb0e2c44c51a6522f262127a7a13179
+  data.tar.gz: e025d8cd63eb3c63f8b34d6209c1470fce148f4f5af64155399777e9244f4563
 SHA512:
-  metadata.gz: c92da678653c77e49932bff37af2f9ae55214a6a3fb3e26d3ccecdde8af8a662ee86822b20273b528c2e0608d3b5bad57d83e2bc4b495d998b6c80fbbcc500b2
-  data.tar.gz: 70750a19c6aab14cae25925529e6ff5b0919ba00ba85ea6eb27398b3c9ca412a5b7564e4febcc4c71cc9b16398ee80443d6d08766dcfed8e3856794ca13b1bdb
+  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}

@@ -436,127 +436,70 @@
   - 2022-02-22
   - 2022-03-05
   - 2022-11-03
+---
 2023:
   :holidays:
-    - 2023-01-01
-    - 2023-01-02
-    - 2023-01-03
-    - 2023-01-04
-    - 2023-01-05
-    - 2023-01-06
-    - 2023-01-07
-    - 2023-01-08
-    - 2023-01-14
-    - 2023-01-15
-    - 2023-01-21
-    - 2023-01-22
-    - 2023-01-28
-    - 2023-01-29
-    - 2023-02-04
-    - 2023-02-05
-    - 2023-02-11
-    - 2023-02-12
-    - 2023-02-18
-    - 2023-02-19
-    - 2023-02-23
-    - 2023-02-24
-    - 2023-02-25
-    - 2023-02-26
-    - 2023-03-04
-    - 2023-03-05
-    - 2023-03-08
-    - 2023-03-11
-    - 2023-03-12
-    - 2023-03-18
-    - 2023-03-19
-    - 2023-03-25
-    - 2023-03-26
-    - 2023-04-01
-    - 2023-04-02
-    - 2023-04-08
-    - 2023-04-09
-    - 2023-04-15
-    - 2023-04-16
-    - 2023-04-22
-    - 2023-04-23
-    - 2023-04-29
-    - 2023-04-30
-    - 2023-05-01
-    - 2023-05-06
-    - 2023-05-07
-    - 2023-05-08
-    - 2023-05-09
-    - 2023-05-13
-    - 2023-05-14
-    - 2023-05-20
-    - 2023-05-21
-    - 2023-05-27
-    - 2023-05-28
-    - 2023-06-03
-    - 2023-06-04
-    - 2023-06-10
-    - 2023-06-11
-    - 2023-06-12
-    - 2023-06-17
-    - 2023-06-18
-    - 2023-06-24
-    - 2023-06-25
-    - 2023-07-01
-    - 2023-07-02
-    - 2023-07-08
-    - 2023-07-09
-    - 2023-07-15
-    - 2023-07-16
-    - 2023-07-22
-    - 2023-07-23
-    - 2023-07-29
-    - 2023-07-30
-    - 2023-08-05
-    - 2023-08-06
-    - 2023-08-12
-    - 2023-08-13
-    - 2023-08-19
-    - 2023-08-20
-    - 2023-08-26
-    - 2023-08-27
-    - 2023-09-02
-    - 2023-09-03
-    - 2023-09-09
-    - 2023-09-10
-    - 2023-09-16
-    - 2023-09-17
-    - 2023-09-23
-    - 2023-09-24
-    - 2023-09-30
-    - 2023-10-01
-    - 2023-10-07
-    - 2023-10-08
-    - 2023-10-14
-    - 2023-10-15
-    - 2023-10-21
-    - 2023-10-22
-    - 2023-10-28
-    - 2023-10-29
-    - 2023-11-04
-    - 2023-11-05
-    - 2023-11-06
-    - 2023-11-11
-    - 2023-11-12
-    - 2023-11-18
-    - 2023-11-19
-    - 2023-11-25
-    - 2023-11-26
-    - 2023-12-02
-    - 2023-12-03
-    - 2023-12-09
-    - 2023-12-10
-    - 2023-12-16
-    - 2023-12-17
-    - 2023-12-23
-    - 2023-12-24
-    - 2023-12-30
-    - 2023-12-31
+  - 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:
-    - 2023-02-22
-    - 2023-03-07
-    - 2023-11-03
+  - 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.6.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