hotchoc 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50267ed0d074efc5ce675e1763a947da964d0ebd
-  data.tar.gz: 40d722542faa6efc13c90b168bac0e559e0a0cd2
+  metadata.gz: 861c7314101175aed1f8e95ebb240e12fe0fe406
+  data.tar.gz: 389e3e46b305d1ed80e43cb99da820f7809c6536
 SHA512:
-  metadata.gz: 9831a75a659d14b26e9bd1fe1e94e102143f00fd9b5be051f93ccd481041ceed29d77c724e7b1cbda957c0d824e712f40ab71261fa7e9a63c27942f74388e727
-  data.tar.gz: 17974b2a003c220394bbbe19ba5d1bbe1c8fa6b3145a966ba5fa6b6b2d73b9a63ad6436620b4d0613e5658b780a55da93101594574f5fcd7ff833edc73418ca2
+  metadata.gz: ffee16f71aded938646f11c3765292d810c9adcfc88c67bd2541b9d866b40de38ec92e1d22f40de73e286a082cc525520e1dd870fb3b1308eb9883340231eae0
+  data.tar.gz: 9d287d520b323f889fda92c50c19ccb0f260f9023b9f16756859b0e0dceb6704cb5de1b43199ef4a383df25efcf11664df163b67c137ce3a042190281d000f0d

data/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 ## Master
 
