enrico 0.1.6 → 0.2.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NzI4ZjMxMDE2MGZjNTkxYjFjMzQyNDA0Mzg4Y2RmNWVkMmNiMmZjMQ==
-  data.tar.gz: !binary |-
-    MDRhZGI5OTQ3ZTE4MDlmNzYyZWMyNGU2YWRkMDAwMWZiM2YwZDBhNw==
+SHA256:
+  metadata.gz: e0b4284f18313432a7dee8a1e136124640ec57c209b6a561a587c3ea3d06040f
+  data.tar.gz: 41e49cd778f06f64c40da5def29fa3bff9b3b4e6639484d907d22566d3630de2
 SHA512:
-  metadata.gz: !binary |-
-    ZjViZTNkNDRkM2IxZTVlNjc0OWQ1ZWY3Mjk4NTNmMTdiNDEyZjkyMWU0ZjNi
-    NjllMDQxMTNiMmU0MTk3MWIyMTQyYTdmZWFjMTYxMzYwZDM1ZjE4ZDIyMWY2
-    MzE1ZWQwMWYxMmJlMzM5YzhmNzA1ZWRlYWIxMzQ5NTFlZTEyMzI=
-  data.tar.gz: !binary |-
-    YzZmMzlmNjU5YmM1MWRjMmYyOTY2MjQ5ZDM1Zjg1ODA4NDQxN2I2NGViMjIw
-    MWFjOTE0OGU2OWZhMGUyYWEzOGQwN2UwM2MzNGU4MzhlY2U2YWYzZTRhMWIx
-    MzI1NGQxNjBkZTMzM2ZmN2YwN2QwNDk0Y2ExZDI3NjY2MmRlOGY=
+  metadata.gz: db42d425e79f2eb8994bb61599b010aa86e94cea6d901a0e65c93a2ccf5476043d25398b61e8035114dc04317bc8bed71964d9a0db82a27f8ba7f122f3b8c47b
+  data.tar.gz: 7a601e5ae90395d6a1174fd8423fc1fe643c6ee46fedc5b290cb9de0dbcb4aaceef83361f2b7caea902c633d5e74aab12ed1e2d3f98258f8a06e9ecc54975a78

data/.github/workflows/test.yml

@@ -0,0 +1,21 @@
+name: test
+
+on:
+  push:
+    branches:
+      - "**"
+    tags-ignore:
+      - "*.*"
+
+jobs:
+  minitest:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.6.10
+          bundler-cache: true
+      - name: Run tests
+        run: bundle exec rake test

data/.ruby-version

@@ -0,0 +1 @@
+2.6.10

data/Gemfile

@@ -1,15 +1,18 @@
 source "http://rubygems.org"
+
+ruby '2.6.10'
+
 # Add dependencies required to use your gem here.
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
-gem 'httparty', '0.12.0'
+gem 'httparty', '~> 0.21.0'
 
 group :development do
   gem "bundler"
-  gem "jeweler", "1.8.8"
+  gem "jeweler"
   gem "simplecov"
   gem "rdoc"
   gem "shoulda"
@@ -17,7 +20,7 @@ group :development do
 end
 
 group :test do
-  gem 'webmock', "< 1.9"
+  gem 'webmock'
   gem 'vcr'
   gem 'turn'
   gem 'rake'

data/Gemfile.lock

@@ -1,93 +1,103 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (4.0.1)
-      i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
-      thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    addressable (2.3.5)
-    ansi (1.4.3)
-    atomic (1.1.14)
-    builder (3.2.2)
-    crack (0.4.1)
-      safe_yaml (~> 0.9.0)
-    docile (1.1.1)
-    faraday (0.8.8)
-      multipart-post (~> 1.2.0)
-    git (1.2.6)
-    github_api (0.10.1)
-      addressable
-      faraday (~> 0.8.1)
+    activesupport (5.2.4.3)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    ansi (1.5.0)
+    builder (3.2.4)
+    concurrent-ruby (1.1.7)
+    crack (0.4.3)
+      safe_yaml (~> 1.0.0)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    docile (1.3.2)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
+    git (1.7.0)
+      rchardet (~> 1.8)
+    github_api (0.11.3)
+      addressable (~> 2.3)
+      descendants_tracker (~> 0.0.1)
+      faraday (~> 0.8, < 0.10)
       hashie (>= 1.2)
