halogen 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 491dfa5f8eb8f51c4973205d1fbab6e883ce40db
-  data.tar.gz: 79c6b3b9b20ba7e86b6684daa38440b60b34460c
+  metadata.gz: ecf269aadcd3040623710454934d01055e58f022
+  data.tar.gz: c389775b46ff5daabf1bb4ccaae8b4967f4eaf89
 SHA512:
-  metadata.gz: a69872769a3355f338b642ff0ae66dcbbc37a76edb9e74f7826e3abf7c53d8525ef8399a042db3d4d38b971d3bd7851984395779af628cd1df99e10983224024
-  data.tar.gz: d6ba44f85ce1d6b5bf1108975aa3426354f8f1b32d3cfc62bd16d91d9f894ac14e8186d8ca6121a561d0e5659cef16b7a81c9421ea386328421329c98c5b4b06
+  metadata.gz: f9ae4d73ca13c7ad45c68c718a527111b522adcc9b02772d641403edb9e642c564afd0a5172b2cb6908c034a35059a03f143555af0a812ad2a97e488529d67c9
+  data.tar.gz: a36c479ad935f1f2d74df13f14afb7652630dc6a9ca37b652cbf64499f2198b3afc839889f4c7328f0eb154b3265180b26799f065c60827ac4a447a4e767f256

data/README.md

@@ -1,6 +1,6 @@
 # Halogen
 
-[![Build Status](https://travis-ci.org/mode/halogen.svg)](https://travis-ci.org/mode/halogen)
+[![Code Climate](https://codeclimate.com/repos/552430af695680100500b659/badges/cdae8d5a10147d135be9/gpa.svg)](https://codeclimate.com/repos/552430af695680100500b659/feed)
 
 This library provides a framework-agnostic interface for generating
 [HAL+JSON](http://stateless.co/hal_specification.html)
@@ -192,7 +192,7 @@ link(:find, :templated) { '/goats/{?id}' }
 # => { _links: { find: { href: '/goats/{?id}', templated: true } } ... }
 ```
 
-### Embedded resources
+#### Embedded resources
 
 Embedded resources are not rendered by default. They will be included if both
 of the following conditions are met:

data/lib/halogen/embeds.rb

@@ -76,7 +76,10 @@ module Halogen
       def render_child(repr, opts)
         return unless repr.class.included_modules.include?(Halogen)
 
-        repr.options.merge!(embed: opts, parent: self)
+        repr.options[:embed] ||= {}
+        repr.options[:embed].merge!(opts)
+
+        repr.options[:parent] = self
 
         repr.render
       end

data/lib/halogen/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 #
 module Halogen
-  VERSION = '0.0.1' # :nodoc:
+  VERSION = '0.0.2' # :nodoc:
 end

data/spec/halogen/embeds_spec.rb

@@ -147,29 +147,35 @@ describe Halogen::Embeds do
 
     describe '#render_child' do
       let :representer do
-        klass.new
+        Class.new do
+          include Halogen
+
+          property(:verify_parent) { parent.object_id }
+          property(:verify_opts)   { options[:embed] }
+        end.new
       end
 
       it 'returns nil if child is not a representer' do
         [nil, 1, ''].each do |child|
-          expect(representer.render_child(child, {})).to be_nil
+          expect(klass.new.render_child(child, {})).to be_nil
         end
       end
 
       it 'renders child representer with correct parent and options' do
-        child = Class.new do
-          include Halogen
-
-          property(:verify_parent) { parent.object_id }
-          property(:verify_opts)   { options[:embed] }
-        end.new
-
-        result = representer.render_child(child, foo: 'bar')
+        result = representer.render_child(representer, foo: 'bar')
 
         expect(result).to eq(
           verify_parent: representer.object_id,
           verify_opts: { foo: 'bar' })
       end
+
+      it 'merges child options if already present' do
+        representer.options[:embed] = { bar: 'bar' }
+
+        result = representer.render_child(representer, foo: 'foo')
+
+        expect(result[:verify_opts]).to eq(foo: 'foo', bar: 'bar')
+      end
     end
 
     describe '#embed_options' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: halogen
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Heather Rivers