Use options hash instead of keyword arguments to support Ruby 1.8 & 1.9

2 files changed, 33 insertions, 27 deletions

diff --git a/lib/plist/generator.rb b/lib/plist/generator.rb
index 7a5b8d5..fb67f67 100644
--- a/lib/plist/generator.rb
+++ b/lib/plist/generator.rb
@@ -22,16 +22,18 @@ module Plist
   #
   # For detailed usage instructions, refer to USAGE[link:files/docs/USAGE.html] and the methods documented below.
   module Emit
-    DEFAULT_INDENT = "\t".freeze
+    DEFAULT_INDENT = "\t"
 
     # Helper method for injecting into classes.  Calls <tt>Plist::Emit.dump</tt> with +self+.
-    def to_plist(envelope = true, indent: DEFAULT_INDENT)
-      return Plist::Emit.dump(self, envelope, indent: indent)
+    def to_plist(envelope = true, options = {})
+      options = { :indent => DEFAULT_INDENT }.merge(options)
+      return Plist::Emit.dump(self, envelope, options)
     end
 
     # Helper method for injecting into classes.  Calls <tt>Plist::Emit.save_plist</tt> with +self+.
-    def save_plist(filename, indent: DEFAULT_INDENT)
-      Plist::Emit.save_plist(self, filename, indent: indent)
+    def save_plist(filename, options = {})
+      options = { :indent => DEFAULT_INDENT }.merge(options)
+      Plist::Emit.save_plist(self, filename, options)
     end
 
     # The following Ruby classes are converted into native plist types:
@@ -42,8 +44,9 @@ module Plist
     # +IO+ and +StringIO+ objects are encoded and placed in <data> elements; other objects are <tt>Marshal.dump</tt>'ed unless they implement +to_plist_node+.
     #
     # The +envelope+ parameters dictates whether or not the resultant plist fragment is wrapped in the normal XML/plist header and footer.  Set it to false if you only want the fragment.
-    def self.dump(obj, envelope = true, indent: DEFAULT_INDENT)
-      output = plist_node(obj, indent: indent)
+    def self.dump(obj, envelope = true, options = {})
+      options = { :indent => DEFAULT_INDENT }.merge(options)
+      output = plist_node(obj, options)
 
       output = wrap(output) if envelope
 
@@ -51,14 +54,16 @@ module Plist
     end
 
     # Writes the serialized object's plist to the specified filename.
-    def self.save_plist(obj, filename, indent: DEFAULT_INDENT)
+    def self.save_plist(obj, filename, options = {})
+      options = { :indent => DEFAULT_INDENT }.merge(options)
       File.open(filename, 'wb') do |f|
-        f.write(obj.to_plist(indent: indent))
+        f.write(obj.to_plist(true, options))
       end
     end
 
     private
-    def self.plist_node(element, indent: DEFAULT_INDENT)
+    def self.plist_node(element, options = {})
+      options = { :indent => DEFAULT_INDENT }.merge(options)
       output = ''
 
       if element.respond_to? :to_plist_node
@@ -69,8 +74,8 @@ module Plist
           if element.empty?
             output << "<array/>\n"
           else
-            output << tag('array', indent: indent) {
-              element.collect {|e| plist_node(e)}
+            output << tag('array', '', options) {
+              element.collect {|e| plist_node(e, options)}
             }
           end
         when Hash
@@ -81,22 +86,22 @@ module Plist
 
             element.keys.sort_by{|k| k.to_s }.each do |k|
               v = element[k]
-              inner_tags << tag('key', CGI.escapeHTML(k.to_s), indent: indent)
-              inner_tags << plist_node(v, indent: indent)
+              inner_tags << tag('key', CGI.escapeHTML(k.to_s), options)
+              inner_tags << plist_node(v, options)
             end
 
-            output << tag('dict', indent: indent) {
+            output << tag('dict', '', options) {
               inner_tags
             }
           end
         when true, false
           output << "<#{element}/>\n"
         when Time
-          output << tag('date', element.utc.strftime('%Y-%m-%dT%H:%M:%SZ'), indent: indent)
+          output << tag('date', element.utc.strftime('%Y-%m-%dT%H:%M:%SZ'), options)
         when Date # also catches DateTime
-          output << tag('date', element.strftime('%Y-%m-%dT%H:%M:%SZ'), indent: indent)
+          output << tag('date', element.strftime('%Y-%m-%dT%H:%M:%SZ'), options)
         when String, Symbol, Integer, Float
-          output << tag(element_type(element), CGI.escapeHTML(element.to_s), indent: indent)
+          output << tag(element_type(element), CGI.escapeHTML(element.to_s), options)
         when IO, StringIO
           element.rewind
           contents = element.read
@@ -106,12 +111,12 @@ module Plist
           # because b64encode is b0rked and ignores the length arg.
           data = "\n"
           Base64.encode64(contents).gsub(/\s+/, '').scan(/.{1,68}/o) { data << $& << "\n" }
-          output << tag('data', data, indent: indent)
+          output << tag('data', data, options)
         else
           output << comment('The <data> element below contains a Ruby object which has been serialized with Marshal.dump.')
           data = "\n"
           Base64.encode64(Marshal.dump(element)).gsub(/\s+/, '').scan(/.{1,68}/o) { data << $& << "\n" }
-          output << tag('data', data, indent: indent)
+          output << tag('data', data, options)
         end
       end
 
@@ -122,11 +127,12 @@ module Plist
       return "<!-- #{content} -->\n"
     end
 
-    def self.tag(type, contents = '', indent: DEFAULT_INDENT, &block)
+    def self.tag(type, contents = '', options = {}, &block)
+      options = { :indent => DEFAULT_INDENT }.merge(options)
       out = nil
 
       if block_given?
-        out = IndentedString.new(indent)
+        out = IndentedString.new(options[:indent])
         out << "<#{type}>"
         out.raise_indent
 
diff --git a/test/test_generator.rb b/test/test_generator.rb
index 71974dd..c93073b 100644
--- a/test/test_generator.rb
+++ b/test/test_generator.rb
@@ -72,10 +72,10 @@ class TestGenerator < Test::Unit::TestCase
   end
 
   def test_custom_indent
-    hsh = { key1: 1, 'key2' => 2 }
-    output_plist_node = Plist::Emit.plist_node(hsh, indent: nil)
-    output_plist_dump_with_envelope = Plist::Emit.dump(hsh, indent: nil)
-    output_plist_dump_no_envelope = Plist::Emit.dump(hsh, false, indent: nil)
+    hsh = { :key1 => 1, 'key2' => 2 }
+    output_plist_node = Plist::Emit.plist_node(hsh, :indent =>  nil)
+    output_plist_dump_with_envelope = Plist::Emit.dump(hsh, true, :indent => nil)
+    output_plist_dump_no_envelope = Plist::Emit.dump(hsh, false, :indent => nil)
 
     expected_with_envelope = <<-STR
 <?xml version="1.0" encoding="UTF-8"?>
@@ -102,7 +102,7 @@ STR
     assert_equal expected_with_envelope, output_plist_dump_with_envelope
     assert_equal expected_no_envelope, output_plist_dump_no_envelope
 
-    hsh.save_plist('test.plist', indent: nil)
+    hsh.save_plist('test.plist', :indent => nil)
     output_plist_file = File.read('test.plist')
     assert_equal expected_with_envelope, output_plist_file
     File.unlink('test.plist')