enrico 0.1.3 → 0.1.5

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.5

data/enrico.gemspec

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

data/lib/enrico.rb

@@ -3,6 +3,7 @@
 require "httparty"
 require 'json'
 require 'active_support/all'
+require "addressable/uri"
 
 Dir[File.dirname(__FILE__) + '/enrico/*.rb'].each do |file|
   require file

data/lib/enrico/country.rb

@@ -59,20 +59,30 @@ module Enrico
       vacation_days      
     end
 
+    def country_parameters(params)
+      base = { country: self.country_code, region: self.region }
+      base.merge!(params)
+      base.to_query
+    end
+
     def is_public_holiday(date)
-      JSON.parse(self.class.get("/?action=isPublicHoliday&date=#{date.strftime("%d-%m-%Y")}&country=#{URI::encode(self.country_code)}&region=#{URI::encode(self.region)}"))
+      params = country_parameters({date: date.strftime("%d-%m-%Y")})
+      JSON.parse(self.class.get("/?action=isPublicHoliday&#{params}"))
     end
 
     def get_public_holidays_for_month(date)
-      JSON.parse(self.class.get("/?action=getPublicHolidaysForMonth&month=#{date.month}&year=#{date.year}&country=#{URI::encode(self.country_code)}&region=#{URI::encode(self.region)}"))
+      params = country_parameters({month: date.month, year: date.year})
+      JSON.parse(self.class.get("/?action=getPublicHolidaysForMonth&#{params}"))
     end
 
     def get_public_holidays_for_year(date)
-      JSON.parse(self.class.get("/?action=getPublicHolidaysForYear&year=#{date.year}&country=#{URI::encode(self.country_code)}&region=#{URI::encode(self.region)}"))
+      params = country_parameters({year: date.year})
+      JSON.parse(self.class.get("/?action=getPublicHolidaysForYear&#{params}"))
     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=#{URI::encode(self.country_code)}&region=#{URI::encode(self.region)}"))
+      params = country_parameters({fromDate: from_date.strftime("%d-%m-%Y"), toDate: to_date.strftime("%d-%m-%Y")})
+      JSON.parse(self.class.get("/?action=getPublicHolidaysForDateRange&#{params}"))
     end
 
   end

data/spec/fixtures/vcr_cassettes/public_holidays_in_date_range.yml

@@ -100,4 +100,33 @@ http_interactions:
         Year''s Day"}]'
     http_version: 
   recorded_at: Thu, 29 Nov 2012 16:56:36 GMT
+- request:
+    method: get
+    uri: http://kayaposoft.com/enrico/json/v1.0/?action=getPublicHolidaysForDateRange&country=ger&from_date=01-01-2012&region=&to_date=01-03-2012
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers: {}
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Fri, 30 Nov 2012 12:32:31 GMT
+      Content-Type:
+      - text/html
+      Content-Length:
+      - '50'
+      Connection:
+      - keep-alive
+      Vary:
+      - User-Agent,Accept-Encoding
+    body:
+      encoding: US-ASCII
+      string: ! '{"error":"Query parameter ''fromDate'' is not set!"}'
+    http_version: 
+  recorded_at: Fri, 30 Nov 2012 12:28:58 GMT
 recorded_with: VCR 2.3.0

metadata

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