russian_workdays 2.6.0 → 2.8.0

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.6.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(:instance_of_day) { described_class.new(date) }
+
+  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 { instance_of_day }.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 { instance_of_day }
+          .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
+        expect(instance_of_day.work?).to eq(true)
+      end
+    end
+
+    context 'when date is preholiday' do
+      let(:date) { preholiday_date }
+
+      it 'return true' do
+        expect(instance_of_day.work?).to eq(true)
+      end
+    end
+
+    context 'when date is holiday' do
+      let(:date) { holiday_date }
+
+      it 'return false' do
+        expect(instance_of_day.work?).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(instance_of_day.preholiday?).to eq(false)
+      end
+    end
+
+    context 'when date is preholiday' do
+      let(:date) { preholiday_date }
+
+      it 'return true' do
+        expect(instance_of_day.preholiday?).to eq(true)
+      end
+    end
+
+    context 'when date is holiday' do
+      let(:date) { holiday_date }
+
+      it 'return false' do
+        expect(instance_of_day.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(instance_of_day.holiday?).to eq(false)
+      end
+    end
+
+    context 'when date is preholiday' do
+      let(:date) { preholiday_date }
+
+      it 'return true' do
+        expect(instance_of_day.holiday?).to eq(false)
+      end
+    end
+
+    context 'when date is holiday' do
+      let(:date) { holiday_date }
+
+      it 'return false' do
+        expect(instance_of_day.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(instance_of_day.type).to eq(:work)
+      end
+    end
+
+    context 'when date is preholiday' do
+      let(:date) { preholiday_date }
+
+      it 'return :preholiday' do
+        expect(instance_of_day.type).to eq(:preholiday)
+      end
+    end
+
+    context 'when date is holiday' do
+      let(:date) { holiday_date }
+
+      it 'return :holiday' do
+        expect(instance_of_day.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,13 @@
 --- !ruby/object:Gem::Specification
 name: russian_workdays
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.8.0
 platform: ruby
 authors:
 - heckfy
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-26 00:00:00.000000000 Z
+date: 2025-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,76 +15,93 @@ 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: 
 rdoc_options: []
 require_paths:
 - lib
@@ -93,20 +109,19 @@ 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: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.6.2
 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