kindleclippings 1.3.1 → 1.3.2

data/README.markdown

@@ -74,3 +74,4 @@ You can filter the results by author, book title or date by using the methods `b
   * brokensandals
   * fboucheros
   * David Ramalho
+  * Kenrick [aka Ken] Chien

data/lib/kindleclippings/clipping.rb

@@ -4,6 +4,9 @@ module KindleClippings
     require 'date'
     
     attr_accessor :book_title, :author, :type, :location, :added_on, :content, :page
+    DEFAULT_DATE_FORMAT = "%A, %B %d, %Y, %I:%M %p"
+    KINDLE_TOUCH_DATE_FORMAT = "%A, %B %d, %Y  %I:%M:%S %p"
+    ALTERNATIVE_DATE_FORMAT = "%A, %d %B %y %H:%M:%S %Z"
 
     def initialize()
     end
@@ -13,7 +16,17 @@ module KindleClippings
       @author = author
       @type = type
       @location = location
-      @added_on = DateTime.strptime(added_on, "%A, %B %d, %Y, %I:%M %p")
+
+      [DEFAULT_DATE_FORMAT, KINDLE_TOUCH_DATE_FORMAT, ALTERNATIVE_DATE_FORMAT].each do |format|
+        break if @added_on
+
+        begin
+          @added_on = DateTime.strptime(added_on, format)
+        rescue ArgumentError => e
+        end
+      end
+      
+
       @content = content
       @page = page.to_i
     end

data/lib/kindleclippings/parser.rb

@@ -37,7 +37,7 @@ module KindleClippings
       end
       
       first_line = lines[0].strip.scan(/^(.+) \((.+)\)$/i).first
-      second_line = lines[1].strip.scan(/^- (.+?) (?:on page (\d+) \| |)Loc. ([0-9-]*?) +\| Added on (.+)$/i).first
+      second_line = lines[1].strip.scan(/^-\s(?:Your\s)?(\w+) (?:on page (\d+) \| |)Loc(?:ation)?\.? ([0-9-]*?) +\| Added on (.+)$/i).first
       
       if first_line.nil?
         title = lines[0].strip

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kindleclippings
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-06 00:00:00.000000000Z
+date: 2012-09-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70213467946360 !ruby/object:Gem::Requirement
+  requirement: &70306233262900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 1.2.9
   type: :development
   prerelease: false
-  version_requirements: *70213467946360
+  version_requirements: *70306233262900
 description: A gem to parse Kindle's "My Clippings.txt" file into ruby objects.
 email: georg.boe@gmail.com
 executables: []