contentful 0.3.4 → 0.3.5

data/lib/contentful/deleted_entry.rb

@@ -7,4 +7,4 @@ module Contentful
     include Contentful::Resource
     include Contentful::Resource::SystemProperties
   end
-end
+end

data/lib/contentful/request.rb

@@ -11,7 +11,7 @@ module Contentful
       @absolute = true if @endpoint.start_with?('http')
 
       @query = if query && !query.empty?
-        normalize_query(query)
+                 normalize_query(query)
       end
 
       if id
@@ -43,7 +43,6 @@ module Contentful
       Marshal.load(Marshal.dump(self))
     end
 
-
     private
 
     def normalize_query(query)

data/lib/contentful/resource.rb

@@ -21,7 +21,7 @@ module Contentful
 
     attr_reader :properties, :request, :client, :default_locale
 
-    def initialize(object, request = nil, client = nil, nested_locale_fields = false, default_locale = Contentful::Client::DEFAULT_CONFIGURATION[:default_locale] )
+    def initialize(object, request = nil, client = nil, nested_locale_fields = false, default_locale = Contentful::Client::DEFAULT_CONFIGURATION[:default_locale])
       self.class.update_coercions!
       @nested_locale_fields = nested_locale_fields
       @default_locale = default_locale

data/lib/contentful/resource/array_like.rb

@@ -14,7 +14,7 @@ module Contentful
       def each_item(&block)
         items.each(&block)
       end
-      alias each each_item
+      alias_method :each, :each_item
 
       # Delegates to items#empty?
       def empty?
@@ -25,8 +25,7 @@ module Contentful
       def size
         items.size
       end
-      alias length size
-
+      alias_method :length, :size
     end
   end
 end

data/lib/contentful/resource/asset_fields.rb

@@ -19,7 +19,7 @@ module Contentful
       def initialize(object, *)
         super
         @fields = {}
-        @fields[locale] = extract_from_object object["fields"], :fields
+        @fields[locale] = extract_from_object object['fields'], :fields
       end
 
       def inspect(info = nil)

data/lib/contentful/resource/fields.rb

@@ -23,14 +23,13 @@ module Contentful
         end
       end
 
-
       private
 
       def extract_fields_from_object!(object)
         @fields = {}
 
         if nested_locale_fields?
