lib/json_parser/builder.rb in json_parser-1.3.0 vs lib/json_parser/builder.rb in json_parser-1.3.1

@@ -1,69 +1,67 @@
 class JsonParser::Builder < Sinclair
 
-  attr_reader :attr_names
+  attr_reader :attr_names, :path, :full_path, :cached
 
-  def initialize(attr_names, clazz, options)
+  def initialize(attr_names, clazz, path: nil, full_path: nil, cached: false, **options)
     super(clazz, {
       after:     false,
-      cached:    false,
       case:      :lower_camel,
       class:     nil,
       compact:   false,
       default:   nil,
       flatten:   false,
-      full_path: nil,
       json:      :json,
-      path:      nil,
       type:      :none
     }.merge(options.symbolize_keys))
 
     @attr_names = attr_names
+    @path = path
+    @full_path = full_path
+    @cached = cached
     init
   end
 
   private
 
-  delegate :path, :full_path, :cached, :compact,
-           :type, :after, to: :options_object
-
   def init
     attr_names.each do |attr|
       add_attr(attr)
     end
   end
 
-  def json_name
-    options[:json]
-  end
-
   def real_path(attribute)
     full_path || [path, attribute].compact.join('.')
   end
 
+  def json_name
+    options[:json]
+  end
+
   def wrapper_clazz
     options[:class]
   end
 
   def case_type
     options[:case]
   end
 
-  def fetcher_options
+  def fetcher_options(attribute)
     options.slice(:compact, :after, :type, :flatten, :default).merge({
       clazz: wrapper_clazz,
-      case_type: case_type
+      case_type: case_type,
+      path: real_path(attribute)
     })
   end
 
   def add_attr(attribute)
     add_method attribute, "#{cached ? cached_fetcher(attribute) : attr_fetcher(attribute)}"
   end
 
   def attr_fetcher(attribute)
     <<-CODE
       ::JsonParser::Fetcher.new(
-        #{json_name}, '#{real_path(attribute)}', self, #{fetcher_options}
+        #{json_name}, self, #{fetcher_options(attribute)}
       ).fetch
     CODE
   end
 
   def cached_fetcher(attribute)