hotchoc 0.1.0 → 0.2.0

data/lib/hotchoc/api.rb

@@ -1,44 +1,20 @@
 module Hotchoc
   module API
 
-    def get_album(id)
-      raise ArgumentError, "Album ID is required" unless id
-
-      get("albums/#{id}")['album']
-    end
-
     def get_albums(opts = {})
-      get("albums", opts)['albums']
-    end
-
-    def get_page(id)
-      raise ArgumentError, "Page ID is required" unless id
-
-      get("pages/#{id}")['page']
+      get('albums', opts)['albums'].map { |album| Hotchoc::Presenters::Album.new(album) }
     end
 
     def get_pages(opts = {})
-      get("pages", opts)['pages']
-    end
-
-    def get_post(id)
-      raise ArgumentError, "Post ID is required" unless id
-
-      get("posts/#{id}")['post']
+      get('pages', opts)['pages'].map { |page| Hotchoc::Presenters::Page.new(page) }
     end
 
     def get_posts(opts = {})
-      get("posts", opts)['posts']
-    end
-
-    def get_topic(id)
-      raise ArgumentError, "Topic ID is required" unless id
-
-      get("topics/#{id}")['topic']
+      get('posts', opts)['posts'].map { |post| Hotchoc::Presenters::Post.new(post) }
     end
 
     def get_topics(opts = {})
-      get("topics", opts)['topics']
+      get('topics', opts)['topics'].map { |topic| Hotchoc::Presenters::Topic.new(topic) }
     end
 
   end

data/lib/hotchoc/errors.rb

@@ -9,4 +9,4 @@ module Hotchoc
     end
 
   end
-end
+end

data/lib/hotchoc/fetcher.rb

@@ -24,7 +24,7 @@ module Hotchoc
         if response.timed_out?
           raise Hotchoc::Errors::RequestError, "Request timed out"
         elsif !response.success?
-          raise Hotchoc::Errors::RequestError, "Request failed, code #{response.code}, message: #{response.return_message}"
+          raise Hotchoc::Errors::RequestError, "Request failed with code #{response.code}. #{response.return_message == 'No error' ? '' : response.return_message}"
         end
       end
 

data/lib/hotchoc/presenters/album.rb

@@ -0,0 +1,65 @@
+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 image_count
+        @item['image_count']
+      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

@@ -0,0 +1,26 @@
+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

@@ -0,0 +1,31 @@
+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

@@ -0,0 +1,23 @@
+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

@@ -0,0 +1,23 @@
+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

@@ -0,0 +1,62 @@
+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

@@ -0,0 +1,69 @@
+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

@@ -0,0 +1,53 @@
+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

@@ -0,0 +1,37 @@
+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

data/lib/hotchoc/presenters/topic.rb

@@ -0,0 +1,33 @@
+module Hotchoc
+  module Presenters
+
+    class Topic < Hotchoc::Presenters::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::Presenters::Topic: name="#{name}">)
+      end
+
+    end
+
+  end
+end

data/lib/hotchoc/version.rb

@@ -1,3 +1,3 @@
 module Hotchoc
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/hotchoc.rb

@@ -1,9 +1,20 @@
+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/version'
 require 'hotchoc/errors'
 require 'hotchoc/api'
 require 'hotchoc/fetcher'
 require 'hotchoc/configuration'
 require 'hotchoc/client'
-require 'hotchoc/version'
 
 module Hotchoc
   extend Configuration

data/spec/hotchoc/api_spec.rb

@@ -11,92 +11,52 @@ describe 'Hotchoc::API' do
 
   describe 'Albums' do
 
-    context 'GET single item' do
-      let(:album) do
-        JSON.parse(File.read(response_stub('album')))['album']
-      end
-
-      it "returns a hash with the album" do
-        expect(client.get_album('53d3a2266c6f72785d010000')).to eq album
-      end
-    end
-
     context 'GET collection' do
       let(:albums) do
-        JSON.parse(File.read(response_stub('albums')))['albums']
+        JSON.parse(File.read(response_stub('albums')))['albums'].map { |album| Hotchoc::Presenters::Album.new(album) }
       end
 
       it "returns an array with the albums" do
-        expect(client.get_albums).to eq albums
+        expect(client.get_albums).to have_the_same_items_as albums
       end
     end
   end
 
   describe 'Pages' do
 
-    context 'GET single item' do
-      let(:page) do
-        JSON.parse(File.read(response_stub('page')))['page']
-      end
-
-      it "returns a hash with the page" do
-        expect(client.get_page('53d3a6ee6c6f72785d260000')).to eq page
-      end
-    end
-
     context 'GET collection' do
       let(:pages) do
-        JSON.parse(File.read(response_stub('pages')))['pages']
+        JSON.parse(File.read(response_stub('pages')))['pages'].map { |page| Hotchoc::Presenters::Page.new(page) }
       end
 
       it "returns an array with the pages" do
-        expect(client.get_pages).to eq pages
+        expect(client.get_pages).to have_the_same_items_as pages
       end
     end
   end
 
   describe 'Posts' do
 
-    context 'GET single item' do
-      let(:post) do
-        JSON.parse(File.read(response_stub('post')))['post']
-      end
-
-      it "returns a hash with the post" do
-        expect(client.get_post('53d3a7596c6f72785d290000')).to eq post
-      end
-    end
-
     context 'GET collection' do
       let(:posts) do
-        JSON.parse(File.read(response_stub('posts')))['posts']
+        JSON.parse(File.read(response_stub('posts')))['posts'].map { |post| Hotchoc::Presenters::Post.new(post) }
       end
 
       it "returns an array with the posts" do
-        expect(client.get_posts).to eq posts
+        expect(client.get_posts).to have_the_same_items_as posts
       end
     end
   end
 
   describe 'Topics' do
 
-    context 'GET single item' do
-      let(:topic) do
-        JSON.parse(File.read(response_stub('topic')))['topic']
-      end
-
-      it "returns a hash with the topic" do
-        expect(client.get_topic('53d0dca56c6f7253e6060000')).to eq topic
-      end
-    end
-
     context 'GET collection' do
       let(:topics) do
-        JSON.parse(File.read(response_stub('topics')))['topics']
+        JSON.parse(File.read(response_stub('topics')))['topics'].map { |topic| Hotchoc::Presenters::Topic.new(topic) }
       end
 
       it "returns an array with the topics" do
-        expect(client.get_topics).to eq topics
+        expect(client.get_topics).to have_the_same_items_as topics
       end
     end
   end

data/spec/support/matchers.rb

@@ -0,0 +1,5 @@
+RSpec::Matchers.define :have_the_same_items_as do |expected|
+  match do |actual|
+    actual.map(&:item) == expected.map(&:item)
+  end
+end