wunderground 1.0.1 → 1.1.0

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.1.0

data/lib/wunderground.rb

@@ -13,7 +13,13 @@ class Wunderground
 
   attr_accessor :api_key, :timeout, :throws_exceptions, :language
 
-  def initialize(api_key = nil, extra_params = {})
+  def initialize(*args)
+    extra_params = {}
+    if !args.nil?
+      api_key = args.first if args.first.is_a?(String)
+      extra_params = args.last if args.last.is_a?(Hash)
+    end
+    
     @api_key = api_key || ENV['WUNDERGROUND_API_KEY'] || ENV['WUNDERGROUND_APIKEY'] || self.class.api_key
     @timeout = extra_params[:timeout] || 30
     @throws_exceptions = extra_params[:throws_exceptions] || false

data/test/test_wunderground.rb

@@ -24,19 +24,6 @@ class TestWunderground < Test::Unit::TestCase
       assert_equal(60,@wunderground.timeout)
       assert_equal('FR',@wunderground.language)
     end
-    should "set an API key from the 'WUNDERGROUND_API_KEY' ENV variable" do
-      ENV['WUNDERGROUND_API_KEY'] = @api_key
-      @wunderground = Wunderground.new
-      assert_equal(@api_key, @wunderground.api_key)
-      ENV.delete('WUNDERGROUND_API_KEY')
-    end
-
-    should "set an API key from the 'WUNDERGROUND_APIKEY' ENV variable" do
-      ENV['WUNDERGROUND_APIKEY'] = @api_key
-      @wunderground = Wunderground.new
-      assert_equal(@api_key, @wunderground.api_key)
-      ENV.delete('WUNDERGROUND_APIKEY')
-    end
 
     should "set an API key via setter" do
       @wunderground = Wunderground.new
@@ -50,6 +37,32 @@ class TestWunderground < Test::Unit::TestCase
       @wunderground.timeout = timeout
       assert_equal(timeout, @wunderground.timeout)
     end
+    
+    context "ENV api key" do
+      setup do
+        ENV['WUNDERGROUND_API_KEY'] = @api_key
+      end
+      
+      teardown do
+        ENV.delete('WUNDERGROUND_API_KEY')
+      end
+      
+      should "set an API key from the 'WUNDERGROUND_API_KEY' ENV variable" do
+        @wunderground = Wunderground.new
+        assert_equal(@api_key, @wunderground.api_key)
+      end
+
+      should "set an API key from the 'WUNDERGROUND_APIKEY' ENV variable" do
+        @wunderground = Wunderground.new
+        assert_equal(@api_key, @wunderground.api_key)
+      end
+      
+      should "set timeout and language in constructor" do
+        @wunderground = Wunderground.new(timeout: 60, language: 'FR')
+        assert_equal(60,@wunderground.timeout)
+        assert_equal('FR',@wunderground.language)
+      end
+    end
   end
 
   context "api url" do

data/wunderground.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "wunderground"
-  s.version = "1.0.1"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Winfred Nadeau"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wunderground
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -188,7 +188,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4516707908487803297
+      hash: 961218802401752725
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: