contentful 0.1.0 → 0.1.1

data/lib/contentful/space.rb

@@ -11,4 +11,4 @@ module Contentful
     property :name, :string
     property :locales, Locale
   end
-end
+end

data/lib/contentful/support.rb

@@ -4,13 +4,15 @@ module Contentful
     class << self
       # Transforms CamelCase into snake_case (taken from zucker)
       def snakify(object)
-        object.to_s.gsub(/(?<!^)[A-Z]/) do "_#$&" end.downcase
+        snake = String(object).gsub(/(?<!^)[A-Z]/) { "_#$&" }
+        snake.downcase
       end
 
       # Transforms each hash key into a symbol (like in AS)
-      def symbolize_keys(h)
+      def symbolize_keys(hash)
         result = {}
-        h.each_key{ |key| result[(key.to_sym rescue key)] = h[key] }
+        # XXX remove inline rescue
+        hash.each_key { |key| result[(key.to_sym rescue key)] = hash[key] }
         result
       end
     end

data/lib/contentful/version.rb

@@ -1,3 +1,3 @@
 module Contentful
-  VERSION = "0.1.0"
+  VERSION = '0.1.1'
 end

data/spec/fixtures/json_responses/includes.json

@@ -0,0 +1,111 @@
+{
+  "sys": {
+    "type": "Array"
+  },
+  "total": 1,
+  "skip": 0,
+  "limit": 100,
+  "items": [
+    {
+      "sys": {
+        "space": {
+          "sys": {
+            "type": "Link",
+            "linkType": "Space",
+            "id": "6yahkaf5ehkk"
+          }
+        },
+        "type": "Entry",
+        "contentType": {
+          "sys": {
+            "type": "Link",
+            "linkType": "ContentType",
+            "id": "tSFLnCNqvuyoMA6SKkQ2W"
+          }
+        },
+        "id": "2fCmT4nxtO6eI6usgoEkQG",
+        "revision": 1,
+        "createdAt": "2014-04-11T10:59:40.249Z",
+        "updatedAt": "2014-04-11T10:59:40.249Z",
+        "locale": "en-US"
+      },
+      "fields": {
+        "foo": "dog",
+        "links": [
+          {
+            "sys": {
+              "type": "Link",
+              "linkType": "Entry",
+              "id": "5ulKc1zdg4ES0oAKuCe8yA"
+            }
+          },
+          {
+            "sys": {
+              "type": "Link",
+              "linkType": "Entry",
+              "id": "49fzjGhfBCAu6iOqIeg8yQ"
+            }
+          }
+        ]
+      }
+    }
+  ],
+  "includes": {
+    "Entry": [
+      {
+        "sys": {
+          "space": {
+            "sys": {
+              "type": "Link",
+              "linkType": "Space",
+              "id": "6yahkaf5ehkk"
+            }
+          },
+          "type": "Entry",
+          "contentType": {
+            "sys": {
+              "type": "Link",
+              "linkType": "ContentType",
+              "id": "tSFLnCNqvuyoMA6SKkQ2W"
+            }
+          },
+          "id": "49fzjGhfBCAu6iOqIeg8yQ",
+          "revision": 1,
+          "createdAt": "2014-04-11T10:58:58.286Z",
+          "updatedAt": "2014-04-11T10:58:58.286Z",
+          "locale": "en-US"
+        },
+        "fields": {
+          "foo": "nyancat"
+        }
+      },
+      {
+        "sys": {
+          "space": {
+            "sys": {
+              "type": "Link",
+              "linkType": "Space",
+              "id": "6yahkaf5ehkk"
+            }
+          },
+          "type": "Entry",
+          "contentType": {
+            "sys": {
+              "type": "Link",
+              "linkType": "ContentType",
+              "id": "tSFLnCNqvuyoMA6SKkQ2W"
+            }
+          },
+          "id": "5ulKc1zdg4ES0oAKuCe8yA",
+          "revision": 1,
+          "createdAt": "2014-04-11T10:59:17.658Z",
+          "updatedAt": "2014-04-11T10:59:17.658Z",
+          "locale": "en-US"
+        },
+        "fields": {
+          "foo": "happycat"
+        }
+      }
+    ]
+  }
+}

