enrico 0.1.2 → 0.1.3

data/README.md

@@ -28,55 +28,31 @@ require "enrico"
 Enrico::Country.all
 ```
 
-If you want to get in more details for a country, initial Enrico with the ’country_code’
+If you want to get in more details about a country, initial Enrico with the ’country_code’
 
-<<<<<<< HEAD
-    country = Enrico::Country.new("ger")
-    country.details
-    country.regions
-
-Enrico implements only a couple of methods, which are pretty much self explenatory:
-
-  ```
-  country.public_holidays_for_month(Date.today)
-  ```
-
-  ```
-  country.public_holidays_for_year(Date.today)
-  ```
-
-  ```
-  country.public_holidays_for_date_range(Date.today, Date.today + 2.month)
-  ```
-
-  ```
-  country.is_public_holiday?(date)
-  ```
-=======
 ```ruby
 country = Enrico::Country.new("ger")
 country.details
 country.regions
 ```
 
-Enrico implements only a couple of methods, which are pretty much self explenatory:
+enrico implements only a couple of methods, which are pretty much self explanatory:
 
-```
+```ruby
 country.public_holidays_for_month(Date.today)
 ```
 
-```
+```ruby
 country.public_holidays_for_year(Date.today)
 ```
 
-```
+```ruby
 country.public_holidays_for_date_range(Date.today, Date.today + 2.month)
 ```
 
+```ruby
+country.is_public_holiday?(Date.today)
 ```
-country.is_public_holiday?(date)
-```
->>>>>>> a4214e5fbbb2b9df5a0110e2a93e0b1913fec159
 
 Installation
 ------------

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/enrico.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "enrico"
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kalle Saas"]

data/lib/enrico/country.rb

@@ -60,19 +60,19 @@ module Enrico
     end
 
     def is_public_holiday(date)
-      JSON.parse(self.class.get("/?action=isPublicHoliday&date=#{date.strftime("%d-%m-%Y")}&country=#{self.country_code}&region=#{self.region}"))      
+      JSON.parse(self.class.get("/?action=isPublicHoliday&date=#{date.strftime("%d-%m-%Y")}&country=#{URI::encode(self.country_code)}&region=#{URI::encode(self.region)}"))
     end
 
     def get_public_holidays_for_month(date)
-      JSON.parse(self.class.get("/?action=getPublicHolidaysForMonth&month=#{date.month}&year=#{date.year}&country=#{self.country_code}&region=#{self.region}"))
+      JSON.parse(self.class.get("/?action=getPublicHolidaysForMonth&month=#{date.month}&year=#{date.year}&country=#{URI::encode(self.country_code)}&region=#{URI::encode(self.region)}"))
     end
 
     def get_public_holidays_for_year(date)
-      JSON.parse(self.class.get("/?action=getPublicHolidaysForYear&year=#{date.year}&country=#{self.country_code}&region=#{self.region}"))
+      JSON.parse(self.class.get("/?action=getPublicHolidaysForYear&year=#{date.year}&country=#{URI::encode(self.country_code)}&region=#{URI::encode(self.region)}"))
     end
 
     def get_public_holidays_for_date_range(from_date, to_date)
-      JSON.parse(self.class.get("/?action=getPublicHolidaysForDateRange&fromDate=#{from_date.strftime("%d-%m-%Y")}&toDate=#{to_date.strftime("%d-%m-%Y")}&country=#{self.country_code}&region=#{self.region}"))
+      JSON.parse(self.class.get("/?action=getPublicHolidaysForDateRange&fromDate=#{from_date.strftime("%d-%m-%Y")}&toDate=#{to_date.strftime("%d-%m-%Y")}&country=#{URI::encode(self.country_code)}&region=#{URI::encode(self.region)}"))
     end
 
   end

data/spec/lib/enrico/vacation_day_spec.rb

@@ -11,7 +11,15 @@ describe Enrico::VacationDay do
       Enrico::VacationDay.new(Date.today.beginning_of_year, "Neujahrstag", "New Year's Day") 
     }
 
-    it "test different initializer methods" do
+    it "test initializer methods" do
+      rsp = {"date"=>{"day"=>1, "month"=>1, "year"=>"2012", "dayOfWeek"=>7}, "localName"=>"Neujahrstag", "englishName"=>"New Year's Day"}
+      day = Enrico::VacationDay.new(rsp) 
+      day.date.must_equal Date.today.beginning_of_year
+      day.local_name.must_equal "Neujahrstag"
+      day.english_name.must_equal "New Year's Day"
+    end
+
+    it "test initializer methods" do
       rsp = {"date"=>{"day"=>1, "month"=>1, "year"=>"2012", "dayOfWeek"=>7}, "localName"=>"Neujahrstag", "englishName"=>"New Year's Day"}
       day = Enrico::VacationDay.new(rsp) 
       day.date.must_equal Date.today.beginning_of_year

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enrico
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -169,7 +169,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1576117388882456692
+      hash: -3664893538224163374
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: