kindleclippings 1.3.4 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bad5d803e94f93eddf895fff36c5f2b8c06fe638
-  data.tar.gz: d9098c7e8ee988d3d9d431ece9f1468d99bde3a8
+  metadata.gz: 6b5b979eb007eca1eaf64a0ac7d007b9e5dd7202
+  data.tar.gz: 0b9b507b53a5eef08362b997f293d569c6e367c0
 SHA512:
-  metadata.gz: 398f292ac820f3bd660f37e729269bbc080ebc02617212f9622ab1feb7f8a7a03610b69b4bcc25fc32aa26ff33481ec319226b413644156ef67112b4d3b815f2
-  data.tar.gz: 059df4679b85572d4ef6cabd22c3c4616687ad4f7426035a70041e5c9fc7e11311e68847fc7f91b1df2bd29eaae4e3b9e0070e7a5eb4bc300ba8d113481932cd
+  metadata.gz: 7bf1cf4de4a38c75d5dea2652cd8b1befec002caad05911fa6c4f9994be2a4f5df8a8cabadf7422e264d5e32bc5ae2e1934a148541401aee1255f858fbee18db
+  data.tar.gz: c1b79c4ab2adcd6472055507eb0d00577a8a050ef348084f944069e44da261dc51f15c8e81a46a1d1eee566626e7aaa3ac3e5c0abe6fc51427b09a5c65737ffb

data/lib/kindleclippings/clipping.rb

@@ -1,6 +1,8 @@
 # encoding: utf-8
 module KindleClippings
   class Clipping
+    include Comparable
+
     require 'date'
     
     attr_accessor :book_title, :author, :type, :location, :added_on, :content, :page
@@ -36,5 +38,44 @@ module KindleClippings
       "- #{@type} #{('on Page ' + @page.to_s + ' | ') if @page > 0}Loc. #{@location} | Added on #{@added_on.strftime('%A, %B %d, %Y, %I:%M %p')}\n\n" +
       "#{@content}"
     end
+
+    def <=>(other_clipping)
+      if @book_title != other_clipping.book_title
+        return @book_title <=> other_clipping.book_title
+      end
+      # Same book
+
+      if @page != other_clipping.page
+        return @page <=> other_clipping.page
+      end
+      # Same book and page
+
+      if @location != other_clipping.location
+        return locations_cmp(@location, other_clipping.location)
+      end
+      # Same book, page and location
+
+      @added_on <=> other_clipping.added_on
+    end
+
+    private
+
+    def locations_cmp(a, b)
+      return 0 if a == b
+
+      a_parts = a.split('-').map(&:to_i)
+      b_parts = b.split('-').map(&:to_i)
+
+      if a_parts[0] != b_parts[0] # beginning differs
+        return a_parts[0] <=> b_parts[0] # compare by beginning
+      end
+      # Same beginning
+
+      if a_parts[1].nil? || b_parts[1].nil? # end missing from a location
+        return 0 # consider equal
+      end
+
+      a_parts[1] <=> b_parts[1] # compare by end
+    end
   end
 end

data/lib/kindleclippings/clippingresult.rb

@@ -31,7 +31,14 @@ module KindleClippings
     
     def filter_by_property(property, value)
       return self unless value
-      self.select { |annotation| annotation.send(property).downcase == value.downcase }
+
+      if value.is_a?(Regexp)
+        select_blk = lambda {|annotation| annotation.send(property) =~ value }
+      else
+        select_blk = lambda {|annotation| annotation.send(property).casecmp(value) == 0 }
+      end
+
+      self.select(&select_blk)
     end
     
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kindleclippings
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.4.0
 platform: ruby
 authors:
 - Georg Alexander Boe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-02 00:00:00.000000000 Z
+date: 2014-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec