plist 3.0.0 → 3.1.0

data/CHANGELOG

@@ -0,0 +1,103 @@
+= plist - All-purpose Property List manipulation library
+
+=== Release version 3.0.0!
+
+2010-02-23:
+ * Ruby 1.9.x compatibility!
+
+2010-02-16:
+ * excise a bunch of unnecessary @@ variables
+ * fix up some tests for cross-version compatibility
+
+2010-02-14:
+ * generalized cleanup:
+   * fix old file headers
+   * modernize rakefile
+   * clean up rdoc
+
+2010-01-08:
+ * move from RubyForge Subversion to GitHub
+
+2007-02-22 (r81):
+ * make the plist parser accept strings contain XML or any object that responds to #read (File and StringIO being the intended targets here).  Test and idea contributed by Chuck Remes.
+
+2006-09-20 (r80):
+ * tweak a comment in generator.rb to make it clear that we're not using Base64.b64encode because it's broken.
+
+=== Release version 3.0.0!
+
+2006-09-20 (r77 - r79):
+ * move IndentedString inside Plist::Emit and :nodoc: it
+ * Tag 3.0.0! (from rev 78)
+
+2006-09-19 (r73 - r75):
+ * Really fix the rakefile this time (apparently I deleted some code that I needed...)
+ * alter the fix_whitespace rake task to ignore the assets directory
+ * cleanup whitespace
+
+2006-09-18 (r70 - r72):
+ * Update this file ;)
+ * Fix Rakefile
+   * gem install -t now works correctly
+   * Remove super-sekr1t rdoc staging area from rdoc publishing task
+
+2006-09-15 (r64 - r69):
+* Change behavior of empty collection elements to match What Apple Does
+* Fix some gem packaging infrastructure
+
+2006-09-13 (r61 - r63):
+* Merge generator injection removal branch into trunk!
+
+2006-09-13 (r52 - r60):
+* Fix indentation/newlines in generator (finally!)
+* Refix indentation to be more faithful to the way Apple emits their plists
+* Remove horrific regex and replace it with proper comment parsing
+* Empty plists return nil when parsed
+* Sort hash keys before emitting (now we can test multi-element hashes!)
+* Inject #<=> into Symbol so that sorting Symbol-keyed hashes won't freak out
+
+2006-09-12 (r47 - r51):
+* More test rejiggering
+* New tests to expose some bugs
+
+2006-09-10 (r33 - r46):
+* Update tests for new generator code
+* Rejigger some tests
+* Make the generator try to call #to_plist_node on any object it tries to serialize, thus allowing class authors to define how their objects will be serialized
+* Marshal.dump unrecognized objects into <data> elements
+* Make the parser strip out comments and Marshal.load <data> elements if possible
+* Update some rdoc
+
+=== Release version 2.1.1!
+
+2006-09-10 (r31 - r32):
+* Added encoding / decoding for entities (&amp; etc)
+* Changed parsing of <data> elements to return StringIO objects
+* Fixed bug with empty <key> tags
+
+2006-08-24 (r25 - r30):
+* Invert ownership of methods in the generator, allowing us to remove the self.extend(self)
+* New branch to remove method inject from parser
+
+2006-08-23 (r22 - r24):
+* Add rcov task to Rakefile
+* Add some tests
+
+2006-08-20 (r9 - r21):
+* Add a bunch of rdoc and rdoc infrastructure
+* Add rake task to clean up errant whitespace
+* Spin off a branch to remove a bunch of method injection in the generator code
+* Rename some tests for clarity's sake
+* Replace NARF generation code with Ben's generation code
+  * Update tests
+  * This broke indentation (will be fixed later)
+* Add Plist::Emit.dump, so you can dump objects which don't include Plist::Emit, update tests to match
+* Fix a bug with the method that wraps output in the plist header/footer
+
+2006-08-19 (r1 - r8):
+* The beginnings of merging the plist project into the NARF plist library (under the plist project's name)
+  * fancier project infrastructure (more tests, Rakefile, the like)
+  * Add/update copyright notices in the source files
+  * Move a bunch of documentation out to README
+  * Split library into chunks
+* Properly delete files when cleaning up from tests

data/{MIT-LICENSE → LICENSE}

@@ -1,5 +1,4 @@
-Copyright (c) 2006, Ben Bleything <ben@bleything.net>
-and Patrick May <patrick@hexane.org>
+Copyright (c) 2006-2010, Ben Bleything and Patrick May
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/{docs/USAGE → README.rdoc}

@@ -1,4 +1,10 @@
-== Parsing
+= All-purpose Property List manipulation library
+
+Plist is a library to manipulate Property List files, also known as plists.  It can parse plist files into native Ruby data structures as well as generating new plist files from your Ruby objects.
+
+== Usage
+
+=== Parsing
 
   result = Plist::parse_xml('path/to/example.plist')
 
@@ -46,7 +52,7 @@
   </dict>
   </plist>
 
-== Generation
+=== Generation
 
 plist also provides the ability to generate plists from Ruby objects.  The following Ruby classes are converted into native plist types:
   Array, Bignum, Date, DateTime, Fixnum, Float, Hash, Integer, String, Symbol, Time, true, false
@@ -102,3 +108,51 @@ An example:
 When you attempt to serialize a +MyFancyString+ object, the +to_plist_node+ method will be called and the object's contents will be defancified and placed in the plist.
 
 If for whatever reason you can't add this method, your object will be serialized with <tt>Marshal.dump</tt> instead.
+
+== Links
+
+[Project Page]  http://plist.rubyforge.org
+[GitHub]        http://github.com/bleything/plist
+[RDoc]          http://plist.rubyforge.org
+
+== Credits
+
+plist is maintained by Ben Bleything <mailto:ben@bleything.net> and Patrick May <mailto:patrick@hexane.org>.  Patrick wrote most of the code; Ben is a recent addition to the project, having merged in his plist generation library.
+
+Other folks who have helped along the way:
+
+[<b>Martin Dittus</b>] who pointed out that +Time+ wasn't enough for plist <tt>Dates</tt>, especially those in <tt>~/Library/Cookies/Cookies.plist</tt>
+[<b>Chuck Remes</b>] who pushed Patrick towards implementing <tt>#to_plist</tt>
+[<b>Mat Schaffer</b>] who supplied code and test cases for <tt><data></tt> elements
+[<b>Michael Granger</b>] for encouragement and help
+[<b>Carsten Bormann, Chris Hoffman, Dana Contreras, Hongli Lai, Johan Sørensen</b>] for contributing Ruby 1.9.x compatibility fixes
+
+== License and Copyright
+
+plist is released under the MIT License.
+
+Portions of the code (notably the Rakefile) contain code pulled and/or adapted from other projects.  These files contain a comment at the top describing what was used.
+
+=== MIT License
+
+Copyright (c) 2006-2010, Ben Bleything <ben@bleything.net> and Patrick May <patrick@hexane.org>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+

data/Rakefile

@@ -1,21 +1,21 @@
-##############################################################
-# Copyright 2006, Ben Bleything <ben@bleything.net> and      #
-#                 Patrick May <patrick@hexane.org>           #
-#                                                            #
-# Based heavily on Geoffrey Grosenbach's Rakefile for gruff. #
-# Includes whitespace-fixing task based on code from Typo.   #
-#                                                            #
-# Distributed under the MIT license.                         #
-##############################################################
+#
+# Plist Rakefile
+#
+# Based heavily on Geoffrey Grosenbach's Rakefile for gruff.
+# Includes whitespace-fixing task based on code from Typo.
+#
+# Copyright 2006-2010 Ben Bleything and Patrick May
+# Distributed under the MIT License
+#
 
 require 'fileutils'
 require 'rubygems'
 require 'rake'
 require 'rake/testtask'
-require 'rake/rdoctask'
 require 'rake/packagetask'
 require 'rake/gempackagetask'
 require 'rake/contrib/rubyforgepublisher'
+require 'rdoc/task'
 
 $:.unshift(File.dirname(__FILE__) + "/lib")
 require 'plist'
@@ -29,10 +29,10 @@ RELEASE_NAME  = "REL #{PKG_VERSION}"
 RUBYFORGE_PROJECT = "plist"
 RUBYFORGE_USER    = ENV['RUBYFORGE_USER']
 
-TEST_FILES    = Dir.glob('test/test_*').delete_if { |item| item.include?( "\.svn" ) }
-TEST_ASSETS   = Dir.glob('test/assets/*').delete_if { |item| item.include?( "\.svn" ) }
-LIB_FILES     = Dir.glob('lib/**/*').delete_if { |item| item.include?( "\.svn" ) }
-RELEASE_FILES = [ "Rakefile", "README", "MIT-LICENSE", "docs/USAGE" ] + LIB_FILES + TEST_FILES + TEST_ASSETS
+TEST_FILES    = Dir.glob('test/test_*')
+TEST_ASSETS   = Dir.glob('test/assets/*')
+LIB_FILES     = Dir.glob('lib/**/*')
+RELEASE_FILES = [ "Rakefile", "README.rdoc", "CHANGELOG", "LICENSE" ] + LIB_FILES + TEST_FILES + TEST_ASSETS
 
 task :default => [ :test ]
 # Run the unit tests
@@ -104,15 +104,19 @@ task :update_rdoc => [ :rdoc ] do
 end
 
 # Genereate the RDoc documentation
-Rake::RDocTask.new { |rdoc|
+RDoc::Task.new do |rdoc|
+  rdoc.title = "All-purpose Property List manipulation library"
+  rdoc.main  = "README.rdoc"
+
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = "All-purpose Property List manipulation library"
-  rdoc.options << '-SNmREADME'
-  rdoc.template = "docs/jamis-template.rb"
-  rdoc.rdoc_files.include('README', 'MIT-LICENSE', 'CHANGELOG')
-  rdoc.rdoc_files.include Dir.glob('docs/**').delete_if {|f| f.include? 'jamis' }
+  rdoc.rdoc_files.include('README.rdoc', 'LICENSE', 'CHANGELOG')
   rdoc.rdoc_files.include('lib/**')
-}
+
+  rdoc.options = [
+    '-H', # show hash marks on method names in comments
+    '-N', # show line numbers
+  ]
+end
 
 # Create compressed packages
 spec = Gem::Specification.new do |s|

data/lib/plist.rb

@@ -1,14 +1,13 @@
-#--
-##############################################################
-# Copyright 2006, Ben Bleything <ben@bleything.net> and      #
-# Patrick May <patrick@hexane.org>                           #
-#                                                            #
-# Distributed under the MIT license.                         #
-##############################################################
-#++
-# = Plist
+#!/usr/bin/env ruby
+#
+# = plist
+#
+# This is the main file for plist. Everything interesting happens in
+# Plist and Plist::Emit.
+#
+# Copyright 2006-2010 Ben Bleything and Patrick May
+# Distributed under the MIT License
 #
-# This is the main file for plist.  Everything interesting happens in Plist and Plist::Emit.
 
 require 'base64'
 require 'cgi'
@@ -18,5 +17,5 @@ require 'plist/generator'
 require 'plist/parser'
 
 module Plist
-  VERSION = '3.0.0'
+  VERSION = '3.1.0'
 end

data/lib/plist/generator.rb

@@ -1,208 +1,213 @@
-#--###########################################################
-# Copyright 2006, Ben Bleything <ben@bleything.net> and      #
-# Patrick May <patrick@hexane.org>                           #
-#                                                            #
-# Distributed under the MIT license.                         #
-##############################################################
-#++
-# See Plist::Emit.
-module Plist
-  # === Create a plist
-  # You can dump an object to a plist in one of two ways:
+#!/usr/bin/env ruby
+#
+# = plist
+#
+# Copyright 2006-2010 Ben Bleything and Patrick May
+# Distributed under the MIT License
+#
+
+module Plist ; end
+
+# === Create a plist
+# You can dump an object to a plist in one of two ways:
+#
+# * <tt>Plist::Emit.dump(obj)</tt>
+# * <tt>obj.to_plist</tt>
+#   * This requires that you mixin the <tt>Plist::Emit</tt> module, which is already done for +Array+ and +Hash+.
+#
+# The following Ruby classes are converted into native plist types:
+#   Array, Bignum, Date, DateTime, Fixnum, Float, Hash, Integer, String, Symbol, Time, true, false
+# * +Array+ and +Hash+ are both recursive; their elements will be converted into plist nodes inside the <array> and <dict> containers (respectively).
+# * +IO+ (and its descendants) and +StringIO+ objects are read from and their contents placed in a <data> element.
+# * User classes may implement +to_plist_node+ to dictate how they should be serialized; otherwise the object will be passed to <tt>Marshal.dump</tt> and the result placed in a <data> element.
+#
+# For detailed usage instructions, refer to USAGE[link:files/docs/USAGE.html] and the methods documented below.
+module Plist::Emit
+  # Helper method for injecting into classes.  Calls <tt>Plist::Emit.dump</tt> with +self+.
+  def to_plist(envelope = true)
+    return Plist::Emit.dump(self, envelope)
+  end
+
+  # Helper method for injecting into classes.  Calls <tt>Plist::Emit.save_plist</tt> with +self+.
+  def save_plist(filename)
+    Plist::Emit.save_plist(self, filename)
+  end
+
+  # The following Ruby classes are converted into native plist types:
+  #   Array, Bignum, Date, DateTime, Fixnum, Float, Hash, Integer, String, Symbol, Time
   #
-  # * <tt>Plist::Emit.dump(obj)</tt>
-  # * <tt>obj.to_plist</tt>
-  #   * This requires that you mixin the <tt>Plist::Emit</tt> module, which is already done for +Array+ and +Hash+.
+  # Write us (via RubyForge) if you think another class can be coerced safely into one of the expected plist classes.
   #
-  # The following Ruby classes are converted into native plist types:
-  #   Array, Bignum, Date, DateTime, Fixnum, Float, Hash, Integer, String, Symbol, Time, true, false
-  # * +Array+ and +Hash+ are both recursive; their elements will be converted into plist nodes inside the <array> and <dict> containers (respectively).
-  # * +IO+ (and its descendants) and +StringIO+ objects are read from and their contents placed in a <data> element.
-  # * User classes may implement +to_plist_node+ to dictate how they should be serialized; otherwise the object will be passed to <tt>Marshal.dump</tt> and the result placed in a <data> element.
+  # +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+.
   #
-  # For detailed usage instructions, refer to USAGE[link:files/docs/USAGE.html] and the methods documented below.
-  module Emit
-    # Helper method for injecting into classes.  Calls <tt>Plist::Emit.dump</tt> with +self+.
-    def to_plist(envelope = true)
-      return Plist::Emit.dump(self, envelope)
-    end
+  # 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)
+    output = plist_node(obj)
 
-    # Helper method for injecting into classes.  Calls <tt>Plist::Emit.save_plist</tt> with +self+.
-    def save_plist(filename)
-      Plist::Emit.save_plist(self, filename)
-    end
-
-    # The following Ruby classes are converted into native plist types:
-    #   Array, Bignum, Date, DateTime, Fixnum, Float, Hash, Integer, String, Symbol, Time
-    #
-    # Write us (via RubyForge) if you think another class can be coerced safely into one of the expected plist classes.
-    #
-    # +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)
-      output = plist_node(obj)
-
-      output = wrap(output) if envelope
+    output = wrap(output) if envelope
 
-      return output
-    end
+    return output
+  end
 
-    # Writes the serialized object's plist to the specified filename.
-    def self.save_plist(obj, filename)
-      File.open(filename, 'wb') do |f|
-        f.write(obj.to_plist)
-      end
+  # Writes the serialized object's plist to the specified filename.
+  def self.save_plist(obj, filename)
+    File.open(filename, 'wb') do |f|
+      f.write(obj.to_plist)
     end
+  end
 
-    private
-    def self.plist_node(element)
-      output = ''
+  private
+  def self.plist_node(element)
+    output = ''
+
+    if element.respond_to? :to_plist_node
+      output << element.to_plist_node
+    else
+      case element
+      when Array
+        if element.empty?
+          output << "<array/>\n"
+        else
+          output << tag('array') {
+            element.collect {|e| plist_node(e)}
+          }
+        end
+      when Hash
+        if element.empty?
+          output << "<dict/>\n"
+        else
+          inner_tags = []
 
-      if element.respond_to? :to_plist_node
-        output << element.to_plist_node
-      else
-        case element
-        when Array
-          if element.empty?
-            output << "<array/>\n"
-          else
-            output << tag('array') {
-              element.collect {|e| plist_node(e)}
-            }
-          end
-        when Hash
-          if element.empty?
-            output << "<dict/>\n"
-          else
-            inner_tags = []
-
-            element.keys.sort.each do |k|
-              v = element[k]
-              inner_tags << tag('key', CGI::escapeHTML(k.to_s))
-              inner_tags << plist_node(v)
-            end
-
-            output << tag('dict') {
-              inner_tags
-            }
+          element.keys.sort.each do |k|
+            v = element[k]
+            inner_tags << tag('key', CGI::escapeHTML(k.to_s))
+            inner_tags << plist_node(v)
           end
-        when true, false
-          output << "<#{element}/>\n"
-        when Time
-          output << tag('date', element.utc.strftime('%Y-%m-%dT%H:%M:%SZ'))
-        when Date # also catches DateTime
-          output << tag('date', element.strftime('%Y-%m-%dT%H:%M:%SZ'))
-        when String, Symbol, Fixnum, Bignum, Integer, Float
-          output << tag(element_type(element), CGI::escapeHTML(element.to_s))
-        when IO, StringIO
-          element.rewind
-          contents = element.read
-          # note that apple plists are wrapped at a different length then
-          # what ruby's base64 wraps by default.
-          # I used #encode64 instead of #b64encode (which allows a length arg)
-          # 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)
-        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 )
+
+          output << tag('dict') {
+            inner_tags
+          }
         end
+      when true, false
+        output << "<#{element}/>\n"
+      when Time
+        output << tag('date', element.utc.strftime('%Y-%m-%dT%H:%M:%SZ'))
+      when Date # also catches DateTime
+        output << tag('date', element.strftime('%Y-%m-%dT%H:%M:%SZ'))
+      when String, Symbol, Fixnum, Bignum, Integer, Float
+        output << tag(element_type(element), CGI::escapeHTML(element.to_s))
+      when IO, StringIO
+        element.rewind
+        contents = element.read
+        # note that apple plists are wrapped at a different length then
+        # what ruby's base64 wraps by default.
+        # I used #encode64 instead of #b64encode (which allows a length arg)
+        # 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)
+      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 )
       end
-
-      return output
     end
 
-    def self.comment(content)
-      return "<!-- #{content} -->\n"
-    end
+    return output
+  end
 
-    def self.tag(type, contents = '', &block)
-      out = nil
+  def self.comment(content)
+    return "<!-- #{content} -->\n"
+  end
 
-      if block_given?
-        out = IndentedString.new
-        out << "<#{type}>"
-        out.raise_indent
+  def self.tag(type, contents = '', &block)
+    out = nil
 
-        out << block.call
+    if block_given?
+      out = IndentedString.new
+      out << "<#{type}>"
+      out.raise_indent
 
-        out.lower_indent
-        out << "</#{type}>"
-      else
-        out = "<#{type}>#{contents.to_s}</#{type}>\n"
-      end
+      out << block.call
 
-      return out.to_s
+      out.lower_indent
+      out << "</#{type}>"
+    else
+      out = "<#{type}>#{contents.to_s}</#{type}>\n"
     end
 
-    def self.wrap(contents)
-      output = ''
+    return out.to_s
+  end
 
-      output << '<?xml version="1.0" encoding="UTF-8"?>' + "\n"
-      output << '<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">' + "\n"
-      output << '<plist version="1.0">' + "\n"
+  def self.wrap(contents)
+    output = ''
 
-      output << contents
+    output << '<?xml version="1.0" encoding="UTF-8"?>' + "\n"
+    output << '<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">' + "\n"
+    output << '<plist version="1.0">' + "\n"
 
-      output << '</plist>' + "\n"
+    output << contents
 
-      return output
-    end
+    output << '</plist>' + "\n"
 
-    def self.element_type(item)
-      return case item
-        when String, Symbol:          'string'
-        when Fixnum, Bignum, Integer: 'integer'
-        when Float:                   'real'
-        else
-          raise "Don't know about this data type... something must be wrong!"
-      end
-    end
-    private
-    class IndentedString #:nodoc:
-      attr_accessor :indent_string
+    return output
+  end
 
-      @@indent_level = 0
+  def self.element_type(item)
+    case item
+    when String, Symbol
+      'string'
 
-      def initialize(str = "\t")
-        @indent_string = str
-        @contents = ''
-      end
+    when Fixnum, Bignum, Integer
+      'integer'
 
-      def to_s
-        return @contents
-      end
+    when Float
+      'real'
 
-      def raise_indent
-        @@indent_level += 1
-      end
+    else
+      raise "Don't know about this data type... something must be wrong!"
+    end
+  end
+  private
+  class IndentedString #:nodoc:
+    attr_accessor :indent_string
+
+    def initialize(str = "\t")
+      @indent_string = str
+      @contents = ''
+      @indent_level = 0
+    end
 
-      def lower_indent
-        @@indent_level -= 1 if @@indent_level > 0
-      end
+    def to_s
+      return @contents
+    end
 
-      def <<(val)
-        if val.is_a? Array
-          val.each do |f|
-            self << f
-          end
-        else
-          # if it's already indented, don't bother indenting further
-          unless val =~ /\A#{@indent_string}/
-            indent = @indent_string * @@indent_level
+    def raise_indent
+      @indent_level += 1
+    end
 
-            @contents << val.gsub(/^/, indent)
-          else
-            @contents << val
-          end
+    def lower_indent
+      @indent_level -= 1 if @indent_level > 0
+    end
+
+    def <<(val)
+      if val.is_a? Array
+        val.each do |f|
+          self << f
+        end
+      else
+        # if it's already indented, don't bother indenting further
+        unless val =~ /\A#{@indent_string}/
+          indent = @indent_string * @indent_level
 
-          # it already has a newline, don't add another
-          @contents << "\n" unless val =~ /\n$/
+          @contents << val.gsub(/^/, indent)
+        else
+          @contents << val
         end
+
+        # it already has a newline, don't add another
+        @contents << "\n" unless val =~ /\n$/
       end
     end
   end

data/lib/plist/parser.rb

@@ -1,10 +1,11 @@
-#--###########################################################
-# Copyright 2006, Ben Bleything <ben@bleything.net> and      #
-# Patrick May <patrick@hexane.org>                           #
-#                                                            #
-# Distributed under the MIT license.                         #
-##############################################################
-#++
+#!/usr/bin/env ruby
+#
+# = plist
+#
+# Copyright 2006-2010 Ben Bleything and Patrick May
+# Distributed under the MIT License
+#
+
 # Plist parses Mac OS X xml property list files into ruby data structures.
 #
 # === Load a plist file
@@ -59,8 +60,15 @@ module Plist
   end
 
   class StreamParser
-    def initialize( filename_or_xml, listener )
-      @filename_or_xml = filename_or_xml
+    def initialize( plist_data_or_file, listener )
+      if plist_data_or_file.respond_to? :read
+        @xml = plist_data_or_file.read
+      elsif File.exists? plist_data_or_file
+        @xml = File.read( plist_data_or_file )
+      else
+        @xml = plist_data_or_file
+      end
+
       @listener = listener
     end
 
@@ -78,15 +86,7 @@ module Plist
 
       require 'strscan'
 
-      contents = (
-        if (File.exists? @filename_or_xml)
-          File.open(@filename_or_xml) {|f| f.read}
-        else
-          @filename_or_xml
-        end
-      )
-
-      @scanner = StringScanner.new( contents )
+      @scanner = StringScanner.new( @xml )
       until @scanner.eos?
         if @scanner.scan(COMMENT_START)
           @scanner.scan(COMMENT_END)

data/test/test_data_elements.rb

@@ -1,9 +1,4 @@
-##############################################################
-# Copyright 2006, Ben Bleything <ben@bleything.net> and      #
-#                 Patrick May <patrick@hexane.org>           #
-#                                                            #
-# Distributed under the MIT license.                         #
-##############################################################
+#!/usr/bin/env ruby
 
 require 'test/unit'
 require 'plist'
@@ -18,9 +13,12 @@ class MarshalableObject
 end
 
 class TestDataElements < Test::Unit::TestCase
-  @@result = Plist::parse_xml('test/assets/test_data_elements.plist')
 
-  def test_marshal
+  def setup
+    @result = Plist.parse_xml( 'test/assets/test_data_elements.plist' )
+  end
+
+  def test_data_object_header
     expected = <<END
 <!-- The <data> element below contains a Ruby object which has been serialized with Marshal.dump. -->
 <data>
@@ -28,14 +26,25 @@ BAhvOhZNYXJzaGFsYWJsZU9iamVjdAY6CUBmb28iHnRoaXMgb2JqZWN0IHdhcyBtYXJz
 aGFsZWQ=
 </data>
 END
+    expected_elements = expected.chomp.split( "\n" )
 
-    mo = MarshalableObject.new('this object was marshaled')
+    actual = Plist::Emit.dump( Object.new, false )
+    actual_elements = actual.chomp.split( "\n" )
 
-    assert_equal expected.chomp, Plist::Emit.dump(mo, false).chomp
+    # check for header
+    assert_equal expected_elements.shift, actual_elements.shift
+
+    # check for opening and closing data tags
+    assert_equal expected_elements.shift, actual_elements.shift
+    assert_equal expected_elements.pop, actual_elements.pop
+  end
 
-    assert_instance_of MarshalableObject, @@result['marshal']
+  def test_marshal_round_trip
+    expected = MarshalableObject.new('this object was marshaled')
+    actual   = Plist.parse_xml( Plist::Emit.dump(expected, false) )
 
-    assert_equal mo.foo, @@result['marshal'].foo
+    assert_kind_of expected.class, actual
+    assert_equal expected.foo, actual.foo
   end
 
   def test_generator_io_and_file
