yaks 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8ee4f04ef31bd3c1e944ee723c910bf37dd97b8
-  data.tar.gz: 93282ee4d7a30bdb826ccc81447d86db1de245f0
+  metadata.gz: e75dbaa5cc865ca07fb16ae3e4662f3983652d96
+  data.tar.gz: bedaee826c1ae525bf0aa5511c62ccb3c02a0738
 SHA512:
-  metadata.gz: d09019c49799077e500badde0c259fa41d06f2fdbfe3ec3c7c7cf71625ce786d2eb682b2b449edc8a683b8a24a20234cd3ea16716697154a58fcd88c6a6773a9
-  data.tar.gz: b0107900f0d00a2b30ab7d6cd701b84a59e3155961a653847b863d5cc0a569c0ff24640769b78826afad31fa6b5667cf3cf294961de82f3b1c6fbd8301f8c460
+  metadata.gz: 8f43aa2b03a6beb9f37009d3540ac8a75623e8dd3fb2b634785be696b81e20a3e7918cb3aef5eac86c63df49390f3ffd806c8a83596beff94e6dfb53793eba3d
+  data.tar.gz: 326578cce03f31740ceb6e927d431b8a42eefc0f79d8c65e0255bcd4475b952a6b0393eaf5ff11fcc5ae15f738bd7983ee767bd5964148cebccd9f8d68f50547

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ### Development
-[full changelog](http://github.com/plexus/yaks/compare/v0.4.2...master)
+[full changelog](http://github.com/plexus/yaks/compare/v0.4.3...master)
+
+Mapping a non-empty collection will try to infer the type, and hence rel of the nested items, based on the first object in the collection. This is only relevant for formats like HAL that don't have a top-level collection representation, and only matters when mapping a collection at the top level, not when mapping a collection from an association.
+
+### 0.4.3
 
 * when specifying a rel_template, instead of allowing for {src} and {dest} fields, now a single {rel} field is expected, which corresponds more with typical usage.
 

data/lib/yaks/breaking_changes.rb

@@ -1,5 +1,8 @@
 module Yaks
 
+# These are displayed in a post-install message when installing the
+# gem to aid upgraiding
+
 BreakingChanges = {
 '0.4.3' => %q~
 
@@ -19,4 +22,6 @@ documentation.
 ~
 }
 
+BreakingChanges['0.4.4'] = BreakingChanges['0.4.3']
+
 end

data/lib/yaks/collection_mapper.rb

@@ -38,6 +38,8 @@ module Yaks
     def collection_type
       if item_mapper = context[:item_mapper]
         item_mapper.config.type || policy.derive_type_from_mapper_class(item_mapper)
+      else
+        policy.derive_type_from_collection(collection)
       end
     end
 

data/lib/yaks/config.rb

@@ -35,10 +35,10 @@ module Yaks
 
     # @param [Hash] opts
     # @param [Hash] env
-    # @return [Yaks::Format::CollectionJson, Yaks::Format::Hal, Yaks::Format::JsonApi]
+    # @return [Class]
     def format_class(opts, env)
-      accept = Rack::Accept::Charset.new(env['HTTP_ACCEPT'])
-      mime_type = accept.best_of(Format.mime_types.values)
+      accept = Rack::Accept::MediaType.new(env['HTTP_ACCEPT'])
+      mime_type = accept.best_of([nil] + Format.mime_types.values)
       return Format.by_mime_type(mime_type) if mime_type
       Format.by_name(opts.fetch(:format) { @default_format })
     end

data/lib/yaks/default_policy.rb

@@ -54,6 +54,14 @@ module Yaks
     # @param [Yaks::Mapper::Association] association
     # @return [Class] of subclass Yaks::Mapper
     # @raise [NameError]
+    def derive_type_from_collection(collection)
+      if collection.any?
+        derive_type_from_mapper_class(
+          derive_mapper_from_object(collection.first)
+        )
+      end
+    end
+
     def derive_mapper_from_association(association)
       @options[:namespace].const_get("#{camelize(association.singular_name)}Mapper")
     end

data/lib/yaks/version.rb

@@ -1,3 +1,3 @@
 module Yaks
-  VERSION = '0.4.3'
+  VERSION = '0.4.4'
 end

data/spec/unit/yaks/collection_mapper_spec.rb

@@ -58,14 +58,14 @@ RSpec.describe Yaks::CollectionMapper do
 
     it 'should infer the item mapper' do
       expect(mapper.call(collection)).to eql Yaks::CollectionResource.new(
-        type: nil,
+        type: 'pet',
         links: [],
         attributes: {},
         members: [
           Yaks::Resource.new(type: 'pet', attributes: {:id => 2, :species => "dog", :name => "boingboing"}),
           Yaks::Resource.new(type: 'pet', attributes: {:id => 3, :species => "cat", :name => "wassup"})
         ],
-        collection_rel: 'collection'
+        collection_rel: 'rel:pets'
       )
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yaks
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Arne Brasseur
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-25 00:00:00.000000000 Z
+date: 2014-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inflection