worldtimeengine 0.0.1 → 0.0.2

data/lib/worldtimeengine/client.rb

@@ -19,11 +19,25 @@ module WorldTimeEngine
       request(:get, path, params, options)
     end
 
+    # Fetch information from WorldTimeEngine about IP address
+    #
+    # @param IP address [String] 
+    # @raise [WorldTimeEngine::Error::Unauthorized] Error raised when supplied user credentials are not valid.
+    # @return [Hashi::Mash] IP info
     def api(ip)
       endpoint = WorldTimeEngine.instance_variable_get(:@endpoint)
       api_key = WorldTimeEngine.instance_variable_get(:@api_key)
 
-      timezone_hash = HTTParty.get("#{endpoint}/api/ip/#{api_key}/#{ip}", :format => :xml).to_hash['timezone']
+      raise ArgumentError.new(":api_key wasn't set in configuration block") if api_key.nil?
+
+      hash = HTTParty.get("#{endpoint}/api/ip/#{api_key}/#{ip}", :format => :xml).to_hash
+
+      if hash.keys.include?('error')
+        raise "Invalid or Expired API Key used; Error code: 10001"
+      end
+
+      timezone_hash = hash['timezone']
+
       timezone_hash.delete('xmlns:xsi')
       timezone_hash.delete('xsi:noNamespaceSchemaLocation')
 
@@ -40,9 +54,11 @@ module WorldTimeEngine
         mash.time.zone.current.utc_offset = mash.time.zone.current.utcoffset
         mash.time.zone.current.effective_until = Time.parse "#{mash.time.zone.current.effectiveUntil} #{mash.time.zone.current.abbreviation} #{mash.time.zone.current.utcoffset}"
 
-        mash.time.zone.next.is_dst = to_boolean mash.time.zone.next.isdst
-        mash.time.zone.next.utc_offset = mash.time.zone.next.utcoffset
-        mash.time.zone.next.effective_until = Time.parse "#{mash.time.zone.next.effectiveUntil} #{mash.time.zone.next.abbreviation} #{mash.time.zone.next.utcoffset}"
+        if mash.time.zone.has_dst 
+          mash.time.zone.next.is_dst = to_boolean mash.time.zone.next.isdst
+          mash.time.zone.next.utc_offset = mash.time.zone.next.utcoffset
+          mash.time.zone.next.effective_until = Time.parse "#{mash.time.zone.next.effectiveUntil} #{mash.time.zone.next.abbreviation} #{mash.time.zone.next.utcoffset}"
+        end
       end
     end
 

data/lib/worldtimeengine/error/unauthorized.rb

@@ -0,0 +1,5 @@
+module WorldTimeEngine
+  class Error
+    # Raised when Twitter returns the HTTP status code 401
+  end
+end

data/spec/fixtures/wrong_key.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<error xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://worldtimeengine.com/error.xsd" type="exception">
+    <code>10001</code>
+    <message>Invalid or Expired API Key used</message>
+</error>

data/spec/worldtimeengine_spec.rb

@@ -12,7 +12,7 @@ describe WorldTimeEngine do
       end
 
       stub_request(:get, "http://worldtimeengine.com/api/ip/abc/193.174.32.100").
-        to_return(:status => 200, :body => fixture('193.174.32.100.xml'), :headers => {})
+        to_return(:status => 200, :body => fixture('germany-193.174.32.100.xml'), :headers => {})
     end
 
     it "requests the correct resource" do
@@ -20,6 +20,62 @@ describe WorldTimeEngine do
 
       a_get("/api/ip/abc/193.174.32.100").should have_been_made
     end
+  end
+
+  describe 'request with invalid api_key' do
+    before do
+      WorldTimeEngine.configure do |config|
+        config.api_key = 'abc'
+      end
+
+      stub_request(:get, "http://worldtimeengine.com/api/ip/abc/212.154.168.243").
+        to_return(:status => 200, :body => fixture('wrong_key.xml'), :headers => {})
+    end
+
+    it "returns raises an exception" do
+      lambda {
+        WorldTimeEngine.api('212.154.168.243')
+      }.should raise_error(RuntimeError, 'Invalid or Expired API Key used; Error code: 10001')
+    end
+  end
+
+  context "region with DST" do
+    before do
+      WorldTimeEngine.configure do |config|
+        config.api_key = 'abc'
+      end
+
+      stub_request(:get, "http://worldtimeengine.com/api/ip/abc/212.154.168.243").
+        to_return(:status => 200, :body => fixture('kazakhstan-212.154.168.243.xml'), :headers => {})
+    end
+
+    it "returns needed values" do
+      response = WorldTimeEngine.api('212.154.168.243')
+
+      response.location.region.should == 'Kazakhstan'
+      response.location.latitude.should == 51.1811
+      response.location.longitude.should == 71.4278
+
+      response.time.zone.has_dst.should == false
+      response.time.zone.current.abbreviation.should == "ALMT"
+    end
+
+    it "skips next attribute" do
+      response = WorldTimeEngine.api('212.154.168.243')
+
+      response.time.zone.next.should be_nil
+    end
+  end
+
+  context "region without DST" do
+    before do
+      WorldTimeEngine.configure do |config|
+        config.api_key = 'abc'
+      end
+
+      stub_request(:get, "http://worldtimeengine.com/api/ip/abc/193.174.32.100").
+        to_return(:status => 200, :body => fixture('germany-193.174.32.100.xml'), :headers => {})
+    end
 
     it "returns needed values" do
       response = WorldTimeEngine.api('193.174.32.100')

data/worldtimeengine.gemspec

@@ -19,6 +19,6 @@ Gem::Specification.new do |gem|
   gem.required_rubygems_version = Gem::Requirement.new('>= 1.3.6')
   gem.summary = %q{WorldTimeEngine API wrapper}
   gem.test_files = Dir.glob("spec/**/*")
-  gem.version = '0.0.1'
+  gem.version = '0.0.2'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: worldtimeengine
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -120,10 +120,12 @@ files:
 - worldtimeengine.gemspec
 - lib/worldtimeengine/client.rb
 - lib/worldtimeengine/configurable.rb
+- lib/worldtimeengine/error/unauthorized.rb
 - lib/worldtimeengine.rb
-- spec/fixtures/193.174.32.100.xml
-- spec/fixtures/another.xml
+- spec/fixtures/germany-193.174.32.100.xml
+- spec/fixtures/kazakhstan-212.154.168.243.xml
 - spec/fixtures/us.xml
+- spec/fixtures/wrong_key.xml
 - spec/helper.rb
 - spec/worldtimeengine_spec.rb
 homepage: https://github.com/nfedyashev/worldtimeengine
@@ -140,7 +142,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4077128795819690830
+      hash: 488971206880791712
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -154,8 +156,9 @@ signing_key:
 specification_version: 3
 summary: WorldTimeEngine API wrapper
 test_files:
-- spec/fixtures/193.174.32.100.xml
-- spec/fixtures/another.xml
+- spec/fixtures/germany-193.174.32.100.xml
+- spec/fixtures/kazakhstan-212.154.168.243.xml
 - spec/fixtures/us.xml
+- spec/fixtures/wrong_key.xml
 - spec/helper.rb
 - spec/worldtimeengine_spec.rb