rb-dayone 0.2.0 → 0.3.3

data/Gemfile

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

data/History.rdoc

@@ -1,3 +1,26 @@
+== 0.3.3 / 2012-08-17
+
+* [FIXED] LibXML will now accept UTF-8 characters in journal entries.
+* Added the command "repair" to the dayone binary, which will at least repair *my* damage.
+* Added the command "verify" to the dayone binary, which I at least find helpful.
+* Added a post-install note telling people upgrading from <= 0.2.0 to repair.
+
+== 0.3.2 / 2012-08-16
+
+* Switched from REXML to LibXML-ruby for XML parsing. Now accepts ampersands in entries, as well as UTF-8. Rejoice!
+
+== 0.3.1 / 2012-08-16
+
+* [FIXED] Minor bugfixes
+* [FIXED] REXML will no longer kill the whole program if it can't parse a journal file.
+
+== 0.3.0 / 2012-08-16
+
+* [FIXED] Fixed several bugs in Builder xml output, including:
+  * Output of trailing <target />
+  * Output of malformed DOCTYPE
+* You can now import existing DayOne entries and search them
+
 == 0.2.0 / 2012-08-14
 
 * Now auto-detects DayOne journal location from your plist file

data/Manifest

@@ -3,16 +3,26 @@ Gemfile
 History.rdoc
 lib/rb-dayone.rb
 lib/rb-dayone/entry.rb
+lib/rb-dayone/entry_importer.rb
 lib/rb-dayone/plist_reader.rb
+lib/rb-dayone/search.rb
 Manifest
+Rakefile
 rb-dayone.gemspec
 README.md
+spec/data/entries/748AD5D252F44149920485B0CEA478E3.doentry
+spec/data/entries/F13723CDFD454481B24312DCD627BFD7.doentry
+spec/data/foo.doentry
+spec/data/locations/location-auto/location
+spec/data/locations/location-specified/location
+spec/data/locations/location-unspecified
+spec/data/sample.doentry
+spec/data/sample.plist
+spec/data/utf.doentry
 spec/dayone_spec.rb
+spec/entry_importer_spec.rb
 spec/entry_spec.rb
-spec/locations/location-auto/location
-spec/locations/location-specified/location
-spec/locations/location-unspecified
-spec/spec_helper.rb
 spec/plist_reader_spec.rb
-spec/sample.plist
+spec/search_spec.rb
+spec/spec_helper.rb
 version.txt

data/README.md

@@ -29,21 +29,32 @@ For more information on what you can do from the command line:
 
     dayone --help
 
+### Validating and repairing doentry files ###
+
+As of version 0.2.0 of this gem, `rb-dayone` is finally outputting *nice* XML. Before then, it wasn't. You can check if any of your DayOne entries need repairing by running:
+
+    dayone validate
+
+If they do, you might be able to fix them using:
+
+    dayone repair
+
+If not, let me know, and I'll see what I can do to fix stuff.
+
 ## Install
 
     gem install rb-dayone
 
 ## Author
 
-Original author: Jan-Yves Ruzicka (@akchizar). Get in touch [via email](mailto:janyves.ruzicka@gmail.com).
+Original author: [Jan-Yves Ruzicka](http://www.1klb.com) ([@akchizar](http://www.twitter.com/akchizar)). Get in touch [via email](mailto:janyves.ruzicka@gmail.com).
 
 ## To do
 
 * Image support
 * Location support?
 
-License
--------
+## License
 
 Copyright (c) 2012 Jan-Yves Ruzicka
 

data/Rakefile

@@ -0,0 +1,34 @@
+gem_title = 'rb-dayone'
+
+def pkg
+  p = Dir['pkg/*.gem'].sort[-1]
+  if p.nil?
+    $stderr.puts "ERROR: Can't find pkg file."
+  else
+    p
+  end
+end
+
+task :build do
+  specfile = "#{gem_title}.gemspec"
+  sh "gem build '#{specfile}'"
+  
+  gem_file = Dir["#{gem_title}-*.gem"]
+  gem_file.each do |f|
+    sh "mv '#{f}' pkg"
+  end
+end
+
+task :install => [:build] do
+  sh "gem install #{pkg}"
+end
+
+task :push => [:build] do
+  sh "gem push #{pkg}"
+end
+
+task :spec do
+  sh "rspec"
+end
+
+task :default => :spec

data/bin/dayone

@@ -61,4 +61,75 @@ If you don't specify the --text tag, it will read text from STDIN and use this a
     entry = DayOne::Entry.new entry_text, starred:starred
     entry.create!
   end
+end
+
+command :repair do |c|
+  c.syntax = "repair"
+  c.description = "Will repair any damage caused by previous versions of rb-dayone."
+  c.summary = "This command will trawl your DayOne journal archive looking for any malformed DayOne entries created by previous versions of rb-dayone, and will fix them. Currently it fixed malformed doctype declarations and trailing target tags."
+
+  c.action do |args, opts|
+    require 'rb-dayone'
+    
+    repairs = {
+      'trailing target' => [
+        /<target\/>\Z/,
+        ''
+      ],
+      'malformed doctype' => [
+        %r|<!DOCTYPE "plist PUBLIC "-//Apple//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">|
+      ]
+    }
+    
+    DayOne.entries.each do |f|
+      contents = File.read(f)
+      modified = []
+      repairs.each do |name, (replace_this, with_this)|
+        if replace_this === contents
+          modified << name
+          contents = contents.gsub(replace_this, with_this)
+        end
+      end
+      
+      unless modified.empty?
+        File.open(f,'w'){ |io| io.puts contents }
+        puts "Repaired file #{f}:"
+        modified.each{ |s| puts "  Fixed #{s}" }
+      end
+    end
+    puts "All files have been repaired!"
+  end
+end
+
+command :validate do |c|
+  c.syntax = "validate"
+  c.description = "Checks through your DayOne database to see if any of your journal entries break XML validation."
+
+  c.action do
+    require 'libxml'
+    require 'rb-dayone'
+    
+    LibXML::XML::Error.set_handler(&LibXML::XML::Error::QUIET_HANDLER)
+    failed_entries = []
+    
+    all_entries = DayOne.entries
+    puts "Checking #{all_entries.size} entr#{all_entries.size == 1 ? 'y' : 'ies'}..."
+    
+    all_entries.each do |f|
+      begin
+        contents = File.read(f)
+        LibXML::XML::Parser.string(contents).parse
+      rescue LibXML::XML::Error
+        failed_entries << f
+      end
+    end
+    
+    if failed_entries.empty?
+      puts "No errors. Everything is OK!"
+    else
+      puts "#{failed_entries.size} error#{failed_entries.size == 1 ? '' : 's'} in validation:"
+      failed_entries.each{ |f| puts "  #{f}" }
+    end
+  end
 end

data/lib/rb-dayone.rb

@@ -42,6 +42,12 @@ module DayOne
       @auto_journal_location ||= File.expand_path(plist_reader['NSNavLastRootDirectory'])
     end
     
+    # All DayOne entries, as file names
+    # @return [Array] all DayOne entries
+    def entries
+      Dir[File.join(journal_location, 'entries','*.doentry')]
+    end
+    
     private
     
     # The journal file location

data/lib/rb-dayone/entry.rb

@@ -1,3 +1,5 @@
+require 'libxml'
+
 # A text-only journal entry for DayOne.
 class DayOne::Entry
 
@@ -10,8 +12,11 @@ class DayOne::Entry
   # Whether the entry has been starred
   attr_accessor :starred
   
+  # Whether the entry has been saved to file at all.
+  attr_accessor :saved
+  
   # The PList doctype, used for XML export
-  DOCTYPE = 'plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"'
+  DOCTYPE = [:DOCTYPE, :plist, :PUBLIC, "-//Apple//DTD PLIST 1.0//EN", "http://www.apple.com/DTDs/PropertyList-1.0.dtd"]
   
   # Initialise a journal entry, ready for inclusion into your journal
   # @param [String] entry_text the body text of the journal entry
@@ -22,6 +27,7 @@ class DayOne::Entry
     @creation_date = Time.now
     @starred = false
     @entry_text = entry_text
+    @saved = false
     
     hsh.each do |k,v|
       setter = "#{k}="
@@ -36,12 +42,17 @@ class DayOne::Entry
     @uuid ||= `uuidgen`.gsub('-','').strip
   end
   
+  # The same as calling Entry#saved
+  def saved?
+    saved
+  end
+  
   # Convert an entry to XML.
   # @return [String] the entry as XML
   def to_xml
-    builder = Builder::XmlMarkup.new
+    builder = Builder::XmlMarkup.new(indent:2)
     builder.instruct!                     # Basic xml tag
-    builder.declare! :DOCTYPE, DOCTYPE   # PList doctype
+    builder.declare! *DOCTYPE   # PList doctype
     builder.plist(version:1.0) do
       builder.dict do
         builder.key 'Creation Date'
@@ -61,7 +72,7 @@ class DayOne::Entry
         builder.string uuid
       end
     end
-    builder.target
+    builder.target!
   end
   
   # Create a .doentry file with this entry.
@@ -74,4 +85,16 @@ class DayOne::Entry
     File.open(file_location,'w'){ |io| io << xml }
     return true
   end
+  
+  # Check to make sure that we output valid xml
+  def xml_valid?
+    LibXML::XML::Error.set_handler(&LibXML::XML::Error::QUIET_HANDLER)
+    begin
+      LibXML::XML::Parser.string(to_xml).parse
+    rescue LibXML::XML::Error
+      return false
+    else
+      return true
+    end
+  end
 end

data/lib/rb-dayone/entry_importer.rb

@@ -0,0 +1,78 @@
+require 'libxml'
+
+# Imports DayOne entries from XML files or plain text
+class DayOne::EntryImporter
+  
+  # Raw data as provided in initialize
+  attr_accessor :data
+  
+  # File (if supplied)
+  attr_accessor :file
+  
+  # Create a new entry based on a string. To import from a file,
+  # use EntryImporter.from_file.
+  # @param [String] data The raw data for the importer to process
+  def initialize data
+    @data = data
+  end
+  
+  # Create a new entry from a file
+  # @param [String] file The file to import
+  def self.from_file file
+    ei = new(File.read(file))
+    ei.file = file
+    ei
+  end
+  
+  # Access entry data by key
+  # @param [String, Symbol] key The key to retrieve 
+  # @return the value stored in the file, or nil
+  def [] key
+    processed_data[key]
+  end
+  
+  # Generate and return the data contained within the doentry file, as a hash
+  # @return [Hash] the processed data
+  def processed_data
+    if !@processed_data
+      @processed_data = {}
+      LibXML::XML::Error.set_handler(&LibXML::XML::Error::QUIET_HANDLER)
+      
+      begin
+        document = LibXML::XML::Parser.string(data).parse
+        key = nil
+        
+        document.find('//plist/dict/*').each do |elem|
+          case elem.name
+          when 'key'
+            key = elem.content
+          when 'date'
+            if elem.content =~ /(\d+)-(\d+)-(\d+)T(\d+):(\d+):(\d+)Z/
+              @processed_data[key] = Time.new($1.to_i, $2.to_i, $3.to_i, $4.to_i, $5.to_i, $6.to_i)
+            end
+          when 'true'
+            @processed_data[key] = true
+          when 'false'
+            @processed_data[key] = false
+          else
+            @processed_data[key] = elem.content
+          end
+        end
+      rescue LibXML::XML::Error
+        $stderr.puts "Error parsing #{file ? "file #{file}" : "data"}. Skipping."
+      end
+    end
+    @processed_data
+  end
+  
+  # Generate an entry from this importer
+  # @return a DayOne::Entry based on this importer
+  def to_entry
+    DayOne::Entry.new(
+      self['Entry Text'],
+      starred: self['Starred'],
+      creation_date: self['Creation Date'],
+      saved: true
+    )
+  end
+end

data/lib/rb-dayone/plist_reader.rb

@@ -1,12 +1,20 @@
 require 'json'
 
+# The PListReader is a class that reads PLists.
+# It is used to read the DayOne preferences PList.
 class DayOne::PlistReader
+  
+  # The path of the PList to read.
   attr_accessor :path
   
+  # 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')
   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}'`
@@ -15,6 +23,7 @@ class DayOne::PlistReader
     @body
   end
   
+  # This allows us to access the body's method as well as the reader's.
   def method_missing sym, *args
     if self.body.respond_to? sym
       self.body.send(sym, *args)

data/lib/rb-dayone/search.rb

@@ -0,0 +1,59 @@
+# A search of the database.
+# Create this object with Search.new. Give it some parameters to search for, then
+# simple use Search#[] to access results.
+class DayOne::Search
+  
+  # The entry must include this text
+  attr_accessor :entry_text
+  
+  # The entry must be starred
+  attr_accessor :starred
+  
+  # Initialize the search. Currently you can only search by entry text and starred status,
+  # but both of these can be passed in via hash.
+  # @param [Hash] hash a hash of search criteria, including:
+  #   * +entry_text+: Text that the entry must include
+  #   * +starred+: whether the entry is starred or not
+  def initialize hash={}
+    @entry_text = ''
+    hash.each do |k,v|
+      setter = "#{k}="
+      self.send(setter, v) if self.respond_to?(setter)
+    end
+  end
+  
+  # Fetch the results by searching. Uses a cached version of the DayOne database.
+  # @return [Array] all entries matching your results
+  def results
+    if !@results
+      @results = []
+      working_results = cache
+
+      working_results = working_results.select{ |e| e.entry_text.include? entry_text } unless entry_text == ''
+      working_results = working_results.select{ |e| e.starred == starred } unless starred.nil?
+      
+      @results = working_results
+    end
+    @results
+  end
+  
+  # Fetches a particular result
+  # @param [Integer] index the index of the result to fetch
+  # @return [DayOne::Entry] the entry
+  def [] index
+    results[index]
+  end
+  
+  private
+  
+  # Caches all journal entries for us. On first running, will load everything
+  # from file. After this, will just refer back to the cache.
+  # @return [Array] an array of DayOne::Entry objects
+  def cache
+    if !@cache
+      entries = File.join(DayOne::journal_location, 'entries', '*.doentry')
+      @cache = Dir[entries].map{ |e| DayOne::EntryImporter::from_file(e).to_entry }
+    end
+    @cache
+  end
+end

data/rb-dayone.gemspec

@@ -5,7 +5,7 @@ Gem::Specification.new do |s|
   s.version = File.read('version.txt')
   
   s.summary = "Create DayOne journal entries in ruby."
-  s.description = "Create [DayOne](http://www.dayoneapp.com) journal entries simply and easily in ruby. Currently only supports text entries, image entries to come."
+  s.description = "Create or search [DayOne](http://www.dayoneapp.com) journal entries simply and easily in ruby. Currently only supports text entries, image entries to come."
   
   s.author = 'Jan-Yves Ruzicka'
   s.email = 'janyves.ruzicka@gmail.com'
@@ -19,4 +19,19 @@ Gem::Specification.new do |s|
   
   s.add_runtime_dependency 'builder', '~> 2.0'
   s.add_runtime_dependency 'commander', '~> 4.1.2'
+  s.add_runtime_dependency 'libxml-ruby', '~> 2.3.3'
+  
+  s.post_install_message = <<-end
+#{'-'*80}
+Hi there! If you're upgrading from version <= 0.2.0 of this gem, I've been a
+horrid dev and let a few bugs through in my XML building code. In order to fix
+this, you can run `dayone verify` to see if your database needs fixing. If any 
+of the errors are my fault, you should be able to fix them with `dayone
+repair`.
+
+Sorry if this has caused any inconvenience. If you still have trouble repairing
+any of your .doentry files, send me an email and I'll see what I can do to
+help.
+#{'-'*80}
+  end
 end

data/spec/data/entries/748AD5D252F44149920485B0CEA478E3.doentry

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>Creation Date</key>
+    <date>2012-08-16T08:42:17Z</date>
+    <key>Entry Text</key>
+    <string>Yes, this is foo.</string>
+    <key>Starred</key>
+    <false/>
+    <key>UUID</key>
+    <string>748AD5D252F44149920485B0CEA478E3</string>
+  </dict>
+</plist>

data/spec/data/entries/F13723CDFD454481B24312DCD627BFD7.doentry

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+<key>Creation Date</key>
+<date>2012-08-16T08:42:19Z</date>
+<key>Entry Text</key>
+<string>Hello bar.</string>
+<key>Starred</key>
+<true/>
+<key>UUID</key>
+<string>F13723CDFD454481B24312DCD627BFD7</string>
+</dict>
+</plist>

data/spec/data/foo.doentry

@@ -0,0 +1 @@
+foo

data/spec/data/sample.doentry

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>Entry Text</key>
+    <string>Hello, world!</string>
+    <key>Starred</key>
+    <true/>
+    <key>Creation Date</key>
+    <date>1997-08-29T02:14:0Z</date>
+  </dict>
+</plist>

data/spec/data/utf.doentry

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>Entry Text</key>
+    <string>æ</string>
+    <key>Starred</key>
+    <true/>
+    <key>Creation Date</key>
+    <date>1997-08-29T02:14:0Z</date>
+  </dict>
+</plist>

data/spec/dayone_spec.rb

