zaypay 1.0.0 → 1.0.1

data/lib/zaypay/price_setting.rb

@@ -102,11 +102,14 @@ module Zaypay
           puts 'Please either specify price_setting id and its API-key as first 2 arguments to #new, or create a config-file (checkout the plugin README)'
           raise e
         end
+
+        config_error = Zaypay::Error.new(:config_error, "You did not provide a price_setting id or/and an API-key. You can either pass it to the constructor or create a config file (check out README)")
+        raise config_error unless config
+
         @price_setting_id = config['default'] unless @price_setting_id
         @key = config[@price_setting_id]
         if @key.nil? || @price_setting_id.nil?
-          raise Zaypay::Error.new(:config_error, "You did not provide a price_setting id or/and an API-key. You can either pass it to the constructor
-                                                  or create a config file (check out README)")
+          raise config_error
         end
       end
     end

data/lib/zaypay/version.rb

@@ -1,3 +1,3 @@
 module Zaypay
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/test/price_setting_test.rb

@@ -28,12 +28,21 @@ class PriceSettingTest < Test::Unit::TestCase
         end
         should "raise Error if yml is blank" do
           error = assert_raise Zaypay::Error do
-            YAML.expects(:load_file).with('anywhere/config/zaypay.yml').returns({})
+            YAML.expects(:load_file).with('anywhere/config/zaypay.yml').returns(false)
             Zaypay::PriceSetting.new
           end
           assert_equal :config_error, error.type
           assert_match "You did not provide a price_setting id or/and an API-key", error.message 
         end
+        
+        should "raise Error if yml only contains value for price_setting but not api-key" do
+          error = assert_raise Zaypay::Error do
+            YAML.expects(:load_file).with('anywhere/config/zaypay.yml').returns({@price_setting_id => nil})
+            ps = Zaypay::PriceSetting.new(@price_setting_id)
+          end
+          assert_equal :config_error, error.type
+          assert_match "You did not provide a price_setting id or/and an API-key", error.message 
+        end
 
         should "raise Error if the yml file is not present" do
           assert_raise Errno::ENOENT do
@@ -63,7 +72,7 @@ class PriceSettingTest < Test::Unit::TestCase
         context "without a valid yml file" do  
           should "raise RuntimeError" do
             error = assert_raise Zaypay::Error do
-              YAML.expects(:load_file).with('anywhere/config/zaypay.yml').returns({})
+              YAML.expects(:load_file).with('anywhere/config/zaypay.yml').returns(false)
               ps = Zaypay::PriceSetting.new(@price_setting_id)
             end
             assert_equal :config_error, error.type

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zaypay
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-17 00:00:00.000000000 Z
+date: 2012-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty