russian_workdays 1.4.0 → 2.0.0

data/lib/russian_workdays/day.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require "yaml"
+
+module RussianWorkdays
+  DATES = YAML.load_file(File.join(__dir__, "dates.yml")).freeze
+
+  class Day
+    def initialize(date)
+      @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))
+    end
+
+    def preholiday?
+      DATES[@date.year][:preholidays].include?(@date)
+    end
+
+    def work?
+      !holiday?
+    end
+
+    def type
+      return :holiday if holiday?
+      return :preholiday if preholiday?
+      return :work if work?
+    end
+
+    private
+
+      def weekend?
+        @date.sunday? || @date.saturday?
+      end
+  end
+end

data/lib/russian_workdays/month.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require_relative "collection_preset"
+
+module RussianWorkdays
+  class Month < CollectionPreset
+    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))
+    end
+  end
+end

data/lib/russian_workdays/version.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module RussianWorkdays
+  VERSION = "2.0.0".freeze
+end

data/lib/russian_workdays/year.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require_relative "collection_preset"
+
+module RussianWorkdays
+  class Year < CollectionPreset
+    def initialize(year = Date.today.year)
+      @dates = Collection.new(Date.new(year, 1, 1)..Date.new(year, 12, -1))
+    end
+  end
+end

data/lib/russian_workdays.rb

@@ -1,36 +1,6 @@
-require 'yaml'
+# frozen_string_literal: true
 
-class RussianWorkdays
-  class << self
-    %w(holiday short).each do |method|
-      define_method("#{method}?") do |date|
-        raise ArgumentError.new('Argument must be Date object') unless date.is_a?(Date)
-        dates[date.year][method].include?(date)
-      end
-
-      define_method("#{method}s") do |year|
-        has_data_for_year?(year)
-        dates[year][method]
-      end
-    end
-
-    def work?(date)
-      raise ArgumentError unless date.is_a?(Date)
-      !holidays(date.year).include?(date) && !shorts(date.year).include?(date)
-    end
-
-    def works(year)
-      has_data_for_year?(year)
-      (Date.new(year, 1, 1)..Date.new(year, 12, 31)).to_a - holidays(year) - shorts(year)
-    end
-
-    private
-      def has_data_for_year?(year)
-        raise ArgumentError.new('Data missing for that year') unless dates.keys.include?(year)
-      end
-
-      def dates
-        @@dates ||= YAML.load_file(File.expand_path('../russian_workdays/dates.yml', __FILE__))
-      end
-  end
-end
+require_relative "russian_workdays/collection"
+require_relative "russian_workdays/day"
+require_relative "russian_workdays/month"
+require_relative "russian_workdays/year"

data/russian_workdays.gemspec

@@ -1,23 +1,24 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
-  spec.name          = 'russian_workdays'
-  spec.version       = '1.4.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       = "2.0.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.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", "~> 1.6"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
 end

data/spec/collection_spec.rb

@@ -0,0 +1,27 @@
+# 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

@@ -0,0 +1,31 @@
+# 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

@@ -0,0 +1,27 @@
+# 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/spec_helper.rb

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

data/spec/year_spec.rb

@@ -0,0 +1,27 @@
+# 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: russian_workdays
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 2.0.0
 platform: ruby
 authors:
 - heckfy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-28 00:00:00.000000000 Z
+date: 2019-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -68,10 +68,19 @@ files:
 - README.md
 - Rakefile
 - 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/month.rb
+- lib/russian_workdays/version.rb
+- lib/russian_workdays/year.rb
 - russian_workdays.gemspec
-- spec/russian_workdays_spec.rb
+- spec/collection_spec.rb
+- spec/day_spec.rb
+- spec/month_spec.rb
 - spec/spec_helper.rb
+- spec/year_spec.rb
 homepage: https://github.com/heckfy/russian_workdays
 licenses:
 - MIT
@@ -96,5 +105,8 @@ signing_key:
 specification_version: 4
 summary: Russian workdays
 test_files:
-- spec/russian_workdays_spec.rb
+- spec/collection_spec.rb
+- spec/day_spec.rb
+- spec/month_spec.rb
 - spec/spec_helper.rb
+- spec/year_spec.rb

data/spec/russian_workdays_spec.rb

@@ -1,39 +0,0 @@
-require 'spec_helper'
-
-describe RussianWorkdays do
-  before(:all) do
-    @shorts = %w(2014-02-24 2014-03-07 2014-04-30 2014-05-08 2014-06-11 2014-12-31)
-    @holidays = %w(2014-01-01 2014-03-22 2014-07-12 2014-09-06 2014-10-26 2014-12-28)
-    @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 short days' do
-    expect(RussianWorkdays.shorts(2014).map(&:to_s)).to eq(@shorts)
-  end
-
-  it 'should return the right holydays' do
-    expect(RussianWorkdays.holidays(2014).map(&:to_s)).to include(*@holidays)
-  end
-
-  it 'should return the right short works' do
-    expect(RussianWorkdays.works(2014).map(&:to_s)).to include(*@works)
-  end
-
-  it 'should return true if date is short day' do
-    @shorts.each do |date|
-      expect(RussianWorkdays.short?(Date.parse(date))).to eq(true)
-    end
-  end
-
-  it 'should return true if date is holiday day' do
-    @holidays.each do |date|
-      expect(RussianWorkdays.holiday?(Date.parse(date))).to eq(true)
-    end
-  end
-
-  it 'should return true if date is work day' do
-    @works.each do |date|
-      expect(RussianWorkdays.work?(Date.parse(date))).to eq(true)
-    end
-  end
-end