hotchoc 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9e5cbbe0a4ac84c3a34276088b1ee8f99bdb4d6
-  data.tar.gz: 23957659ecc09f31f748b56b3117316ba7d9d22f
+  metadata.gz: 4343918396edff5deef7f5b6f9f2b4056f49ac85
+  data.tar.gz: 6a7735696aef0581aae2eb2707053e7497ec8eac
 SHA512:
-  metadata.gz: 56bace741611ecb19ef9e10ca7e5120c61936b257bdbd07271599887ccda5ddcbc05722f19ea96e8e00b6e03382e97b0ae62fac72be74ea458d7917a0a4ed4c8
-  data.tar.gz: f57a0c75eee90516efc980ec3eef3bfb034216011f456083b7c19e49147f938f4bb51743c9f9f1531109f10ab246ce6169490241fb12e10edb1b5de2d8c436af
+  metadata.gz: 0a9ce027a457ea6ea088c41fce52e5f6e4e3dc2eeaa925a5b5a380be77c52e24fe07a7c472916b1ad5032934cb028c5cb365f1389d781352d4ad6fb33b7c1f66
+  data.tar.gz: c044fefbf11ad365ef3035269b369df8f8acb91ca9a1ac8d93061115047446b762ba5a25ef95c1814e28148aaa64fbba5290b075d8c11acbd8f377971819c446

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ## Master
 
