plist4r 1.0.1 → 1.1.0

data/.gitignore

@@ -21,6 +21,8 @@ pkg
 ## PROJECT::SPECIFIC
 .yardoc
 doc
+ext/osx_plist/plist.o
+ext/osx_plist/Makefile
 
 # Ruby
 *.bundle

data/Rakefile

@@ -51,13 +51,24 @@ end
 
 task :default => :spec
 
-namespace :backend do
-  task :tests do
+namespace :backends do
+  task :compile do
+    if File.exists? "/System/Library/Frameworks/CoreFoundation.framework"
+      r = %x[rm ext/osx_plist/osx_plist.bundle lib/plist4r/backend/osx_plist/ext/osx_plist.bundle]
+      puts r if r.length > 0
+      puts %x[cd ext/osx_plist && ./extconf.rb && make clean && make]
+      r = %x[cp ext/osx_plist/osx_plist.bundle lib/plist4r/backend/osx_plist/ext/osx_plist.bundle]
+      puts r if r.length > 0
+    end
+  end
+
+  task :test => :compile do
     require 'lib/plist4r'
     require 'plist4r/backend/test/output'
     o = Plist4r::Backend::Test::Output.new
     puts o
     o.write_html_file
+    o.results_stdout
   end
 end
 

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.1.0

data/ext/osx_plist/extconf.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
 
 if File.exists? "/System/Library/Frameworks/CoreFoundation.framework"
   require 'mkmf'

data/lib/plist4r.rb

@@ -42,6 +42,11 @@ module Plist4r
     # @example
     # Plist4r.string_detect_format("{ \"key1\" = \"value1\"; \"key2\" = \"value2\"; }") => :gnustep
     def string_detect_format string
+      if RUBY_VERSION >= '1.9'
+        string = string.force_encoding(Encoding::ASCII_8BIT)
+      end
+
+
       string.strip! if string[0,1] =~ /\s/
       case string[0,1]
       when "{","("

data/lib/plist4r/backend/c_f_property_list/rbCFPropertyList.rb

@@ -3,6 +3,7 @@
 require 'libxml'
 require 'kconv'
 require 'date'
+require 'time'
 
 #
 # CFPropertyList implementation

data/lib/plist4r/backend/haml.rb

@@ -3,7 +3,7 @@ require 'plist4r/backend_base'
 require 'plist4r/mixin/ruby_stdlib'
 require 'haml'
 require 'base64'
-require 'date'
+require 'time'
 
 # This backend uses haml to generate xml plists
 # @author Dreamcat4 (dreamcat4@gmail.com)
@@ -39,9 +39,6 @@ module Plist4r::Backend::Haml
 					- when Time
 						%key #{k}
 						%date #{v.utc.strftime('%Y-%m-%dT%H:%M:%SZ')}
-					- when Date
-						%key #{k}
-						%date #{v.strftime('%Y-%m-%dT%H:%M:%SZ')}
 					- when Array
 						%key #{k}
 						%array
@@ -61,8 +58,6 @@ module Plist4r::Backend::Haml
 										%real #{e}
 									- when Time
 										%date #{e.utc.strftime('%Y-%m-%dT%H:%M:%SZ')}
-									- when Date
-										%date #{e.strftime('%Y-%m-%dT%H:%M:%SZ')}
 									- when Hash
 										%dict
 											- tab_up ; block.call(e, block) ; tab_down

data/lib/plist4r/backend/libxml4r.rb

@@ -2,7 +2,7 @@
 require 'plist4r/backend_base'
 require 'libxml4r'
 require 'base64'
-require 'date'
+require 'time'
 
 # This backend uses Libxml4r / Libxml-Ruby to parse xml plists
 # @author Dreamcat4 (dreamcat4@gmail.com)

data/lib/plist4r/backend/ruby_cocoa.rb

@@ -1,8 +1,10 @@
 
 require 'plist4r/backend_base'
 require 'plist4r/mixin/ruby_stdlib'
+require 'time'
 
 module Plist4r
+  # @private
   class StringIOData
     attr_accessor :string
     def initialize string
@@ -26,6 +28,7 @@ module Plist4r
 end
 
 class String
+  # @private
   def _dump arg
     if self.blob?
       string_io_data = Plist4r::StringIOData.new(self)
@@ -35,6 +38,7 @@ class String
     end
   end
   
+  # @private
   def self._load string
     String.new string
   end
@@ -64,7 +68,7 @@ dir = ARGV[0]
 $LOAD_PATH.unshift dir unless $LOAD_PATH.include?(dir)
 
 require 'osx/cocoa'
-require 'date'
+require 'time'
 require 'plist4r/mixin/ordered_hash'
 require 'plist4r/mixin/ruby_stdlib'
 
@@ -138,7 +142,7 @@ class OSX::NSObject
     when OSX::NSArray
       self.to_a.map { |x| x.is_a?(OSX::NSObject) ? x.to_ruby : x }
     when OSX::NSDictionary
