hotchoc 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4343918396edff5deef7f5b6f9f2b4056f49ac85
-  data.tar.gz: 6a7735696aef0581aae2eb2707053e7497ec8eac
+  metadata.gz: 906bf6c641ca369e29effabcc2238b7d6143befe
+  data.tar.gz: 20a9b7fc5bcb94186a9d92c9fd029726c52a2e19
 SHA512:
-  metadata.gz: 0a9ce027a457ea6ea088c41fce52e5f6e4e3dc2eeaa925a5b5a380be77c52e24fe07a7c472916b1ad5032934cb028c5cb365f1389d781352d4ad6fb33b7c1f66
-  data.tar.gz: c044fefbf11ad365ef3035269b369df8f8acb91ca9a1ac8d93061115047446b762ba5a25ef95c1814e28148aaa64fbba5290b075d8c11acbd8f377971819c446
+  metadata.gz: 8d99f1414b96f84ffe1bb7bcadd57d7d4ba357a1f2b2d944925c2b359914eb57381d036904820297ea2a4ede6a2b00b14456eb873a07e3668d5377caf7298a1d
+  data.tar.gz: dca562a26a8e584c55471aded8d35c41ce1e1ec1e04490f308237c931a79acd47c5da01bde1a102e974e09050e30f01213a4c5da0a326560fa6a137bba3c3f04

data/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 ## Master
 
