lib/pump/object.rb in pump-0.5.1 vs lib/pump/object.rb in pump-0.6.0

@@ -7,22 +7,38 @@
     extend ActiveSupport::Concern
 
     def pump_to_xml(options={})
       encoder = self.class.pumps.get(options[:set], :xml)
       if encoder
-        encoder.encode(self)
+        encoder.encode(self, options)
       else
-        self.to_xml(options)
+        to_xml(options)
       end
     end
 
+    def pump_to_json(options={})
+      encoder = self.class.pumps.get(options[:set], :json)
+      if encoder
+        encoder.encode(self, options)
+      else
+        to_json(options)
+      end
+    end
+
     module ClassMethods
       def pumps
         @pumps ||= Pump::Collection.new
       end
 
       def add_pump(name, set=nil, options={}, &block)
-        pumps.add(set, :xml, Pump::Xml.new(name, options, &block))
+        if options[:base]
+          xml_options = options.dup.merge({:base => pumps.get(options[:base], :xml)})
+          json_options = options.dup.merge({:base => pumps.get(options[:base], :json)})
+        else
+          xml_options, json_options = options, options
+        end
+        pumps.add(set, :xml, Pump::Xml.new(name, xml_options, &block))
+        pumps.add(set, :json, Pump::Json.new(name, json_options, &block))
       end
     end
   end
 end
\ No newline at end of file