-      h = ::Plist4r::OrderedHash.new
+      h = Plist4r::ActiveSupport::OrderedHash.new
       self.each do |x, y| 
         x = x.to_ruby if x.is_a?(OSX::NSObject)
         y = y.to_ruby if y.is_a?(OSX::NSObject)
@@ -162,6 +166,7 @@ module Plist
     # to_plist defaults to NSPropertyListXMLFormat_v1_0
     hash = Marshal.load(File.read(input_file))
     x = hash.to_plist
+    # x = hash.inspect
     write_result_file x
   end
 
@@ -169,6 +174,7 @@ module Plist
     # Here 200 == NSPropertyListBinaryFormat_v1_0
     hash = Marshal.load(File.read(input_file))
     x = hash.to_plist 200
+    # x = hash.inspect
     write_result_file x
   end
 
@@ -177,7 +183,7 @@ module Plist
     unless plist_dict
       plist_array = ::OSX::NSArray.arrayWithContentsOfFile(filename) unless plist_dict
       raise "Couldnt parse file: #{filename}" unless plist_array
-      plist_dict = ::Plist4r::OrderedHash.new
+      plist_dict = Plist4r::ActiveSupport::OrderedHash.new
       plist_dict["Array"] = plist_array.to_ruby
     end
 
@@ -253,13 +259,36 @@ EOC
       File.read @result_file.path
     end
 
+    def convert_19_to_hash hash, key=nil
+      h = Hash.new
+      h.replace hash
+    
+      hash.each do |key,value|
+        if value.class.ancestors.include? Hash
+          unless value.class == Hash
+            h[key] = convert_19_to_hash(value)
+          end
+        end
+      end
+      h
+    end
+
     def to_xml plist
       require 'tempfile'
       input_file = Tempfile.new "input_file.rb."
-      input_file.puts Marshal.dump(plist.to_hash)
+
+      oh = nil
+      if RUBY_VERSION >= '1.9'
+        old_style_hash = convert_19_to_hash(plist.to_hash)
+        input_file.puts Marshal.dump(old_style_hash)
+      else
+        input_file.puts Marshal.dump(plist.to_hash)
+      end
+
       input_file.close
       result = ruby_cocoa_exec "to_xml(\"#{input_file.path}\")"
-      
+      # print read_result_file
+
       case result[1].exitstatus
       when 0
         xml_string = read_result_file
@@ -273,9 +302,17 @@ EOC
     def to_binary plist
       require 'tempfile'
       input_file = Tempfile.new "input_file.rb."
-      input_file.puts Marshal.dump(plist.to_hash)
+
+      if RUBY_VERSION >= '1.9'
+        old_style_hash = convert_19_to_hash(plist.to_hash)
+        input_file.puts Marshal.dump(old_style_hash)
+      else
+        input_file.puts Marshal.dump(plist.to_hash)
+      end
+
       input_file.close
       result = ruby_cocoa_exec "to_binary(\"#{input_file.path}\")"
+      # print read_result_file
 
       case result[1].exitstatus
       when 0
@@ -288,12 +325,11 @@ EOC
     end
 
     def open_with_args plist, filename
-      require 'date'
-
       result = ruby_cocoa_exec "open(\"#{filename}\")"
       case result[1].exitstatus
       when 0
-        hash = ::Plist4r::OrderedHash.new
+        hash = Plist4r::OrderedHash.new
+        
         hash.replace Marshal.load(read_result_file)
         plist.import_hash hash
       else

data/lib/plist4r/backend/test/data_types.rb

@@ -54,7 +54,7 @@ module Plist4r
         end
 
         def gen_time
-          require 'date'
+          require 'time'
           (0..25).each do |i|
             @plist.store "DateKey#{(65+i).chr}", Time.parse("2010-04-#{sprintf("%.2i",i+1)}T19:50:01Z")
           end
@@ -85,6 +85,7 @@ module Plist4r
         def gen_hash
           (0..25).each do |i|
             h = Plist4r::OrderedHash.new
+            # (0..0).each do |j|
             (0..i).each do |j|
               h["String#{(65+j).chr}"] = "#{(97+j).chr}"*(j+1)
             end

data/lib/plist4r/backend/test/harness.rb

@@ -27,8 +27,8 @@ module Plist4r
           :to_binary   => :c_f_property_list,
           # :from_binary => :ruby_cocoa,
           # :to_binary   => :ruby_cocoa,
-          :from_binary => :osx_plist,
-          :to_binary   => :osx_plist,
+          # :from_binary => :osx_plist,
+          # :to_binary   => :osx_plist,
         }
 
         def reference_backend_for meth
@@ -103,23 +103,19 @@ module Plist4r
                   begin
                     plist_result = Plist4r.new :backends => [b_sym], :from_string => string                
                     if @data_types.plists[sym].to_hash == plist_result.to_hash
-                      puts "match, #{b_sym}, #{sym}" if sym == :data
+                      puts "match, #{b_sym}, #{sym}"
                       # puts @data_types.plists[sym].hash.inspect
-                      # puts plist_result.hash.inspect
                       # puts @data_types.plists[sym].to_hash["DataKeyW"].hash.inspect
                       # puts plist_result.to_hash["DataKeyW"].hash.inspect
                     else
-                      puts "fail, #{b_sym}, #{sym}" if sym == :data
+                      puts "fail, #{b_sym}, #{sym}"
+                      failures << sym
 
-                      if sym == :data
+                      if true
                         puts "expected:"
                         puts @data_types.plists[sym].hash.inspect
                         puts @data_types.plists[sym].to_hash.inspect
-                        # puts @data_types.plists[sym].to_hash["DataKeyW"].read.inspect
-                        # @data_types.plists[sym].to_hash["DataKeyW"].rewind
-                        # puts @data_types.plists[sym].to_hash["DataKeyW"].read.inspect
                         puts "got:"
-                        puts plist_result.hash.inspect
                         puts plist_result.to_hash.inspect
                         # puts plist_result.to_xml if b_sym == "ruby_cocoa"
                       end
@@ -163,10 +159,10 @@ module Plist4r
                                         :backends => [reference_backend_for("from_#{fmt}".to_sym)]
 
                       if plist_gen_from.to_hash == plist.to_hash
-                          puts "match, #{b_sym}, #{sym}" if sym == :data
+                          puts "match, #{b_sym}, #{sym}"
                           # puts plist.hash.inspect
                           # puts plist_gen_from.hash.inspect
-                          if sym == :data
+                          # if sym == :data
                             if b_sym == "ruby_cocoa"
                               # plist_gen_from.to_hash.keys.each do |key|
                               # puts "point a"
@@ -182,21 +178,26 @@ module Plist4r
                               # puts "expected:"
                               # puts plist.to_hash.inspect
                               # puts "got:"
+                              # puts plist.send("to_#{fmt}")
                               # puts plist_gen_from.to_hash.inspect
                             end
-                          end
+                          # end
                       else
-                        puts "fail, #{b_sym}, #{sym}" if sym == :data
-                        if sym == :data
+                        puts "fail, #{b_sym}, #{sym}"
+                        failures << sym
+                        if true
                           puts "expected:"
                           puts plist.to_hash.inspect
                           puts "got:"
                           puts plist_gen_from.to_hash.inspect
+                          puts "got:"
+                          puts plist.send("to_#{fmt}")
                         end
                       end
                     rescue
                       puts "fail, #{b_sym}, #{sym} - exception"
-
+                      # puts $!.inspect if b_sym == :ruby_cocoa
+                      raise
                       begin
                         # what went wrong?
                         if fmt == :binary
@@ -211,6 +212,7 @@ module Plist4r
                         end
                       rescue
                       end
+                      # raise if b_sym == :ruby_cocoa
                       failures << sym
                     end
                   end
@@ -237,18 +239,9 @@ module Plist4r
             cgi += 2
           end
           puts ""
-          puts "REFERENCE BACKENDS"
-          puts "=================="
-          ReferenceBackends.each do |sym,b_sym|
-            puts "#{sym.inspect} generated by #{b_sym.inspect}"
-          end
-          puts ""
-          puts t.inspect
           @results = t
         end
 
-
-
       end
     end
   end

data/lib/plist4r/backend/test/output.rb

@@ -17,7 +17,7 @@ module Plist4r
   %p Ruby Enterprise Edition (REE) 1.8.7 p248, Mac OS-X 10.6.3
   = @test_harness.results
   %p To re-run the backend tests
-  %pre{ :class => "code" } $ cd plist4r && rake backend:tests
+  %pre{ :class => "code" } $ cd plist4r && rake backends:test
 %p
 EOC
         end
@@ -40,6 +40,17 @@ EOC
           end
         end
 
+        def results_stdout
+          puts ""
+          puts "REFERENCE BACKENDS"
+          puts "=================="
+          Plist4r::Backend::Test::Harness::ReferenceBackends.each do |sym,b_sym|
+            puts "#{sym.inspect} generated by #{b_sym.inspect}"
+          end
+          puts ""
+          puts @test_harness.results.inspect
+          puts ""
+        end
       end
     end
   end

data/lib/plist4r/docs/Backends.html

@@ -18,42 +18,42 @@
     <tbody>
       <tr>
         <th style='padding: 5px; padding-left: 15px; padding-right: 15px; background-color: #F5F5FF; text-align: right'>c_f_property_list</th>