+## 0.4.0
+
+[Full changelog](https://github.com/choc/hotchoc-ruby/compare/v0.3.1...v0.4.0)
+
+Changes:
+
+* Removed presenter namespace
+
+Bugfixes:
+
+* Client options merging fixed (this time for real)
+
 ## 0.3.1
 
 [Full changelog](https://github.com/choc/hotchoc-ruby/compare/v0.3.0...v0.3.1)

data/README.md

@@ -31,15 +31,15 @@ Or install it manually as:
 
     # Get single album by ID
     client.get_albums(id: '77774dc8-4edf-4b3a-8571-a6b64c8adace')
-    => [#<Hotchoc::Presenters::Album: title="Test album 1">]
+    => [#<Hotchoc::Album: title="Test album 1">]
 
     # Get all albums
     client.get_albums
-    => [#<Hotchoc::Presenters::Album: title="Test album 2">, #<Hotchoc::Presenters::Album: title="Test album 1">]
+    => [#<Hotchoc::Album: title="Test album 2">, #<Hotchoc::Album: title="Test album 1">]
 
     # Get only first 10 albums
     client.get_albums(limit: 10)
-    => [#<Hotchoc::Presenters::Album: title="Test album 2">, #<Hotchoc::Presenters::Album: title="Test album 1">]
+    => [#<Hotchoc::Album: title="Test album 2">, #<Hotchoc::Album: title="Test album 1">]
 
 ## API
 

data/lib/hotchoc.rb

@@ -1,13 +1,13 @@
-require 'hotchoc/presenters/base'
-require 'hotchoc/presenters/album'
-require 'hotchoc/presenters/blocks/base'
-require 'hotchoc/presenters/blocks/image'
-require 'hotchoc/presenters/blocks/text'
-require 'hotchoc/presenters/file'
-require 'hotchoc/presenters/page'
-require 'hotchoc/presenters/post'
-require 'hotchoc/presenters/thumbnail'
-require 'hotchoc/presenters/topic'
+require 'hotchoc/base'
+require 'hotchoc/album'
+require 'hotchoc/blocks/base'
+require 'hotchoc/blocks/image'
+require 'hotchoc/blocks/text'
+require 'hotchoc/file'
+require 'hotchoc/page'
+require 'hotchoc/post'
+require 'hotchoc/thumbnail'
+require 'hotchoc/topic'
 
 require 'hotchoc/client/version'
 require 'hotchoc/client/errors'

data/lib/hotchoc/album.rb

@@ -0,0 +1,55 @@
+module Hotchoc
+  class Album < Hotchoc::Base
+    def id
+      @item['id']
+    end
+
+    def title
+      @item['title']
+    end
+
+    def subtitle
+      @item['subtitle']
+    end
+
+    def description
+      @item['description']
+    end
+
+    def identifier
+      @item['identifier']
+    end
+
+    def status
+      @item['status']
+    end
+
+    def publish_date
+      Time.parse(@item['publish_date'])
+    end
+
+    def cover
+      @item['cover'] ? block_for(@item['cover']) : nil
+    end
+
+    def blocks
+      @item['blocks'].to_a.map { |block| block_for(block) }
+    end
+
+    def topics
+      @item['topics'].to_a.map { |topic| Hotchoc::Topic.new(topic) }
+    end
+
+    def created_at
+      Time.parse(@item['created_at'])
+    end
+
+    def updated_at
+      Time.parse(@item['updated_at'])
+    end
+
+    def inspect
+      %(#<Hotchoc::Album: title="#{title}">)
+    end
+  end
+end

data/lib/hotchoc/base.rb

@@ -0,0 +1,20 @@
+module Hotchoc
+  class Base
+    attr_reader :item
+
+    def initialize(item = {})
+      @item = item
+    end
+
+    private
+
+    def block_for(block)
+      case block['type']
+      when 'text'
+        Hotchoc::Blocks::Text.new(block)
+      when 'image'
+        Hotchoc::Blocks::Image.new(block)
+      end
+    end
+  end
+end

data/lib/hotchoc/{presenters/topic.rb → blocks/base.rb}

@@ -1,16 +1,16 @@
 module Hotchoc
-  module Presenters
-    class Topic < Hotchoc::Presenters::Base
+  module Blocks
+    class Base < Hotchoc::Base
       def id
         @item['id']
       end
 
-      def name
-        @item['name']
+      def type
+        @item['type']
       end
 
-      def identifier
-        @item['identifier']
+      def position
+        @item['position']
       end
 
       def created_at
@@ -20,10 +20,6 @@ module Hotchoc
       def updated_at
         Time.parse(@item['updated_at'])
       end
-
-      def inspect
-        %(#<Hotchoc::Presenters::Topic: name="#{name}">)
-      end
     end
   end
 end

data/lib/hotchoc/blocks/image.rb

@@ -0,0 +1,17 @@
+module Hotchoc
+  module Blocks
+    class Image < Hotchoc::Blocks::Base
+      def title
+        @item['content']['title']
+      end
+
+      def image
+        @item['content']['image'] ? Hotchoc::File.new(@item['content']['image']) : nil
+      end
+
+      def inspect
+        %(#<Hotchoc::Blocks::Image: title="#{title}" position="#{position}">)
+      end
+    end
+  end
+end

data/lib/hotchoc/blocks/text.rb

@@ -0,0 +1,17 @@
+module Hotchoc
+  module Blocks
+    class Text < Hotchoc::Blocks::Base
+      def markdown
+        @item['content']['markdown']
+      end
+
+      def html
+        @item['content']['html']
+      end
+
+      def inspect
+        %(#<Hotchoc::Blocks::Text: position="#{position}">)
+      end
+    end
+  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) { |key, oldval, newval| oldval || newval }
+      options = Hotchoc.options.merge(opts) { |_key, oldval, newval| newval.nil? ? oldval : newval }
 
       fail ArgumentError, 'API key is required' unless options[:api_key]
       fail ArgumentError, 'Site name is required' unless options[:site]

data/lib/hotchoc/client/api.rb

@@ -2,19 +2,19 @@ module Hotchoc
   class Client
     module API
       def get_albums(opts = {})
-        get('albums', opts)['albums'].map { |album| Hotchoc::Presenters::Album.new(album) }
+        get('albums', opts)['albums'].map { |album| Hotchoc::Album.new(album) }
       end
 
       def get_pages(opts = {})
-        get('pages', opts)['pages'].map { |page| Hotchoc::Presenters::Page.new(page) }
+        get('pages', opts)['pages'].map { |page| Hotchoc::Page.new(page) }
       end
 
       def get_posts(opts = {})
-        get('posts', opts)['posts'].map { |post| Hotchoc::Presenters::Post.new(post) }
+        get('posts', opts)['posts'].map { |post| Hotchoc::Post.new(post) }
       end
 
       def get_topics(opts = {})
-        get('topics', opts)['topics'].map { |topic| Hotchoc::Presenters::Topic.new(topic) }
+        get('topics', opts)['topics'].map { |topic| Hotchoc::Topic.new(topic) }
       end
     end
   end

data/lib/hotchoc/client/version.rb

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

data/lib/hotchoc/file.rb

@@ -0,0 +1,56 @@
+module Hotchoc
+  class File < Hotchoc::Base
+    def id
+      @item['id']
+    end
+
+    def name
+      @item['name']
+    end
+
+    def url
+      @item['url']
+    end
+
+    def width
+      @item['width']
+    end
+
+    def height
+      @item['height']
+    end
+
+    def size
+      @item['size']
+    end
+
+    def content_type
+      @item['content_type']
+    end
+
+    def thumbnails
+      if @item['thumbnails']
+        @item['thumbnails']['original'].map { |thumbnail| Hotchoc::Thumbnail.new(thumbnail) } +
+          @item['thumbnails']['square'].map { |thumbnail| Hotchoc::Thumbnail.new(thumbnail) }
+      else
+        []
+      end
+    end
+
+    def exif
+      @item['exif']
+    end
+
+    def created_at
+      Time.parse(@item['created_at'])
+    end
+
+    def updated_at
+      Time.parse(@item['updated_at'])
+    end
+
+    def inspect
+      %(#<Hotchoc::File: name="#{name}">)
+    end
+  end
+end

data/lib/hotchoc/page.rb

@@ -0,0 +1,63 @@
+module Hotchoc
+  class Page < Hotchoc::Base
+    def id
+      @item['id']
+    end
+
+    def title
+      @item['title']
+    end
+
+    def subtitle
+      @item['subtitle']
+    end
+
+    def identifier
+      @item['identifier']
+    end
+
+    def status
+      @item['status']
+    end
+
+    def path
+      @item['path']
+    end
+
+    def parent_id
+      @item['parent_id']
+    end
+
+    def position
+      @item['position']
+    end
+
+    def level
+      @item['level']
+    end
+
+    def publish_date
+      Time.parse(@item['publish_date'])
+    end
+
+    def blocks
+      @item['blocks'].to_a.map { |block| block_for(block) }
+    end
+
+    def topics
+      @item['topics'].to_a.map { |topic| Hotchoc::Topic.new(topic) }
+    end
+
+    def created_at
+      Time.parse(@item['created_at'])
+    end
+
+    def updated_at
+      Time.parse(@item['updated_at'])
+    end
+
+    def inspect
+      %(#<Hotchoc::Page: title="#{title}">)
+    end
+  end
+end

data/lib/hotchoc/post.rb

@@ -0,0 +1,47 @@
+module Hotchoc
+  class Post < Hotchoc::Base
+    def id
+      @item['id']
+    end
+
+    def title
+      @item['title']
+    end
+
+    def subtitle
+      @item['subtitle']
+    end
+
+    def identifier
+      @item['identifier']
+    end
+
+    def status
+      @item['status']
+    end
+
+    def publish_date
+      Time.parse(@item['publish_date'])
+    end
+
+    def blocks
+      @item['blocks'].to_a.map { |block| block_for(block) }
+    end
+
+    def topics
+      @item['topics'].to_a.map { |topic| Hotchoc::Topic.new(topic) }
+    end
+
+    def created_at
+      Time.parse(@item['created_at'])
+    end
+
+    def updated_at
+      Time.parse(@item['updated_at'])
+    end
+
+    def inspect
+      %(#<Hotchoc::Post: title="#{title}">)
+    end
+  end
+end

data/lib/hotchoc/thumbnail.rb

@@ -0,0 +1,31 @@
+module Hotchoc
+  class Thumbnail < Hotchoc::Base
+    def name
+      @item['name']
+    end
+
+    def width
+      @item['width']
+    end
+
+    def height
+      @item['height']
+    end
+
+    def square?
+      width == height
+    end
+
+    def size
+      @item['size']
+    end
+
+    def url
+      @item['url']
+    end
+
+    def inspect
+      %(#<Hotchoc::Thumbnail:>)
+    end
+  end
+end

data/lib/hotchoc/topic.rb

@@ -0,0 +1,27 @@
+module Hotchoc
+  class Topic < Hotchoc::Base
+    def id
+      @item['id']
+    end
+
+    def name
+      @item['name']
+    end
+
+    def identifier
+      @item['identifier']
+    end
+
+    def created_at
+      Time.parse(@item['created_at'])
+    end
+
+    def updated_at
+      Time.parse(@item['updated_at'])
+    end
+
+    def inspect
+      %(#<Hotchoc::Topic: name="#{name}">)
+    end
+  end
+end

data/spec/hotchoc/{presenters/album_spec.rb → album_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Hotchoc::Presenters::Album do
+describe Hotchoc::Album do
   let(:data) do
     JSON.parse(File.read(response_stub('albums')))['albums'].first
   end
@@ -38,17 +38,17 @@ describe Hotchoc::Presenters::Album do
   end
 
   it 'has a cover' do
-    expect(album.cover).to be_a(Hotchoc::Presenters::Blocks::Image)
+    expect(album.cover).to be_a(Hotchoc::Blocks::Image)
   end
 
   it 'has blocks' do
     expect(album.blocks).to_not be_empty
-    expect(album.blocks.first).to be_a(Hotchoc::Presenters::Blocks::Image)
+    expect(album.blocks.first).to be_a(Hotchoc::Blocks::Image)
   end
 
   it 'has topics' do
     expect(album.topics).to_not be_empty
-    expect(album.topics.first).to be_a(Hotchoc::Presenters::Topic)
+    expect(album.topics.first).to be_a(Hotchoc::Topic)
   end
 
   it 'has a created_at' do

data/spec/hotchoc/{presenters/blocks → blocks}/image_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Hotchoc::Presenters::Blocks::Image do
+describe Hotchoc::Blocks::Image do
   let(:data) do
     JSON.parse(File.read(response_stub('albums')))['albums'].first['blocks'].first
   end
@@ -14,6 +14,6 @@ describe Hotchoc::Presenters::Blocks::Image do
   end
 
   it 'has an image' do
-    expect(block.image).to be_a(Hotchoc::Presenters::File)
+    expect(block.image).to be_a(Hotchoc::File)
   end
 end

data/spec/hotchoc/{presenters/blocks → blocks}/text_spec.rb

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

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::Presenters::Album.new(album) }
+        JSON.parse(File.read(response_stub('albums')))['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::Presenters::Page.new(page) }
+        JSON.parse(File.read(response_stub('pages')))['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::Presenters::Post.new(post) }
+        JSON.parse(File.read(response_stub('posts')))['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::Presenters::Topic.new(topic) }
+        JSON.parse(File.read(response_stub('topics')))['topics'].map { |topic| Hotchoc::Topic.new(topic) }
       end
 
       it 'returns an array with the topics' do

data/spec/hotchoc/{presenters/file_spec.rb → file_spec.rb}

@@ -1,12 +1,12 @@
 require 'spec_helper'
 
-describe Hotchoc::Presenters::File do
+describe Hotchoc::File do
   let(:data) do
     JSON.parse(File.read(response_stub('albums')))['albums'].first['blocks'].first
   end
 
   let(:file) do
-    Hotchoc::Presenters::Blocks::Image.new(data).image
+    Hotchoc::Blocks::Image.new(data).image
   end
 
   it 'has an id' do
@@ -39,7 +39,7 @@ describe Hotchoc::Presenters::File do
 
   it 'has thumbnails' do
     expect(file.thumbnails).to_not be_empty
-    expect(file.thumbnails.first).to be_a(Hotchoc::Presenters::Thumbnail)
+    expect(file.thumbnails.first).to be_a(Hotchoc::Thumbnail)
   end
 
   it 'has exif info' do

data/spec/hotchoc/{presenters/page_spec.rb → page_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Hotchoc::Presenters::Page do
+describe Hotchoc::Page do
   let(:data) do
     JSON.parse(File.read(response_stub('pages')))['pages'].first
   end
@@ -51,12 +51,12 @@ describe Hotchoc::Presenters::Page do
 
   it 'has blocks' do
     expect(page.blocks).to_not be_empty
-    expect(page.blocks.first).to be_a(Hotchoc::Presenters::Blocks::Text)
+    expect(page.blocks.first).to be_a(Hotchoc::Blocks::Text)
   end
 
   it 'has topics' do
     expect(page.topics).to_not be_empty
-    expect(page.topics.first).to be_a(Hotchoc::Presenters::Topic)
+    expect(page.topics.first).to be_a(Hotchoc::Topic)
   end
 
   it 'has a created_at' do

data/spec/hotchoc/{presenters/post_spec.rb → post_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Hotchoc::Presenters::Post do
+describe Hotchoc::Post do
   let(:data) do
     JSON.parse(File.read(response_stub('posts')))['posts'].first
   end
@@ -35,12 +35,12 @@ describe Hotchoc::Presenters::Post do
 
   it 'has blocks' do
     expect(post.blocks).to_not be_empty
-    expect(post.blocks.first).to be_a(Hotchoc::Presenters::Blocks::Text)
+    expect(post.blocks.first).to be_a(Hotchoc::Blocks::Text)
   end
 
   it 'has topics' do
     expect(post.topics).to_not be_empty
-    expect(post.topics.first).to be_a(Hotchoc::Presenters::Topic)
+    expect(post.topics.first).to be_a(Hotchoc::Topic)
   end
 
   it 'has a created_at' do

data/spec/hotchoc/{presenters/thumbnail_spec.rb → thumbnail_spec.rb}

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

data/spec/hotchoc/{presenters/topic_spec.rb → topic_spec.rb}

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hotchoc
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Matthias Siegel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-12 00:00:00.000000000 Z
+date: 2015-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -140,34 +140,34 @@ files:
 - Rakefile
 - hotchoc.gemspec
 - lib/hotchoc.rb
+- lib/hotchoc/album.rb
+- lib/hotchoc/base.rb
+- lib/hotchoc/blocks/base.rb
+- lib/hotchoc/blocks/image.rb
+- lib/hotchoc/blocks/text.rb
 - lib/hotchoc/client.rb
 - lib/hotchoc/client/api.rb
 - lib/hotchoc/client/configuration.rb
 - lib/hotchoc/client/errors.rb
 - lib/hotchoc/client/fetcher.rb
 - lib/hotchoc/client/version.rb
-- lib/hotchoc/presenters/album.rb
-- lib/hotchoc/presenters/base.rb
-- lib/hotchoc/presenters/blocks/base.rb
-- lib/hotchoc/presenters/blocks/image.rb
-- lib/hotchoc/presenters/blocks/text.rb
-- lib/hotchoc/presenters/file.rb
-- lib/hotchoc/presenters/page.rb
-- lib/hotchoc/presenters/post.rb
-- lib/hotchoc/presenters/thumbnail.rb
-- lib/hotchoc/presenters/topic.rb
+- lib/hotchoc/file.rb
+- lib/hotchoc/page.rb
+- lib/hotchoc/post.rb
+- lib/hotchoc/thumbnail.rb
+- lib/hotchoc/topic.rb
+- spec/hotchoc/album_spec.rb
+- spec/hotchoc/blocks/image_spec.rb
+- spec/hotchoc/blocks/text_spec.rb
 - spec/hotchoc/client/api_spec.rb
 - spec/hotchoc/client/configuration_spec.rb
 - spec/hotchoc/client/main_spec.rb
 - spec/hotchoc/client_spec.rb
-- spec/hotchoc/presenters/album_spec.rb
-- spec/hotchoc/presenters/blocks/image_spec.rb
-- spec/hotchoc/presenters/blocks/text_spec.rb
-- spec/hotchoc/presenters/file_spec.rb
-- spec/hotchoc/presenters/page_spec.rb
-- spec/hotchoc/presenters/post_spec.rb
-- spec/hotchoc/presenters/thumbnail_spec.rb
-- spec/hotchoc/presenters/topic_spec.rb
+- spec/hotchoc/file_spec.rb
+- spec/hotchoc/page_spec.rb
+- spec/hotchoc/post_spec.rb
+- spec/hotchoc/thumbnail_spec.rb
+- spec/hotchoc/topic_spec.rb
 - spec/spec_helper.rb
 - spec/support/helpers.rb
 - spec/support/matchers.rb
@@ -201,18 +201,18 @@ signing_key:
 specification_version: 4
 summary: Ruby wrapper for the Hotchoc API.
 test_files:
+- spec/hotchoc/album_spec.rb
+- spec/hotchoc/blocks/image_spec.rb
+- spec/hotchoc/blocks/text_spec.rb
 - spec/hotchoc/client/api_spec.rb
 - spec/hotchoc/client/configuration_spec.rb
 - spec/hotchoc/client/main_spec.rb
 - spec/hotchoc/client_spec.rb
-- spec/hotchoc/presenters/album_spec.rb
-- spec/hotchoc/presenters/blocks/image_spec.rb
-- spec/hotchoc/presenters/blocks/text_spec.rb
-- spec/hotchoc/presenters/file_spec.rb
-- spec/hotchoc/presenters/page_spec.rb
-- spec/hotchoc/presenters/post_spec.rb
-- spec/hotchoc/presenters/thumbnail_spec.rb
-- spec/hotchoc/presenters/topic_spec.rb
+- spec/hotchoc/file_spec.rb
+- spec/hotchoc/page_spec.rb
+- spec/hotchoc/post_spec.rb
+- spec/hotchoc/thumbnail_spec.rb
+- spec/hotchoc/topic_spec.rb
 - spec/spec_helper.rb
 - spec/support/helpers.rb
 - spec/support/matchers.rb

data/lib/hotchoc/presenters/album.rb

@@ -1,57 +0,0 @@
-module Hotchoc
-  module Presenters
-    class Album < Hotchoc::Presenters::Base
-      def id
-        @item['id']
-      end
-
-      def title
-        @item['title']
-      end
-
-      def subtitle
-        @item['subtitle']
-      end
-
-      def description
-        @item['description']
-      end
-
-      def identifier
-        @item['identifier']
-      end
-
-      def status
-        @item['status']
-      end
-
-      def publish_date
-        Time.parse(@item['publish_date'])
-      end
-
-      def cover
-        @item['cover'] ? block_for(@item['cover']) : nil
-      end
-
-      def blocks
-        @item['blocks'].to_a.map { |block| block_for(block) }
-      end
-
-      def topics
-        @item['topics'].to_a.map { |topic| Hotchoc::Presenters::Topic.new(topic) }
-      end
-
-      def created_at
-        Time.parse(@item['created_at'])
-      end
-
-      def updated_at
-        Time.parse(@item['updated_at'])
-      end
-
-      def inspect
-        %(#<Hotchoc::Presenters::Album: title="#{title}">)
-      end
-    end
-  end
-end

data/lib/hotchoc/presenters/base.rb

@@ -1,22 +0,0 @@
-module Hotchoc
-  module Presenters
-    class Base
-      attr_reader :item
-
-      def initialize(item = {})
-        @item = item
-      end
-
-      private
-
-      def block_for(block)
-        case block['type']
-        when 'text'
-          Hotchoc::Presenters::Blocks::Text.new(block)
-        when 'image'
-          Hotchoc::Presenters::Blocks::Image.new(block)
-        end
-      end
-    end
-  end
-end

data/lib/hotchoc/presenters/blocks/base.rb

@@ -1,27 +0,0 @@
-module Hotchoc
-  module Presenters
-    module Blocks
-      class Base < Hotchoc::Presenters::Base
-        def id
-          @item['id']
-        end
-
-        def type
-          @item['type']
-        end
-
-        def position
-          @item['position']
-        end
-
-        def created_at
-          Time.parse(@item['created_at'])
-        end
-
-        def updated_at
-          Time.parse(@item['updated_at'])
-        end
-      end
-    end
-  end
-end

data/lib/hotchoc/presenters/blocks/image.rb

@@ -1,19 +0,0 @@
-module Hotchoc
-  module Presenters
-    module Blocks
-      class Image < Hotchoc::Presenters::Blocks::Base
-        def title
-          @item['content']['title']
-        end
-
-        def image
-          @item['content']['image'] ? Hotchoc::Presenters::File.new(@item['content']['image']) : nil
-        end
-
-        def inspect
-          %(#<Hotchoc::Presenters::Blocks::Image: title="#{title}" position="#{position}">)
-        end
-      end
-    end
-  end
-end

data/lib/hotchoc/presenters/blocks/text.rb

@@ -1,19 +0,0 @@
-module Hotchoc
-  module Presenters
-    module Blocks
-      class Text < Hotchoc::Presenters::Blocks::Base
-        def markdown
-          @item['content']['markdown']
-        end
-
-        def html
-          @item['content']['html']
-        end
-
-        def inspect
-          %(#<Hotchoc::Presenters::Blocks::Text: position="#{position}">)
-        end
-      end
-    end
-  end
-end

data/lib/hotchoc/presenters/file.rb

@@ -1,58 +0,0 @@
-module Hotchoc
-  module Presenters
-    class File < Hotchoc::Presenters::Base
-      def id
-        @item['id']
-      end
-
-      def name
-        @item['name']
-      end
-
-      def url
-        @item['url']
-      end
-
-      def width
-        @item['width']
-      end
-
-      def height
-        @item['height']
-      end
-
-      def size
-        @item['size']
-      end
-
-      def content_type
-        @item['content_type']
-      end
-
-      def thumbnails
-        if @item['thumbnails']
-          @item['thumbnails']['original'].map { |thumbnail| Hotchoc::Presenters::Thumbnail.new(thumbnail) } +
-            @item['thumbnails']['square'].map { |thumbnail| Hotchoc::Presenters::Thumbnail.new(thumbnail) }
-        else
-          []
-        end
-      end
-
-      def exif
-        @item['exif']
-      end
-
-      def created_at
-        Time.parse(@item['created_at'])
-      end
-
-      def updated_at
-        Time.parse(@item['updated_at'])
-      end
-
-      def inspect
-        %(#<Hotchoc::Presenters::File: name="#{name}">)
-      end
-    end
-  end
-end

data/lib/hotchoc/presenters/page.rb

@@ -1,65 +0,0 @@
-module Hotchoc
-  module Presenters
-    class Page < Hotchoc::Presenters::Base
-      def id
-        @item['id']
-      end
-
-      def title
-        @item['title']
-      end
-
-      def subtitle
-        @item['subtitle']
-      end
-
-      def identifier
-        @item['identifier']
-      end
-
-      def status
-        @item['status']
-      end
-
-      def path
-        @item['path']
-      end
-
-      def parent_id
-        @item['parent_id']
-      end
-
-      def position
-        @item['position']
-      end
-
-      def level
-        @item['level']
-      end
-
-      def publish_date
-        Time.parse(@item['publish_date'])
-      end
-
-      def blocks
-        @item['blocks'].to_a.map { |block| block_for(block) }
-      end
-
-      def topics
-        @item['topics'].to_a.map { |topic| Hotchoc::Presenters::Topic.new(topic) }
-      end
-
-      def created_at
-        Time.parse(@item['created_at'])
-      end
-
-      def updated_at
-        Time.parse(@item['updated_at'])
-      end
-
-      def inspect
-        %(#<Hotchoc::Presenters::Page: title="#{title}">)
-      end
-    end
-  end
-end

data/lib/hotchoc/presenters/post.rb

@@ -1,49 +0,0 @@
-module Hotchoc
-  module Presenters
-    class Post < Hotchoc::Presenters::Base
-      def id
-        @item['id']
-      end
-
-      def title
-        @item['title']
-      end
-
-      def subtitle
-        @item['subtitle']
-      end
-
-      def identifier
-        @item['identifier']
-      end
-
-      def status
-        @item['status']
-      end
-
-      def publish_date
-        Time.parse(@item['publish_date'])
-      end
-
-      def blocks
-        @item['blocks'].to_a.map { |block| block_for(block) }
-      end
-
-      def topics
-        @item['topics'].to_a.map { |topic| Hotchoc::Presenters::Topic.new(topic) }
-      end
-
-      def created_at
-        Time.parse(@item['created_at'])
-      end
-
-      def updated_at
-        Time.parse(@item['updated_at'])
-      end
-
-      def inspect
-        %(#<Hotchoc::Presenters::Post: title="#{title}">)
-      end
-    end
-  end
-end

data/lib/hotchoc/presenters/thumbnail.rb

@@ -1,33 +0,0 @@
-module Hotchoc
-  module Presenters
-    class Thumbnail < Hotchoc::Presenters::Base
-      def name
-        @item['name']
-      end
-
-      def width
-        @item['width']
-      end
-
-      def height
-        @item['height']
-      end
-
-      def square?
-        width == height
-      end
-
-      def size
-        @item['size']
-      end
-
-      def url
-        @item['url']
-      end
-
-      def inspect
-        %(#<Hotchoc::Presenters::Thumbnail:>)
-      end
-    end
-  end
-end