lib/rom/reader_builder.rb in rom-0.4.0 vs lib/rom/reader_builder.rb in rom-0.4.1

@@ -1,28 +1,38 @@
 module ROM
 
   # @api private
   class ReaderBuilder
+    DEFAULT_OPTIONS = { inherit_header: true }.freeze
+
     attr_reader :relations, :readers
 
     # @api private
     def initialize(relations)
       @relations = relations
       @readers = {}
     end
 
     # @api private
-    def call(name, options = {}, &block)
-      parent = relations[options.fetch(:parent) { name }]
+    def call(name, input_options = {}, &block)
+      with_options(input_options) do |options|
+        parent = relations[options.fetch(:parent) { name }]
 
-      builder = MapperBuilder.new(name, parent, options)
-      builder.instance_exec(&block)
-      mapper = builder.call
+        builder = MapperBuilder.new(name, parent, options)
+        builder.instance_exec(&block) if block
+        mapper = builder.call
 
-      mappers = options[:parent] ? readers.fetch(parent.name).mappers : {}
+        mappers = options[:parent] ? readers.fetch(parent.name).mappers : {}
 
-      mappers[name] = mapper
-      readers[name] = Reader.new(name, parent, mappers) unless options[:parent]
+        mappers[name] = mapper
+        readers[name] = Reader.new(name, parent, mappers) unless options[:parent]
+      end
+    end
+
+    private
+
+    def with_options(options)
+      yield(DEFAULT_OPTIONS.merge(options))
     end
 
   end
 end