wordtree 0.1.1 → 0.1.2

data/lib/wordtree/db/librarian.rb

@@ -4,9 +4,15 @@ require 'wordtree/book'
 module WordTree
   module DB
     class Librarian
-      def initialize(rethinkdb_connection)
-        @rdb = rethinkdb_connection
+      # @connection can be either a Hash or a RethinkDB::Connection object
+      # If a hash, it uses keys :host, :port, and :db
+      def initialize(connection)
         @r = RethinkDB::RQL.new
+        if connection.is_a? Hash
+          @rdb = @r.connect(connection)
+        else
+          @rdb = connection
+        end
       end
 
       def find(book_id)

data/lib/wordtree/disk/librarian.rb

@@ -6,10 +6,18 @@ require 'wordtree/archdown'
 module WordTree
   module Disk
     class Librarian
+      include Enumerable
+
       attr_reader :library
 
+      # @library can be either a string (the path of the library) or a
+      # WordTree::Disk::Library object
       def initialize(library)
-        @library = library
+        if library.is_a? String
+          @library = WordTree::Disk::Library.new(library)
+        else
+          @library = library
+        end
       end
 
       def find(book_id)
@@ -21,6 +29,13 @@ module WordTree
         end
       end
 
+      def each(file_suffix_re=/\.(md|txt)$/, &block)
+        library.each(file_suffix_re) do |path|
+          retrieved = Preamble.load(path, :external_encoding => "utf-8")
+          yield Book.new(retrieved.metadata.merge("content" => retrieved.content))
+        end
+      end
+
       def save(book)
         library.mkdir(book.id)
         Preamble.new(book.metadata, book.content || "").save(library.path_to(book.id))

data/lib/wordtree/disk/library.rb

@@ -1,4 +1,5 @@
 require 'fileutils'
+require 'find'
 
 require 'wordtree/archdown'
 require 'wordtree/disk/library_locator'
@@ -6,6 +7,7 @@ require 'wordtree/disk/library_locator'
 module WordTree
   module Disk
     class Library
+      include Enumerable
 
       FILE_TYPES = {
         :raw => "%s.md"
@@ -38,6 +40,23 @@ module WordTree
       def mkdir(book_id)
         FileUtils.mkdir_p(dir_of(book_id))
       end
+
+      # Breadth-first search of the directory structure, operating on each book
+      def each(file_suffix_re=/\.(md|txt)$/, &block)
+        Find.find(@root) do |path|
+          if FileTest.directory?(path)
+            if File.basename(path)[0] == ?.
+              # Don't look any further into this directory.
+              Find.prune
+            else
+              next
+            end
+          elsif path =~ file_suffix_re
+            yield path
+          end
+        end
+      end
+
     end
   end
 end

data/lib/wordtree/version.rb

@@ -1,3 +1,3 @@
 module Wordtree
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/fixtures/library/bo/ok/book/book.md

@@ -1,4 +1,5 @@
 ---
+archive_org_id: book
 year: 1800
 ---
 Book with content

data/spec/fixtures/library/ot/er/other/other.md

@@ -0,0 +1,5 @@
+---
+archive_org_id: other
+year: 1801
+---
+Other book with content

data/spec/wordtree/disk/librarian_spec.rb

@@ -34,6 +34,13 @@ describe WordTree::Disk::Librarian do
       end
     end
 
+    describe "#each" do
+      it "iterates through each book" do
+        book_sizes = librarian.map{ |book| book.size_bytes }
+        expect(book_sizes).to contain_exactly(17, 23)
+      end
+    end
+
     it "saves to disk (yaml, content)" do
       tmp_root = Dir.mktmpdir
       tmp_library = WordTree::Disk::Library.new(tmp_root)
@@ -49,6 +56,7 @@ describe WordTree::Disk::Librarian do
       updated = Preamble.load(tmp_library.path_to("book"))
       expect(updated.metadata).to eq(
         :id => "book",
+        :archive_org_id => "book",
         :year => 1800,
         :source => "test",
         :simhash => 14921967289891934128,

data/spec/wordtree/disk/library_spec.rb

@@ -20,4 +20,15 @@ describe WordTree::Disk::Library do
     library.mkdir(book_id)
     expect(File.exist?(library.dir_of(book_id))).to be_truthy
   end
+
+  context "with fixture library" do
+    let(:root) { fixture('library') }
+
+    describe "#each" do
+      it "iterates through each book" do
+        books = library.map.to_a
+        expect(books.size).to eq 2
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wordtree
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-20 00:00:00.000000000 Z
+date: 2014-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus
@@ -260,6 +260,7 @@ files:
 - lib/wordtree/version.rb
 - spec/fixtures/cassettes/archive_org_download_book.yml
 - spec/fixtures/library/bo/ok/book/book.md
+- spec/fixtures/library/ot/er/other/other.md
 - spec/spec_helper.rb
 - spec/wordtree/book_spec.rb
 - spec/wordtree/db/librarian_spec.rb
@@ -295,6 +296,7 @@ summary: Wordtree common library code
 test_files:
 - spec/fixtures/cassettes/archive_org_download_book.yml
 - spec/fixtures/library/bo/ok/book/book.md
+- spec/fixtures/library/ot/er/other/other.md
 - spec/spec_helper.rb
 - spec/wordtree/book_spec.rb
 - spec/wordtree/db/librarian_spec.rb