plist 3.1.0 → 3.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b76cafca96f807c09a6ab294cfbbdb7382d037e3
+  data.tar.gz: 6934d855210d3a9962b3810139061075eec5ef23
+SHA512:
+  metadata.gz: 446131557d54d2a68e215ab21ff083a9181a6228e02a6e060b5307927e37c5f2c1fef85cf65317da12e633c59388502b83a85d7d3d5f3170067dd43ddeec72c9
+  data.tar.gz: aa7bfd8345be6d48b86f526df32837e1890114c76c8170c9c88dd1d19042a271a1d619002659badcb7a0dfd8c0a53cacdb9ba0028aedae30c8d265ab9ea2b583

data/README.rdoc

@@ -20,7 +20,7 @@ Plist is a library to manipulate Property List files, also known as plists.  It
 ==== Example Property List
 
   <?xml version="1.0" encoding="UTF-8"?>
-  <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+  <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
   <plist version="1.0">
   <dict>
           <key>FirstName</key>
@@ -74,7 +74,7 @@ If you've mixed in <tt>Plist::Emit</tt> (which is already done for +Array+ and +
 This is equivalent to calling <tt>Plist::Emit.dump(obj)</tt>.  Either one will yield:
 
   <?xml version="1.0" encoding="UTF-8"?>
-  <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+  <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
   <plist version="1.0">
   <array>
       <integer>1</integer>

data/Rakefile

@@ -13,9 +13,8 @@ require 'rubygems'
 require 'rake'
 require 'rake/testtask'
 require 'rake/packagetask'
-require 'rake/gempackagetask'
 require 'rake/contrib/rubyforgepublisher'
-require 'rdoc/task'
+require 'rubygems/package_task'
 
 $:.unshift(File.dirname(__FILE__) + "/lib")
 require 'plist'
@@ -38,7 +37,7 @@ task :default => [ :test ]
 # Run the unit tests
 Rake::TestTask.new { |t|
   t.libs << "test"
-  t.pattern = 'test/test_*.rb'
+  t.test_files = TEST_FILES
   t.verbose = true
 }
 
@@ -103,19 +102,25 @@ task :update_rdoc => [ :rdoc ] do
   Rake::SshDirPublisher.new("#{RUBYFORGE_USER}@rubyforge.org", "/var/www/gforge-projects/#{RUBYFORGE_PROJECT}", "rdoc").upload
 end
 
-# Genereate the RDoc documentation
-RDoc::Task.new do |rdoc|
-  rdoc.title = "All-purpose Property List manipulation library"
-  rdoc.main  = "README.rdoc"
+begin
+  require 'rdoc/task'
 
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.rdoc_files.include('README.rdoc', 'LICENSE', 'CHANGELOG')
-  rdoc.rdoc_files.include('lib/**')
+  # Generate the RDoc documentation
+  RDoc::Task.new do |rdoc|
+    rdoc.title = "All-purpose Property List manipulation library"
+    rdoc.main  = "README.rdoc"
 
-  rdoc.options = [
-    '-H', # show hash marks on method names in comments
-    '-N', # show line numbers
-  ]
+    rdoc.rdoc_dir = 'rdoc'
+    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
+rescue LoadError
+  $stderr.puts "Could not load rdoc tasks"
 end
 
 # Create compressed packages
@@ -128,7 +133,7 @@ spec = Gem::Specification.new do |s|
 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.
 EOD
 
-  s.authors  = "Ben Bleything and Patrick May"
+  s.authors  = "Ben Bleything and Patrick Way"
   s.homepage = "http://plist.rubyforge.org"
 
   s.rubyforge_project = RUBYFORGE_PROJECT
@@ -141,8 +146,9 @@ EOD
   s.autorequire = 'plist'
 end
 
-Rake::GemPackageTask.new(spec) do |p|
+Gem::PackageTask.new(spec) do |p|
   p.gem_spec = spec
   p.need_tar = true
   p.need_zip = true
 end
+

data/lib/plist.rb

@@ -17,5 +17,5 @@ require 'plist/generator'
 require 'plist/parser'
 
 module Plist
-  VERSION = '3.1.0'
+  VERSION = '3.2.0'
 end

data/lib/plist/generator.rb

@@ -78,7 +78,7 @@ module Plist::Emit
         else
           inner_tags = []
 
-          element.keys.sort.each do |k|
+          element.keys.sort_by{|k| k.to_s }.each do |k|
             v = element[k]
             inner_tags << tag('key', CGI::escapeHTML(k.to_s))
             inner_tags << plist_node(v)
@@ -144,7 +144,7 @@ module Plist::Emit
     output = ''
 
     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 << '<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">' + "\n"
     output << '<plist version="1.0">' + "\n"
 
     output << contents
@@ -213,13 +213,6 @@ module Plist::Emit
   end
 end
 
-# we need to add this so sorting hash keys works properly
-class Symbol #:nodoc:
-  def <=> (other)
-    self.to_s <=> other.to_s
-  end
-end
-
 class Array #:nodoc:
   include Plist::Emit
 end

data/lib/plist/parser.rb

@@ -18,7 +18,7 @@ module Plist
 #  + Date elements are returned as DateTime objects.
 #  + Data elements are implemented as Tempfiles
 #
-# Plist::parse_xml will blow up if it encounters a data element.
+# Plist::parse_xml will blow up if it encounters a Date element.
 # If you encounter such an error, or if you have a Date element which
 # can't be parsed into a Time object, please send your plist file to
 # plist@hexane.org so that I can implement the proper support.
@@ -63,7 +63,7 @@ module Plist
     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
+      elsif File.exist? plist_data_or_file
         @xml = File.read( plist_data_or_file )
       else
         @xml = plist_data_or_file
@@ -210,8 +210,7 @@ module Plist
   require 'base64'
   class PData < PTag
     def to_ruby
-      data = Base64.decode64(text.gsub(/\s+/, ''))
-
+      data = Base64.decode64(text.gsub(/\s+/, '')) unless text.nil?
       begin
         return Marshal.load(data)
       rescue Exception => e

data/test/assets/AlbumData.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>Application Version</key>

data/test/assets/Cookies.plist

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <array>
 	<dict>

data/test/assets/commented.plist

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <!-- I am a comment! -->
 <!--

data/test/assets/example_data.plist

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>IMs</key>

data/test/assets/test_data_elements.plist

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
   <dict>
     <key>stringio</key>
@@ -20,5 +20,7 @@
     <data>BAhvOhZNYXJzaGFsYWJsZU9iamVjdAY6CUBmb28iHnRoaXMgb2JqZWN0IHdh
     cyBtYXJzaGFsZWQ=
     </data>
+    <key>nodata</key>
+    <data/>
   </dict>
 </plist>

data/test/assets/test_empty_key.plist

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
   <dict>
     <key>key</key>

data/test/test_generator.rb

@@ -51,4 +51,25 @@ class TestGenerator < Test::Unit::TestCase
 
     File.unlink('test.plist')
   end
+
+  # The hash in this test was failing with 'hsh.keys.sort',
+  # we are making sure it works with 'hsh.keys.sort_by'.
+  def test_sorting_keys
+    hsh = {:key1 => 1, :key4 => 4, 'key2' => 2, :key3 => 3}
+    output = Plist::Emit.plist_node(hsh)
+    expected = <<-STR
+<dict>
+  <key>key1</key>
+  <integer>1</integer>
+  <key>key2</key>
+  <integer>2</integer>
+  <key>key3</key>
+  <integer>3</integer>
+  <key>key4</key>
+  <integer>4</integer>
+</dict>
+    STR
+
+    assert_equal expected, output.gsub(/[\t]/, "\s\s")
+  end
 end

metadata

@@ -1,85 +1,66 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: plist
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 3
-  - 1
-  - 0
-  version: 3.1.0
+version: !ruby/object:Gem::Version
+  version: 3.2.0
 platform: ruby
-authors: 
-- Ben Bleything and Patrick May
+authors:
+- Ben Bleything and Patrick Way
 autorequire: plist
 bindir: bin
 cert_chain: []
-
-date: 2010-02-23 00:00:00 -08:00
-default_executable: 
+date: 2016-01-28 00:00:00.000000000 Z
 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.rdoc
+files:
 - CHANGELOG
 - LICENSE
+- README.rdoc
+- Rakefile
+- lib/plist.rb
 - 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
-- test/test_generator_collections.rb
-- test/test_parser.rb
 - test/assets/AlbumData.xml
-- test/assets/commented.plist
 - test/assets/Cookies.plist
+- test/assets/commented.plist
 - test/assets/example_data.bin
 - test/assets/example_data.jpg
 - test/assets/example_data.plist
 - test/assets/test_data_elements.plist
 - test/assets/test_empty_key.plist
-has_rdoc: true
+- test/test_data_elements.rb
+- test/test_generator.rb
+- test/test_generator_basic_types.rb
+- test/test_generator_collections.rb
+- test/test_parser.rb
 homepage: http://plist.rubyforge.org
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+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"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: plist
-rubygems_version: 1.3.6
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: All-purpose Property List manipulation library.
-test_files: 
+test_files:
 - test/test_data_elements.rb
 - test/test_generator.rb
 - test/test_generator_basic_types.rb