wordtree 0.2.0 → 0.2.1

data/lib/wordtree/disk/library.rb

@@ -52,7 +52,7 @@ module WordTree
               next
             end
           elsif path =~ file_suffix_re
-            yield path
+            yield path, LibraryLocator.id_from_path(path)
           end
         end
       end

data/lib/wordtree/disk/library_locator.rb

@@ -16,6 +16,8 @@ module WordTree
       # The book ID to locate
       attr_reader :id
 
+      NotPath = Class.new(StandardError)
+      
       # Construct a LibraryLocator from a string (book ID)
       def initialize(id)
         @id = id
@@ -41,6 +43,11 @@ module WordTree
       def self.identity(id)
         id.is_a?(LibraryLocator) ? id : new(id)
       end
+
+      def self.id_from_path(path)
+        raise NotPath, "not a path" if path.nil? or !path.is_a?(String)
+        File.basename(path).sub(/\.[^\.]+$/, '')
+      end
     end
   end
 end

data/lib/wordtree/version.rb

@@ -1,3 +1,3 @@
 module Wordtree
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/wordtree/disk/library_locator_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+require 'wordtree/disk/library'
+require 'tmpdir'
+
+describe WordTree::Disk::LibraryLocator do
+  describe "#id_from_path" do
+    it "disallows non-strings" do
+      expect{ WordTree::Disk::LibraryLocator.id_from_path(:test) }.to raise_error
+    end
+
+    it "removes the directory" do
+      id = WordTree::Disk::LibraryLocator.id_from_path("/path/to/book.txt")
+      expect(id).to eq "book"
+    end
+
+    it "removes the suffix" do
+      id = WordTree::Disk::LibraryLocator.id_from_path("/path/to/book.txt.md")
+      expect(id).to eq "book.txt"
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wordtree
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-03 00:00:00.000000000 Z
+date: 2014-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus
@@ -265,6 +265,7 @@ files:
 - spec/wordtree/book_spec.rb
 - spec/wordtree/db/librarian_spec.rb
 - spec/wordtree/disk/librarian_spec.rb
+- spec/wordtree/disk/library_locator_spec.rb
 - spec/wordtree/disk/library_spec.rb
 - spec/wordtree/text_utils_spec.rb
 - wordtree.gemspec
@@ -301,6 +302,7 @@ test_files:
 - spec/wordtree/book_spec.rb
 - spec/wordtree/db/librarian_spec.rb
 - spec/wordtree/disk/librarian_spec.rb
+- spec/wordtree/disk/library_locator_spec.rb
 - spec/wordtree/disk/library_spec.rb
 - spec/wordtree/text_utils_spec.rb
 has_rdoc: