dbox 0.6.1 → 0.6.2

data/History.txt

@@ -1,3 +1,7 @@
+== 0.6.2 / 2011-11-24
+  * Bug Fixes
+    * Fixed db migration.
+
 == 0.6.1 / 2011-11-24
   * Bug Fixes
     * Fixed sync command in command-line client.

data/VERSION

@@ -1 +1 @@
-0.6.1
+0.6.2

data/dbox.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "dbox"
-  s.version = "0.6.1"
+  s.version = "0.6.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ken Pratt"]

data/lib/dbox/database.rb

@@ -100,7 +100,7 @@ module Dbox
         new_revisions = {}
 
         # fetch the new revision IDs from dropbox
-        find_entries().each do |entry|
+        find_entries_with_columns([ :id, :path, :is_dir, :parent_id, :hash, :modified, :revision ]).each do |entry|
           path = relative_to_remote_path(entry[:path])
           begin
             data = api.metadata(path, nil, false)
@@ -164,7 +164,7 @@ module Dbox
         })
 
         # calculate hashes on files with same timestamp as we have (as that was the previous mechanism used to check freshness)
-        find_entries().each do |entry|
+        find_entries_with_columns([ :id, :path, :is_dir, :parent_id, :local_hash, :remote_hash, :modified, :revision ]).each do |entry|
           unless entry[:is_dir]
             path = relative_to_local_path(entry[:path])
             if times_equal?(File.mtime(path), entry[:modified])
@@ -283,18 +283,26 @@ module Dbox
     private
 
     def find_entry(conditions = "", *args)
+      find_entry_with_columns(ENTRY_COLS, conditions, *args)
+    end
+
+    def find_entry_with_columns(entry_cols, conditions = "", *args)
       res = @db.get_first_row(%{
-        SELECT #{ENTRY_COLS.join(",")} FROM entries #{conditions} LIMIT 1;
+        SELECT #{entry_cols.join(",")} FROM entries #{conditions} LIMIT 1;
       }, *args)
-      entry_res_to_fields(res)
+      entry_res_to_fields(entry_cols, res)
     end
 
     def find_entries(conditions = "", *args)
+      find_entries_with_columns(ENTRY_COLS, conditions, *args)
+    end
+
+    def find_entries_with_columns(entry_cols, conditions = "", *args)
       out = []
       @db.execute(%{
-        SELECT #{ENTRY_COLS.join(",")} FROM entries #{conditions} ORDER BY path ASC;
+        SELECT #{entry_cols.join(",")} FROM entries #{conditions} ORDER BY path ASC;
       }, *args) do |res|
-        out << entry_res_to_fields(res)
+        out << entry_res_to_fields(entry_cols, res)
       end
       out
     end
@@ -327,9 +335,9 @@ module Dbox
       }, *args)
     end
 
-    def entry_res_to_fields(res)
+    def entry_res_to_fields(entry_cols, res)
       if res
-        h = make_fields(ENTRY_COLS, res)
+        h = make_fields(entry_cols, res)
         h[:is_dir] = (h[:is_dir] == 1)
         h[:modified]  = Time.at(h[:modified]) if h[:modified]
         h

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dbox
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 6
-  - 1
-  version: 0.6.1
+  - 2
+  version: 0.6.2
 platform: ruby
 authors: 
 - Ken Pratt