data/spec/fixtures/json_responses/link_array.json

@@ -0,0 +1,43 @@
+{
+  "sys": {
+    "space": {
+      "sys": {
+        "type": "Link",
+        "linkType": "Space",
+        "id": "6yahkaf5ehkk"
+      }
+    },
+    "type": "Entry",
+    "contentType": {
+      "sys": {
+        "type": "Link",
+        "linkType": "ContentType",
+        "id": "tSFLnCNqvuyoMA6SKkQ2W"
+      }
+    },
+    "id": "2fCmT4nxtO6eI6usgoEkQG",
+    "revision": 1,
+    "createdAt": "2014-04-11T10:59:40.249Z",
+    "updatedAt": "2014-04-11T10:59:40.249Z",
+    "locale": "en-US"
+  },
+  "fields": {
+    "foo": "dog",
+    "links": [
+      {
+        "sys": {
+          "type": "Link",
+          "linkType": "Entry",
+          "id": "5ulKc1zdg4ES0oAKuCe8yA"
+        }
+      },
+      {
+        "sys": {
+          "type": "Link",
+          "linkType": "Entry",
+          "id": "49fzjGhfBCAu6iOqIeg8yQ"
+        }
+      }
+    ]
+  }
+}

data/spec/resource_building_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+
+describe 'Resource Building Examples' do
+  it 'can deal with arrays' do
+    response = Contentful::Response.new raw_fixture('link_array')
+    resource = Contentful::ResourceBuilder.new(create_client, response).run
+
+    expect( resource.fields[:links] ).to be_a Array
+    expect( resource.fields[:links].first ).to be_a Contentful::Link
+  end
+
+  it 'replaces links with included versions if present' do
+    response = Contentful::Response.new raw_fixture('includes')
+    resource = Contentful::ResourceBuilder.new(create_client, response).run.first
+
+    expect( resource.fields[:links] ).to be_a Array
+    expect( resource.fields[:links].first ).to be_a Contentful::Entry
+  end
+end

data/spec/spec_helper.rb

@@ -1,6 +1,10 @@
+require 'coveralls'
+Coveralls.wear!
+
 require 'rspec'
 require 'contentful'
 require 'securerandom'
 require 'rr'
 
-Dir[File.dirname(__FILE__) + '/support/**/*.rb'].each{ |f| require f }
+
+Dir[File.dirname(__FILE__) + '/support/**/*.rb'].each{ |f| require f }

metadata

@@ -1,164 +1,151 @@
 --- !ruby/object:Gem::Specification
 name: contentful
 version: !ruby/object:Gem::Version
-  version: 0.1.0
-  prerelease: 
+  version: 0.1.1
 platform: ruby
 authors:
 - Contentful GmbH (Jan Lelis)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-14 00:00:00.000000000 Z
+date: 2014-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10'
 - !ruby/object:Gem::Dependency
   name: rubygems-tasks
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.17.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.17.3
 description: Ruby client for the https://www.contentful.com Content Delivery API
@@ -167,208 +154,167 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
-- .rspec
-- .README.md.swp
-- doc/js/full_list.js
-- doc/js/app.js
-- doc/js/jquery.js
-- doc/css/style.css
-- doc/css/full_list.css
-- doc/css/common.css
-- doc/Contentful.html
-- doc/file_list.html
-- doc/Contentful/Field.html
-- doc/Contentful/Locale.html
-- doc/Contentful/ResourceBuilder.html
-- doc/Contentful/Asset.html
-- doc/Contentful/NotFound.html
-- doc/Contentful/Unauthorized.html
-- doc/Contentful/Request.html
-- doc/Contentful/Link.html
-- doc/Contentful/Response.html
-- doc/Contentful/Error.html
-- doc/Contentful/Array.html
-- doc/Contentful/ContentType.html
-- doc/Contentful/File.html
-- doc/Contentful/UnparsableResource.html
-- doc/Contentful/ServerError.html
-- doc/Contentful/AccessDenied.html
-- doc/Contentful/Space.html
-- doc/Contentful/Resource.html
-- doc/Contentful/DynamicEntry.html
-- doc/Contentful/Support.html
-- doc/Contentful/Entry.html
-- doc/Contentful/UnparsableJson.html
-- doc/Contentful/BadRequest.html
-- doc/Contentful/Resource/SystemProperties.html
-- doc/Contentful/Resource/Fields/ClassMethods.html
-- doc/Contentful/Resource/SystemProperties/ClassMethods.html
-- doc/Contentful/Resource/ClassMethods.html
-- doc/Contentful/Resource/AssetFields/ClassMethods.html
-- doc/Contentful/Resource/AssetFields.html
-- doc/Contentful/Resource/Fields.html
-- doc/Contentful/Client.html
-- doc/index.html
-- doc/class_list.html
-- doc/top-level-namespace.html
-- doc/_index.html
-- doc/file.README.html
-- doc/method_list.html
-- doc/frames.html
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
+- ChangeLog.md
+- Gemfile
+- Gemfile.lock
+- LICENSE.txt
+- README.md
+- Rakefile
+- contentful.gemspec
+- coverage/.last_run.json
+- coverage/.resultset.json
+- examples/custom_classes.rb
+- examples/dynamic_entries.rb
+- examples/example_queries.rb
+- examples/raise_errors.rb
+- examples/raw_mode.rb
+- examples/resource_mapping.rb
+- lib/contentful.rb
+- lib/contentful/array.rb
+- lib/contentful/asset.rb
+- lib/contentful/client.rb
+- lib/contentful/content_type.rb
 - lib/contentful/dynamic_entry.rb
-- lib/contentful/response.rb
-- lib/contentful/space.rb
-- lib/contentful/resource/fields.rb
-- lib/contentful/resource/system_properties.rb
-- lib/contentful/resource/asset_fields.rb
+- lib/contentful/entry.rb
 - lib/contentful/error.rb
-- lib/contentful/link.rb
 - lib/contentful/field.rb
-- lib/contentful/resource.rb
-- lib/contentful/resource_builder.rb
 - lib/contentful/file.rb
-- lib/contentful/content_type.rb
-- lib/contentful/request.rb
-- lib/contentful/entry.rb
+- lib/contentful/link.rb
 - lib/contentful/locale.rb
 - lib/contentful/location.rb
-- lib/contentful/client.rb
-- lib/contentful/array.rb
+- lib/contentful/request.rb
+- lib/contentful/resource.rb
+- lib/contentful/resource/asset_fields.rb
+- lib/contentful/resource/fields.rb
+- lib/contentful/resource/system_properties.rb
+- lib/contentful/resource_builder.rb
+- lib/contentful/response.rb
+- lib/contentful/space.rb
 - lib/contentful/support.rb
-- lib/contentful/asset.rb
 - lib/contentful/version.rb
-- lib/contentful.rb
-- spec/request_spec.rb
-- spec/space_spec.rb
-- spec/entry_spec.rb
-- spec/error_class_spec.rb
-- spec/spec_helper.rb
 - spec/array_spec.rb
 - spec/asset_spec.rb
+- spec/auto_includes_spec.rb
+- spec/client_class_spec.rb
+- spec/client_configuration_spec.rb
 - spec/coercions_spec.rb
-- spec/link_spec.rb
-- spec/field_spec.rb
-- spec/resource_spec.rb
-- spec/location_spec.rb
+- spec/content_type_spec.rb
 - spec/dynamic_entry_spec.rb
-- spec/locale_spec.rb
-- spec/support/json_responses.rb
-- spec/support/vcr.rb
-- spec/support/client.rb
-- spec/auto_includes_spec.rb
+- spec/entry_spec.rb
+- spec/error_class_spec.rb
+- spec/error_requests_spec.rb
+- spec/field_spec.rb
+- spec/file_spec.rb
+- spec/fixtures/json_responses/content_type.json
+- spec/fixtures/json_responses/includes.json
+- spec/fixtures/json_responses/link_array.json
+- spec/fixtures/json_responses/not_found.json
+- spec/fixtures/json_responses/nyancat.json
+- spec/fixtures/json_responses/unparsable.json
+- spec/fixtures/vcr_cassettes/array.yml
 - spec/fixtures/vcr_cassettes/array_page_1.yml
 - spec/fixtures/vcr_cassettes/array_page_2.yml
-- spec/fixtures/vcr_cassettes/field.yml
-- spec/fixtures/vcr_cassettes/space.yml
-- spec/fixtures/vcr_cassettes/content_type.yml
 - spec/fixtures/vcr_cassettes/asset.yml
-- spec/fixtures/vcr_cassettes/unauthorized.yml
+- spec/fixtures/vcr_cassettes/bad_request.yml
+- spec/fixtures/vcr_cassettes/content_type.yml
+- spec/fixtures/vcr_cassettes/entries.yml
+- spec/fixtures/vcr_cassettes/entry.yml
+- spec/fixtures/vcr_cassettes/entry_cache.yml
+- spec/fixtures/vcr_cassettes/field.yml
 - spec/fixtures/vcr_cassettes/locale.yml
-- spec/fixtures/vcr_cassettes/array.yml
 - spec/fixtures/vcr_cassettes/location.yml
-- spec/fixtures/vcr_cassettes/entries.yml
 - spec/fixtures/vcr_cassettes/not_found.yml
-- spec/fixtures/vcr_cassettes/bad_request.yml
 - spec/fixtures/vcr_cassettes/nyancat.yml
-- spec/fixtures/vcr_cassettes/entry.yml
-- spec/fixtures/vcr_cassettes/entry_cache.yml
-- spec/fixtures/vcr_cassettes/reloaded_entry.yml
 - spec/fixtures/vcr_cassettes/nyancat_include.yml
-- spec/fixtures/json_responses/unparsable.json
-- spec/fixtures/json_responses/not_found.json
-- spec/fixtures/json_responses/nyancat.json
-- spec/fixtures/json_responses/content_type.json
-- spec/client_configuration_spec.rb
-- spec/content_type_spec.rb
+- spec/fixtures/vcr_cassettes/reloaded_entry.yml
+- spec/fixtures/vcr_cassettes/space.yml
+- spec/fixtures/vcr_cassettes/unauthorized.yml
+- spec/link_spec.rb
+- spec/locale_spec.rb
+- spec/location_spec.rb
+- spec/request_spec.rb
+- spec/resource_building_spec.rb
+- spec/resource_spec.rb
 - spec/response_spec.rb
-- spec/client_class_spec.rb
-- spec/file_spec.rb
-- spec/error_requests_spec.rb
-- README.md
-- Rakefile
-- contentful.gemspec
-- do_request.sh
-- LICENSE.txt
-- examples/dynamic_entries.rb
-- examples/resource_mapping.rb
-- examples/raise_errors.rb
-- examples/example_queries.rb
-- examples/raw_mode.rb
-- examples/custom_classes.rb
-- Gemfile
-- ChangeLog.md
+- spec/space_spec.rb
+- spec/spec_helper.rb
+- spec/support/client.rb
+- spec/support/json_responses.rb
+- spec/support/vcr.rb
 homepage: https://github.com/contentful/contentful.rb
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: contentful
 test_files:
-- spec/request_spec.rb
-- spec/space_spec.rb
-- spec/entry_spec.rb
-- spec/error_class_spec.rb
-- spec/spec_helper.rb
 - spec/array_spec.rb
 - spec/asset_spec.rb
+- spec/auto_includes_spec.rb
+- spec/client_class_spec.rb
+- spec/client_configuration_spec.rb
 - spec/coercions_spec.rb
-- spec/link_spec.rb
-- spec/field_spec.rb
-- spec/resource_spec.rb
-- spec/location_spec.rb
+- spec/content_type_spec.rb
 - spec/dynamic_entry_spec.rb
-- spec/locale_spec.rb
-- spec/support/json_responses.rb
-- spec/support/vcr.rb
-- spec/support/client.rb
-- spec/auto_includes_spec.rb
+- spec/entry_spec.rb
+- spec/error_class_spec.rb
+- spec/error_requests_spec.rb
+- spec/field_spec.rb
+- spec/file_spec.rb
+- spec/fixtures/json_responses/content_type.json
+- spec/fixtures/json_responses/includes.json
+- spec/fixtures/json_responses/link_array.json
+- spec/fixtures/json_responses/not_found.json
+- spec/fixtures/json_responses/nyancat.json
+- spec/fixtures/json_responses/unparsable.json
+- spec/fixtures/vcr_cassettes/array.yml
 - spec/fixtures/vcr_cassettes/array_page_1.yml
 - spec/fixtures/vcr_cassettes/array_page_2.yml
-- spec/fixtures/vcr_cassettes/field.yml
-- spec/fixtures/vcr_cassettes/space.yml
-- spec/fixtures/vcr_cassettes/content_type.yml
 - spec/fixtures/vcr_cassettes/asset.yml
-- spec/fixtures/vcr_cassettes/unauthorized.yml
+- spec/fixtures/vcr_cassettes/bad_request.yml
+- spec/fixtures/vcr_cassettes/content_type.yml
+- spec/fixtures/vcr_cassettes/entries.yml
+- spec/fixtures/vcr_cassettes/entry.yml
+- spec/fixtures/vcr_cassettes/entry_cache.yml
+- spec/fixtures/vcr_cassettes/field.yml
 - spec/fixtures/vcr_cassettes/locale.yml
-- spec/fixtures/vcr_cassettes/array.yml
 - spec/fixtures/vcr_cassettes/location.yml
-- spec/fixtures/vcr_cassettes/entries.yml
 - spec/fixtures/vcr_cassettes/not_found.yml
-- spec/fixtures/vcr_cassettes/bad_request.yml
 - spec/fixtures/vcr_cassettes/nyancat.yml
-- spec/fixtures/vcr_cassettes/entry.yml
-- spec/fixtures/vcr_cassettes/entry_cache.yml
-- spec/fixtures/vcr_cassettes/reloaded_entry.yml
 - spec/fixtures/vcr_cassettes/nyancat_include.yml
-- spec/fixtures/json_responses/unparsable.json
-- spec/fixtures/json_responses/not_found.json
-- spec/fixtures/json_responses/nyancat.json
-- spec/fixtures/json_responses/content_type.json
-- spec/client_configuration_spec.rb
-- spec/content_type_spec.rb
+- spec/fixtures/vcr_cassettes/reloaded_entry.yml
+- spec/fixtures/vcr_cassettes/space.yml
+- spec/fixtures/vcr_cassettes/unauthorized.yml
+- spec/link_spec.rb
+- spec/locale_spec.rb
+- spec/location_spec.rb
+- spec/request_spec.rb
+- spec/resource_building_spec.rb
+- spec/resource_spec.rb
 - spec/response_spec.rb
-- spec/client_class_spec.rb
-- spec/file_spec.rb
-- spec/error_requests_spec.rb
-has_rdoc: 
+- spec/space_spec.rb
+- spec/spec_helper.rb
+- spec/support/client.rb
+- spec/support/json_responses.rb
+- spec/support/vcr.rb