nanaimo 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5c776733dc2e81f8c653f7825a5313a7cb1c0e8588f76c6bc07178ee6dc1486
-  data.tar.gz: fe1b3fdacf28874194c37fc0c112202f972c251979e444fa31832f04fbd266d8
+  metadata.gz: c1081493a2517a57bb1e78617df2d88f088ab01a5d67b349ca6bdb7a1b0abfc5
+  data.tar.gz: 7a654acc8e0e8f792a584d3dab347a29fc6cb6e18d8a79e55d0a83cfbf6574ff
 SHA512:
-  metadata.gz: b40376d8b00dc4cbed495c40503f0b5f7b99b1bb8f68f383eab8de510940db9277d3704e6ee5cdb85159124f22938c32412430099813aff25f14118e4e9757e1
-  data.tar.gz: 3047fc03c205700b4408f3efa7e4ae7b286daa5d139bb6a12f8539e6a55c497c9d0781c36027fe4d512dc26975cb0157a8a4678ead8350d6f132d23777bbaa4b
+  metadata.gz: 51b9aabdc0d52b41745e9d212d5ab11b682ac84a62d4a164099b98a21049e8029c378621c8ee8b82a55b7ab6eb5f548372ea84cd2381270f8a3ba30d508a6523
+  data.tar.gz: 866422ae0447fc661d5fa9dc551f62b31aba0094c0a1acdedaeb90a69523260ff765794f1197112b157fe093b6e8e17e401615c5b258ff20826b522070e1aac7

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Nanaimo Changelog
 
+## 0.2.6 (2018-07-01)
+
+##### Enhancements
+
+* None.  
+
+##### Bug Fixes
+
+* Fix parse errors crashing when attempting to show context when the error
+  occurs on the first character in the plist.  
+  [Samuel Giddins](https://github.com/segiddins)
+
+
 ## 0.2.5 (2018-04-04)
 
 ##### Enhancements

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nanaimo (0.2.5)
+    nanaimo (0.2.6)
 
 GEM
   remote: https://rubygems.org/
@@ -48,4 +48,4 @@ DEPENDENCIES
   rubocop
 
 BUNDLED WITH
-   1.16.1
+   1.16.2

data/lib/nanaimo/reader.rb

@@ -272,6 +272,7 @@ module Nanaimo
       pos = scanner.charpos
       line = scanner.string[0..scanner.charpos].scan(NEWLINE).size + 1
       column = pos - (scanner.string.rindex(NEWLINE, pos - 1) || -1)
+      column = [1, column].max
       [line, column]
     end
 

data/lib/nanaimo/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Nanaimo
-  VERSION = '0.2.5'.freeze
+  VERSION = '0.2.6'.freeze
 end

data/lib/nanaimo/writer/pbxproj.rb

@@ -28,7 +28,7 @@ module Nanaimo
           write_newline
           output << "/* Begin #{isa} section */"
           write_newline
-          sort_dictionary(kvs).each do |k, v|
+          sort_dictionary(kvs, key_can_be_isa: false).each do |k, v|
             write_dictionary_key_value_pair(k, v)
           end
           output << "/* End #{isa} section */"
@@ -40,31 +40,34 @@ module Nanaimo
       end
 
       def write_dictionary_key_value_pair(k, v)
-        @objects_section = true if value_for(k) == 'objects'
+        # since the objects section is always at the top-level,
+        # we can avoid checking if we're starting the 'objects'
+        # section if we're further "indented" (aka deeper) in the project
+        @objects_section = true if indent == 1 && value_for(k) == 'objects'
+
         super
       end
 
-      def sort_dictionary(dictionary)
+      def sort_dictionary(dictionary, key_can_be_isa: true)
         hash = value_for(dictionary)
-        hash.to_a.sort do |(k1, v1), (k2, v2)|
-          v2_isa = isa_for(v2)
-          v1_isa = v2_isa && isa_for(v1)
-          comp = v1_isa <=> v2_isa
-          next comp if !comp.zero? && v1_isa
-
-          key1 = value_for(k1)
-          key2 = value_for(k2)
-          next -1 if key1 == 'isa'
-          next 1 if key2 == 'isa'
-          key1 <=> key2
+        hash.sort_by do |k, _v|
+          k = value_for(k)
+          if key_can_be_isa
+            k == 'isa' ? '' : k
+          else
+            k
+          end
         end
       end
 
       def isa_for(dictionary)
         dictionary = value_for(dictionary)
         return unless dictionary.is_a?(Hash)
-        isa = dictionary.values_at('isa', ISA).map(&method(:value_for)).compact.first
-        isa && value_for(isa)
+        if isa = dictionary['isa']
+          value_for(isa)
+        elsif isa = dictionary[ISA]
+          value_for(isa)
+        end
       end
 
       def flat_dictionary?(dictionary)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nanaimo
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Danielle Tomlinson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-04 00:00:00.000000000 Z
+date: 2018-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -107,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: A library for (de)serialization of ASCII Plists.