rb-dayone 0.4.0 → 0.4.1

data/Gemfile

@@ -2,4 +2,5 @@ source :rubygems
 
 gem 'builder', '~> 2.0'
 gem 'commander', '~> 4.1.2'
-gem 'libxml-ruby', '~> 2.3.3'
+gem 'libxml-ruby', '~> 2.3.3'
+gem 'nokogiri', '~> 1.5.0'

data/History.rdoc

@@ -1,3 +1,8 @@
+== 0.4.1 / 2012-11-14
+
+* [FIXED] rb-dayone was looking in the wrong place for preferences
+* [FIXED] new preference files not json-parseable. Swapped to XML/Nokogiri
+
 == 0.4.0 / 2012-10-22
 
 * Added image support

data/lib/rb-dayone.rb

@@ -39,7 +39,7 @@ module DayOne
     # the DayOne plist file stored in +~/Library/Preferences+.
     # @return [String] the DayONe journal location
     def auto_journal_location
-      @auto_journal_location ||= File.expand_path(plist_reader['NSNavLastRootDirectory'])
+      @auto_journal_location ||= File.expand_path(plist_reader.journal_location)
     end
     
     # All DayOne entries, as file names

data/lib/rb-dayone/plist_reader.rb

@@ -1,4 +1,4 @@
-require 'json'
+require 'nokogiri'
 
 # The PListReader is a class that reads PLists.
 # It is used to read the DayOne preferences PList.
@@ -10,18 +10,57 @@ class DayOne::PlistReader
   # Initialize the PList Reader, given a path
   # @param [String] path the path to the PList; defaults to the standard DayOne preference plist
   def initialize path=nil
-    @path = path || File.join(ENV['HOME'], 'Library', 'Preferences', 'com.dayoneapp.dayone.plist')
+    default_paths = [ # There have been two default paths over the versions...
+      File.join(ENV['HOME'], 'Library', 'Group Containers', '5U8NS4GX82.dayoneapp', 'Data', 'Preferences', 'dayone.plist'), # From 1.7 on
+      File.join(ENV['HOME'], 'Library', 'Preferences', 'com.dayoneapp.dayone.plist') # Pre-1.7
+    ]
+
+
+    @path = if path
+      path
+    else
+      first_valid_default_path = default_paths.find{ |p| File.exists?(p) }
+      if first_valid_default_path.nil?
+        raise RuntimeError, "Cannot locate DayOne preference file"
+      else
+        first_valid_default_path
+      end
+    end
   end
   
   # Retrieve the body of the plist as an array, parsed through JSON
   # @return [Hash] the body of the plist as a hash.
   def body
     if !@body
-      json_string = `plutil -convert json -o - '#{path}'`
-      @body = JSON.parse(json_string)
+      @body = Nokogiri::XML `plutil -convert xml1 -o - '#{path}'`
     end
     @body
   end
+
+  # Retrieves an array of Nokogiri XML objects representing the
+  # keys of the plist
+  # @return [Array] the keys in the plist
+  def keys
+    body.xpath('//dict/key')
+  end
+
+  # Retrieves a specific key's value, or nil
+  # @return the value of the key, or nil if it doesn't exist
+  def key key_value
+    key_element = keys.find{ |e| e.content == key_value }
+    if key_element
+      key_element.next_element.content
+    else
+      nil
+    end
+  end
+
+  # Retrieve the DayOne journal location
+  # @return [String] the path to the current DayOne journal location
+  def journal_location
+    key('JournalPackageURL') || # First, try the 1.7 location...
+    key('NSNavLastRootDirectory')
+  end
   
   # This allows us to access the body's method as well as the reader's.
   def method_missing sym, *args

data/spec/dayone_spec.rb

@@ -18,7 +18,9 @@ describe DayOne do
     end
     
     it "should return a default value when +location+ is 'auto'" do
-      DayOne.plist_reader = {'NSNavLastRootDirectory' => 'foo'}
+      reader = double('ReaderMock')
+      reader.should_receive(:journal_location).and_return('foo')
+      DayOne.plist_reader = reader
       DayOne::dayone_folder = location('auto')
       DayOne::journal_location.should == File.expand_path('foo')
     end

data/spec/plist_reader_spec.rb

@@ -8,13 +8,11 @@ describe DayOne::PlistReader do
   end
   
   describe "#body" do
-    it "should give us the location of the DayOne journal file" do
-      subject.should have_key('NSNavLastRootDirectory')
-    end
-    
     it "should correctly parse binary plists" do
       reader = DayOne::PlistReader.new(File.join(File.dirname(__FILE__),'data', 'sample.plist'))
-      reader['foo'].should == 'bar'
+
+      reader.key('foo').should == 'bar'
+      expect(reader.key('bing')).to be_nil
     end
   end
 end

data/version.txt

@@ -1 +1 @@
-0.4.0
+0.4.1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rb-dayone
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-22 00:00:00.000000000 Z
+date: 2012-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder