holidays 1.0.8 → 1.1.0

data/test/test_parse_definitions.rb

@@ -0,0 +1,24 @@
+require File.expand_path(File.dirname(__FILE__)) + '/test_helper'
+
+class ParseDefinitionsTests < Test::Unit::TestCase
+
+  def test_single_parse_definition_file
+    module_src, test_src = Holidays.parse_definition_files_and_return_source(:test_region, 'test/data/test_single_custom_holiday_defs.yaml')
+
+    assert_equal false, module_src.empty?
+    assert_equal false, test_src.empty?
+  end
+
+  def test_parsing_without_def_file_results_in_error
+    assert_raises ArgumentError do
+      Holidays.parse_definition_files_and_return_source(:custom)
+    end
+  end
+
+  def test_parsing_of_multiple_definition_files
+    module_src, test_src = Holidays.parse_definition_files_and_return_source(:test_region_multiple, 'test/data/test_single_custom_holiday_defs.yaml', 'test/data/test_custom_govt_holiday_defs.yaml')
+
+    assert_equal false, module_src.empty?
+    assert_equal false, test_src.empty?
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: holidays
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.1.0
 platform: ruby
 authors:
 - Alex Dunae
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-14 00:00:00.000000000 Z
+date: 2015-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,10 +58,10 @@ files:
 - data/au.yaml
 - data/be.yaml
 - data/br.yaml
-- data/build_defs.rb
 - data/ca.yaml
 - data/ch.yaml
 - data/cl.yaml
+- data/cr.yaml
 - data/cz.yaml
 - data/de.yaml
 - data/dk.yaml
@@ -69,6 +69,7 @@ files:
 - data/el.yaml
 - data/es.yaml
 - data/federal_reserve.yaml
+- data/fedex.yaml
 - data/fi.yaml
 - data/fr.yaml
 - data/gb.yaml
@@ -113,6 +114,7 @@ files:
 - lib/holidays/ca.rb
 - lib/holidays/ch.rb
 - lib/holidays/cl.rb
+- lib/holidays/cr.rb
 - lib/holidays/cz.rb
 - lib/holidays/de.rb
 - lib/holidays/dk.rb
@@ -120,6 +122,7 @@ files:
 - lib/holidays/el.rb
 - lib/holidays/es.rb
 - lib/holidays/europe.rb
+- lib/holidays/fed_ex.rb
 - lib/holidays/federal_reserve.rb
 - lib/holidays/fi.rb
 - lib/holidays/fr.rb
@@ -155,6 +158,9 @@ files:
 - lib/holidays/version.rb
 - lib/holidays/vi.rb
 - lib/holidays/za.rb
+- test/data/test_custom_govt_holiday_defs.yaml
+- test/data/test_multiple_custom_holiday_defs.yaml
+- test/data/test_single_custom_holiday_defs.yaml
 - test/defs/test_defs_ar.rb
 - test/defs/test_defs_at.rb
 - test/defs/test_defs_au.rb
@@ -163,6 +169,7 @@ files:
 - test/defs/test_defs_ca.rb
 - test/defs/test_defs_ch.rb
 - test/defs/test_defs_cl.rb
+- test/defs/test_defs_cr.rb
 - test/defs/test_defs_cz.rb
 - test/defs/test_defs_de.rb
 - test/defs/test_defs_dk.rb
@@ -170,6 +177,7 @@ files:
 - test/defs/test_defs_el.rb
 - test/defs/test_defs_es.rb
 - test/defs/test_defs_europe.rb
+- test/defs/test_defs_fed_ex.rb
 - test/defs/test_defs_federal_reserve.rb
 - test/defs/test_defs_fi.rb
 - test/defs/test_defs_fr.rb
@@ -198,16 +206,19 @@ files:
 - test/defs/test_defs_sg.rb
 - test/defs/test_defs_si.rb
 - test/defs/test_defs_sk.rb
+- test/defs/test_defs_united_nations.rb
 - test/defs/test_defs_ups.rb
 - test/defs/test_defs_us.rb
 - test/defs/test_defs_ve.rb
 - test/defs/test_defs_vi.rb
 - test/defs/test_defs_za.rb
 - test/test_all_regions.rb
+- test/test_custom_holidays.rb
 - test/test_date.rb
 - test/test_helper.rb
 - test/test_holidays.rb
 - test/test_multiple_regions.rb
+- test/test_parse_definitions.rb
 homepage: https://github.com/alexdunae/holidays
 licenses:
 - MIT
@@ -233,6 +244,9 @@ signing_key:
 specification_version: 4
 summary: A collection of Ruby methods to deal with statutory and other holidays.
 test_files:
+- test/data/test_custom_govt_holiday_defs.yaml
+- test/data/test_multiple_custom_holiday_defs.yaml
+- test/data/test_single_custom_holiday_defs.yaml
 - test/defs/test_defs_ar.rb
 - test/defs/test_defs_at.rb
 - test/defs/test_defs_au.rb
@@ -241,6 +255,7 @@ test_files:
 - test/defs/test_defs_ca.rb
 - test/defs/test_defs_ch.rb
 - test/defs/test_defs_cl.rb
+- test/defs/test_defs_cr.rb
 - test/defs/test_defs_cz.rb
 - test/defs/test_defs_de.rb
 - test/defs/test_defs_dk.rb
@@ -248,6 +263,7 @@ test_files:
 - test/defs/test_defs_el.rb
 - test/defs/test_defs_es.rb
 - test/defs/test_defs_europe.rb