-        <td style='padding: 5px; padding-left: 15px; padding-right: 15px; background-color: #FAFAFA; text-align: center'>18.2 ms</td>
-        <td style='padding: 5px; padding-left: 15px; padding-right: 15px; background-color: #FAFAFA; text-align: center'>19.5 ms</td>
-        <td style='padding: 5px; padding-left: 15px; padding-right: 15px; background-color: #FAFAFA; text-align: center'>33.4 ms</td>
-        <td style='padding: 5px; padding-left: 15px; padding-right: 15px; background-color: #FAFAFA; text-align: center'>34.9 ms</td>
+        <td style='padding: 5px; padding-left: 15px; padding-right: 15px; background-color: #FAFAFA; text-align: center'>26.2 ms</td>
+        <td style='padding: 5px; padding-left: 15px; padding-right: 15px; background-color: #FAFAFA; text-align: center'>36.1 ms</td>
+        <td style='padding: 5px; padding-left: 15px; padding-right: 15px; background-color: #FAFAFA; text-align: center'>15.5 ms</td>
+        <td style='padding: 5px; padding-left: 15px; padding-right: 15px; background-color: #FAFAFA; text-align: center'>67.7 ms</td>
       </tr>
       <tr>
         <th style='padding: 5px; padding-left: 15px; padding-right: 15px; background-color: #F5F5FF; text-align: right'>haml</th>
         <td style='padding: 5px; padding-left: 15px; padding-right: 15px; background-color: #FAFAFA; text-align: center'>n/a</td>
-        <td style='padding: 5px; padding-left: 15px; padding-right: 15px; background-color: #FAFAFA; text-align: center'>126.8 ms</td>
+        <td style='padding: 5px; padding-left: 15px; padding-right: 15px; background-color: #FAFAFA; text-align: center'>30.3 ms</td>
         <td style='padding: 5px; padding-left: 15px; padding-right: 15px; background-color: #FAFAFA; text-align: center'>n/a</td>
         <td style='padding: 5px; padding-left: 15px; padding-right: 15px; background-color: #FAFAFA; text-align: center'>n/a</td>
       </tr>
       <tr>
         <th style='padding: 5px; padding-left: 15px; padding-right: 15px; background-color: #F5F5FF; text-align: right'>libxml4r</th>
-        <td style='padding: 5px; padding-left: 15px; padding-right: 15px; background-color: #FAFAFA; text-align: center'>41.4 ms</td>
+        <td style='padding: 5px; padding-left: 15px; padding-right: 15px; background-color: #FAFAFA; text-align: center'>57.2 ms</td>
         <td style='padding: 5px; padding-left: 15px; padding-right: 15px; background-color: #FAFAFA; text-align: center'>n/a</td>
         <td style='padding: 5px; padding-left: 15px; padding-right: 15px; background-color: #FAFAFA; text-align: center'>n/a</td>
         <td style='padding: 5px; padding-left: 15px; padding-right: 15px; background-color: #FAFAFA; text-align: center'>n/a</td>
       </tr>
       <tr>
         <th style='padding: 5px; padding-left: 15px; padding-right: 15px; background-color: #F5F5FF; text-align: right'>osx_plist</th>
-        <td style='padding: 5px; padding-left: 15px; padding-right: 15px; background-color: #FAFAFA; text-align: center'>4.8 ms</td>
-        <td style='padding: 5px; padding-left: 15px; padding-right: 15px; background-color: #FAFAFA; text-align: center'>5.0 ms</td>
-        <td style='padding: 5px; padding-left: 15px; padding-right: 15px; background-color: #FAFAFA; text-align: center'>4.6 ms</td>
-        <td style='padding: 5px; padding-left: 15px; padding-right: 15px; background-color: #FAFAFA; text-align: center'>4.6 ms</td>
+        <td style='padding: 5px; padding-left: 15px; padding-right: 15px; background-color: #FAFAFA; text-align: center'>6.0 ms</td>
+        <td style='padding: 5px; padding-left: 15px; padding-right: 15px; background-color: #FAFAFA; text-align: center'>17.8 ms</td>
+        <td style='padding: 5px; padding-left: 15px; padding-right: 15px; background-color: #FAFAFA; text-align: center'>3.6 ms</td>
+        <td style='padding: 5px; padding-left: 15px; padding-right: 15px; background-color: #FAFAFA; text-align: center'>5.4 ms</td>
       </tr>
       <tr>
         <th style='padding: 5px; padding-left: 15px; padding-right: 15px; background-color: #F5F5FF; text-align: right'>ruby_cocoa</th>
-        <td style='padding: 5px; padding-left: 15px; padding-right: 15px; background-color: #FAFAFA; text-align: center'>320.4 ms</td>
-        <td style='padding: 5px; padding-left: 15px; padding-right: 15px; background-color: #FAFAFA; text-align: center'>318.8 ms</td>
-        <td style='padding: 5px; padding-left: 15px; padding-right: 15px; background-color: #FAFAFA; text-align: center'>319.7 ms</td>
-        <td style='padding: 5px; padding-left: 15px; padding-right: 15px; background-color: #FAFAFA; text-align: center'>319.2 ms</td>
+        <td style='padding: 5px; padding-left: 15px; padding-right: 15px; background-color: #FAFAFA; text-align: center'>297.9 ms</td>
+        <td style='padding: 5px; padding-left: 15px; padding-right: 15px; background-color: #FAFAFA; text-align: center'>267.4 ms</td>
+        <td style='padding: 5px; padding-left: 15px; padding-right: 15px; background-color: #FAFAFA; text-align: center'>288.4 ms</td>
+        <td style='padding: 5px; padding-left: 15px; padding-right: 15px; background-color: #FAFAFA; text-align: center'>264.0 ms</td>
       </tr>
     </tbody>
   </table>
   <p>To re-run the backend tests</p>
-  <pre class='code'>$ cd plist4r && rake backend:tests</pre>
+  <pre class='code'>$ cd plist4r && rake backends:test</pre>
 </div>
 <p></p>

data/lib/plist4r/docs/DeveloperGuide.rdoc

@@ -36,7 +36,7 @@ We re-use common support objects when writing a new PlistType
 For a change in the {Plist4r} Core library
 
 * Please update the inline source code documentation, generate locally with +rake yard+
-* Please run the regression tests with +rake spec+ and +rake backend:tests+
+* Please run the regression tests with +rake spec+ and +rake backends:test+
 * Please update the existing regression tests (in RSpec) or write new ones
 
 For a {Plist4r::Backend}

data/lib/plist4r/mixin/ordered_hash.rb

@@ -1,185 +1,191 @@
 
 module Plist4r
   module ActiveSupport
-    # Hash is ordered in Ruby 1.9!
-    unless RUBY_VERSION >= '1.9'
-      # {ActiveSupport::OrderedHash}
-      #
-      # Copyright (c) 2005 David Hansson, 
-      #
-      # Copyright (c) 2007 Mauricio Fernandez, Sam Stephenson
-      #
-      # Copyright (c) 2008 Steve Purcell, Josh Peek
-      #
-      # Copyright (c) 2009 Christoffer Sawicki
-      #
-      # 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.
-      #
-      class OrderedHash < Hash
-        def initialize(*args, &block)
-          super
-          @keys = []
-        end
-
-        def self.[](*args)
-          ordered_hash = new
-
-          if (args.length == 1 && args.first.is_a?(Array))
-            args.first.each do |key_value_pair|
-              next unless (key_value_pair.is_a?(Array))
-              ordered_hash[key_value_pair[0]] = key_value_pair[1]
-            end
-
-            return ordered_hash
-          end
+    # ActiveSupport::OrderedHash
+    # 
+    # Copyright (c) 2005 David Hansson, 
+    #
+    # Copyright (c) 2007 Mauricio Fernandez, Sam Stephenson
+    #
+    # Copyright (c) 2008 Steve Purcell, Josh Peek
+    #
+    # Copyright (c) 2009 Christoffer Sawicki
+    #
+    # 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.
+    #
+    class OrderedHash < Hash
+      def initialize(*args, &block)
+        super
+        @keys = []
+      end
 
-          unless (args.size % 2 == 0)
-            raise ArgumentError.new("odd number of arguments for Hash")
-          end
+      def self.[](*args)
+        ordered_hash = new
 
-          args.each_with_index do |val, ind|
-            next if (ind % 2 != 0)
-            ordered_hash[val] = args[ind + 1]
+        if (args.length == 1 && args.first.is_a?(Array))
+          args.first.each do |key_value_pair|
+            next unless (key_value_pair.is_a?(Array))
+            ordered_hash[key_value_pair[0]] = key_value_pair[1]
           end
 
-          ordered_hash
+          return ordered_hash
         end
 
-        def initialize_copy(other)
-          super
-          # make a deep copy of keys
-          @keys = other.keys
+        unless (args.size % 2 == 0)
+          raise ArgumentError.new("odd number of arguments for Hash")
         end
 
-        def store(key, value)
-          @keys << key if !has_key?(key)
-          super
+        args.each_with_index do |val, ind|
+          next if (ind % 2 != 0)
+          ordered_hash[val] = args[ind + 1]
         end
 
-        def []=(key, value)
-          @keys << key if !has_key?(key)
-          super
-        end
+        ordered_hash
+      end
 
-        def delete(key)
-          if has_key? key
-            index = @keys.index(key)
-            @keys.delete_at index
-          end
-          super
-        end
+      def initialize_copy(other)
+        super
+        # make a deep copy of keys
+        @keys = other.keys
+      end
 
-        def delete_if
-          super
-          sync_keys!
-          self
-        end
+      def store(key, value)
+        @keys << key if !has_key?(key)
+        super
+      end
 
-        def reject!
-          super
-          sync_keys!
-          self
-        end
+      def []=(key, value)
+        @keys << key if !has_key?(key)
+        super
+      end
 
-        def reject(&block)
-          dup.reject!(&block)
+      def delete(key)
+        if has_key? key
+          index = @keys.index(key)
+          @keys.delete_at index
         end
+        super
+      end
 
-        def keys
-          @keys.dup
-        end
+      def delete_if
+        super
+        sync_keys!
+        self
+      end
 
-        def values
-          @keys.collect { |key| self[key] }
-        end
+      def reject!
+        super
+        sync_keys!
+        self
+      end
 
-        def to_hash
-          self
-        end
+      def reject(&block)
+        dup.reject!(&block)
+      end
 
-        def to_a
-          @keys.map { |key| [ key, self[key] ] }
-        end
+      def keys
+        (@keys || []).dup
+      end
 
-        def each_key
-          @keys.each { |key| yield key }
-        end
+      def values
+        @keys.collect { |key| self[key] }
+      end
 
-        def each_value
-          @keys.each { |key| yield self[key]}
-        end
+      def to_hash
+        self
+      end
 
-        def each
-          @keys.each {|key| yield [key, self[key]]}
-        end
+      def to_a
+        @keys.map { |key| [ key, self[key] ] }
+      end
 
-        alias_method :each_pair, :each
+      def each_key
+        @keys.each { |key| yield key }
+      end
 
-        def clear
-          super
-          @keys.clear
-          self
-        end
+      def each_value
+        @keys.each { |key| yield self[key]}
+      end
 
-        def shift
-          k = @keys.first
-          v = delete(k)
-          [k, v]
-        end
+      def each
+        @keys.each {|key| yield [key, self[key]]}
+      end
 
-        def merge!(other_hash)
-          other_hash.each {|k,v| self[k] = v }
-          self
-        end
+      alias_method :each_pair, :each
 
-        def merge(other_hash)
-          dup.merge!(other_hash)
-        end
+      def clear
+        super
+        @keys.clear
+        self
+      end
 
-        # When replacing with another hash, the initial order of our keys must come from the other hash -ordered or not.
-        def replace(other)
-          super
-          @keys = other.keys
-          self
-        end
+      def shift
+        k = @keys.first
+        v = delete(k)
+        [k, v]
+      end
 
-        # This breaks passing the Hash through Stdin to RubyCocoa
-        # def inspect
-        #   "#<OrderedHash #{super}>"
-        # end
+      def merge!(other_hash)
+        other_hash.each {|k,v| self[k] = v }
+        self
+      end
 
-      private
+      def merge(other_hash)
+        dup.merge!(other_hash)
+      end
 
-        def sync_keys!
-          @keys.delete_if {|k| !has_key?(k)}
-        end
+      # When replacing with another hash, the initial order of our keys must come from the other hash -ordered or not.
+      def replace(other)
+        super
+        @keys = other.keys
+        self
       end
-    else
-      class OrderedHash < ::Hash
+
+      def inspect
+        "#<OrderedHash #{super}>"
+      end
+
+    private
+
+      def sync_keys!
+        @keys.delete_if {|k| !has_key?(k)}
       end
     end
   end
 end
 
 module Plist4r
-  # This is an {ActiveSupport::OrderedHash}
-  class OrderedHash < ActiveSupport::OrderedHash
+  if RUBY_VERSION >= '1.9'
+    # Inheritance
+    #   Ruby 1.9 < Hash
+    #   Ruby 1.8 < ActiveSupport::OrderedHash
+    class OrderedHash < ::Hash
+    end
+  else
+    # Inheritance
+    #   Ruby 1.9 < Hash
+    #   Ruby 1.8 < ActiveSupport::OrderedHash
+    class OrderedHash < Plist4r::ActiveSupport::OrderedHash
+    end
   end
 end
+
+
+

data/lib/plist4r/mixin/ruby_stdlib.rb

@@ -70,6 +70,23 @@ class Array
 end
 
 class Hash
+  # Merge together an array of complex hash structures
+  # @example
+  #   @aohoa1 = {}
+  #   
+  #   @aohoa2 = [
+  #     { :array1 => [:a], :array2 => [:a,:b], :array3 => [:a,:b,:c] },
+  #     { :array1 => [:aa], :array2 => [:aa,:bb], :array3 => [:aa,:bb,:cc] },
+  #     { :array1 => [:aaa], :array2 => [:aaa,:bbb], :array3 => [:aaa,:bbb,:ccc] }
+  #   ]
+  #   
+  #   @aohoa1.merge_array_of_hashes_of_arrays(@aohoa2)
+  #   => { 
+  #     :array1 => [:a,:aa,:aaa], 
+  #     :array2 => [:a,:b,:aa,:bb,:aaa,:bbb], 
+  #     :array3 => [:a,:b,:c,:aa,:bb,:cc,:aaa,:bbb,:ccc]
+  #   }
+  # @see Plist4r::PlistType::Info::ValidKeys
   def merge_array_of_hashes_of_arrays array_of_hashes_of_arrays
     a = array_of_hashes_of_arrays
     raise "not an array_of_hashes_of_arrays" unless a.is_a? Array
@@ -88,6 +105,7 @@ class Hash
     h
   end
 
+  # @see #merge_array_of_hashes_of_arrays
   def merge_array_of_hashes_of_arrays! array_of_hashes_of_arrays
     h = merge_array_of_hashes_of_arrays array_of_hashes_of_arrays
     self.replace h
@@ -186,6 +204,11 @@ class Float
     # @example
     #  16.347.round(2) => 16.35
     def round(n=0)
-        (self * (10.0 ** n)).round_orig * (10.0 ** (-n))
+      sprintf("%#{n}.#{n}f", self).to_f
     end
 end
+
+
+
+
+

data/lib/plist4r/plist.rb

@@ -73,7 +73,7 @@ module Plist4r
     def from_string string=nil
       case string
       when String
-        plist_format = ::Plist4r.string_detect_format(string)
+        plist_format = Plist4r.string_detect_format(string)
         if plist_format
           @from_string = string
           @plist_cache ||= PlistCache.new self
@@ -344,12 +344,12 @@ module Plist4r
     # @see Backend::Example
     def import_hash hash=nil
       case hash
-      when ::Plist4r::OrderedHash
+      when Plist4r::OrderedHash
         @hash = hash
       when nil
         @hash = ::Plist4r::OrderedHash.new
       else
-        raise "Please use ::Plist4r::OrderedHash.new for your hashes"
+        raise "Please use Plist4r::OrderedHash.new for your hashes"
       end
     end
 
@@ -392,11 +392,17 @@ module Plist4r
     # @yield Keep every key-value pair for which the passed block evaluates to true. Works as per the ruby core classes Hash#select method
     def select *keys, &blk
       if block_given?
-        a = @hash.select &blk
+        selection = @hash.select &blk
         old_hash = @hash.deep_clone
         clear
-        a.each do |pair|
-          store pair[0], pair[1]
+        if RUBY_VERSION >= '1.9'
+          selection.each do |key,value|
+            store key, value
+          end
+        else
+          selection.each do |pair|
+            store pair[0], pair[1]
+          end
         end
         keys.each do |k|
           store k, old_hash[k]

data/plist4r.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{plist4r}
-  s.version = "1.0.1"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["dreamcat4"]
-  s.date = %q{2010-07-20}
+  s.date = %q{2010-07-21}
   s.default_executable = %q{plist4r}
   s.description = %q{Plist4r is for editing Plist files in an easy-to-use, fast, and reliabile way. A comprehensive and fully featured Ruby library. Xml and Binary file formats are supported, with backends for Linux and Mac.}
   s.email = %q{dreamcat4@gmail.com}
@@ -29,10 +29,8 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "bin/plist4r",
-    "ext/osx_plist/Makefile",
     "ext/osx_plist/extconf.rb",
     "ext/osx_plist/plist.c",
-    "ext/osx_plist/plist.o",
     "features/plist4r.feature",
     "features/step_definitions/plist4r_steps.rb",
     "features/support/env.rb",

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 0
   - 1
-  version: 1.0.1
+  - 0
+  version: 1.1.0
 platform: ruby
 authors: 
 - dreamcat4
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-20 00:00:00 +01:00
+date: 2010-07-21 00:00:00 +01:00
 default_executable: plist4r
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -110,10 +110,8 @@ files:
 - Rakefile
 - VERSION
 - bin/plist4r
-- ext/osx_plist/Makefile
 - ext/osx_plist/extconf.rb
 - ext/osx_plist/plist.c
-- ext/osx_plist/plist.o
 - features/plist4r.feature
 - features/step_definitions/plist4r_steps.rb
 - features/support/env.rb

data/ext/osx_plist/Makefile

@@ -1,157 +0,0 @@
-
-SHELL = /bin/sh
-
-#### Start of system configuration section. ####
-
-srcdir = .
-topdir = /System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib/ruby/1.8/universal-darwin10.0
-hdrdir = $(topdir)
-VPATH = $(srcdir):$(topdir):$(hdrdir)
-exec_prefix = $(prefix)
-prefix = $(DESTDIR)/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr
-sharedstatedir = $(prefix)/com
-mandir = $(DESTDIR)/usr/share/man
-psdir = $(docdir)
-oldincludedir = $(DESTDIR)/usr/include
-localedir = $(datarootdir)/locale
-bindir = $(exec_prefix)/bin
-libexecdir = $(exec_prefix)/libexec
-sitedir = $(DESTDIR)/Library/Ruby/Site
-htmldir = $(docdir)
-vendorarchdir = $(vendorlibdir)/$(sitearch)
-includedir = $(prefix)/include
-infodir = $(DESTDIR)/usr/share/info
-vendorlibdir = $(vendordir)/$(ruby_version)
-sysconfdir = $(prefix)/etc
-libdir = $(exec_prefix)/lib
-sbindir = $(exec_prefix)/sbin
-rubylibdir = $(libdir)/ruby/$(ruby_version)
-docdir = $(datarootdir)/doc/$(PACKAGE)
-dvidir = $(docdir)
-vendordir = $(libdir)/ruby/vendor_ruby
-datarootdir = $(prefix)/share
-pdfdir = $(docdir)
-archdir = $(rubylibdir)/$(arch)
-sitearchdir = $(sitelibdir)/$(sitearch)
-datadir = $(datarootdir)
-localstatedir = $(prefix)/var
-sitelibdir = $(sitedir)/$(ruby_version)
-
-CC = gcc
-LIBRUBY = $(LIBRUBY_SO)
-LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
-LIBRUBYARG_SHARED = 
-LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)
-
-RUBY_EXTCONF_H = 
-CFLAGS   =  -fno-common -arch i386 -arch x86_64 -g -Os -pipe -fno-common -DENABLE_DTRACE  -fno-common  -pipe -fno-common $(cflags) 
-INCFLAGS = -I. -I$(topdir) -I$(hdrdir) -I$(srcdir)
-DEFS     = 
-CPPFLAGS =   -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE $(DEFS) $(cppflags)
-CXXFLAGS = $(CFLAGS) 
-ldflags  = -L. -arch i386 -arch x86_64  -framework CoreFoundation -undefined suppress -flat_namespace
-dldflags = 
-archflag = 
-DLDFLAGS = $(ldflags) $(dldflags) $(archflag)
-LDSHARED = cc -arch i386 -arch x86_64 -pipe -bundle -undefined dynamic_lookup
-AR = ar
-EXEEXT = 
-
-RUBY_INSTALL_NAME = ruby
-RUBY_SO_NAME = ruby
-arch = universal-darwin10.0
-sitearch = universal-darwin10.0
-ruby_version = 1.8
-ruby = /System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
-RUBY = $(ruby)
-RM = rm -f
-MAKEDIRS = mkdir -p
-INSTALL = /usr/bin/install -c
-INSTALL_PROG = $(INSTALL) -m 0755
-INSTALL_DATA = $(INSTALL) -m 644
-COPY = cp
-
-#### End of system configuration section. ####
-
-preload = 
-
-libpath = . $(libdir)
-LIBPATH =  -L. -L$(libdir)
-DEFFILE = 
-
-CLEANFILES = mkmf.log
-DISTCLEANFILES = 
-
-extout = 
-extout_prefix = 
-target_prefix = /plist4r/backend/osx_plist/ext
-LOCAL_LIBS = 
-LIBS = $(LIBRUBYARG_SHARED)  -lpthread -ldl  
-SRCS = plist.c
-OBJS = plist.o
-TARGET = osx_plist
-DLLIB = $(TARGET).bundle
-EXTSTATIC = 
-STATIC_LIB = 
-
-BINDIR        = $(bindir)
-RUBYCOMMONDIR = $(sitedir)$(target_prefix)
-RUBYLIBDIR    = $(sitelibdir)$(target_prefix)
-RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
-
-TARGET_SO     = $(DLLIB)
-CLEANLIBS     = $(TARGET).bundle $(TARGET).il? $(TARGET).tds $(TARGET).map
-CLEANOBJS     = *.o *.a *.s[ol] *.pdb *.exp *.bak
-
-all:		$(DLLIB)
-static:		$(STATIC_LIB)
-
-clean:
-		@-$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES)
-
-distclean:	clean
-		@-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
-		@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES)
-
-realclean:	distclean
-install: install-so install-rb
-
-install-so: $(RUBYARCHDIR)
-install-so: $(RUBYARCHDIR)/$(DLLIB)
-$(RUBYARCHDIR)/$(DLLIB): $(DLLIB)
-	$(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
-install-rb: pre-install-rb install-rb-default
-install-rb-default: pre-install-rb-default
-pre-install-rb: Makefile
-pre-install-rb-default: Makefile
-$(RUBYARCHDIR):
-	$(MAKEDIRS) $@
-
-site-install: site-install-so site-install-rb
-site-install-so: install-so
-site-install-rb: install-rb
-
-.SUFFIXES: .c .m .cc .cxx .cpp .C .o
-
-.cc.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
-
-.cxx.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
-
-.cpp.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
-
-.C.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
-
-.c.o:
-	$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) -c $<
-
-$(DLLIB): $(OBJS) Makefile
-	@-$(RM) $@
-	$(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)
-
-
-
-$(OBJS): ruby.h defines.h