@@ -9,7 +9,7 @@ describe DayOne do
     end
     
     def location str
-      File.join(File.dirname(__FILE__),"locations", "location-#{str}")
+      spec_data("locations", "location-#{str}")
     end
     
     it "should return the value given by the +location+ file" do

data/spec/entry_importer_spec.rb

@@ -0,0 +1,69 @@
+#encoding: UTF-8
+
+require './spec/spec_helper'
+
+describe DayOne::EntryImporter do
+  let(:sample_entry){ DayOne::EntryImporter::from_file spec_data('sample.doentry') }
+  
+  describe "#initialize" do
+    it "should accept a string or file" do
+      ei = DayOne::EntryImporter.new('foo')
+      ei.data.should == 'foo'
+      
+      file_ei = DayOne::EntryImporter::from_file spec_data('foo.doentry')
+      file_ei.data.should == 'foo'
+    end
+  end
+  
+  describe "#[]" do
+    
+    def wrap str
+      <<-end
+<plist>
+  <dict>
+    <key>element</key>
+    <string>#{str}</string>
+  </dict>
+</plist>
+      end
+    end
+    
+    it "should parse strings" do
+      sample_entry['Entry Text'].should == 'Hello, world!'
+    end
+    
+    it "should parse booleans" do
+      sample_entry['Starred'].should == true
+    end
+    
+    it "should parse dates" do
+      sample_entry['Creation Date'].should == Time.new(1997, 8, 29, 2, 14, 0)
+    end
+    
+    it "should accept ampersands" do
+      importer = DayOne::EntryImporter.new(wrap('&amp;'))
+      importer['element'].should == '&'
+    end
+    
+    it "should accept UTF-8" do
+      importer = DayOne::EntryImporter.new(wrap('æ'))
+      importer['element'].should == 'æ'
+    end
+    
+    it "should accept UTF-8 from file" do
+      importer = DayOne::EntryImporter.from_file spec_data('utf.doentry')
+      importer['Entry Text'].should == 'æ'
+    end
+    
+  end
+  
+  describe "#to_entry" do
+    it "should make a valid entry" do
+      entry = sample_entry.to_entry
+      entry.entry_text.should == 'Hello, world!'
+      entry.starred.should be_true
+      entry.creation_date.year.should == 1997
+      entry.should be_saved      
+    end
+  end
+end

data/spec/entry_spec.rb

@@ -2,12 +2,18 @@ require './spec/spec_helper'
 require 'fileutils'
 
 describe DayOne::Entry do
-  after :all do
-    Dir['spec/entries/*.doentry'].each{ |f| FileUtils.rm(f) }
-    FileUtils.rmdir('spec/entries')
+  before :each do
+    FileUtils::mkdir_p spec_data('working/entries')
+  end
+  
+  after :each do
+    FileUtils::rm_rf spec_data('working')
   end
   
   describe "#to_xml" do
+    
+    let(:sample_entry){ DayOne::Entry.new('foo', starred:true) }
+    
     it "should give a default entry" do
       e = subject.to_xml
       e.should match %r|<key>Entry Text</key>\s*<string></string>|
@@ -15,31 +21,38 @@ describe DayOne::Entry do
     end
     
     it "should set from initialize" do
-      e = DayOne::Entry.new 'foo', starred:true
-      e.starred.should be_true
-      e.entry_text.should == 'foo'
+      sample_entry.starred.should be_true
+      sample_entry.entry_text.should == 'foo'
+      sample_entry.should_not be_saved
     end
     
     it "should act properly when starred" do
-      e = DayOne::Entry.new('foo', starred:true).to_xml
-      e.should match %r|<key>Starred</key>\s*<true/>|
+      sample_entry.to_xml.should match %r|<key>Starred</key>\s*<true/>|
     end
   end
   
   describe "#create!" do
     it "should correctly create a .doentry file" do
-      DayOne::journal_location = 'spec'
-      FileUtils::mkdir_p 'spec/entries'
+      
+      DayOne::journal_location = spec_data('working')
       
       e = subject
       e.entry_text = "Hello, world!"
       e.create!
       
-      file_location = Dir['spec/entries/*.doentry'][0]
+      file_location = Dir[spec_data('working', 'entries', '*.doentry')][0]
       file_location.should_not be_nil
       
       contents = File.read(file_location)
       contents.should == e.to_xml
     end
   end
+  
+  describe "#xml_valid?" do
+    it "should handle weird XML characters" do
+      e = subject
+      e.entry_text = "Hello <&> Goodbye"
+      e.should be_xml_valid
+    end
+  end
 end

data/spec/plist_reader_spec.rb

@@ -13,7 +13,7 @@ describe DayOne::PlistReader do
     end
     
     it "should correctly parse binary plists" do
-      reader = DayOne::PlistReader.new(File.join(File.dirname(__FILE__),'sample.plist'))
+      reader = DayOne::PlistReader.new(File.join(File.dirname(__FILE__),'data', 'sample.plist'))
       reader['foo'].should == 'bar'
     end
   end

data/spec/search_spec.rb

@@ -0,0 +1,35 @@
+describe DayOne::Search do
+  describe "#initialize" do
+    it "should create a Search object, uninitialized" do
+      subject.entry_text.should == ''
+      subject.starred.should be_nil
+    end
+  end
+  
+  describe "#results" do
+    before :all do
+      DayOne::journal_location = spec_data
+    end
+    
+    it "should find all posts when no search criteria are applied" do
+      subject.results.size.should == 2
+    end
+    
+    it "should find posts when searching by string" do
+      search = DayOne::Search.new entry_text: 'foo'
+      search.results.size.should == 1
+      search[0].entry_text.should == "Yes, this is foo."
+    end
+    
+    it "should find posts when searching by starred" do
+      search = DayOne::Search.new starred:true
+      search.results.size.should == 1
+      search[0].entry_text.should == "Hello bar."
+    end
+    
+    it "should find posts when searching by string and starred" do
+      search = DayOne::Search.new entry_text: 'foo', starred:true
+      search.results.should be_empty
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1 +1,5 @@
 require './lib/rb-dayone'
+
+def spec_data *path
+  File.join(File.dirname(__FILE__), 'data', *path)
+end

data/version.txt

@@ -1 +1 @@
-0.2.0
+0.3.3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rb-dayone
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-14 00:00:00.000000000 Z
+date: 2012-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -43,8 +43,24 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 4.1.2
-description: Create [DayOne](http://www.dayoneapp.com) journal entries simply and
-  easily in ruby. Currently only supports text entries, image entries to come.
+- !ruby/object:Gem::Dependency
+  name: libxml-ruby
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.3
+description: Create or search [DayOne](http://www.dayoneapp.com) journal entries simply
+  and easily in ruby. Currently only supports text entries, image entries to come.
 email: janyves.ruzicka@gmail.com
 executables:
 - dayone
@@ -57,21 +73,37 @@ files:
 - History.rdoc
 - lib/rb-dayone.rb
 - lib/rb-dayone/entry.rb
+- lib/rb-dayone/entry_importer.rb
 - lib/rb-dayone/plist_reader.rb
+- lib/rb-dayone/search.rb
 - Manifest
+- Rakefile
 - rb-dayone.gemspec
 - README.md
+- spec/data/entries/748AD5D252F44149920485B0CEA478E3.doentry
+- spec/data/entries/F13723CDFD454481B24312DCD627BFD7.doentry
+- spec/data/foo.doentry
+- spec/data/locations/location-auto/location
+- spec/data/locations/location-specified/location
+- spec/data/sample.doentry
+- spec/data/sample.plist
+- spec/data/utf.doentry
 - spec/dayone_spec.rb
+- spec/entry_importer_spec.rb
 - spec/entry_spec.rb
-- spec/locations/location-auto/location
-- spec/locations/location-specified/location
-- spec/spec_helper.rb
 - spec/plist_reader_spec.rb
-- spec/sample.plist
+- spec/search_spec.rb
+- spec/spec_helper.rb
 - version.txt
 homepage: https://github.com/jyruzicka/rb-dayone
 licenses: []
-post_install_message: 
+post_install_message: ! "--------------------------------------------------------------------------------\nHi
+  there! If you're upgrading from version <= 0.2.0 of this gem, I've been a\nhorrid
+  dev and let a few bugs through in my XML building code. In order to fix\nthis, you
+  can run `dayone verify` to see if your database needs fixing. If any \nof the errors
+  are my fault, you should be able to fix them with `dayone\nrepair`.\n\nSorry if
+  this has caused any inconvenience. If you still have trouble repairing\nany of your
+  .doentry files, send me an email and I'll see what I can do to\nhelp.\n--------------------------------------------------------------------------------\n"
 rdoc_options: []
 require_paths:
 - lib