@@ -57,14 +66,14 @@ END
     assert_equal expected, Plist::Emit.dump(io, false).chomp
     assert_equal expected, Plist::Emit.dump(f, false).chomp
 
-    assert_instance_of StringIO, @@result['io']
-    assert_instance_of StringIO, @@result['file']
+    assert_instance_of StringIO, @result['io']
+    assert_instance_of StringIO, @result['file']
 
     io.rewind
     f.rewind
 
-    assert_equal io.read, @@result['io'].read
-    assert_equal f.read,  @@result['file'].read
+    assert_equal io.read, @result['io'].read
+    assert_equal f.read,  @result['file'].read
 
     io.close
     f.close
@@ -81,10 +90,10 @@ END
 
     assert_equal expected.chomp, Plist::Emit.dump(sio, false).chomp
 
-    assert_instance_of StringIO, @@result['stringio']
+    assert_instance_of StringIO, @result['stringio']
 
     sio.rewind
-    assert_equal sio.read, @@result['stringio'].read
+    assert_equal sio.read, @result['stringio'].read
   end
 
   # this functionality is credited to Mat Schaffer,

data/test/test_generator.rb

@@ -1,9 +1,4 @@
-##############################################################
-# Copyright 2006, Ben Bleything <ben@bleything.net> and      #
-#                 Patrick May <patrick@hexane.org>           #
-#                                                            #
-# Distributed under the MIT license.                         #
-##############################################################
+#!/usr/bin/env ruby
 
 require 'test/unit'
 require 'plist'
@@ -22,7 +17,7 @@ end
 
 class TestGenerator < Test::Unit::TestCase
   def test_to_plist_vs_plist_emit_dump_no_envelope
-    source   = [1, :b, true]
+    source = [1, :b, true]
 
     to_plist = source.to_plist(false)
     plist_emit_dump = Plist::Emit.dump(source, false)

data/test/test_generator_basic_types.rb

@@ -1,9 +1,4 @@
-##############################################################
-# Copyright 2006, Ben Bleything <ben@bleything.net> and      #
-#                 Patrick May <patrick@hexane.org>           #
-#                                                            #
-# Distributed under the MIT license.                         #
-##############################################################
+#!/usr/bin/env ruby
 
 require 'test/unit'
 require 'plist'

data/test/test_generator_collections.rb

@@ -1,9 +1,4 @@
-##############################################################
-# Copyright 2006, Ben Bleything <ben@bleything.net> and      #
-#                 Patrick May <patrick@hexane.org>           #
-#                                                            #
-# Distributed under the MIT license.                         #
-##############################################################
+#!/usr/bin/env ruby
 
 require 'test/unit'
 require 'plist'

data/test/test_parser.rb

@@ -1,12 +1,6 @@
-##############################################################
-# Copyright 2006, Ben Bleything <ben@bleything.net> and      #
-#                 Patrick May <patrick@hexane.org>           #
-#                                                            #
-# Distributed under the MIT license.                         #
-##############################################################
+#!/usr/bin/env ruby
 
 require 'test/unit'
-
 require 'plist'
 
 class TestParser < Test::Unit::TestCase
@@ -15,15 +9,18 @@ class TestParser < Test::Unit::TestCase
 
     # dict
     assert_kind_of( Hash, result )
-    assert_equal( ["List of Albums",
-                   "Minor Version",
-                   "Master Image List",
-                   "Major Version",
-                   "List of Keywords",
-                   "Archive Path",
-                   "List of Rolls",
-                   "Application Version"],
-                  result.keys )
+
+    expected = [
+      "List of Albums",
+      "Minor Version",
+      "Master Image List",
+      "Major Version",
+      "List of Keywords",
+      "Archive Path",
+      "List of Rolls",
+      "Application Version"
+    ]
+    assert_equal( expected.sort, result.keys.sort )
 
     # array
     assert_kind_of( Array, result["List of Rolls"] )
@@ -62,7 +59,7 @@ class TestParser < Test::Unit::TestCase
   def test_date_fields
     result = Plist::parse_xml("test/assets/Cookies.plist")
     assert_kind_of( DateTime, result.first['Expires'] )
-    assert_equal( "2007-10-25T12:36:35Z", result.first['Expires'].to_s )
+    assert_equal DateTime.parse( "2007-10-25T12:36:35Z" ), result.first['Expires']
   end
 
   # bug fix for empty <key>
@@ -85,6 +82,16 @@ class TestParser < Test::Unit::TestCase
       assert_nil( Plist::parse_xml( File.read('test/assets/commented.plist') ) )
     end
   end
+
+  def test_filename_or_xml_is_stringio
+    require 'stringio'
+
+    str = StringIO.new
+    data = Plist::parse_xml(str)
+
+    assert_nil data
+  end
+
 end
 
 __END__

metadata

@@ -1,42 +1,41 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
-specification_version: 1
 name: plist
 version: !ruby/object:Gem::Version 
-  version: 3.0.0
-date: 2006-09-20 00:00:00 -07:00
-summary: All-purpose Property List manipulation library.
-require_paths: 
-- lib
-email: 
-homepage: http://plist.rubyforge.org
-rubyforge_project: plist
-description: Plist is a library to manipulate Property List files, also known as plists.  It can parse plist files into native Ruby data structures as well as generating new plist files from your Ruby objects.
-autorequire: plist
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  prerelease: false
+  segments: 
+  - 3
+  - 1
+  - 0
+  version: 3.1.0
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Ben Bleything and Patrick May
+autorequire: plist
+bindir: bin
+cert_chain: []
+
+date: 2010-02-23 00:00:00 -08:00
+default_executable: 
+dependencies: []
+
+description: |
+  Plist is a library to manipulate Property List files, also known as plists.  It can parse plist files into native Ruby data structures as well as generating new plist files from your Ruby objects.
+
+email: 
+executables: []
+
+extensions: []
+
+extra_rdoc_files: []
+
 files: 
 - Rakefile
-- README
-- MIT-LICENSE
-- docs/USAGE
-- lib/plist
-- lib/plist.rb
+- README.rdoc
+- CHANGELOG
+- LICENSE
 - lib/plist/generator.rb
 - lib/plist/parser.rb
+- lib/plist.rb
 - test/test_data_elements.rb
 - test/test_generator.rb
 - test/test_generator_basic_types.rb
@@ -50,21 +49,39 @@ files:
 - test/assets/example_data.plist
 - test/assets/test_data_elements.plist
 - test/assets/test_empty_key.plist
+has_rdoc: true
+homepage: http://plist.rubyforge.org
+licenses: []
+
+post_install_message: 
+rdoc_options: []
+
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+requirements: []
+
+rubyforge_project: plist
+rubygems_version: 1.3.6
+signing_key: 
+specification_version: 3
+summary: All-purpose Property List manipulation library.
 test_files: 
 - test/test_data_elements.rb
 - test/test_generator.rb
 - test/test_generator_basic_types.rb
 - test/test_generator_collections.rb
 - test/test_parser.rb
-rdoc_options: []
-
-extra_rdoc_files: []
-
-executables: []
-
-extensions: []
-
-requirements: []
-
-dependencies: []
-

data/README

@@ -1,36 +0,0 @@
-= All-purpose Property List manipulation library
-
-Plist is a library to manipulate Property List files, also known as plists.  It can parse plist files into native Ruby data structures as well as generating new plist files from your Ruby objects.
-
-== Usage
-
-See USAGE[link:files/docs/USAGE.html].
-
-== Links
-
-[<b>Project Page</b>]          http://plist.rubyforge.org
-[<b>Subversion repository</b>] svn://rubyforge.org//var/svn/plist
-[<b>RDoc (on RubyForge)</b>]   http://plist.rubyforge.org
-
-== Credits
-
-plist is maintained by Ben Bleything <mailto:ben@bleything.net> and Patrick May <mailto:patrick@hexane.org>.  Patrick wrote most of the code; Ben is a recent addition to the project, having merged in his plist generation library.
-
-Other folks who have helped along the way:
-
-[<b>Martin Dittus</b>] who pointed out that +Time+ wasn't enough for plist <tt>Dates</tt>, especially those in <tt>~/Library/Cookies/Cookies.plist</tt>
-[<b>Chuck Remes</b>] who pushed Patrick towards implementing <tt>#to_plist</tt>
-[<b>Mat Schaffer</b>] who supplied code and test cases for <tt><data></tt> elements
-[<b>Michael Granger</b>] for encouragement and help
-
-== License and Copyright
-
-plist is released under the MIT License.
-
-Portions of the code (notably the Rakefile) contain code pulled and/or adapted from other projects.  These files contain a comment at the top describing what was used.
-
-=== MIT License
-
-:include: MIT-LICENSE
-
-