contentful 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4b2933230edf4826b39a5a7d4d6b351556df06e
-  data.tar.gz: bc501b5ebf3ec6c371601e4042722d02fb34abe5
+  metadata.gz: 4ba77ca80d0071ad28546271729538c6a701616d
+  data.tar.gz: 65a9ee25b3709bb641deed8345862914480068e7
 SHA512:
-  metadata.gz: c1dde750063924ec1d9986608d5b66eb68862823ff50b175f2d1cd7e6b32f3c1df37dc00f1fb177a8f7e372ffd6aa00012016e97a625aa1fa05905ff47c03851
-  data.tar.gz: dae89c9fccdc81b19db54f9c8f2ed9daaddf5a222ce194d82ac3f801eef9bed26fe2a77da609c2f36979e7cc28c8b7f5801f062a8bbf70728aba1bd29289d3ff
+  metadata.gz: 51c966da267b2dc62c189a57dd69200ec9a83f81cba5bccd4695c5ef756babdc6aeccbb53a7c98bde97325fbfff86c68eac08912871192d035d36188828de389
+  data.tar.gz: d5c14ff5244ef3463bfec9cac959be1de527f45ca0f48e8885101ea473dc5f53f1b8d471a2479b668504cc8ee003ccb23ea4be549a3e5aee1135929f03039c91

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Change Log
 ## Unreleased
 
+## 0.11.0
+### Fixed
+* Fixed Locale handling [#98](https://github.com/contentful/contentful.rb/issues/98)
+
 ## 0.10.0
 ### Added
 * Added `:fl` parameter to `Asset#image_url` to support `progressive` File Layering

data/Gemfile

@@ -2,6 +2,7 @@ source 'https://rubygems.org'
 
 gemspec
 
+gem 'listen', '3.0.6'
 
 group :documentation do
   gem 'coveralls', :require => false

data/README.md

@@ -89,7 +89,7 @@ However, you can (and should) set `:dynamic_entries` to `:auto` in your client c
 client = Contentful::Client.new(
   access_token: 'b4c0n73n7fu1',
   space: 'cfexampleapi',
-  dynamic_entries: :auto,
+  dynamic_entries: :auto
 )
 
 entry = client.entry 'nyancat' # => #<Contentful::DynamicEntry[cat]: ...>

data/contentful.gemspec

@@ -15,8 +15,9 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^spec/})
   gem.require_paths = ['lib']
 
-  gem.add_dependency 'http', '~> 0.8'
+  gem.add_dependency 'http', '~> 1.0'
   gem.add_dependency 'multi_json', '~> 1'
+  gem.add_dependency 'json', '~> 1.8'
 
   gem.add_development_dependency 'bundler', '~> 1.5'
   gem.add_development_dependency 'rake', '~> 10'
@@ -26,9 +27,10 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'guard-rspec'
   gem.add_development_dependency 'guard-rubocop'
   gem.add_development_dependency 'guard-yard'
-  gem.add_development_dependency 'rubocop'
+  gem.add_development_dependency 'rubocop', '~> 0.41.0'
   gem.add_development_dependency 'rspec', '~> 2'
   gem.add_development_dependency 'rr'
   gem.add_development_dependency 'vcr'
   gem.add_development_dependency 'webmock', '~> 1', '>= 1.17.3'
+  gem.add_development_dependency 'tins', '~> 1.6.0'
 end

data/lib/contentful/dynamic_entry.rb

@@ -31,7 +31,7 @@ module Contentful
 
       Class.new DynamicEntry do
         content_type.fields.each do |f|
-          define_method Support.snakify(f.id).to_sym do |wanted_locale = default_locale|
+          define_method Support.snakify(f.id).to_sym do |wanted_locale = nil|
             fields(wanted_locale)[f.id.to_sym]
           end
         end

data/lib/contentful/resource.rb

@@ -174,9 +174,7 @@ module Contentful
     end
 
     def coerce_value_or_array(value, what = nil)
-      if value.nil?
-        nil
-      elsif value.is_a? ::Array
+      if value.is_a? ::Array
         value.map { |v| coerce_or_create_class(v, what) }
       elsif should_coerce_hash?(value)
         ::Hash[value.map do |k, v|
@@ -214,8 +212,10 @@ module Contentful
       case what
       when Symbol
         COERCIONS[what] ? COERCIONS[what][value] : value
+      when Proc
+        what[value]
       when Class
-        what.new(value, client)
+        what.new(value, client) if value
       else
         value
       end

data/lib/contentful/resource/asset_fields.rb

@@ -17,7 +17,7 @@ module Contentful
       #
       # @return [Hash] localized fields
       def fields(wanted_locale = default_locale)
-        @fields[locale || wanted_locale]
+        @fields[locale || wanted_locale] || {}
       end
 
       # @private

data/lib/contentful/resource/fields.rb

@@ -10,9 +10,9 @@ module Contentful
       # Returns all fields of the asset
       #
       # @return [Hash] fields for Resource on selected locale
-      def fields(wanted_locale = default_locale)
-        wanted_locale = wanted_locale.to_s
-        @fields.key?(wanted_locale) ? @fields[wanted_locale] : @fields[locale]
+      def fields(wanted_locale = nil)
+        wanted_locale = (locale || default_locale) if wanted_locale.nil?
+        @fields[wanted_locale.to_s] || {}
       end
 
       # Returns all fields of the asset with locales nested by field

data/lib/contentful/resource_builder.rb

@@ -69,9 +69,10 @@ module Contentful
 
       unless @included_resources.empty?
         replace_links_in_included_resources_with_known_resources
-        replace_links_with_known_resources @resource
       end
 
+      replace_links_with_known_resources @resource
+
       @resource
     rescue UnparsableResource => error
       error

data/lib/contentful/version.rb

@@ -1,5 +1,5 @@
 # Contentful Namespace
 module Contentful
   # Gem Version
-  VERSION = '0.10.0'
+  VERSION = '0.11.0'
 end

data/spec/coercions_spec.rb

@@ -7,4 +7,17 @@ describe 'Coercion Examples' do
     expect(entry.created_at).to be_a DateTime
     expect(entry.created_at.day).to eq 27
   end
+
+  describe 'custom coercion' do
+    class TestCar
+      include Contentful::Resource
+
+      property :parts, ->(v) { Array(v) unless v }
+    end
+
+    it 'can use proc' do
+      car = TestCar.new("parts" => nil)
+      expect(car.parts).to be_empty
+    end
+  end
 end

data/spec/entry_spec.rb

@@ -121,7 +121,7 @@ describe Contentful::Entry do
         expect(entry).to be_a Kategorie
         expect(entry.title).to eq "Some Title"
         expect(entry.slug).to eq "/asda.html"
-        expect(entry.featured_articles.first.is_a?(Contentful::Link)).to be_truthy
+        expect(entry.featured_articles.first.is_a?(Contentful::Entry)).to be_truthy
         expect(entry.top).to be_truthy
       }
     end

data/spec/spec_helper.rb

@@ -4,3 +4,8 @@ require 'securerandom'
 require 'rr'
 
 Dir[File.dirname(__FILE__) + '/support/**/*.rb'].each { |f| require f }
+
+RSpec.configure do |config|
+  config.filter_run :focus => true
+  config.run_all_when_everything_filtered = true
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contentful
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Contentful GmbH (Jan Lelis)
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-11 00:00:00.000000000 Z
+date: 2016-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -39,6 +39,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -141,16 +155,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.41.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.41.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -213,6 +227,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.17.3
+- !ruby/object:Gem::Dependency
+  name: tins
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.0
 description: Ruby client for the https://www.contentful.com Content Delivery API
 email: rubygems@contentful.com
 executables: []