kindlefs 0.1.0 → 0.1.1

data/lib/kindlefs/filesystem.rb

@@ -3,16 +3,16 @@ require 'rindle/mixins/regexp'
 
 module KindleFS
   class Filesystem < FuseFS::FuseDir
-    ROOT_PATH        = /^\/$/
-    COLLECTIONS_PATH = /^\/collections$/.freeze
-    DOCUMENTS_PATH   = /^\/documents$/.freeze
-    PICTURES_PATH    = /^\/pictures$/.freeze
-    COLLECTION_NAME  = /([A-Za-z0-9_\-\s'"\.]+)/i.freeze
-    COLLECTION_PATH  = /^#{COLLECTIONS_PATH.strip}\/#{COLLECTION_NAME.strip}$/.freeze
-    DOCUMENT_NAME    = /([A-Za-z0-9_\s\-]+\.(mobi|epub|rtf|pdf|azw|azw1)+)/i.freeze
+    ROOT_PATH                  = /^\/$/
+    COLLECTIONS_PATH           = /^\/collections$/.freeze
+    DOCUMENTS_PATH             = /^\/documents$/.freeze
+    PICTURES_PATH              = /^\/pictures$/.freeze
+    COLLECTION_NAME            = /([A-Za-z0-9_\-\s'"\.]+)/i.freeze
+    COLLECTION_PATH            = /^#{COLLECTIONS_PATH.strip}\/#{COLLECTION_NAME.strip}$/.freeze
+    DOCUMENT_NAME              = /([A-Za-z0-9_\s,\.\[\]\(\)'&!\-]+\.(mobi|epub|rtf|pdf|azw|azw1)+)/i.freeze
     COLLECTION_DOCUMENT_PATH   = /^#{COLLECTIONS_PATH.strip}\/#{COLLECTION_NAME.strip}\/#{DOCUMENT_NAME.strip}$/.freeze
     UNASSOCIATED_DOCUMENT_PATH = /^#{COLLECTIONS_PATH.strip}\/#{DOCUMENT_NAME.strip}$/.freeze
-    DOCUMENT_PATH    = /^#{DOCUMENTS_PATH.strip}\/#{DOCUMENT_NAME.strip}$/.freeze
+    DOCUMENT_PATH              = /^#{DOCUMENTS_PATH.strip}\/#{DOCUMENT_NAME.strip}$/.freeze
 
     def contents path
       case path
@@ -28,12 +28,16 @@ module KindleFS
       else
         []
       end
+    rescue Exception => e
+      puts e
+      false
     end
 
     def file?(path)
       case path
       when DOCUMENT_PATH
-        return true
+        doc = Rindle::Document.find_by_name $1
+        return !doc.nil?
       when COLLECTION_DOCUMENT_PATH
         col = Rindle::Collection.find_by_name $1
         doc = Rindle::Document.find_by_name $2
@@ -43,6 +47,9 @@ module KindleFS
         return doc.collections.empty? if doc
       end
       false
+    rescue Exception => e
+      puts e
+      false
     end
 
     def directory?(path)
@@ -50,10 +57,14 @@ module KindleFS
       when COLLECTIONS_PATH, DOCUMENTS_PATH, PICTURES_PATH
         true
       when COLLECTION_PATH
-        Rindle::Collection.exists?(:named => $1)
+        col = Rindle::Collection.find_by_name $1
+        !col.nil?
       else
         false
       end
+    rescue Exception => e
+      puts e
+      false
     end
 
     def executable? path
@@ -61,20 +72,29 @@ module KindleFS
     end
 
     def size path
+      puts "size #{path}"
       doc = Rindle::Document.find_by_name File.basename(path)
       File.size File.join(Rindle.root_path, doc.path)
+    rescue Exception => e
+      puts e
+      false
     end
 
     def can_delete?(path)
+      puts "can_delete? #{path}"
       case path
       when DOCUMENTS_PATH, PICTURES_PATH, COLLECTIONS_PATH
         false
       else
         true
       end
+    rescue Exception => e
+      puts e
+      false
     end
 
     def can_write?(path)
+      puts "can_write? #{path}"
       if path !~ ROOT_PATH
         true
       else
@@ -83,6 +103,7 @@ module KindleFS
     end
 
     def can_mkdir?(path)
+      puts "can_mkdir? #{path}"
       case path
       when COLLECTION_PATH
         true
@@ -92,15 +113,20 @@ module KindleFS
     end
 
     def can_rmdir?(path)
+      puts "can_rmdir #{path}"
       case path
       when COLLECTION_PATH
         true
       else
         false
       end
+    rescue Exception => e
+      puts e
+      false
     end
 
     def touch(path, val = 0)
+      puts "touch #{path}"
       filename = File.basename(path)
       case path
       when UNASSOCIATED_DOCUMENT_PATH, DOCUMENT_PATH
@@ -112,9 +138,13 @@ module KindleFS
       else
         false
       end
+    rescue Exception => e
+      puts e
+      false
     end
 
     def mkdir(path)
+      puts "mkdir #{path}"
       if path =~ COLLECTION_PATH
         col = Rindle::Collection.find_by_name $1
         Rindle::Collection.create($1) if col.nil?
@@ -123,9 +153,13 @@ module KindleFS
       else
         false
       end
+    rescue Exception => e
+      puts e
+      false
     end
 
     def rmdir(path)
+      puts "rmdir #{path}"
       if path =~ COLLECTION_PATH
         collection = Rindle::Collection.first :named => $1
         return false unless collection
@@ -135,9 +169,13 @@ module KindleFS
       end
       Rindle.save
       true
+    rescue Exception => e
+      puts e
+      false
     end
 
     def delete path
+      puts "delete #{path}"
       case path
       when COLLECTION_DOCUMENT_PATH
         col = Rindle::Collection.find_by_name $1
@@ -149,6 +187,9 @@ module KindleFS
       end
       Rindle.save
       true
+    rescue Exception => e
+      puts e
+      false
     end
 
     def rename old, new
@@ -189,6 +230,9 @@ module KindleFS
       end
       Rindle.save
       true
+    rescue Exception => e
+      puts e
+      false
     end
 
     def write_to path, body
@@ -209,11 +253,17 @@ module KindleFS
       end
       Rindle.save
       true
+    rescue Exception => e
+      puts e
+      false
     end
 
     def read_file path
       doc = Rindle::Document.find_by_name File.basename(path)
-      File.read File.join(Rindle.root_path, doc.path)
+      doc.filename
+    rescue Exception => e
+      puts "read file error: #{e}"
+      ''
     end
   end
 end

data/lib/kindlefs/version.rb

@@ -1,3 +1,3 @@
 module KindleFS
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/kindlefs/filesystem_spec.rb

@@ -23,6 +23,12 @@ describe KindleFS::Filesystem do
       '/documents'.should_not match(KindleFS::Filesystem::COLLECTIONS_PATH)
       '/collections/dummy'.should_not match(KindleFS::Filesystem::COLLECTIONS_PATH)
     end
+
+    it 'should match a collections document path correctly' do
+      '/collections/collection1/The 4 Hour Workweek Escape 9 5 L-asin_B000PDZF70-type_EBOK-v_0.azw'.
+        should match KindleFS::Filesystem::COLLECTION_DOCUMENT_PATH
+    end
+
   end
 
   describe '#contents' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kindlefs
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &11542360 !ruby/object:Gem::Requirement
+  requirement: &19332940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11542360
+  version_requirements: *19332940
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &11445000 !ruby/object:Gem::Requirement
+  requirement: &19332380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11445000
+  version_requirements: *19332380
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &11058220 !ruby/object:Gem::Requirement
+  requirement: &19331680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11058220
+  version_requirements: *19331680
 - !ruby/object:Gem::Dependency
   name: rfusefs
-  requirement: &9408900 !ruby/object:Gem::Requirement
+  requirement: &19330980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9408900
+  version_requirements: *19330980
 - !ruby/object:Gem::Dependency
   name: rindle
-  requirement: &8717100 !ruby/object:Gem::Requirement
+  requirement: &19330220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8717100
+  version_requirements: *19330220
 description: KindleFS mounts the collection information of a Kindle device as file
   system in user space via the Rindle gem.
 email:
@@ -111,18 +111,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3452657948332476179
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3452657948332476179
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.17