chillfile 0.0.3 → 0.1.0

data/chillfile.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{chillfile}
-  s.version = "0.0.3"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["dpree"]
-  s.date = %q{2010-12-08}
+  s.date = %q{2011-01-09}
   s.default_executable = %q{chillfile}
   s.description = %q{Let your files chill on the couch}
   s.email = %q{whiterabbit.init@gmail.com}
@@ -32,9 +32,10 @@ Gem::Specification.new do |s|
     "lib/chillfile/cli.rb",
     "lib/chillfile/config.rb",
     "lib/chillfile/database_server.rb",
+    "lib/chillfile/helper/sync_helper.rb",
     "lib/chillfile/model.rb",
+    "lib/chillfile/model/asset.rb",
     "lib/chillfile/model/base.rb",
-    "lib/chillfile/model/sync_file.rb",
     "lib/chillfile/sync.rb",
     "spec/filesystem_after/bar.1.moved.untouched",
     "spec/filesystem_after/bar.2.moved.copy",
@@ -55,7 +56,7 @@ Gem::Specification.new do |s|
     "spec/filesystem_before/wuu.deleted",
     "spec/fixtures/filesystem_after.json",
     "spec/fixtures/filesystem_before.json",
-    "spec/lib/chillfile/model/sync_file_spec.rb",
+    "spec/lib/chillfile/model/asset_spec.rb",
     "spec/lib/chillfile_spec.rb",
     "spec/spec_helper.rb",
     "spec/support/db_helper.rb",
