property-list 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a77c93353f4ae1b3e24f38e0976a133a68251ec
-  data.tar.gz: 2c68650d8755fc85dd1752951e930f153624a372
+  metadata.gz: 3c5d4e0a084175a1ea51a31be189467896203dc9
+  data.tar.gz: 796a23fede74ba3c0bcf9bd767963c3d7630123e
 SHA512:
-  metadata.gz: 786bb0eaba6ebf83dee461f951ce9966b51c649e945fd1a06ebb3d6a7176ebd886abb6c773172ae85455a310a23a9b93ed00b567b18d58b5bc74cc4696985e4d
-  data.tar.gz: 4c64f96962192fa6cea63ceb476baaa9129996ec33f322465134b169b19b270ff136836419ca18ddd96fe5a804a35948fa89bdb6c0f8dc89dc4cc8fee4f10ed4
+  metadata.gz: 8dab686da733d62fc7dc66215b8f2df1d101fd12d73b82e385b4795ca83bdc1979e388cab4e94e2a6e88f7b73abe997cf0f7fdf0159c0e3522ace940a8f197b8
+  data.tar.gz: 1781700ecee2756062c5d45f6308e1bd7d90fc2f48172b9b03a52c6bf7b00b32b51e59fcb5442ce457cafb1859d624b836a83610a58fdcbd8d9f20d860858614

data/.travis.yml

@@ -0,0 +1,14 @@
+sudo: false
+language: ruby
+rvm:
+  - 2.0.0-p648 # macOS
+  - 2.1.10
+  - 2.2.7
+  - 2.3.4
+  - 2.4.1
+  - ruby-head
+  - jruby-head
+  - rbx-3.72
+before_install: gem install bundler -v '~> 1.15' --conservative
+install: bundle install
+script: CI_COVERAGE=1 bundle exec rake

data/README.md

@@ -1,10 +1,14 @@
-Fully featured propertylist library.
-Can load and dump XML/ASCII/Binary plists and offer fine-grained formatting options.
+[![Build Status](https://travis-ci.org/luikore/property-list.svg?branch=master)](https://travis-ci.org/luikore/property-list)
+[![Gem Version](https://badge.fury.io/rb/property-list.svg)](https://badge.fury.io/rb/property-list)
+[![Coverage Status](https://coveralls.io/repos/github/luikore/property-list/badge.svg?branch=master)](https://coveralls.io/github/luikore/property-list?branch=master)
+
+Fully featured plist library.
+Can load and dump XML/ASCII/Binary/SMIME propertylist and offer fine-grained formatting options.
 Cross platform, clean code, performance tuned, no dependency.
 
 ## Install
 
-Requires Ruby 1.9+
+Requires Ruby 2.0+
 
     gem ins property-list
 
@@ -23,9 +27,9 @@ Generate a plist file data
     PropertyList.dump_binary obj
     PropertyList.dump_ascii obj
 
-XML formatting options for `PropertyList.dump_xml object, options`
+**XML formatting** options for `PropertyList.dump_xml object, options`
 
-- `segment:` whether output an XML segment (not wrapped with `<?xml>`, `<DOCTYPE>`, `<plist>` tags), default is `false`.
+- `segment:` whether output an XML segment (not wrapped with `<?xml>, <DOCTYPE>, <plist>` tags), default is `false`.
 - `xml_version:` you can also specify `"1.1"` for https://www.w3.org/TR/xml11/, default is `"1.0"`, no effect if `:segment` is set to `true`.
 - `gnu_dtd:` use GNUStep DTD instead (which is a bit different in string escaping), default is `false`.
 - `indent_unit:` the indent unit, default value is `"\t"`, set to or `''` if you don't need indent.
@@ -33,44 +37,78 @@ XML formatting options for `PropertyList.dump_xml object, options`
 - `base64_width:` the width of characters per line when serializing data with Base64, default value is `68`, must be multiple of `4`.
 - `base64_indent:` whether indent the Base64 encoded data, you can use `false` for compatibility to generate same output for other frameworks, default value is `true`.
 
-ASCII formatting options for `PropertyList.dump_ascii object, options`
+**ASCII formatting** options for `PropertyList.dump_ascii object, options`
 
 - `indent_unit:` the indent unit, default value is `"\t"`, set to `''` if you don't need indent.
 - `initial_indent:` initial indent space, default is `''`, the indentation per line equals to `initial_indent + indent * current_indent_level`.
 - `wrap:` wrap the top level output with `{...}` when obj is a Hash, default is `true`.
 - `encoding_comment:` add encoding comment `// !$*UTF8*$!` on top of file, default is `false`.
 - `sort_keys:` sort dict keys, default is `true`.
-- `gnu_extension` whether allow GNUStep extensions for ASCII plist to support serializing more types, default is `true`.
+- `gnu_extension:` whether allow GNUStep extensions for ASCII plist to support serializing more types, default is `true`.
 
 ## Data type mapping
 
-Data type mapping in `PropertyList.load`:
-
-    real:    Float
-    string:  String
-    integer: Integer
-    data:    StringIO
-    date:    DateTime
-    true:    true
-    false:   false
-    uid:     PropertyList::UID  # only in binary plist, obj.uid is the integer index
-    array:   Array
-    dict:    Hash
-    set:     Set                # only in binary plist
-
-Reverse mapping in `PropertyList.dump_*`:
-
-    Float:                real
-    String, Symbol:       string
-    Integer:              integer
-    StringIO, IO:         data
-    Time, DateTime, Date: date
-    true:                 true
-    false:                false
-    PropertyList::Uid:    uid      # only in binary plist
-    Dict:                 dict
-    Array:                array
-    Set:                  set      # only in binary plist
+When loading, plist data types will be mapped to native Ruby types:
+
+    Plist type     Ruby type
+    ------------------------------
+    real           Float
+    string         String
+    unicode_string String
+    integer        Integer
+    data           StringIO
+    date           DateTime
+    true           TrueClass
+    false          FalseClass
+    uid            PropertyList::Uid [*1]
+    array          Array
+    dict           Hash
+
+    # binary plist v1x elements:
+
+    null           NilClass
+    set            Set
+    ordset         PropertyList::OrdSet
+    uuid           PropertyList::Uuid
+    url_base       PropertyList::Url [*2]
+    url_no_base    PropertyList::Url
+
+Notes:
+
+- \[\*1] **uid** is only available in binary plist, `PropertyList::Uid#uid` is the integer index.
+- \[\*2] **url_base** means URL with base.
+
+When dumping, native Ruby types will be mapped to plist data types:
+
+    Ruby type             Plist type
+    -----------------------------------
+    Float                 real
+    String                string, unicode_string
+    Symbol                string, unicode_string
+    Integer               integer
+    StringIO              data
+    IO                    data
+    Time                  date
+    DateTime              date
+    Date                  date
+    true                  true
+    false                 false
+    PropertyList::Uid     uid
+    Dict                  dict
+    Array                 array
+    Set                   set
+
+    # binary plist v1x elements:
+
+    NilClass              null
+    Set                   set
+    PropertyList::OrdSet  ordset
+    PropertyList::Uuid    uuid
+    PropertyList::Url     url_base, url_no_base
+
+Notes:
+
+- `PropertyList::Uid` and `Set` can only be serialized in binary plist.
 
 Type mappings in ASCII plist depends on the DTD.
 
@@ -81,4 +119,4 @@ The binary generating code is modified from https://github.com/jarib/plist with
 ## Alternative plist libraries for Ruby
 
 - [plist](https://github.com/patsplat/plist): only deals with XML plist, and generates wrong plist when there is handle line endings in strings.
-- [CFPropertyList](https://github.com/ckruse/CFPropertyList): also deals with XML/Binary/ASCII plist files, more complex API and more thourough tests.
+- [CFPropertyList](https://github.com/ckruse/CFPropertyList): also deals with XML/Binary/ASCII plist files, but not v1x binary plist, more hard-to-use API and more thourough tests.

data/Rakefile

@@ -1,3 +1,6 @@
+desc "default task"
+task default: :test
+
 desc "run tests"
 task :test do
   Dir.glob './test/test_*.rb' do |f|

data/gems.locked

@@ -1,12 +1,13 @@
-PATH
-  remote: .
-  specs:
-    property-list (1.0)
-
 GEM
   remote: https://rubygems.org/
   specs:
     coderay (1.1.1)
+    coveralls (0.8.21)
+      json (>= 1.8, < 3)
+      simplecov (~> 0.14.1)
+      term-ansicolor (~> 1.3)
+      thor (~> 0.19.4)
+      tins (~> 1.6)
     docile (1.1.5)
     hoe (3.16.1)
       rake (>= 0.8, < 13.0)
@@ -23,19 +24,23 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
     slop (3.6.0)
+    term-ansicolor (1.6.0)
+      tins (~> 1.0)
     test-unit (1.2.3)
       hoe (>= 1.5.1)
+    thor (0.19.4)
+    tins (1.15.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.15.4)
-  property-list!
-  pry (~> 0.10.4)
-  rake (~> 12.0.0)
-  simplecov (~> 0.14.1)
-  test-unit (~> 1.2.3)
+  bundler (~> 1.15)
+  coveralls
+  pry (~> 0.10)
+  rake (~> 12.0)
+  simplecov (~> 0.14)
+  test-unit (~> 1.2)
 
 BUNDLED WITH
    1.15.4

data/gems.rb

@@ -1,3 +1,8 @@
 source "https://rubygems.org"
 
-gemspec
+gem "bundler", "~> 1.15"
+gem "rake", "~> 12.0"
+gem "test-unit", "~> 1.2"
+gem "pry", "~> 0.10"
+gem "simplecov", "~> 0.14", require: false
+gem 'coveralls', require: false

data/lib/property-list/ascii_parser.rb

@@ -130,18 +130,21 @@ module PropertyList
             chars << "\r"
           when 't'
             chars << "\t"
-          when 'U'
+          when 'U', 'u'
             if (hex = @lexer.scan /[0-9a-h]{4}/i)
-              chars << [hex].pack('U')
+              chars << [hex.to_i(16)].pack('U')
             else
               syntax_error "Expect 4 digit hex code"
             end
-          else
-            if (oct = @lexer.scan /[0-7]{3}/)
-              chars << [oct.to_i(8)].pack('U')
+          when /(\d)/
+            oct_init = $1
+            if (oct = @lexer.scan /[0-7]{2}/)
+              chars << [(oct_init + oct).to_i(8)].pack('U')
             else
               syntax_error "Expect 3 digit oct code"
             end
+          else
+            syntax_error "Bad escape"
           end
         else
           chars << ch
@@ -211,7 +214,7 @@ module PropertyList
     def syntax_error msg
       pre = @lexer.string[0...@lexer.pos]
       line = pre.count("\n") + 1
-      col = pre.size - pre.rindex("\n")
+      col = pre.size - (pre.rindex("\n") || -1)
       raise SyntaxError, msg + " at line: #{line} col: #{col} #{@lexer.inspect}", caller
     end
   end

data/lib/property-list/binary_generator.rb

@@ -5,6 +5,7 @@ module PropertyList
   def self.dump_binary obj, options=nil
     generator = BinaryGenerator.new options
     generator.generate obj
+    binding.pry if $test
     generator.output.join
   end
 
@@ -15,109 +16,95 @@ module PropertyList
   class BinaryGenerator #:nodoc:
     include BinaryMarkers
 
+    Collection = Struct.new :marker, :size, :refs
+
+    V0_MAGIC = "bplist00".force_encoding('binary').freeze
+    V1_MAGIC = "bplist10".force_encoding('binary').freeze
+    TAIL_PADDING = "\0\0\0\0\0\0".force_encoding('binary').freeze
+
     def initialize opts
       @output = []
       @offset = 0
+      @objs = []
+      @ref_size = 0
     end
     attr_reader :output
 
-    # Encodes +obj+ as a binary property list. If +obj+ is an Array, Hash, or
-    # Set, the property list includes its contents.
-    def generate object
-      flatten_objects = flatten_collection object
-      ref_byte_size = min_byte_size flatten_objects.size - 1
+    def generate obj
+      flatten obj
+      ref_byte_size = min_byte_size @ref_size - 1
 
-      # Write header and encoded objects.
-      # TODO use bplist10 when there are version 1x elements
-      add_output "bplist00"
+      add_output V0_MAGIC
       offset_table = []
-      flatten_objects.each do |o|
+      @objs.each do |o|
         offset_table << @offset
         binary_object o, ref_byte_size
       end
 
-      # Write offset table.
+      if @v1
+        @output[0] = V1_MAGIC
+      end
+
       offset_table_addr = @offset
       offset_byte_size = min_byte_size @offset
       offset_table.each do |offset|
         binary_integer offset, offset_byte_size
       end
 
-      # Write trailer. (6 + 2 + 24 = 32 bytes)
-      add_output [
-        "\0\0\0\0\0\0", # padding
+      add_output pack([
+        TAIL_PADDING,
         offset_byte_size, ref_byte_size,
-        flatten_objects.size,
+        @ref_size,
         0, # index of root object
         offset_table_addr
-      ].pack("a*C2Q>3")
+      ], "a*C2Q>3")
     end
 
-    private
+    def flatten obj
+      @ref_size += 1
 
-    # Takes an object (nominally a collection, like an Array, Set, or Hash, but
-    # any object is acceptable) and flattens it into a one-dimensional array.
-    # Non-collection objects appear in the array as-is, but the contents of
-    # Arrays, Sets, and Hashes are modified like so: (1) The contents of the
-    # collection are added, one-by-one, to the one-dimensional array. (2) The
-    # collection itself is modified so that it contains indexes pointing to the
-    # objects in the one-dimensional array. Here's an example with an Array:
-    #
-    #   ary = [:a, :b, :c]
-    #   flatten_collection(ary) # => [[1, 2, 3], :a, :b, :c]
-    #
-    # In the case of a Hash, keys and values are both appended to the one-
-    # dimensional array and then replaced with indexes.
-    #
-    #   hsh = {:a => "blue", :b => "purple", :c => "green"}
-    #   flatten_collection(hsh)
-    #   # => [{1 => 2, 3 => 4, 5 => 6}, :a, "blue", :b, "purple", :c, "green"]
-    #
-    # An object will never be added to the one-dimensional array twice. If a
-    # collection refers to an object more than once, the object will be added
-    # to the one-dimensional array only once.
-    #
-    #   ary = [:a, :a, :a]
-    #   flatten_collection(ary) # => [[1, 1, 1], :a]
-    #
-    # The +obj_list+ and +id_refs+ parameters are private; they're used for
-    # descending into sub-collections recursively.
-    def flatten_collection collection, obj_list=[], id_refs={}
-      case collection
-      when Array, Set
-        if id_refs[collection.object_id]
-          return obj_list[id_refs[collection.object_id]]
+      case obj
+      when Array
+        refs = []
+        @objs << Collection[MARKER_ARRAY, obj.size, refs]
+        obj.each do |e|
+          refs << @ref_size
+          flatten e
         end
-        obj_refs = collection.class.new
-        id_refs[collection.object_id] = obj_list.length
-        obj_list << obj_refs
-        collection.each do |obj|
-          flatten_collection(obj, obj_list, id_refs)
-          obj_refs << id_refs[obj.object_id]
+
+      when Set
+        @v1 = true
+        refs = []
+        @objs << Collection[MARKER_SET, obj.size, refs]
+        obj.each do |e|
+          refs << @ref_size
+          flatten e
         end
-        return obj_list
 
       when Hash
-        if id_refs[collection.object_id]
-          return obj_list[id_refs[collection.object_id]]
+        refs = []
+        @objs << Collection[MARKER_DICT, obj.size, refs]
+        obj.each do |e, _|
+          refs << @ref_size
+          flatten e
         end
-        obj_refs = {}
-        id_refs[collection.object_id] = obj_list.length
-        obj_list << obj_refs
-        collection.keys.sort.each do |key|
-          value = collection[key]
-          key = key.to_s if key.is_a?(Symbol)
-          flatten_collection(key, obj_list, id_refs)
-          flatten_collection(value, obj_list, id_refs)
-          obj_refs[id_refs[key.object_id]] = id_refs[value.object_id]
+        obj.each do |_, e|
+          refs << @ref_size
+          flatten e
         end
-        return obj_list
-      else
-        unless id_refs[collection.object_id]
-          id_refs[collection.object_id] = obj_list.length
-          obj_list << collection
+
+      when OrdSet
+        @v1 = true
+        refs = []
+        elements = obj.elements
+        @objs << Collection[MARKER_ORD_SET, elements.size, refs]
+        elements.each do |e|
+          refs << @ref_size
+          flatten e
         end
-        return obj_list
+
+      else
+        @objs << obj
       end
     end
 
@@ -126,92 +113,72 @@ module PropertyList
       @offset += data.bytesize
     end
 
-    # Returns a binary property list fragment that represents +obj+. The
-    # returned string is not a complete property list, just a fragment that
-    # describes +obj+, and is not useful without a header, offset table, and
-    # trailer.
-    #
-    # The following classes are recognized: String, Float, Integer, the Boolean
-    # classes, Time, IO, StringIO, Array, Set, and Hash. IO and StringIO
-    # objects are rewound, read, and the contents stored as data (i.e., Cocoa
-    # applications will decode them as NSData). All other classes are dumped
-    # with Marshal and stored as data.
-    #
-    # Note that subclasses of the supported classes will be encoded as though
-    # they were the supported superclass. Thus, a subclass of (for example)
-    # String will be encoded and decoded as a String, not as the subclass:
-    #
-    #   class ExampleString < String
-    #     ...
-    #   end
-    #
-    #   s = ExampleString.new("disquieting plantlike mystery")
-    #   encoded_s = binary_object(s)
-    #   decoded_s = decode_binary_object(encoded_s)
-    #   puts decoded_s.class # => String
-    #
-    # +ref_byte_size+ is the number of bytes to use for storing references to
-    # other objects.
     def binary_object obj, ref_byte_size = 4
       case obj
       when Symbol
         binary_string obj.to_s
       when String
         binary_string obj
-      when URL
-        binary_url obj.url
       when Float
-        add_output [(MARKER_REAL | 3), obj].pack("CG")
+        add_output pack([(MARKER_REAL | 3), obj], "CG")
       when Integer
         nbytes = min_byte_size obj
         size_bits = { 1 => 0, 2 => 1, 4 => 2, 8 => 3, 16 => 4 }[nbytes]
-        add_output (MARKER_INT | size_bits).chr
+        add_output chr(MARKER_INT | size_bits)
         binary_integer obj, nbytes
       when TrueClass
-        add_output MARKER_TRUE.chr
+        add_output chr(MARKER_TRUE)
       when FalseClass
-        add_output MARKER_FALSE.chr
+        add_output chr(MARKER_FALSE)
       when Time
-        add_output [MARKER_DATE, obj.to_f - TIME_INTERVAL_SINCE_1970].pack("CG")
+        add_output pack([MARKER_DATE, obj.to_f - TIME_INTERVAL_SINCE_1970], "CG")
       when Date # also covers DateTime
-        add_output [MARKER_DATE, obj.to_time.to_f - TIME_INTERVAL_SINCE_1970].pack("CG")
-      when IO, StringIO
+        add_output pack([MARKER_DATE, obj.to_time.to_f - TIME_INTERVAL_SINCE_1970], "CG")
+      when StringIO
+        data = obj.string.force_encoding('binary') # NOTE StringIO.binmode doesn't work in <2.0.0 & rbx
+        binary_marker MARKER_DATA, data.bytesize
+        add_output data
+      when IO
         obj.rewind
         obj.binmode
         data = obj.read
         binary_marker MARKER_DATA, data.bytesize
         add_output data
-      when Array
-        # Must be an array of object references as returned by flatten_collection.
-        binary_marker MARKER_ARRAY, obj.size
-        obj.each do |i|
-          binary_integer i, ref_byte_size
-        end
-      when Set
-        # Must be a set of object references as returned by flatten_collection.
-        binary_marker MARKER_SET, obj.size
-        obj.each do |i|
+      when Collection
+        binary_marker obj.marker, obj.size
+        obj.refs.each do |i|
           binary_integer i, ref_byte_size
         end
-      when Hash
-        # Must be a table of object references as returned by flatten_collection.
-        binary_marker MARKER_DICT, obj.size
-        obj.keys.each do |k|
-          binary_integer k, ref_byte_size
-        end
-        obj.values.each do |v|
-          binary_integer v, ref_byte_size
-        end
+      when Uid
+        # Encoding is as integers, except values are unsigned.
+        nbytes = min_byte_size obj.uid
+        size_bits = { 1 => 0, 2 => 1, 4 => 2, 8 => 3, 16 => 4 }[nbytes]
+        add_output chr(MARKER_UID | size_bits)
+        binary_integer obj.uid, nbytes
+
+      ## the following are v1x data types ##
+
+      when Uuid
+        @v1 = true
+        data = pack([obj.uuid], 'H*')
+        add_output chr(MARKER_UUID)
+        add_output data
+      when Url
+        @v1 = true
+        binary_url obj
+      when NilClass
+        @v1 = true
+        add_output chr(MARKER_NULL)
       else
-        raise "Unsupported class: #{obj.class}"
+        raise UnsupportedTypeError, obj.class.to_s
       end
     end
 
     def binary_marker marker, size
       if size < 15
-        add_output (marker | size).chr
+        add_output chr(marker | size)
       else
-        add_output (marker | 0xf).chr
+        add_output chr(marker | 0xf)
         binary_object size
       end
     end
@@ -233,22 +200,21 @@ module PropertyList
     end
 
     def binary_url obj
-      @v1 = true
-      if obj =~ /\A\w+:/
-        add_output MARKER_WITH_BASE_URL.chr
+      if obj.url =~ /\A\w+:\/\//
+        add_output chr(MARKER_WITH_BASE_URL)
       else
-        add_output MARKER_NO_BASE_URL.chr
+        add_output chr(MARKER_NO_BASE_URL)
       end
-      binary_marker MARKER_ASCII_STRING, obj.bytesize
-      add_output obj
+      binary_marker MARKER_ASCII_STRING, obj.url.bytesize
+      add_output obj.url
     end
 
-    def binary_uuid obj
-      # TODO
+    def chr c
+      c.chr.force_encoding 'binary'
     end
 
-    def binary_ordered_set obj
-      # TODO
+    def pack objs, format
+      objs.pack(format).force_encoding 'binary'
     end
 
     # Packs an integer +i+ into its binary representation in the specified
@@ -260,19 +226,19 @@ module PropertyList
       end
       case num_bytes
       when 1
-        add_output [i].pack("C")
+        add_output pack([i], "C")
       when 2
-        add_output [i].pack("n")
+        add_output pack([i], "n")
       when 4
-        add_output [i].pack("N")
+        add_output pack([i], "N")
       when 8
-        add_output [i].pack("q>")
+        add_output pack([i], "q>")
       when 16
         # TODO verify 128 bit integer encoding
         if i < 0
           i = 0xffff_ffff_ffff_ffff_ffff_ffff_ffff_ffff ^ i.abs + 1
         end
-        add_output [i >> 64, i & 0xffff_ffff_ffff_ffff].pack("q>2")
+        add_output pack([i >> 64, i & 0xffff_ffff_ffff_ffff], "q>2")
       else
         raise ArgumentError, "num_bytes must be 1, 2, 4, 8, or 16"
       end

data/lib/property-list/binary_parser.rb

@@ -24,36 +24,26 @@ module PropertyList
     private
 
     def decode_object offset
-      first_byte, = @src.unpack "@#{offset}C"
+      first_byte, _ = @src.unpack "@#{offset}C"
       marker = first_byte & 0xF0
       if marker == 0 or first_byte == MARKER_DATE
         marker = first_byte
       end
 
       case marker
-      when MARKER_NULL
-        nil
       when MARKER_FALSE
         false
       when MARKER_TRUE
         true
-      when MARKER_NO_BASE_URL
-        raise 'todo'
-      when MARKER_WITH_BASE_URL
-        raise 'todo'
-      when MARKER_UUID
-        raise 'todo'
-      when MARKER_FILL
-        decode_object offest + 1
       when MARKER_INT
         size_bits = first_byte & 0x0F
         num_bytes = 2 ** size_bits
         decode_integer offset + 1, num_bytes
       when MARKER_REAL
-        r, = @src.unpack "@#{offset + 1}G"
+        r, _ = @src.unpack "@#{offset + 1}G"
         r
       when MARKER_DATE
-        seconds_since_2001, = @src.unpack "@#{offset + 1}G"
+        seconds_since_2001, _ = @src.unpack "@#{offset + 1}G"
         Time.at(TIME_INTERVAL_SINCE_1970 + seconds_since_2001).to_datetime
       when MARKER_DATA
         data = @src.byteslice *(decode_vl_info offset)
@@ -64,13 +54,7 @@ module PropertyList
         str_offset, str_size = decode_vl_info offset
         s = @src.byteslice str_offset, str_size * 2
         s.force_encoding('utf-16be').encode 'utf-8'
-      when MARKER_UTF8_STRING
-        s = @src.byteslice *(decode_vl_info offset)
-        s.force_encoding 'utf-8'
       when MARKER_UID
-        # Encoding is as integers, except values are unsigned.
-        # These are used extensively in files written using NSKeyedArchiver, a serializer for Objective-C objects.
-        # The value is the index in parse_result["$objects"]
         size = (first_byte & 0xF) + 1
         bytes = @src.byteslice offset + 1, size
         res = 0
@@ -78,21 +62,13 @@ module PropertyList
           res *= 256
           res += byte
         end
-        UID[res]
+        Uid.new res
       when MARKER_ARRAY
         offset, size = decode_vl_info offset
         size.times.map do |i|
           id = decode_ref_id offset + i * @ref_byte_size
           decode_id id
         end
-      when MARKER_ORD_SET, MARKER_SET
-        r = Set.new
-        offset, size = decode_vl_info offset
-        size.times do |i|
-          id = decode_ref_id offset + i * @ref_byte_size
-          r << (decode_id id)
-        end
-        r
       when MARKER_DICT
         offset, size = decode_vl_info offset
         keys_byte_size = @ref_byte_size * size
@@ -107,18 +83,52 @@ module PropertyList
         end
         entries.sort_by! &:first
         Hash[entries]
+
+      ## the following are v1x data types ##
+
+      when MARKER_UTF8_STRING
+        s = @src.byteslice *(decode_vl_info offset)
+        s.force_encoding 'utf-8'
+      when MARKER_ORD_SET
+        r = []
+        offset, size = decode_vl_info offset
+        size.times do |i|
+          id = decode_ref_id offset + i * @ref_byte_size
+          r << (decode_id id)
+        end
+        OrdSet.new r
+      when MARKER_SET
+        r = Set.new
+        offset, size = decode_vl_info offset
+        size.times do |i|
+          id = decode_ref_id offset + i * @ref_byte_size
+          r << (decode_id id)
+        end
+        r
+      when MARKER_NULL
+        nil
+      when MARKER_NO_BASE_URL, MARKER_WITH_BASE_URL
+        # TODO check with real v1x plist
+        url = decode_object offset + 1
+        Url.new url
+      when MARKER_UUID
+        bytes = @src.byteslice offset + 1, 16
+        hex, _ = bytes.unpack 'H*'
+        Uuid.new hex.upcase
+      when MARKER_FILL
+        decode_object offest + 1
       else
         raise "unused marker: 0b#{marker.to_s(2).rjust 8, '0'}"
       end
     end
 
     def decode_vl_info offset
-      marker, = @src.unpack "@#{offset}C"
+      marker, _ = @src.unpack "@#{offset}C"
       vl_size_bits = marker & 0x0F
 
       if vl_size_bits == 0x0F
         # size is followed by marker int
-        int_marker, = @src.unpack "@#{offset + 1}C"
+        int_marker, _ = @src.unpack "@#{offset + 1}C"
         num_bytes = 2 ** (int_marker & 0x0F)
         size = decode_integer offset + 2, num_bytes
         [offset + 2 + num_bytes, size]
@@ -151,13 +161,13 @@ module PropertyList
       # NOTE: only num_bytes = 8 or 16 it can be negative
       case num_bytes
       when 1
-        i, = @src.unpack "@#{offset}C"
+        i, _ = @src.unpack "@#{offset}C"
       when 2
-        i, = @src.unpack "@#{offset}n"
+        i, _ = @src.unpack "@#{offset}n"
       when 4
-        i, = @src.unpack "@#{offset}N"
+        i, _ = @src.unpack "@#{offset}N"
       when 8
-        i, = @src.unpack "@#{offset}q>"
+        i, _ = @src.unpack "@#{offset}q>"
       when 16
         hi, lo = @src.unpack "@#{offset}q>2"
         i = (hi << 64) | lo

data/lib/property-list/version.rb

@@ -1,3 +1,3 @@
 module PropertyList
-  VERSION = '1.0.2'.freeze
+  VERSION = '1.0.3'.freeze
 end

data/lib/property-list/xml_generator.rb

@@ -4,7 +4,7 @@ module PropertyList
   #
   # Options:
   #
-  # - `segment:` whether output an XML segment (not wrapped with `<?xml>`, `<DOCTYPE>`, `<plist>` tags), default is `false`.
+  # - `segment:` whether output an XML segment (not wrapped with `<?xml>, <DOCTYPE>, <plist>` tags), default is `false`.
   # - `xml_version:` you can also specify `"1.1"` for https://www.w3.org/TR/xml11/, default is `"1.0"`, no effect if `:segment` is set to `true`.
   # - `gnu_dtd:` use GNUStep DTD instead (which is a bit different in string escaping), default is `false`.
   # - `indent_unit:` the indent unit, default value is `"\t"`, set to or `''` if you don't need indent.
@@ -124,10 +124,6 @@ module PropertyList
       @output << "#@indent<data>\n#{base64}#@indent</data>\n"
     end
 
-    def comment_tag content
-      @output << "#@indent<!-- #{content} -->\n"
-    end
-
     def tag name, contents=nil
       if block_given?
         @output << "#@indent<#{name}>\n"

data/lib/property-list/xml_parser.rb

@@ -22,7 +22,6 @@ module PropertyList
       # TODO xml_encoding = xml_declaration.match(/(?:\A|\s)encoding=(?:"(.*?)"|'(.*?)')(?:\s|\Z)/)
 
       skip_space_and_comments
-      # TODO doctype should co-exist with xml
       @lexer.skip(/\s*<!DOCTYPE\s+.*?>/m)
       skip_space_and_comments
 
@@ -115,7 +114,7 @@ module PropertyList
     def syntax_error msg
       pre = @lexer.string[0...@lexer.pos]
       line = pre.count("\n") + 1
-      col = pre.size - pre.rindex("\n")
+      col = pre.size - (pre.rindex("\n") || -1)
       raise SyntaxError, msg + " at line: #{line} col: #{col} #{@lexer.inspect}", caller
     end
   end

data/lib/property-list.rb

@@ -44,38 +44,69 @@ module PropertyList
 
   # binary plist v0x elements:
 
-  class UID
+  # These are used extensively in files written using NSKeyedArchiver, a serializer for Objective-C objects.
+  # The value is the index in parse_result["$objects"]
+  #
+  # call-seq:
+  #
+  #     PropertyList::Uid.new 34
+  class Uid
     def initialize uid
       @uid = uid
     end
+
     attr_reader :uid
+
+    def == other
+      other.is_a?(Uid) and @uid == other.uid
+    end
   end
 
   # binary plist v1x elements:
 
-  class URL
+  # call-seq:
+  #
+  #     PropertyList::Url.new 'http://foo.com' # with base
+  #     PropertyList::Url.new '/foo.com'       # no base
+  class Url
     def initialize url
       @url = url
     end
+
     attr_reader :url
+
+    def == other
+      other.is_a?(Url) and @url == other.url
+    end
   end
 
-  class UUID
+  # call-seq:
+  #
+  #     PropertyList::Uuid.new 'F' * 32
+  class Uuid
     def initialize uuid
       @uuid = uuid
     end
+
     attr_reader :uuid
+
+    def == other
+      other.is_a?(Uuid) and @uuid == other.uuid
+    end
   end
 
-  class OrderedSet
+  # call-seq:
+  #
+  #     PropertyList::OrdSet.new ['foo', 'bar', 3, 4]
+  class OrdSet
     def initialize elements
       @elements = elements.uniq
     end
 
-    def each
-      @elements.each do |e|
-        yield e
-      end
+    attr_reader :elements
+
+    def == other
+      other.is_a?(OrdSet) and @elements == other.elements
     end
   end
 end

data/property-list.gemspec

@@ -1,24 +1,29 @@
 require_relative 'lib/property-list/version'
 
+class Array
+  if ![].respond_to?(:grep_v)
+    def grep_v reg
+      self - grep(reg)
+    end
+  end
+end
+
+puts 'wa?'
 Gem::Specification.new do |spec|
   spec.name          = "property-list"
   spec.version       = PropertyList::VERSION
-  spec.authors       = ["Luikore"]
+  puts 'gsd'
+  spec.author        = "Luikore"
+  puts 'hmm'
   spec.email         = 'no@email'
 
-  spec.summary       = "Property List (plist, propertylist) library with all formats support"
-  spec.description   = "Fully featured propertylist library.
-Can load and dump XML/ASCII/Binary plists and offer fine-grained formatting options.
+  spec.summary       = "Property list (plist) library with all formats support"
+  spec.description   = "Fully featured property_plist library.
+Can load and dump XML/ASCII/Binary/SMIME propertyplist and offer fine-grained formatting options.
 Cross platform, clean code, performance tuned, no dependency."
   spec.homepage      = "https://github.com/luikore/property-list"
   spec.license       = "BSD-3-Clause"
 
   spec.files = `git ls-files -z`.split("\x0").grep_v %r{^(test|spec|features)/}
   spec.require_paths = ["lib"]
-
-  spec.add_development_dependency "bundler", "~> 1.15"
-  spec.add_development_dependency "rake", "~> 12.0"
-  spec.add_development_dependency "test-unit", "~> 1.2"
-  spec.add_development_dependency "pry", "~> 0.10"
-  spec.add_development_dependency "simplecov", "~> 0.14"
 end

metadata

@@ -1,88 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: property-list
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Luikore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-13 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.15'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.15'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '12.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '12.0'
-- !ruby/object:Gem::Dependency
-  name: test-unit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.10'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.10'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.14'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.14'
+date: 2017-09-15 00:00:00.000000000 Z
+dependencies: []
 description: |-
-  Fully featured propertylist library.
-  Can load and dump XML/ASCII/Binary plists and offer fine-grained formatting options.
+  Fully featured property_plist library.
+  Can load and dump XML/ASCII/Binary/SMIME propertyplist and offer fine-grained formatting options.
   Cross platform, clean code, performance tuned, no dependency.
 email: no@email
 executables: []
@@ -91,6 +21,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rdoc_options"
+- ".travis.yml"
 - LICENSE
 - README.md
 - Rakefile
@@ -126,8 +57,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
-summary: Property List (plist, propertylist) library with all formats support
+summary: Property list (plist) library with all formats support
 test_files: []