larva 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2cc04eb147c0c63389af5c4e6504f8ec954bc0a
-  data.tar.gz: 7c76b2b988cab34763f1693328d900e903c51ffb
+  metadata.gz: 61a53fd82ceaa915f5c0be118a0bfcb2abfe521f
+  data.tar.gz: f458f5b9646991ccc9c861305ebc750cb9d9fe93
 SHA512:
-  metadata.gz: 40a291096f12284eaa82b3568ae9c5fb289dbf7911755be11df92e152e6c847806a926f81827ed921aeacc26d25fe07b605413d3e99300e553fdfb946c39d10c
-  data.tar.gz: f13153f42a05167c9b10235c5c7704a5f1b17d42267d8895a2bbf522b6a879fd1d9451c1f39b1c75cc99a47580585bfe109cedee8ce910285a0cd1af45c9a160
+  metadata.gz: 07ebf500a6f3f6a2eeb5246ef117cd8614d13f214c81b5ed226b6677d382163cfe00d20828b39cc260542246da0dd6ec54143813a841dbe2116fb2563440498e
+  data.tar.gz: 38e06ee79938a33773eab8461bce10a68ab0513e893561b12869165c92e12c67f9411b3784646df0c959d5d20f6ee8502ab3af638a7e953d0d92b51a536e03ad

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 0.7.1 / 2014-02-26
+* [BUGFIX] Fix issue with SDK secret being incorrectly set to nil.
+
 # 0.7.0 / 2014-02-24
 * [FEATURE] Add configurator
 

data/lib/larva/configurator.rb

@@ -21,8 +21,10 @@ module Larva
       if meducation_sdk_config = parse_config_file('meducation-sdk.yml')
         MeducationSDK.config do |config|
           config.access_id  = meducation_sdk_config[:access_id]
-          config.secret_key = @options.fetch(:meducation_sdk_secret_key,  meducation_sdk_config[:secret_key])
-          config.endpoint   = @options.fetch(:meducation_sdk_endpoint, "http://localhost:3000/system") if @env == 'development'
+
+          # Don't use fetch for these as nil values might be deliberately passed it
+          config.secret_key = @options[:meducation_sdk_secret_key] || meducation_sdk_config[:secret_key]
+          config.endpoint   = @options[:meducation_sdk_endpoint ] || "http://localhost:3000/system" if @env == 'development'
           config.logger     = Filum.logger
         end
       end

data/lib/larva/version.rb

@@ -1,3 +1,3 @@
 module Larva
-  VERSION = '0.7.0'
+  VERSION = '0.7.1'
 end

data/test/configurator_test.rb

@@ -27,6 +27,19 @@ module Larva
       assert_equal logfile, Filum.logger.logfile
     end
 
+    def test_sdk_secret_key_can_be_overriden
+      sdk_yaml_path = File.expand_path('../../template/config/meducation-sdk.yml', __FILE__)
+      begin
+        optional_sdk_yaml_path = "#{sdk_yaml_path}.optional"
+        `cp #{optional_sdk_yaml_path} #{sdk_yaml_path}`
+        secret_key = "Foobar!"
+        Configurator.configure(logfile: logfile, config_dir: config_dir, meducation_sdk_secret_key: secret_key)
+        assert_equal secret_key, MeducationSDK.config.secret_key
+      ensure
+        `rm #{sdk_yaml_path}`
+      end
+    end
+
     def test_meducation_sdk_gets_config_in_dev
       sdk_yaml_path = File.expand_path('../../template/config/meducation-sdk.yml', __FILE__)
       begin

data/test/test_helper.rb

@@ -25,6 +25,7 @@ class Minitest::Test
   def setup
     Fog.mock!
     Filum.setup('log/test.log')
+    MeducationSDK.instance_variable_set(:@config, nil)
     Propono.config do |config|
       config.access_key = "test-access-key"
       config.secret_key = "test-secret-key"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: larva
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - iHiD
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-24 00:00:00.000000000 Z
+date: 2014-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: propono