+## 0.3.1
+
+[Full changelog](https://github.com/choc/hotchoc-ruby/compare/v0.3.0...v0.3.1)
+
+Bugfixes:
+
+* Client options merging fixed
+
 ## 0.3.0
 
 [Full changelog](https://github.com/choc/hotchoc-ruby/compare/v0.2.1...v0.3.0)

data/lib/hotchoc/client/version.rb

@@ -1,5 +1,5 @@
 module Hotchoc
   class Client
-    VERSION = '0.3.0'
+    VERSION = '0.3.1'
   end
 end

data/lib/hotchoc/client.rb

@@ -8,7 +8,7 @@ module Hotchoc
     attr_accessor(*Configuration::VALID_CONFIG_KEYS)
 
     def initialize(opts = {})
-      options = Hotchoc.options.merge(opts)
+      options = Hotchoc.options.merge(opts) { |key, oldval, newval| oldval || newval }
 
       fail ArgumentError, 'API key is required' unless options[:api_key]
       fail ArgumentError, 'Site name is required' unless options[:site]

data/spec/hotchoc/client/api_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Hotchoc::Client::API' do
+describe Hotchoc::Client::API do
   let(:client) do
     Hotchoc::Client.new(
       api_key: 'test',

data/spec/hotchoc/client/configuration_spec.rb

@@ -1,14 +1,14 @@
 require 'spec_helper'
 
-describe 'Hotchoc::Client::Configuration' do
+describe Hotchoc::Client::Configuration do
   after do
     Hotchoc.reset
   end
 
-  Hotchoc::Client::Configuration::VALID_CONFIG_KEYS.each do |key|
+  described_class::VALID_CONFIG_KEYS.each do |key|
     describe ".#{key}" do
-      it "should return the default #{key}" do
-        expect(Hotchoc.send(key)).to eq Hotchoc::Client::Configuration.const_get("DEFAULT_#{key.upcase}")
+      it "returns the default #{key}" do
+        expect(Hotchoc.send(key)).to eq described_class.const_get("DEFAULT_#{key.upcase}")
       end
     end
   end

data/spec/hotchoc/client/main_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-describe 'Hotchoc' do
-  it 'should have a version' do
+describe Hotchoc do
+  it 'has a version' do
     expect(Hotchoc::Client::VERSION).to_not be_nil
   end
 end

data/spec/hotchoc/client_spec.rb

@@ -1,37 +1,36 @@
 require 'spec_helper'
 
-describe 'Hotchoc::Client' do
-  before do
-    @keys = Hotchoc::Client::Configuration::VALID_CONFIG_KEYS
+describe Hotchoc::Client do
+  let(:keys) do
+    Hotchoc::Client::Configuration::VALID_CONFIG_KEYS
+  end
+  let(:config) do
+    {
+      api_key: 'abc',
+      site: 'def',
+      hostname: 'ghi',
+      verify: false
+    }
   end
 
   describe 'with class configuration' do
-    before do
-      @config = {
-        api_key: 'abc',
-        site: 'def',
-        hostname: 'ghi',
-        verify: false
-      }
-    end
-
-    it 'should override module configuration' do
-      client = Hotchoc::Client.new(@config)
+    it 'overrides module configuration' do
+      client = described_class.new(config)
 
-      @keys.each do |key|
-        expect(client.send(key)).to eq @config[key]
+      keys.each do |key|
+        expect(client.send(key)).to eq config[key]
       end
     end
 
-    it 'should override module configuration after' do
-      client = Hotchoc::Client.new(api_key: 'rst', site: 'uvw', hostname: 'xyz', verify: true)
+    it 'overrides module configuration after' do
+      client = described_class.new(api_key: 'rst', site: 'uvw', hostname: 'xyz', verify: true)
 
-      @config.each do |key, value|
+      config.each do |key, value|
         client.send("#{key}=", value)
       end
 
-      @keys.each do |key|
-        expect(client.send("#{key}")).to eq @config[key]
+      keys.each do |key|
+        expect(client.send("#{key}")).to eq config[key]
       end
     end
   end

data/spec/hotchoc/presenters/album_spec.rb

@@ -1,12 +1,12 @@
 require 'spec_helper'
 
-describe 'Hotchoc::Presenters::Album' do
+describe Hotchoc::Presenters::Album do
   let(:data) do
     JSON.parse(File.read(response_stub('albums')))['albums'].first
   end
 
   let(:album) do
-    Hotchoc::Presenters::Album.new(data)
+    described_class.new(data)
   end
 
   it 'has an ID' do

data/spec/hotchoc/presenters/blocks/image_spec.rb

@@ -1,12 +1,12 @@
 require 'spec_helper'
 
-describe 'Hotchoc::Presenters::Blocks::Image' do
+describe Hotchoc::Presenters::Blocks::Image do
   let(:data) do
     JSON.parse(File.read(response_stub('albums')))['albums'].first['blocks'].first
   end
 
   let(:block) do
-    Hotchoc::Presenters::Blocks::Image.new(data)
+    described_class.new(data)
   end
 
   it 'has a title' do

data/spec/hotchoc/presenters/blocks/text_spec.rb

@@ -1,13 +1,13 @@
 require 'spec_helper'
 
-describe 'Hotchoc::Presenters::Blocks::Text' do
+describe Hotchoc::Presenters::Blocks::Text do
   let(:data) do
     blocks = JSON.parse(File.read(response_stub('pages')))['pages'].first['blocks']
     blocks.detect { |block| block['type'] == 'text' }
   end
 
   let(:block) do
-    Hotchoc::Presenters::Blocks::Text.new(data)
+    described_class.new(data)
   end
 
   it 'has an html version' do

data/spec/hotchoc/presenters/file_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Hotchoc::Presenters::File' do
+describe Hotchoc::Presenters::File do
   let(:data) do
     JSON.parse(File.read(response_stub('albums')))['albums'].first['blocks'].first
   end

data/spec/hotchoc/presenters/page_spec.rb

@@ -1,12 +1,12 @@
 require 'spec_helper'
 
-describe 'Hotchoc::Presenters::Page' do
+describe Hotchoc::Presenters::Page do
   let(:data) do
     JSON.parse(File.read(response_stub('pages')))['pages'].first
   end
 
   let(:page) do
-    Hotchoc::Presenters::Page.new(data)
+    described_class.new(data)
   end
 
   it 'has an ID' do

data/spec/hotchoc/presenters/post_spec.rb

@@ -1,12 +1,12 @@
 require 'spec_helper'
 
-describe 'Hotchoc::Presenters::Post' do
+describe Hotchoc::Presenters::Post do
   let(:data) do
     JSON.parse(File.read(response_stub('posts')))['posts'].first
   end
 
   let(:post) do
-    Hotchoc::Presenters::Post.new(data)
+    described_class.new(data)
   end
 
   it 'has an ID' do

data/spec/hotchoc/presenters/thumbnail_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Hotchoc::Presenters::Thumbnail' do
+describe Hotchoc::Presenters::Thumbnail do
   let(:data) do
     JSON.parse(File.read(response_stub('albums')))['albums'].first['blocks'].first
   end

data/spec/hotchoc/presenters/topic_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Hotchoc::Presenters::Topic' do
+describe Hotchoc::Presenters::Topic do
   let(:data) do
     JSON.parse(File.read(response_stub('posts')))['posts'].first
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hotchoc
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Matthias Siegel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-10 00:00:00.000000000 Z
+date: 2015-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty