contentful 0.3.2 → 0.3.3

data/TAGS

@@ -1,8 +1,8 @@
 
 examples/custom_classes.rb,120
-class MyResourceMyResource
12,405
-class MyBetterArray < Contentful::ArrayMyBetterArray
36,919
-  def lastlast
38,1002
+class MyResourceMyResource
12,406
+class MyBetterArray < Contentful::ArrayMyBetterArray
36,920
+  def lastlast
38,1003
 
 examples/dynamic_entries.rb,0
 
@@ -13,8 +13,8 @@ examples/raise_errors.rb,0
 examples/raw_mode.rb,0
 
 examples/resource_mapping.rb,84
-class MyBetterArray < Contentful::ArrayMyBetterArray
12,361
-  def lastlast
14,444
+class MyBetterArray < Contentful::ArrayMyBetterArray
12,377
+  def lastlast
14,460
 
 lib/contentful/array.rb,95
 module ContentfulContentful
4,68
@@ -26,28 +26,28 @@ module ContentfulContentful
4,70
   class AssetAsset
7,203
     def image_url(options = {})image_url
19,627
 
-lib/contentful/client.rb,1109
-module ContentfulContentful
10,256
-  class ClientClient
14,419
-    def self.get_http(url, query, headers = {})get_http
32,886
-    def initialize(given_configuration = {})initialize
36,987
-    def default_configurationdefault_configuration
49,1356
-    def space(query = {})space
56,1537
-    def content_type(id, query = {})content_type
63,1742
-    def content_types(query = {})content_types
70,1993
-    def entry(id, query = {})entry
77,2207
-    def entries(query = {})entries
84,2433
-    def asset(id, query = {})asset
91,2635
-    def assets(query = {})assets
98,2859
-    def base_urlbase_url
103,3001
-    def request_headersrequest_headers
108,3190
-    def request_query(query)request_query
117,3660
-    def get(request, build_resource = true)get
128,3998
-    def update_dynamic_entry_cache!update_dynamic_entry_cache!
154,4785
-    def register_dynamic_entry(key, klass)register_dynamic_entry
167,5115
-    def sync(options = { initial: true })sync
174,5355
-    def normalize_configuration!normalize_configuration!
181,5450
-    def validate_configuration!validate_configuration!
186,5700
+lib/contentful/client.rb,1108
+module ContentfulContentful
8,132
+  class ClientClient
12,295
+    def self.get_http(url, query, headers = {})get_http
30,762
+    def initialize(given_configuration = {})initialize
34,863
+    def default_configurationdefault_configuration
47,1232
+    def space(query = {})space
54,1413
+    def content_type(id, query = {})content_type
61,1618
+    def content_types(query = {})content_types
68,1869
+    def entry(id, query = {})entry
75,2083
+    def entries(query = {})entries
82,2309
+    def asset(id, query = {})asset
89,2511
+    def assets(query = {})assets
96,2735
+    def base_urlbase_url
101,2877
+    def request_headersrequest_headers
106,3066
+    def request_query(query)request_query
115,3536
+    def get(request, build_resource = true)get
126,3874
+    def update_dynamic_entry_cache!update_dynamic_entry_cache!
152,4661
+    def register_dynamic_entry(key, klass)register_dynamic_entry
165,4991
+    def sync(options = { initial: true })sync
172,5231
+    def normalize_configuration!normalize_configuration!
179,5326
+    def validate_configuration!validate_configuration!
184,5576
 
 lib/contentful/content_type.rb,72
 module ContentfulContentful
4,54
@@ -70,18 +70,19 @@ lib/contentful/entry.rb,60
 module ContentfulContentful
4,64
   class EntryEntry
7,198
 
-lib/contentful/error.rb,547
+lib/contentful/error.rb,614
 module ContentfulContentful
1,0
   class Error < StandardErrorError
4,142
     def initialize(response)initialize
7,199
     def self.[](error_status_code)[]
14,396
-  class NotFound < Error; endNotFound
33,691
-  class BadRequest < Error; endBadRequest
36,730
-  class AccessDenied < Error; endAccessDenied
39,771
-  class Unauthorized < Error; endUnauthorized
42,814
-  class ServerError < Error; endServerError
45,857
-  class UnparsableJson < Error; endUnparsableJson
48,933
-  class UnparsableResource < Error; endUnparsableResource
51,1037
+  class NotFound < Error; endNotFound
35,733
+  class BadRequest < Error; endBadRequest
38,772
+  class AccessDenied < Error; endAccessDenied
41,813
+  class Unauthorized < Error; endUnauthorized
44,856
+  class ServerError < Error; endServerError
47,899
+  class ServiceUnavailable < Error; endServiceUnavailable
50,941
+  class UnparsableJson < Error; endUnparsableJson
53,1024
+  class UnparsableResource < Error; endUnparsableResource
56,1128
 
 lib/contentful/field.rb,60
 module ContentfulContentful
3,29
@@ -160,21 +161,21 @@ lib/contentful/resource.rb,1041
 module ContentfulContentful
4,62
   module ResourceResource
13,463
     def initialize(object, request = nil, client = nil, nested_locale_fields = false, default_locale = Contentful::Client::DEFAULT_CONFIGURATION[:default_locale] )initialize
24,743
-    def inspect(info = nil)inspect
34,1184
-    def array?array?
40,1417
-    def nested_locale_fields?nested_locale_fields?
45,1544
-    def syssys
50,1686
-    def fieldsfields
55,1797
-    def reloadreload
61,1941
-    def extract_from_object(object, namespace, keys = nil)extract_from_object
71,2050
-    def coerce_value_or_array(value, what = nil)coerce_value_or_array
85,2459
-    def coerce_or_create_class(value, what)coerce_or_create_class
93,2669
-    module ClassMethodsClassMethods
105,2982
-      def nested_locale_fields?nested_locale_fields?
107,3098
-      def property_coercionsproperty_coercions
111,3155
-      def property(name, property_class = nil)property
126,3829
-      def update_coercions!update_coercions!
134,4100
-    def self.included(base)included
153,4689
+    def inspect(info = nil)inspect
35,1225
+    def array?array?
41,1458
+    def nested_locale_fields?nested_locale_fields?
46,1585
+    def syssys
51,1727
+    def fieldsfields
56,1838
+    def reloadreload
62,1982
+    def extract_from_object(object, namespace, keys = nil)extract_from_object
72,2091
+    def coerce_value_or_array(value, what = nil)coerce_value_or_array
85,2510
+    def coerce_or_create_class(value, what)coerce_or_create_class
95,2755
+    module ClassMethodsClassMethods
107,3068
+      def nested_locale_fields?nested_locale_fields?
109,3184
+      def property_coercionsproperty_coercions
113,3241
+      def property(name, property_class = nil)property
128,3915
+      def update_coercions!update_coercions!
136,4186
+    def self.included(base)included
155,4775
 
 lib/contentful/resource_builder.rb,2028
 module ContentfulContentful
13,309
@@ -204,12 +205,14 @@ module ContentfulContentful
13,309
     def maybe_replace_link(link, parent, key)maybe_replace_link
255,8011
     def replace_links_in_included_resources_with_known_resourcesreplace_links_in_included_resources_with_known_resources
262,8243
 
-lib/contentful/response.rb,228
-module ContentfulContentful
4,47
-  class ResponseResponse
22,837
-    def initialize(raw, request = nil)initialize
25,920
-    def parse_json!parse_json!
38,1113
-    def parse_contentful_error!parse_contentful_error!
48,1327
+lib/contentful/response.rb,362
+module ContentfulContentful
6,62
+  class ResponseResponse
24,852
+    def initialize(raw, request = nil)initialize
27,935
+    def service_unavailable_response?service_unavailable_response?
45,1377
+    def no_content_response?no_content_response?
49,1449
+    def parse_json!parse_json!
53,1531
+    def parse_contentful_error!parse_contentful_error!
63,1745
 
 lib/contentful/space.rb,60
 module ContentfulContentful
4,55

data/lib/contentful/error.rb

@@ -23,6 +23,8 @@ module Contentful
         Unauthorized
       when 500
         ServerError
+      when 503
+        ServiceUnavailable
       else
         Error
       end
@@ -44,6 +46,9 @@ module Contentful
   # 500
   class ServerError < Error; end
 
+  # 503
+  class ServiceUnavailable < Error; end
+
   # Raised when response is no valid json
   class UnparsableJson < Error; end
 

data/lib/contentful/response.rb

@@ -27,7 +27,10 @@ module Contentful
       @request = request
       @status  = :ok
 
-      if no_content_response?
+      if service_unavailable_response?
+        @status = :service_unavailable
+        @error_message = 'Service Unavailable, contenful.com API seems to be down'
+      elsif no_content_response?
         @status = :no_content
         @object = true
       elsif parse_json!
@@ -37,6 +40,10 @@ module Contentful
 
     private
 
+    def service_unavailable_response?
+      @raw.status == 503
+    end
+
     def no_content_response?
       @raw.to_s == '' && @raw.status == 204
     end

data/lib/contentful/version.rb

@@ -1,3 +1,3 @@
 module Contentful
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 end

data/spec/response_spec.rb

@@ -7,7 +7,7 @@ describe Contentful::Response do
 
   describe "#raw" do
     it "returns the raw response it has been initalized with" do
-      expect( successful_response.raw ).to eq raw_fixture('nyancat')
+      expect( successful_response.raw.to_s ).to eql raw_fixture('nyancat').to_s
     end
   end
 
@@ -38,7 +38,7 @@ describe Contentful::Response do
 
     it 'returns :no_content for responses without content' do
       raw_response = ''
-      mock(raw_response).status {204}
+      stub(raw_response).status {204}
       no_content_response = Contentful::Response.new raw_response
       expect( no_content_response.status).to eq :no_content
     end
@@ -52,6 +52,10 @@ describe Contentful::Response do
     it 'returns json parser error message for json parse errors' do
       expect( unparsable_response.error_message ).to include "unexpected token"
     end
-  end
 
+    it 'returns a ServiceUnavailable error on a 503' do
+      error_response = Contentful::Response.new raw_fixture('not_found', 503)
+      expect(error_response.status).to eql :service_unavailable
+    end
+  end
 end

data/spec/support/json_responses.rb

@@ -1,11 +1,15 @@
 require 'multi_json'
 
-def raw_fixture(which, as_json = false)
-  File.read File.dirname(__FILE__) + "/../fixtures/json_responses/#{which}.json"
+def raw_fixture(which,status = 200, as_json = false)
+  object = Object.new
+  stub(object).status { status }
+  stub(object).to_s { File.read File.dirname(__FILE__) + "/../fixtures/json_responses/#{which}.json" }
+
+  object
 end
 
 def json_fixture(which, as_json = false)
   MultiJson.load(
     File.read File.dirname(__FILE__) + "/../fixtures/json_responses/#{which}.json"
   )
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contentful
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-06 00:00:00.000000000 Z
+date: 2014-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -288,7 +288,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3768775141988377798
+      hash: -1847885584219532891
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -297,10 +297,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3768775141988377798
+      hash: -1847885584219532891
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.23.2
 signing_key: 
 specification_version: 3
 summary: contentful