-          object["fields"].each do |field_name, nested_child_object|
+          object['fields'].each do |field_name, nested_child_object|
             nested_child_object.each do |object_locale, real_child_object|
               @fields[object_locale] ||= {}
               @fields[object_locale].merge! extract_from_object(
@@ -39,7 +38,7 @@ module Contentful
             end
           end
         else
-          @fields[locale] = extract_from_object object["fields"], :fields
+          @fields[locale] = extract_from_object object['fields'], :fields
         end
       end
 

data/lib/contentful/resource/system_properties.rb

@@ -17,7 +17,7 @@ module Contentful
 
       def initialize(object, *)
         super
-        @sys = extract_from_object object["sys"], :sys
+        @sys = extract_from_object object['sys'], :sys
       end
 
       def inspect(info = nil)

data/lib/contentful/resource_builder.rb

@@ -28,12 +28,11 @@ module Contentful
 
     attr_reader :client, :response, :resource_mapping, :entry_mapping, :resource
 
-
     def initialize(client, response, resource_mapping = {}, entry_mapping = {}, default_locale = Contentful::Client::DEFAULT_CONFIGURATION[:default_locale])
       @response = response
       @client = client
       @included_resources = {}
-      @known_resources = Hash.new{ |h,k| h[k] = {} }
+      @known_resources = Hash.new { |h, k| h[k] = {} }
       @nested_locales = false
       @default_locale = default_locale
       @resource_mapping = default_resource_mapping.merge(resource_mapping)
@@ -43,19 +42,10 @@ module Contentful
     # Starts the parsing process.
     # Either returns an Error, or the parsed Resource
     def run
-      case response.status
-      when :contentful_error
-        Error[response.raw.status].new(response)
-      when :unparsable_json
-        UnparsableJson.new(response)
-      when :not_contentful
-        Error.new(response)
+      if response.status == :ok
+        create_all_resources!
       else
-        begin
-          create_all_resources!
-        rescue UnparsableResource => error
-          error
-        end
+        response.object
       end
     end
 
@@ -76,6 +66,8 @@ module Contentful
       end
 
       @resource
+    rescue UnparsableResource => error
+      error
     end
 
     # Creates a single resource from the response object
@@ -110,15 +102,15 @@ module Contentful
 
     # Returns the id of the related ContentType, if there is one
     def content_type_id_for_entry(object)
-      object["sys"] &&
-      object["sys"]["contentType"] &&
-      object["sys"]["contentType"]["sys"] &&
-      object["sys"]["contentType"]["sys"]["id"]
+      object['sys'] &&
+      object['sys']['contentType'] &&
+      object['sys']['contentType']['sys'] &&
+      object['sys']['contentType']['sys']['id']
     end
 
     # Detects if a resource is an Contentful::Array or a SyncPage
     def array_or_sync_page(object)
-      if object["nextPageUrl"] || object["nextSyncUrl"]
+      if object['nextPageUrl'] || object['nextSyncUrl']
         SyncPage
       else
         Array
@@ -133,7 +125,7 @@ module Contentful
     # - Proc: Will be called, expected to return the proper Class
     # - Symbol: Will be called as method of the ResourceBuilder itself
     def detect_resource_class(object)
-      type = object["sys"] && object["sys"]["type"]
+      type = object['sys'] && object['sys']['type']
 
       case res_class = resource_mapping[type]
       when Symbol
@@ -141,7 +133,7 @@ module Contentful
       when Proc
         res_class[object]
       when nil
-        raise UnparsableResource.new(response)
+        fail UnparsableResource.new(response)
       else
         res_class
       end
@@ -157,7 +149,6 @@ module Contentful
       DEFAULT_ENTRY_MAPPING.dup
     end
 
-
     private
 
     def detect_child_objects(object)
@@ -191,7 +182,7 @@ module Contentful
           res.public_send(name)[child_name.to_sym] = create_resource(child_object)
         end
         next if name == 'includes'
-        detect_child_arrays(potential_objects).each do |child_name, child_array|
+        detect_child_arrays(potential_objects).each do |child_name, _child_array|
           replace_child_array res.public_send(name)[child_name.to_sym]
         end
       end

data/lib/contentful/response.rb

@@ -27,62 +27,67 @@ module Contentful
       @request = request
       @status = :ok
 
-      if service_unavailable_response?
-        @status = :service_unavailable
-        @error_message = 'Service Unavailable, contenful.com API seems to be down'
+      if valid_http_response?
+        parse_json!
       elsif no_content_response?
         @status = :no_content
-        @object = true
-      elsif parse_json!
-        parse_contentful_error!
+      elsif no_resource_or_bad_request?
+        parse_contentful_error
+      else
+        parse_http_error
       end
     end
 
     private
 
-    def service_unavailable_response?
-      @raw.status == 503
+    def error_object?
+      object['sys']['type'] == 'Error'
+    end
+
+    def parse_contentful_error
+      @object = load_json
+      @error_message = object['message'] if error_object?
+      parse_http_error
+    end
+
+    def valid_http_response?
+      [200, 201].include?(raw.status)
+    end
+
+    def parse_http_error
+      @status = :error
+      @object = Error[raw.status].new(self)
+    end
+
+    def no_resource_or_bad_request?
+      [400, 404].include?(raw.status)
     end
 
     def no_content_response?
-      @raw.to_s == '' && @raw.status == 204
+      raw.to_s == '' && raw.status == 204
     end
 
     def parse_json!
-      body =  unzip_response(raw)
-      @object = MultiJson.load(body)
-      true
-    rescue MultiJson::LoadError => e
-      @status = :unparsable_json
-      @error_message = e.message
-      @object = e
-      false
+      @object = load_json
+    rescue MultiJson::LoadError => error
+      @error_message = error.message
+      @status = :error
+      UnparsableJson.new(self)
     end
 
-    def parse_contentful_error!
-      if @object && @object["sys"]
-        if @object["sys"]["type"] == 'Error'
-          @status = :contentful_error
-          @error_message = object['message']
-          true
-        else
-          false
-        end
-      else
-        @status = :not_contentful
-        @error_message = "No contentful system properties found in object"
-      end
+    def load_json
+      MultiJson.load(unzip_response(raw))
     end
 
     def unzip_response(response)
-      if response.headers['Content-Encoding'].eql?('gzip') then
-        sio = StringIO.new(response.to_s)
+      parsed_response = response.to_s
+      if response.headers['Content-Encoding'].eql?('gzip')
+        sio = StringIO.new(parsed_response)
         gz = Zlib::GzipReader.new(sio)
-        gz.read()
+        gz.read
       else
-        response.to_s
+        parsed_response
       end
     end
-
   end
 end

data/lib/contentful/sync.rb

@@ -32,7 +32,7 @@ module Contentful
 
     # Returns false as long as last sync page has not been reached
     def completed?
-      !! next_sync_url
+      !!next_sync_url
     end
 
     # Directly iterates over all resources that have changed
@@ -57,7 +57,6 @@ module Contentful
       page
     end
 
-
     private
 
     def link_page_to_sync!(page)
@@ -67,6 +66,5 @@ module Contentful
     def update_sync_state_from!(page)
       @next_sync_url = page.next_sync_url
     end
-
   end
 end

data/lib/contentful/sync_page.rb

@@ -22,12 +22,11 @@ module Contentful
     end
 
     def next_page?
-      !! next_page_url
+      !!next_page_url
     end
 
     def last_page?
-      ! next_page_url
+      !next_page_url
     end
-
   end
 end

data/lib/contentful/version.rb

@@ -1,3 +1,3 @@
 module Contentful
-  VERSION = '0.3.4'
+  VERSION = '0.3.5'
 end

data/spec/array_spec.rb

@@ -1,69 +1,69 @@
 require 'spec_helper'
 
 describe Contentful::Array do
-  let(:array){ vcr('array'){ create_client.content_types } }
+  let(:array) { vcr('array') { create_client.content_types } }
 
   describe 'SystemProperties' do
     it 'has a #sys getter returning a hash with symbol keys' do
-      expect( array.sys ).to be_a Hash
-      expect( array.sys.keys.sample ).to be_a Symbol
+      expect(array.sys).to be_a Hash
+      expect(array.sys.keys.sample).to be_a Symbol
     end
 
     it 'has #type' do
-      expect( array.type ).to eq "Array"
+      expect(array.type).to eq 'Array'
     end
   end
 
   describe 'Properties' do
     it 'has a #properties getter returning a hash with symbol keys' do
-      expect( array.properties ).to be_a Hash
-      expect( array.properties.keys.sample ).to be_a Symbol
+      expect(array.properties).to be_a Hash
+      expect(array.properties.keys.sample).to be_a Symbol
     end
 
     it 'has #total' do
-      expect( array.total ).to eq 4
+      expect(array.total).to eq 4
     end
 
     it 'has #skip' do
-      expect( array.skip ).to eq 0
+      expect(array.skip).to eq 0
     end
 
     it 'has #limit' do
-      expect( array.limit ).to eq 100
+      expect(array.limit).to eq 100
     end
 
     it 'has #items which contain resources' do
-      expect( array.items ).to be_a Array
-      expect( array.items.sample ).to be_a Contentful::Resource
+      expect(array.items).to be_a Array
+      expect(array.items.sample).to be_a Contentful::Resource
     end
   end
 
   describe '#each' do
     it 'is an Enumerator' do
-      expect( array.each ).to be_a Enumerator
+      expect(array.each).to be_a Enumerator
     end
 
     it 'iterates over items' do
-      expect( array.each.to_a ).to eq array.items
+      expect(array.each.to_a).to eq array.items
     end
 
     it 'includes Enumerable' do
-      expect( array.map{ |r| r.type } ).to eq array.items.map{ |r| r.type }
+      expect(array.map { |r| r.type }).to eq array.items.map { |r| r.type }
     end
   end
 
   describe '#next_page' do
     it 'requests more of the same content from the server, using its limit and skip values' do
-      array_page_1 = vcr('array_page_1'){ create_client.content_types(skip: 3, limit: 2) }
-      array_page_2 = vcr('array_page_2'){ array_page_1.next_page }
+      array_page_1 = vcr('array_page_1') { create_client.content_types(skip: 3, limit: 2) }
+      array_page_2 = vcr('array_page_2') { array_page_1.next_page }
 
-      expect( array_page_2 ).to be_a Contentful::Array
-      expect( array_page_2.limit ).to eq 2
-      expect( array_page_2.skip  ).to eq 5
+      expect(array_page_2).to be_a Contentful::Array
+      expect(array_page_2.limit).to eq 2
+      expect(array_page_2.skip).to eq 5
     end
 
     it 'will return false if #request not available' do
-      expect( Contentful::Array.new({}).reload ).to be_false
+      expect(Contentful::Array.new({}).reload).to be_false
     end
   end
 end

data/spec/asset_spec.rb

@@ -1,62 +1,62 @@
 require 'spec_helper'
 
 describe Contentful::Asset do
-  let(:asset){ vcr('asset'){ create_client.asset('nyancat') } }
+  let(:asset) { vcr('asset') { create_client.asset('nyancat') } }
 
   describe 'SystemProperties' do
     it 'has a #sys getter returning a hash with symbol keys' do
-      expect( asset.sys ).to be_a Hash
-      expect( asset.sys.keys.sample ).to be_a Symbol
+      expect(asset.sys).to be_a Hash
+      expect(asset.sys.keys.sample).to be_a Symbol
     end
 
     it 'has #id' do
-      expect( asset.id ).to eq "nyancat"
+      expect(asset.id).to eq 'nyancat'
     end
 
     it 'has #type' do
-      expect( asset.type ).to eq "Asset"
+      expect(asset.type).to eq 'Asset'
     end
 
     it 'has #space' do
-      expect( asset.space ).to be_a Contentful::Link
+      expect(asset.space).to be_a Contentful::Link
     end
 
     it 'has #created_at' do
-      expect( asset.created_at ).to be_a DateTime
+      expect(asset.created_at).to be_a DateTime
     end
 
     it 'has #updated_at' do
-      expect( asset.updated_at ).to be_a DateTime
+      expect(asset.updated_at).to be_a DateTime
     end
 
     it 'has #revision' do
-      expect( asset.revision ).to eq 1
+      expect(asset.revision).to eq 1
     end
   end
 
   describe 'Fields' do
     it 'has #title' do
-      expect( asset.title ).to eq "Nyan Cat"
+      expect(asset.title).to eq 'Nyan Cat'
     end
 
     it 'could have #description' do
-      expect( asset ).to respond_to :description
+      expect(asset).to respond_to :description
     end
 
     it 'has #file' do
-      expect( asset.file ).to be_a Contentful::File
+      expect(asset.file).to be_a Contentful::File
     end
   end
 
   describe '#image_url' do
     it 'returns #url of #file without parameter' do
-      expect( asset.image_url ).to eq asset.file.url
+      expect(asset.image_url).to eq asset.file.url
     end
 
     it 'adds image options if given' do
       url = asset.image_url(width: 100, format: 'jpg', quality: 50)
       expect(url).to include asset.file.url
-      expect(url).to include "?w=100&fm=jpg&q=50"
+      expect(url).to include '?w=100&fm=jpg&q=50'
     end
   end
 end