@@ -69,7 +70,7 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Tiny tool to sync filesystem with couchdb}
   s.test_files = [
-    "spec/lib/chillfile/model/sync_file_spec.rb",
+    "spec/lib/chillfile/model/asset_spec.rb",
     "spec/lib/chillfile_spec.rb",
     "spec/spec_helper.rb",
     "spec/support/db_helper.rb",

data/lib/chillfile.rb

@@ -14,14 +14,17 @@ require "progressbar"
 
 require File.join(File.dirname(__FILE__), "chillfile/config")
 require File.join(File.dirname(__FILE__), "chillfile/cli")
+
+require File.join(File.dirname(__FILE__), "chillfile/helper/sync_helper")
+
 require File.join(File.dirname(__FILE__), "chillfile/database_server")
 require File.join(File.dirname(__FILE__), "chillfile/sync")
 require File.join(File.dirname(__FILE__), "chillfile/model")
 
 module Chillfile
   get_version = lambda do
-    v = YAML.parse_file(File.join(File.dirname(__FILE__), "../version.yml"))
-    "#{v[:major].value}.#{v[:minor].value}.#{v[:patch].value}"
+    v = YAML.load_file(File.join(File.dirname(__FILE__), "../version.yml"))
+    "#{v[:major]}.#{v[:minor]}.#{v[:patch]}"
   end
   VERSION = get_version.call
   
@@ -55,7 +58,7 @@ module Chillfile
   
     # databse
     def db_list
-      Chillfile::Model::SyncFile.by_filesystem_raw
+      Chillfile::Asset.by_filesystem_raw
     end
   end
 end

data/lib/chillfile/helper/sync_helper.rb

@@ -0,0 +1,53 @@
+module Chillfile::SyncHelper
+  # CREATED
+  def create_doc(checksum, path)
+    doc = Chillfile::Asset.new(:checksum => checksum, :path => path)
+    doc.save
+    begin
+      file = File.open(path)
+      doc.create_attachment(:file => file, :name => "master")
+    ensure
+      file.close
+    end
+    doc
+  end
+  
+  # DELETED
+  def delete_doc(doc)
+    doc.deleted = true
+    doc.save
+    doc
+  end
+
+  # COPIED
+  def copy_doc(doc, path)
+    doc = create_doc(doc.checksum, path)
+    
+    # TODO keep metadata => make a deep clone here...
+    
+    doc
+  end
+
+  # MOVED
+  def update_doc_path(doc, new_path)
+    doc.path = new_path
+    doc
+  end
+
+  # MODIFIED
+  def update_doc_attachment(doc, new_checksum)
+    doc.checksum = new_checksum
+    begin
+      file = File.open(doc.path)
+      doc.update_attachment(:file => file, :name => "master")
+    ensure
+      file.close
+    end
+    doc
+  end
+  
+  # FINALIZER
+  def doc_save!(doc)
+    doc.save
+  end
+end

data/lib/chillfile/model.rb

@@ -5,7 +5,7 @@ module Chillfile
     
       # all models
       require File.join(File.dirname(__FILE__), "model/base")
-      require File.join(File.dirname(__FILE__), "model/sync_file")
+      require File.join(File.dirname(__FILE__), "model/asset")
     end
   
     private

data/lib/chillfile/model/asset.rb

@@ -0,0 +1,24 @@
+class Chillfile::Asset < Chillfile::Base
+  timestamps!
+  property :checksum, String
+  property :path, String
+  
+  property :deleted, TrueClass, :default => false
+  
+  view_by :checksum
+  view_by :path
+  
+  view_by :filesystem, :map => "
+    function(doc) {
+      if (doc['type'] == 'Chillfile::Asset' && !doc['deleted']) {
+        emit(null, [doc['checksum'], doc['path']]);
+      }
+    }
+  "
+  
+  def self.by_filesystem_raw
+    self.by_filesystem(:include_docs => false)["rows"].map do |f|
+      f["value"]
+    end
+  end
+end

data/lib/chillfile/model/base.rb

@@ -1,3 +1,3 @@
-class Chillfile::Model::Base < CouchRest::Model::Base
+class Chillfile::Base < CouchRest::Model::Base
   use_database Chillfile.db
 end

data/lib/chillfile/sync.rb

@@ -1,138 +1,90 @@
-module Chillfile
-  module Sync
-    class << self      
-      def process!(comparator, progressbar = nil)
-        @progressbar = progressbar
-        
-        # deleted
-        process_list(comparator.deleted, "Delete") do |checksum, path|
-          for_doc_with(checksum) do |doc|
-            if doc.paths.size > 1
-              update_doc_paths(doc, [path])
-            else
-              delete_doc(doc)
-            end
-          end
-        end
-        
-        # moved files
-        process_list(comparator.moved, "Move") do |checksum, paths|
-          for_doc_with(checksum) do |doc|
-            update_doc_paths(doc, paths[:old_paths], paths[:new_paths])
-          end
-        end
+module Chillfile::Sync 
+  class << self
+    include Chillfile::SyncHelper
+
+    def process!(comparator, progressbar = nil)
+      @progressbar = progressbar
       
-        # modified files
-        process_list(comparator.modified, "Modify") do |path, checksums|
-          for_doc_with(checksums[:old_checksum]) do |doc|
-            
-            # split it up if there is more than one path
-            if doc.paths.size > 1
-              
-              # remove the old path from the list
-              base_doc = update_doc_paths(doc, [path])
-              
-              # new forked doc
-              fork_doc = create_doc(checksums[:new_checksum], path)
-              
-              [base_doc, fork_doc]
-            else
-              update_doc_attachment(doc, checksums[:new_checksum])
-            end          
-          end
+      process_deleted(comparator)
+      process_moved(comparator)
+      process_modified(comparator)
+      process_created(comparator)
+      
+      true
+    end
+  
+    private
+    
+    # deleted
+    def process_deleted(comparator)
+      process_list(comparator.deleted, "Delete") do |checksum, path|
+        for_doc_with(checksum) do |doc|
+          delete_doc(doc)
         end
-        
-        # created files
-        process_list(comparator.created, "Create") do |checksum, path|
-          for_doc_with(checksum) do |doc|
-            if doc
-              update_doc_add_path(doc, path)
-            else
-              create_doc(checksum, path)
+      end
+    end
+    
+     # moved files
+    def process_moved(comparator)
+      process_list(comparator.moved, "Move") do |checksum, paths|
+        for_doc_with(checksum) do |doc|
+          if paths[:new_paths].size > 1
+            delete_doc(doc)
+            docs = paths[:new_paths].map do |new_path|
+              copy_doc(doc, new_path)
             end
+            docs
+          else
+            update_doc_path(doc, paths[:new_paths].first)
           end
         end
       end
+    end
     
-      private
-    
-      # CREATED
-      def create_doc(checksum, path)
-        doc = Chillfile::Model::SyncFile.new(:checksum => checksum, :paths => [path])
-        doc.save
-        begin
-          file = File.open(path)
-          doc.create_attachment(:file => file, :name => "master")
-        ensure
-          file.close
+    def process_modified(comparator)
+      # modified files
+      process_list(comparator.modified, "Modify") do |path, checksums|
+        for_doc_with(checksums[:old_checksum]) do |doc|
+          update_doc_attachment(doc, checksums[:new_checksum])
         end
-        doc
-      end
-    
-      # COPIED
-      def update_doc_add_path(doc, path)
-        update_doc_paths(doc, [], [path])
       end
+    end
     
-      # MOVED/COPIED
-      def update_doc_paths(doc, del_paths = [], add_paths = [])
-        # del old paths
-        del_paths.each do |path|
-          doc.paths.delete(path)
+    def process_created(comparator)
+      # created files
+      process_list(comparator.created, "Create") do |checksum, path|
+        for_doc_with(checksum) do |doc|
+          create_doc(checksum, path)
         end
-    
-        # add new paths
-        doc.paths = doc.paths + add_paths
-      
-        doc
       end
+    end
     
-      # MODIFIED
-      def update_doc_attachment(doc, new_checksum)
-        doc.checksum = new_checksum
-        begin
-          file = File.open(doc.paths.first)
-          doc.update_attachment(:file => file, :name => "master")
-        ensure
-          file.close
+    # wrapper outer
+    def process_list(list, title, &block)
+      return true if list.empty?
+      
+      list_iterator = lambda do |notifier|
+        list.each do |args|
+          block.call(*args)
+          notifier.call if notifier
         end
-        doc
-      end
-    
-      # DELETED
-      def delete_doc(doc)
-        doc.deleted = true
-        doc.paths = []
-        doc
       end
       
-      # wrapper outer
-      def process_list(list, title, &block)
-        return true if list.empty?
-        
-        list_iterator = lambda do |notifier|
-          list.each do |args|
-            block.call(*args)
-            notifier.call if notifier
-          end
-        end
-        
-        if @progressbar
-          @progressbar.call({:name => title, :size => list.size}, list_iterator)
-        else
-          list_iterator.call(nil)
-        end
+      if @progressbar
+        @progressbar.call({:name => title, :size => list.size}, list_iterator)
+      else
+        list_iterator.call(nil)
       end
-    
-      # wrapper
-      def for_doc_with(checksum, &block)
-        old_doc = Chillfile::Model::SyncFile.by_checksum(:key => checksum).first
-        new_doc_or_docs = block.call(old_doc)
-        if new_doc_or_docs.is_a? Array
-          new_doc_or_docs.each{|d| d.save}
-        else
-          new_doc_or_docs.save
-        end
+    end
+  
+    # wrapper
+    def for_doc_with(checksum, &block)
+      old_doc = Chillfile::Asset.by_checksum(:key => checksum).first
+      new_doc_or_docs = block.call(old_doc)
+      if new_doc_or_docs.is_a? Array
+        new_doc_or_docs.each{|d| doc_save!(d)}
+      else
+        doc_save!(new_doc_or_docs)
       end
     end
   end

data/spec/lib/chillfile/model/asset_spec.rb

@@ -0,0 +1,22 @@
+require "spec_helper"
+
+describe Chillfile::Asset do
+  include DbHelper
+  
+  before(:each) do
+    reset_db!
+  end
+  
+  it "should be possible create a file" do
+   Chillfile::Asset.new(:path => "./foo/bar.baz", :checksum => "13123f6casdd03480be5f781ee12312asdasd232").save.persisted?.should be_true
+  end
+  
+  it "should be possible to find using a checksum" do
+    Chillfile::Asset.new(:path => "./foo/bar.baz", :checksum => "13123f6casdd03480be5f781ee12312asdasd232").save
+    Chillfile::Asset.new(:path => "./woo_lands", :checksum => "13123f6casdd03480be5f781ee12312asdasd232").save
+    paths = Chillfile::Asset.by_checksum(:key => "13123f6casdd03480be5f781ee12312asdasd232").map{|a| a.path}
+    paths.size.should == 2
+    paths.include?("./foo/bar.baz").should be_true
+    paths.include?("./woo_lands").should be_true
+  end
+end

data/spec/lib/chillfile_spec.rb

@@ -21,7 +21,7 @@ describe Chillfile do
   end
   
   it "should be possible to list from db" do
-    Chillfile::Model::SyncFile.new(:paths => ["./foo/bar.baz"], :checksum => "13123f6casdd03480be5f781ee12312asdasd232").save
+    Chillfile::Asset.new(:path => "./foo/bar.baz", :checksum => "13123f6casdd03480be5f781ee12312asdasd232").save
     Chillfile.db_list.should == [["13123f6casdd03480be5f781ee12312asdasd232", "./foo/bar.baz"]]
   end
   

data/version.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 0
-:minor: 0
-:patch: 3
+:minor: 1
+:patch: 0
 :build: 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 3
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors: 
 - dpree
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-08 00:00:00 +01:00
+date: 2011-01-09 00:00:00 +01:00
 default_executable: chillfile
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -195,9 +195,10 @@ files:
 - lib/chillfile/cli.rb
 - lib/chillfile/config.rb
 - lib/chillfile/database_server.rb
+- lib/chillfile/helper/sync_helper.rb
 - lib/chillfile/model.rb
+- lib/chillfile/model/asset.rb
 - lib/chillfile/model/base.rb
-- lib/chillfile/model/sync_file.rb
 - lib/chillfile/sync.rb
 - spec/filesystem_after/bar.1.moved.untouched
 - spec/filesystem_after/bar.2.moved.copy
@@ -218,7 +219,7 @@ files:
 - spec/filesystem_before/wuu.deleted
 - spec/fixtures/filesystem_after.json
 - spec/fixtures/filesystem_before.json
-- spec/lib/chillfile/model/sync_file_spec.rb
+- spec/lib/chillfile/model/asset_spec.rb
 - spec/lib/chillfile_spec.rb
 - spec/spec_helper.rb
 - spec/support/db_helper.rb
@@ -259,7 +260,7 @@ signing_key:
 specification_version: 3
 summary: Tiny tool to sync filesystem with couchdb
 test_files: 
-- spec/lib/chillfile/model/sync_file_spec.rb
+- spec/lib/chillfile/model/asset_spec.rb
 - spec/lib/chillfile_spec.rb
 - spec/spec_helper.rb
 - spec/support/db_helper.rb

data/lib/chillfile/model/sync_file.rb

@@ -1,28 +0,0 @@
-class Chillfile::Model::SyncFile < Chillfile::Model::Base
-  timestamps!
-  property :checksum, String
-  property :paths, [String]
-  
-  # alternative to paths.empty?
-  property :deleted, TrueClass, :default => false
-  
-  validates_uniqueness_of :checksum
-  
-  view_by :checksum
-  
-  view_by :filesystem, :map => "
-    function(doc) {
-      if (doc['type'] == 'Chillfile::Model::SyncFile') {
-        for (var i = 0; i < doc['paths'].length; i++) {
-          emit(null, [doc['checksum'], doc['paths'][i]]);
-        }
-      }
-    }
-  "
-  
-  def self.by_filesystem_raw
-    self.by_filesystem(:include_docs => false)["rows"].map do |f|
-      f["value"]
-    end
-  end
-end

data/spec/lib/chillfile/model/sync_file_spec.rb

@@ -1,18 +0,0 @@
-require "spec_helper"
-
-describe Chillfile::Model::SyncFile do
-  include DbHelper
-  
-  before(:each) do
-    reset_db!
-  end
-  
-  it "should be possible create a file" do
-    Chillfile::Model::SyncFile.new(:paths => ["./foo/bar.baz"], :checksum => "13123f6casdd03480be5f781ee12312asdasd232").save.persisted?.should be_true
-  end
-  
-  it "should be possible to find using a checksum" do
-    Chillfile::Model::SyncFile.new(:paths => ["./foo/bar.baz", "./woo_lands"], :checksum => "13123f6casdd03480be5f781ee12312asdasd232").save
-    Chillfile::Model::SyncFile.by_checksum(:key => "13123f6casdd03480be5f781ee12312asdasd232").first[:paths].should == ["./foo/bar.baz", "./woo_lands"]
-  end
-end