-      multi_json (~> 1.4)
-      nokogiri (~> 1.5.2)
+      multi_json (>= 1.7.5, < 2.0)
+      nokogiri (~> 1.6.0)
       oauth2
-    hashie (2.0.5)
-    highline (1.6.20)
-    httparty (0.12.0)
-      json (~> 1.8)
+    hashdiff (1.0.1)
+    hashie (4.1.0)
+    highline (2.0.3)
+    httparty (0.21.0)
+      mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    httpauth (0.2.0)
-    i18n (0.6.5)
-    jeweler (1.8.8)
+    i18n (1.8.5)
+      concurrent-ruby (~> 1.0)
+    jeweler (2.3.5)
       builder
-      bundler (~> 1.0)
+      bundler (>= 1.0)
       git (>= 1.2.5)
-      github_api (= 0.10.1)
+      github_api (~> 0.11.0)
       highline (>= 1.6.15)
-      nokogiri (= 1.5.10)
+      nokogiri (>= 1.5.10)
+      psych (~> 2.2)
       rake
       rdoc
-    json (1.8.1)
-    jwt (0.1.8)
-      multi_json (>= 1.5)
-    minitest (4.7.5)
-    multi_json (1.8.2)
-    multi_xml (0.5.5)
-    multipart-post (1.2.0)
-    nokogiri (1.5.10)
-    oauth2 (0.9.2)
-      faraday (~> 0.8)
-      httpauth (~> 0.2)
-      jwt (~> 0.1.4)
-      multi_json (~> 1.0)
+      semver2
+    jwt (2.2.2)
+    mini_mime (1.1.5)
+    mini_portile2 (2.1.0)
+    minitest (5.14.1)
+    multi_json (1.15.0)
+    multi_xml (0.6.0)
+    multipart-post (2.1.1)
+    nokogiri (1.6.8.1)
+      mini_portile2 (~> 2.1.0)
+    oauth2 (1.4.4)
+      faraday (>= 0.8, < 2.0)
+      jwt (>= 1.0, < 3.0)
+      multi_json (~> 1.3)
       multi_xml (~> 0.5)
-      rack (~> 1.2)
-    rack (1.5.2)
-    rake (10.1.0)
-    rdoc (4.0.1)
-      json (~> 1.4)
-    safe_yaml (0.9.7)
-    shoulda (3.5.0)
-      shoulda-context (~> 1.0, >= 1.0.1)
-      shoulda-matchers (>= 1.4.1, < 3.0)
-    shoulda-context (1.1.6)
-    shoulda-matchers (2.4.0)
-      activesupport (>= 3.0.0)
-    simplecov (0.8.2)
-      docile (~> 1.1.0)
-      multi_json
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
-    thread_safe (0.1.3)
-      atomic
+      rack (>= 1.2, < 3)
+    psych (2.2.4)
+    public_suffix (4.0.5)
+    rack (2.2.3)
+    rake (13.0.1)
+    rchardet (1.8.0)
+    rdoc (6.2.1)
+    safe_yaml (1.0.5)
+    semver2 (3.4.2)
+    shoulda (4.0.0)
+      shoulda-context (~> 2.0)
+      shoulda-matchers (~> 4.0)
+    shoulda-context (2.0.0)
+    shoulda-matchers (4.4.0)
+      activesupport (>= 4.2.0)
+    simplecov (0.18.5)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+    simplecov-html (0.12.2)
+    thread_safe (0.3.6)
     turn (0.9.6)
       ansi
-    tzinfo (0.3.38)
-    vcr (2.8.0)
-    webmock (1.8.11)
-      addressable (>= 2.2.7)
-      crack (>= 0.1.7)
+    tzinfo (1.2.7)
+      thread_safe (~> 0.1)
+    vcr (6.0.0)
+    webmock (3.8.3)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+      hashdiff (>= 0.4.0, < 2.0.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler
-  httparty (= 0.12.0)
-  jeweler (= 1.8.8)
+  httparty (~> 0.21.0)
+  jeweler
   minitest
   rake
   rdoc
@@ -95,4 +105,10 @@ DEPENDENCIES
   simplecov
   turn
   vcr
-  webmock (< 1.9)
+  webmock
+
+RUBY VERSION
+   ruby 2.6.10p210
+
+BUNDLED WITH
+   2.0.2

data/README.md

@@ -1,18 +1,18 @@
 enrico
 ===========
 
-enrico is a small wrapper around the JSON API from [enrico](http://kayaposoft.com/enrico/json/)
+enrico is a small wrapper around the JSON API from [enrico v2](http://kayaposoft.com/enrico/json/)
 
 The Enrico Service
 ------------------
 
 ```
-Enrico Service is a free service written in PHP providing public holidays for several 
-countries. You can use either web service or json to get public holidays from Enrico. 
-Each provided public holiday includes date and name of the holiday in the local language 
-and English. Public holidays for the countries like U.S. or Germany are provided separately for each state. 
-You can use Enrico Service to display public holidays on your website or in your desktop application written in any programming language. 
-lthough Enrico is free to use, we do not provide the source code for download. If you are interested in hosting Enrico on your 
+Enrico Service is a free service written in PHP providing public holidays for several
+countries. You can use either web service or json to get public holidays from Enrico.
+Each provided public holiday includes date and name of the holiday in the local language
+and English. Public holidays for the countries like U.S. or Germany are provided separately for each state.
+You can use Enrico Service to display public holidays on your website or in your desktop application written in any programming language.
+lthough Enrico is free to use, we do not provide the source code for download. If you are interested in hosting Enrico on your
 server, please contact us on enrico@kayaposoft.com.
 ```
 
@@ -39,15 +39,18 @@ country.regions
 enrico implements only a couple of methods, which are pretty much self explanatory:
 
 ```ruby
-country.public_holidays_for_month(Date.today)
+country.holidays_for_month(Date.today)
+country.holidays_for_month(Date.today, holiday_type: 'public_holiday')
 ```
 
 ```ruby
-country.public_holidays_for_year(Date.today)
+country.holidays_for_year(Date.today)
+country.holidays_for_year(Date.today, holiday_type: 'public_holiday')
 ```
 
 ```ruby
-country.public_holidays_for_date_range(Date.today, Date.today + 2.month)
+country.holidays_for_year(Date.today)
+country.holidays_for_year(Date.today, holiday_type: 'public_holiday')
 ```
 
 ```ruby
@@ -80,7 +83,7 @@ Copyright (c) 2012 easyPEP UG
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
-"Software"), to use, copy and modify copies of the Software, subject 
+"Software"), to use, copy and modify copies of the Software, subject
 to the following conditions:
 
 The above copyright notice and this permission notice shall be

data/Rakefile

@@ -15,10 +15,10 @@ require 'jeweler'
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
   gem.name = "enrico"
-  gem.homepage = "http://github.com/easyPEP/enrico"
+  gem.homepage = "https://github.com/easyPEP/enrico"
   gem.license = "MIT"
   gem.summary = "A ruby wrapper around enrico holiday API"
-  gem.description = "http://github.com/easyPEP/enrico"
+  gem.description = "https://github.com/easyPEP/enrico"
   gem.email = "kalle@easypep.de"
   gem.authors = ["Kalle Saas"]
   # dependencies defined in Gemfile

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.2.1

data/enrico.gemspec

@@ -2,17 +2,18 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: enrico 0.1.6 ruby lib
+# stub: enrico 0.2.1 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "enrico"
-  s.version = "0.1.6"
+  s.name = "enrico".freeze
+  s.version = "0.2.1"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Kalle Saas"]
-  s.date = "2013-12-02"
-  s.description = "http://github.com/easyPEP/enrico"
-  s.email = "kalle@easypep.de"
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["Kalle Saas".freeze]
+  s.date = "2025-07-18"
+  s.description = "https://github.com/easyPEP/enrico".freeze
+  s.email = "kalle@easypep.de".freeze
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.md",
@@ -20,6 +21,8 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
+    ".github/workflows/test.yml",
+    ".ruby-version",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
@@ -27,16 +30,15 @@ Gem::Specification.new do |s|
     "README.rdoc",
     "Rakefile",
     "VERSION",
-    "enrico-0.1.5.gem",
-    "enrico-0.1.6.gem",
     "enrico.gemspec",
     "lib/enrico.rb",
     "lib/enrico/country.rb",
     "lib/enrico/vacation_day.rb",
+    "mise.toml",
+    "spec/fixtures/vcr_cassettes/holidays_in_date_range.yml",
+    "spec/fixtures/vcr_cassettes/holidays_in_month.yml",
+    "spec/fixtures/vcr_cassettes/holidays_in_year.yml",
     "spec/fixtures/vcr_cassettes/is_public_holiday.yml",
-    "spec/fixtures/vcr_cassettes/public_holidays_in_date_range.yml",
-    "spec/fixtures/vcr_cassettes/public_holidays_in_month.yml",
-    "spec/fixtures/vcr_cassettes/public_holidays_in_year.yml",
     "spec/fixtures/vcr_cassettes/supported_countries.yml",
     "spec/lib/enrico/country_public_holidays_for_month_spec.rb",
     "spec/lib/enrico/country_spec.rb",
@@ -44,40 +46,39 @@ Gem::Specification.new do |s|
     "spec/lib/enrico/vacation_day_spec.rb",
     "spec/spec_helper.rb"
   ]
-  s.homepage = "http://github.com/easyPEP/enrico"
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "2.1.5"
-  s.summary = "A ruby wrapper around enrico holiday API"
+  s.homepage = "https://github.com/easyPEP/enrico".freeze
+  s.licenses = ["MIT".freeze]
+  s.rubygems_version = "3.0.3.1".freeze
+  s.summary = "A ruby wrapper around enrico holiday API".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<httparty>, ["= 0.12.0"])
-      s.add_development_dependency(%q<bundler>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, ["= 1.8.8"])
-      s.add_development_dependency(%q<simplecov>, [">= 0"])
-      s.add_development_dependency(%q<rdoc>, [">= 0"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<minitest>, [">= 0"])
+      s.add_runtime_dependency(%q<httparty>.freeze, ["~> 0.21.0"])
+      s.add_development_dependency(%q<bundler>.freeze, [">= 0"])
+      s.add_development_dependency(%q<jeweler>.freeze, [">= 0"])
+      s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
+      s.add_development_dependency(%q<rdoc>.freeze, [">= 0"])
+      s.add_development_dependency(%q<shoulda>.freeze, [">= 0"])
+      s.add_development_dependency(%q<minitest>.freeze, [">= 0"])
     else
-      s.add_dependency(%q<httparty>, ["= 0.12.0"])
-      s.add_dependency(%q<bundler>, [">= 0"])
-      s.add_dependency(%q<jeweler>, ["= 1.8.8"])
-      s.add_dependency(%q<simplecov>, [">= 0"])
-      s.add_dependency(%q<rdoc>, [">= 0"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<minitest>, [">= 0"])
+      s.add_dependency(%q<httparty>.freeze, ["~> 0.21.0"])
+      s.add_dependency(%q<bundler>.freeze, [">= 0"])
+      s.add_dependency(%q<jeweler>.freeze, [">= 0"])
+      s.add_dependency(%q<simplecov>.freeze, [">= 0"])
+      s.add_dependency(%q<rdoc>.freeze, [">= 0"])
+      s.add_dependency(%q<shoulda>.freeze, [">= 0"])
+      s.add_dependency(%q<minitest>.freeze, [">= 0"])
     end
   else
-    s.add_dependency(%q<httparty>, ["= 0.12.0"])
-    s.add_dependency(%q<bundler>, [">= 0"])
-    s.add_dependency(%q<jeweler>, ["= 1.8.8"])
-    s.add_dependency(%q<simplecov>, [">= 0"])
-    s.add_dependency(%q<rdoc>, [">= 0"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<minitest>, [">= 0"])
+    s.add_dependency(%q<httparty>.freeze, ["~> 0.21.0"])
+    s.add_dependency(%q<bundler>.freeze, [">= 0"])
+    s.add_dependency(%q<jeweler>.freeze, [">= 0"])
+    s.add_dependency(%q<simplecov>.freeze, [">= 0"])
+    s.add_dependency(%q<rdoc>.freeze, [">= 0"])
+    s.add_dependency(%q<shoulda>.freeze, [">= 0"])
+    s.add_dependency(%q<minitest>.freeze, [">= 0"])
   end
 end
 

data/lib/enrico/country.rb

@@ -7,7 +7,7 @@ module Enrico
 
     include HTTParty
 
-    base_uri 'http://kayaposoft.com/enrico/json/v1.0'
+    base_uri 'https://kayaposoft.com/enrico/json/v2.0'
 
     def initialize(country_code, region = nil)
       self.country_code = country_code
@@ -22,18 +22,18 @@ module Enrico
       self.class.all.select{|country| country["countryCode"] == self.country_code }.first
     end
 
-    def public_holidays_for_month(date)
-      response = self.get_public_holidays_for_month(date)
+    def holidays_for_month(date)
+      response = self.get_holidays_for_month(date)
       self.vacation_days_from_response(response)
     end
 
-    def public_holidays_for_year(date)
-      response = self.get_public_holidays_for_year(date)
+    def holidays_for_year(date)
+      response = self.get_holidays_for_year(date)
       self.vacation_days_from_response(response)
     end
 
-    def public_holidays_for_date_range(from_date, to_date)
-      response = self.get_public_holidays_for_date_range(from_date, to_date)
+    def holidays_for_date_range(from_date, to_date)
+      response = self.get_holidays_for_date_range(from_date, to_date)
       self.vacation_days_from_response(response)
     end
 
@@ -59,10 +59,14 @@ module Enrico
       vacation_days
     end
 
-    def country_parameters(params)
-      base = { country: self.country_code, region: self.region }
-      base.merge!(params)
-      base.to_query
+    def country_parameters(params, holiday_type: nil)
+      {
+        country: self.country_code,
+        region: self.region
+      }
+      .merge(params)
+      .tap { |result| result[:holidayType] = holiday_type if holiday_type.present? }
+      .to_query
     end
 
     def is_public_holiday(date)
@@ -70,23 +74,20 @@ module Enrico
       self.class.get("/?action=isPublicHoliday&#{params}")
     end
 
-    def get_public_holidays_for_month(date)
-      params = country_parameters({month: date.month, year: date.year})
-      self.class.get("/?action=getPublicHolidaysForMonth&#{params}")
+    def get_holidays_for_month(date, holiday_type: nil)
+      params = country_parameters({month: date.month, year: date.year}, holiday_type: holiday_type)
+      self.class.get("/?action=getHolidaysForMonth&#{params}")
     end
 
-    def get_public_holidays_for_year(date)
-      params = country_parameters({year: date.year})
-      self.class.get("/?action=getPublicHolidaysForYear&#{params}")
+    def get_holidays_for_year(date, holiday_type: nil)
+      params = country_parameters({year: date.year}, holiday_type: holiday_type)
+      self.class.get("/?action=getHolidaysForYear&#{params}")
     end
 
-    def get_public_holidays_for_date_range(from_date, to_date)
-      params = country_parameters({fromDate: from_date.strftime("%d-%m-%Y"), toDate: to_date.strftime("%d-%m-%Y")})
-      self.class.get("/?action=getPublicHolidaysForDateRange&#{params}")
+    def get_holidays_for_date_range(from_date, to_date, holiday_type: nil)
+      params = country_parameters({fromDate: from_date.strftime("%d-%m-%Y"), toDate: to_date.strftime("%d-%m-%Y")}, holiday_type: holiday_type)
+      self.class.get("/?action=getHolidaysForDateRange&#{params}")
     end
 
   end
 end
-
-
-

data/lib/enrico/vacation_day.rb

@@ -2,14 +2,12 @@
 
 module Enrico
   class VacationDay
-
     attr_accessor :date, :local_name, :english_name
 
     def initialize(args)
       self.date         = Date.new( args["date"]["year"].to_i, args["date"]["month"].to_i, args["date"]["day"].to_i  )
-      self.local_name   = args["localName"]
-      self.english_name = args["englishName"]
+      self.local_name   = args["name"][0]["text"]
+      self.english_name = args["name"][1].present? ? args["name"][1]["text"] : args["name"][0]["text"]
     end
-
   end
 end

data/mise.toml

@@ -0,0 +1,2 @@
+[tools]
+ruby = "2.6.10"