russian_workdays 0.0.1 → 1.0.0

data/lib/russian_workdays.rb

@@ -1,47 +1,36 @@
-require 'russian_workdays/version'
-require 'open-uri'
-require 'nokogiri'
+require 'yaml'
 
-module RussianWorkdays
+class RussianWorkdays
   class << self
-    def get_dates year
-      if @year == year
-        return @dates
-      else
-        @year = year
+    %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.to_s)
       end
-      @dates = parse Nokogiri::HTML(open("http://www.superjob.ru/proizvodstvennyj_kalendar/#{year}"))
-    end
 
-    def parse page
-      dates = {}
-      months = [nil, 'Январь', 'Февраль', 'Март', 'Апрель', 'Май', 'Июнь', 'Июль', 'Август', 'Сентябрь', 'Октябрь', 'Ноябрь', 'Декабрь']
-      page.css('td.pk_container').each do |month|
-        month.css('div.pk_cells div').each do |day|
-          unless day.attr('class') == 'pk_other'
-            date = Date.new @year, months.index(month.css('div.pk_header').inner_text), day.inner_text.to_i
-            case day.attr 'class'
-              when /pk_holiday/
-                dates[date] = 'holiday'
-              when /pk_preholiday/
-                dates[date] = 'short'
-              else
-                dates[date] = 'work'
-            end
-          end
-        end
+      define_method("#{method}s") do |year|
+        has_data_for_year?(year)
+        dates[year][method]
       end
-      dates
     end
 
-    %w(holiday short work).each do |method|
-      define_method("#{method}?") do |date|
-        get_dates(date.year)[date] == method
+    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
 
-      define_method("#{method}s") do |year|
-        get_dates(year).select{|key, value| value == method}.keys
+      def dates
+        @@dates ||= YAML.load_file(File.expand_path('../russian_workdays/dates.yml', __FILE__))
       end
-    end
   end
-end
+end

data/russian_workdays.gemspec

@@ -1,16 +1,15 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'russian_workdays/version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'russian_workdays'
-  spec.version       = RussianWorkdays::VERSION
+  spec.version       = '1.0.0'
   spec.authors       = ['heckfy']
   spec.email         = ['heckfyoz@gmail.com']
   spec.summary       = 'Russian workdays'
-  spec.description   = ''
-  spec.homepage      = ''
+  spec.description   = 'Производственный календарь РФ'
+  spec.homepage      = 'https://github.com/heckfy/russian_workdays'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")

data/spec/russian_workdays_spec.rb

@@ -21,19 +21,19 @@ describe RussianWorkdays do
 
   it 'should return true if date is short day' do
     @shorts.each do |date|
-      expect(RussianWorkdays.short?(Date.parse date)).to eq(true)
+      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)
+      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)
+      expect(RussianWorkdays.work?(Date.parse(date))).to eq(true)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: russian_workdays
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 1.0.0
 platform: ruby
 authors:
 - heckfy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-22 00:00:00.000000000 Z
+date: 2014-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,7 +52,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: ''
+description: "Производственный календарь РФ"
 email:
 - heckfyoz@gmail.com
 executables: []
@@ -65,11 +65,11 @@ files:
 - README.md
 - Rakefile
 - lib/russian_workdays.rb
-- lib/russian_workdays/version.rb
+- lib/russian_workdays/dates.yml
 - russian_workdays.gemspec
 - spec/russian_workdays_spec.rb
 - spec/spec_helper.rb
-homepage: ''
+homepage: https://github.com/heckfy/russian_workdays
 licenses:
 - MIT
 metadata: {}

data/lib/russian_workdays/version.rb

@@ -1,3 +0,0 @@
-module RussianWorkdays
-  VERSION = '0.0.1'
-end