+- test/defs/test_defs_fed_ex.rb
 - test/defs/test_defs_federal_reserve.rb
 - test/defs/test_defs_fi.rb
 - test/defs/test_defs_fr.rb
@@ -276,13 +292,16 @@ test_files:
 - test/defs/test_defs_sg.rb
 - test/defs/test_defs_si.rb
 - test/defs/test_defs_sk.rb
+- test/defs/test_defs_united_nations.rb
 - test/defs/test_defs_ups.rb
 - test/defs/test_defs_us.rb
 - test/defs/test_defs_ve.rb
 - test/defs/test_defs_vi.rb
 - test/defs/test_defs_za.rb
 - test/test_all_regions.rb
+- test/test_custom_holidays.rb
 - test/test_date.rb
 - test/test_helper.rb
 - test/test_holidays.rb
 - test/test_multiple_regions.rb
+- test/test_parse_definitions.rb

data/data/build_defs.rb

@@ -1,157 +0,0 @@
-require 'yaml'
-
-# Functions are stored in generated files as both Procs (:function) and 
-# Strings (:function_id). The String version makes comparisons of Procs much 
-# easier.
-#
-# TODO:
-# - better comparison of existing rules
-def parse_holiday_defs(module_name, files)
-  regions = []
-  rules_by_month = {}
-  custom_methods = {}
-  test_strs = []
-
-  files.each do |file|
-    def_file = YAML.load_file(file)
-    puts "  Loading #{file}"
-    if def_file['months']
-      puts "   - importing dates..."
-      def_file['months'].each do |month, definitions|
-        rules_by_month[month] = [] unless rules_by_month[month]
-        definitions.each do |definition|
-          rule = {}
-          definition.each do |key, val|
-            rule[key] = val
-          end
-
-          rule['regions'] = rule['regions'].collect { |r| r.to_sym }
-
-          regions << rule['regions']
-
-          exists = false
-          rules_by_month[month].each do |ex|
-            if ex['name'] == rule['name'] and ex['wday'] == rule['wday'] and ex['mday'] == rule['mday'] and ex['week'] == rule['week'] and ex['type'] == rule['type'] and ex['function'] == rule['function'] and ex['observed'] == rule['observed']
-              ex['regions'] << rule['regions'].flatten
-              exists = true
-            end
-          end
-          unless exists
-            rules_by_month[month] << rule
-          end
-
-        end # /defs.each
-      end
-    end
-
-    if def_file['methods']
-      puts "   - importing methods..."
-      def_file['methods'].each do |name, code|
-        custom_methods[name] = code
-      end # /methods.each
-    end
-
-    if def_file['tests']
-      puts "   - importing tests..."
-      test_strs << def_file['tests']
-    end
-  end
-
-  # Build the definitions
-  month_strs = []
-  rules_by_month.each do |month, rules|
-    month_str = "      #{month.to_s} => ["
-    rule_strings = []
-    rules.each do |rule|
-      str = '{'
-      if rule['mday']
-        str << ":mday => #{rule['mday']}, "
-      elsif rule['function']
-        str << ":function => lambda { |year| Holidays.#{rule['function']} }, "
-        str << ":function_id => \"#{rule['function'].to_s}\", "
-      else
-        str << ":wday => #{rule['wday']}, :week => #{rule['week']}, "
-      end
-
-      if rule['observed']
-        str << ":observed => lambda { |date| Holidays.#{rule['observed']}(date) }, "
-        str << ":observed_id => \"#{rule['observed'].to_s}\", "
-      end
-
-      if rule['type']
-        str << ":type => :#{rule['type']}, "
-      end
-
-      # shouldn't allow the same region twice
-      str << ":name => \"#{rule['name']}\", :regions => [:" + rule['regions'].uniq.join(', :') + "]}"
-      rule_strings << str
-    end
-    month_str << rule_strings.join(",\n            ") + "]"
-    month_strs << month_str
-  end
-
-  month_strs.join(",\n")
-
-
-  # Build the methods
-  method_str = ''
-  custom_methods.each do |key, code|
-    method_str << code + "\n\n"
-  end
-
-
-  # Build the module file
-  module_src =<<-EOM
-# encoding: utf-8
-module Holidays
-  # This file is generated by the Ruby Holidays gem.
-  #
-  # Definitions loaded: #{files.join(', ')}
-  #
-  # To use the definitions in this file, load it right after you load the 
-  # Holiday gem:
-  #
-  #   require 'holidays'
-  #   require 'holidays/#{module_name.downcase}'
-  #
-  # All the definitions are available at https://github.com/alexdunae/holidays
-  module #{module_name} # :nodoc:
-    def self.defined_regions
-      [:#{regions.flatten.uniq.join(', :')}]
-    end
-
-    def self.holidays_by_month
-      {
-        #{month_strs.join(",\n")}
-      }
-    end
-  end
-
-#{method_str}
-end
-
-Holidays.merge_defs(Holidays::#{module_name}.defined_regions, Holidays::#{module_name}.holidays_by_month)
-EOM
-
-
-# Build the test file
-  unless test_strs.empty?
-    test_src =<<-EndOfTests
-# encoding: utf-8
-require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
-
-# This file is generated by the Ruby Holiday gem.
-#
-# Definitions loaded: #{files.join(', ')}
-class #{module_name.capitalize}DefinitionTests < Test::Unit::TestCase  # :nodoc:
-
-  def test_#{module_name.downcase}
-#{test_strs.join("\n\n")}
-  end
-end
-    EndOfTests
-  end
-
-return module_src, test_src || ''
-
-end