+## 0.6.0
+
+[Full changelog](https://github.com/choc/hotchoc-ruby/compare/v0.5.0...v0.6.0)
+
+Changes:
+
+* Removed `verify` option
+* Added `protocol` option
+
 ## 0.5.0
 
 [Full changelog](https://github.com/choc/hotchoc-ruby/compare/v0.4.1...v0.5.0)

data/lib/hotchoc/client/configuration.rb

@@ -1,12 +1,12 @@
 module Hotchoc
   class Client
     module Configuration
-      VALID_CONFIG_KEYS = [:api_key, :site, :hostname, :verify].freeze
+      VALID_CONFIG_KEYS = [:api_key, :site, :hostname, :protocol].freeze
 
       DEFAULT_API_KEY = nil
       DEFAULT_SITE = nil
       DEFAULT_HOSTNAME = 'hotchoc.io'
-      DEFAULT_VERIFY = true
+      DEFAULT_PROTOCOL = 'https'
 
       #
       # Build accessor methods for every config options so we can do this, for example:
@@ -26,7 +26,7 @@ module Hotchoc
         self.api_key = DEFAULT_API_KEY
         self.site = DEFAULT_SITE
         self.hostname = DEFAULT_HOSTNAME
-        self.verify = DEFAULT_VERIFY
+        self.protocol = DEFAULT_PROTOCOL
       end
 
       def options

data/lib/hotchoc/client/fetcher.rb

@@ -13,12 +13,12 @@ module Hotchoc
         follow_redirects: true
       }
 
-      def self.get(url, opts = {}, verify = true)
-        new.get(url, opts, verify)
+      def self.get(url, opts = {})
+        new.get(url, opts)
       end
 
-      def get(url, opts = {}, verify = true)
-        response = HTTParty.get(url, params(opts, verify))
+      def get(url, opts = {})
+        response = HTTParty.get(url, params(opts))
 
         if response.success?
           JSON.parse(response.body)
@@ -29,11 +29,8 @@ module Hotchoc
 
       private
 
-      def params(opts, verify)
-        {
-          query: opts,
-          verify: verify
-        }.merge(DEFAULT_OPTIONS)
+      def params(opts)
+        { query: opts }.merge(DEFAULT_OPTIONS)
       end
 
       def request_error_message(response)

data/lib/hotchoc/client/version.rb

@@ -1,5 +1,5 @@
 module Hotchoc
   class Client
-    VERSION = '0.5.0'
+    VERSION = '0.6.0'
   end
 end

data/lib/hotchoc/client.rb

@@ -32,9 +32,9 @@ module Hotchoc
     private
 
     def get(path, opts = {})
-      url = "https://#{site}.#{hostname}/api/#{path}"
+      url = "#{protocol}://#{site}.#{hostname}/api/#{path}"
 
-      Fetcher.get(url, merged_options(opts), verify)
+      Fetcher.get(url, merged_options(opts))
     end
 
     def merged_options(opts)

data/spec/hotchoc/album_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Hotchoc::Album do
   let(:data) do
-    JSON.parse(File.read(response_stub('albums')))['albums'].first
+    JSON.parse(File.read(response_stub('albums'))).first
   end
 
   let(:album) do

data/spec/hotchoc/blocks/image_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Hotchoc::Blocks::Image do
   let(:data) do
-    JSON.parse(File.read(response_stub('albums')))['albums'].first['blocks'].first
+    JSON.parse(File.read(response_stub('albums'))).first['blocks'].first
   end
 
   let(:block) do

data/spec/hotchoc/blocks/text_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Hotchoc::Blocks::Text do
   let(:data) do
-    blocks = JSON.parse(File.read(response_stub('pages')))['pages'].first['blocks']
+    blocks = JSON.parse(File.read(response_stub('pages'))).first['blocks']
     blocks.detect { |block| block['type'] == 'text' }
   end
 

data/spec/hotchoc/client/api_spec.rb

@@ -11,7 +11,7 @@ describe Hotchoc::Client::API do
   describe 'Albums' do
     context 'GET collection' do
       let(:albums) do
-        JSON.parse(File.read(response_stub('albums')))['albums'].map { |album| Hotchoc::Album.new(album) }
+        JSON.parse(File.read(response_stub('albums'))).map { |album| Hotchoc::Album.new(album) }
       end
 
       it 'returns an array with the albums' do
@@ -23,7 +23,7 @@ describe Hotchoc::Client::API do
   describe 'Pages' do
     context 'GET collection' do
       let(:pages) do
-        JSON.parse(File.read(response_stub('pages')))['pages'].map { |page| Hotchoc::Page.new(page) }
+        JSON.parse(File.read(response_stub('pages'))).map { |page| Hotchoc::Page.new(page) }
       end
 
       it 'returns an array with the pages' do
@@ -35,7 +35,7 @@ describe Hotchoc::Client::API do
   describe 'Posts' do
     context 'GET collection' do
       let(:posts) do
-        JSON.parse(File.read(response_stub('posts')))['posts'].map { |post| Hotchoc::Post.new(post) }
+        JSON.parse(File.read(response_stub('posts'))).map { |post| Hotchoc::Post.new(post) }
       end
 
       it 'returns an array with the posts' do
@@ -47,7 +47,7 @@ describe Hotchoc::Client::API do
   describe 'Topics' do
     context 'GET collection' do
       let(:topics) do
-        JSON.parse(File.read(response_stub('topics')))['topics'].map { |topic| Hotchoc::Topic.new(topic) }
+        JSON.parse(File.read(response_stub('topics'))).map { |topic| Hotchoc::Topic.new(topic) }
       end
 
       it 'returns an array with the topics' do

data/spec/hotchoc/client_spec.rb

@@ -9,7 +9,7 @@ describe Hotchoc::Client do
       api_key: 'abc',
       site: 'def',
       hostname: 'ghi',
-      verify: false
+      protocol: 'http'
     }
   end
 
@@ -23,7 +23,7 @@ describe Hotchoc::Client do
     end
 
     it 'overrides module configuration after' do
-      client = described_class.new(api_key: 'rst', site: 'uvw', hostname: 'xyz', verify: true)
+      client = described_class.new(api_key: 'rst', site: 'uvw', hostname: 'xyz', protocol: 'https')
 
       config.each do |key, value|
         client.send("#{key}=", value)

data/spec/hotchoc/file_spec.rb

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

data/spec/hotchoc/page_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Hotchoc::Page do
   let(:data) do
-    JSON.parse(File.read(response_stub('pages')))['pages'].first
+    JSON.parse(File.read(response_stub('pages'))).first
   end
 
   let(:page) do

data/spec/hotchoc/post_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Hotchoc::Post do
   let(:data) do
-    JSON.parse(File.read(response_stub('posts')))['posts'].first
+    JSON.parse(File.read(response_stub('posts'))).first
   end
 
   let(:post) do

data/spec/hotchoc/thumbnail_spec.rb

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

data/spec/hotchoc/topic_spec.rb

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