rubysync 0.0.2 → 0.0.3

data/lib/ruby_sync/connectors/memory_connector.rb

@@ -20,66 +20,10 @@ require "yaml"
 module RubySync::Connectors
   class MemoryConnector < RubySync::Connectors::BaseConnector
 
-    def each_change
-      while event = @events.shift
-        yield event
-      end
-    end
 
     def each_entry
-      # todo implement
-    end
-
-    def is_echo? event
-      event.sets_value?(:modifier, 'rubysync')
-    end
-
-    def associate(association, path)
-      path = normalize(path)
-      log.info "Associating '#{association}' with '#{path}'"
-      entry = @data[path]
-      if entry
-        (@association_index[association.context] ||= {})[association.key] = path
-        (entry[:association] ||= {})[association.context] = association.key
-      end
-    end
-
-    def path_for_association(association)
-      context = @association_index[association.context] || {}
-      context[association.key.to_s]
-    end
-
-    def association_key_for(context, path)
-      path = normalize(path)
-      log.debug "Retrieving association key for '#{path}' within '#{context}'"
-      entry = @data[path]
-      unless entry
-        p @data
-      end
-      if entry && entry[:association] && key = entry[:association][context]
-        return key
-      end
-      log.info "No association found."
-      log.debug entry.inspect
-      return nil
-    end
-    
-    def associations_for path
-      path = normalize path
-      entry = @data[path]
-      (entry[:association] || {}).map do |context, key|
-        RubySync::Association.new(context, key)
-      end
-    end
-    
-    def remove_association(association)
-      path = path_for_association association
-      context = @association_index[association.context]
-      context.delete(association.key) if context
-      entry = @data[path]
-      if entry
-        entry_context = (entry[:association] || {})[association.context]
-        entry_context.delete(association.key) if entry_context
+      @data.each do |key, entry|
+        yield key, entry
       end
     end
 
@@ -87,26 +31,14 @@ module RubySync::Connectors
     def initialize options
       super
       @data = {}
-      @events = []
-      @association_index = {}
     end
 
-    # Normally, the add method is called by the pipeline and simply stores
-    # the data to the datastore and that's it.
-    # In this case, though, we also generate an add event.
-    # This simulates the likely effect that an add would have on a proper datastore
-    # where doing an add would very likely cause an event to be generated that the
-    # pipeline should rightly ignore because it's just a side-effect.
-    # In other words, we're simply simulating an undesirable behaviour for testing
-    # purposes. 
     def add id, operations
       id = normalize id
       raise Exception.new("Item already exists") if @data[id]
       log.debug "Adding new record with key '#{id}'"
       @data[id] = perform_operations operations
       association_key = (is_vault?)? nil : [nil, own_association_key_for(id)]
-      log.info "#{name}: Injecting add event"
-      @events << RubySync::Event.add(self, id, association_key, operations.dup)
       return id
     end
 
@@ -114,18 +46,6 @@ module RubySync::Connectors
       id = normalize id
       raise Exception.new("Attempting to modify non-existent record '#{id}'") unless @data[id]
       perform_operations operations, @data[id]
-      association_key = (is_vault?)? nil : [nil, own_association_key_for(id)]
-      log.info "#{name}: Injecting modify event"
-      if is_vault?
-        associations_for(id).each do |association|
-          @events << (event = RubySync::Event.modify(self, id, association))
-        end
-      else
-        association = [nil, own_association_key_for(id)]
-        @events << (event = RubySync::Event.modify(self, id, association))
-      end
-
-      @events << RubySync::Event.modify(self, id, association_key, operations.dup)
       return id
     end
 
@@ -136,32 +56,10 @@ module RubySync::Connectors
          log.warn "Can't delete non-existent item '#{id}'"
          return
        end
-      log.info "#{name}: Injecting delete events"
-      if is_vault?
-        associations_for(id).each do |association|
-          @events << (event = RubySync::Event.delete(self, id, association))
-          @association_index.delete association
-        end
-      else
-        association = [nil, own_association_key_for(id)]
-        @events << (event = RubySync::Event.delete(self, id, association))
-      end
       @data.delete id
     end
 
-    # Put a clue there that we did this change so that we can detect and filter
-    # out the echo.
-    def target_transform event
-      event.payload << RubySync::Operation.new(:add, :modifier, ['rubysync'])
-    end
     
-    def source_transform event
-      event.drop_changes_to [:modifier, :foreign_key]
-    end
-
-    def drop_pending_events
-      @events = []
-    end
   
     def [](key)
       @data[normalize(key)]

data/lib/ruby_sync/connectors/xml_connector.rb

@@ -0,0 +1,98 @@
+#!/usr/bin/env ruby -w
+#
+#  Copyright (c) 2007 Ritchie Young. All rights reserved.
+#
+# This file is part of RubySync.
+# 
+# RubySync is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+# 
+# RubySync is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License along with RubySync; if not, write to the
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+
+
+lib_path = File.dirname(__FILE__) + '/../lib'
+$:.unshift lib_path unless $:.include?(lib_path) || $:.include?(File.expand_path(lib_path))
+
+require 'ruby_sync'
+$VERBOSE = false
+#require 'xmlsimple'
+#$VERBOSE = true
+
+
+
+module RubySync::Connectors
+  class XmlConnector < RubySync::Connectors::BaseConnector
+
+    option :filename
+
+    def each_entry
+      with_xml(:read_only=>true) do |content|
+        content.each do |entry|
+          yield entry[0], entry[1][0]
+        end
+      end
+    end
+    
+    def add id, operations
+      with_xml do |content|
+        content[id] = perform_operations(operations)
+      end
+      id
+    end
+    
+    def modify id, operations
+      with_xml do |content|
+        existing = content[id] && content[id][0] || {}
+        content[id] = perform_operations(operations, existing)
+      end
+      id
+    end
+    
+    def delete id
+      with_xml do |content|
+        content.delete(id)
+      end
+      id
+    end
+    
+    def [](id)
+      value = nil
+      with_xml(:read_only=>true) do |content|
+        value = content[id] && content[id][0]
+      end
+      value
+    end
+
+    def []=(id, value)
+      with_xml do |content|
+        content[id] = value 
+      end
+    end
+    
+    
+    def self.sample_config
+          return <<END
+          #
+          # "filename" should be the full name of the file containing
+          # the xml representation of the synchronized content.
+          # You probably want to change this:
+          #
+          filename "/tmp/rubysync.xml"
+END
+    end    
+
+private
+
+    
+    def with_xml options={}
+      content = (File.exist?(filename))? content = XmlSimple.xml_in(filename) : {}
+      yield content
+      XmlSimple.xml_out(content, {'OutputFile'=>filename}) unless options[:read_only]
+    end
+
+  end
+end

data/lib/ruby_sync/event.rb

@@ -51,6 +51,9 @@ module RubySync
                   :target_path,
                   :association
 
+    def self.force_resync source
+      self.new(:force_resync, source)
+    end
     
     def self.delete source, source_path, association=nil
       self.new(:delete, source, source_path, association)
@@ -92,7 +95,7 @@ module RubySync
     
     def merge other
       # TODO implement merge
-      log.warning "Event.merge not yet implemented"
+      log.warn "Event.merge not yet implemented"
     end
     
     # Retrieves all known values for the record affected by this event and
@@ -111,6 +114,9 @@ module RubySync
     def convert_to_modify
       log.info "Converting '#{type}' event to modify"
       @type = :modify
+      @payload.each do |op|
+        op.type = :replace
+      end
     end
           
     

data/lib/ruby_sync/util/utilities.rb

@@ -18,11 +18,20 @@ require 'fileutils'
 require 'irb'
 
 
+class ::File
+  def self.delete_if_exists(files)
+    files.kind_of?(Array) or files = [files]
+    files.each do |file|
+      File.delete(file) if File.exist?(file)
+    end
+  end
+end
 
 # Generally useful methods
 module RubySync
   module Utilities
     
+    @@base_path=nil
 
     # Perform an action and rescue any exceptions thrown, display the exception with the specified text
     def with_rescue text
@@ -50,15 +59,17 @@ module RubySync
     
     
     # Ensure that a given path exists as a directory
-    def ensure_dir_exists path
-      raise Exception.new("Can't create nil directory") unless path
-      if File.exist? path
-        unless File.directory? path
-          raise Exception.new("'#{path}' exists but is not a directory")
+    def ensure_dir_exists paths
+      paths.as_array.each do |path|
+        raise Exception.new("Can't create nil directory") unless path
+        if File.exist? path
+          unless File.directory? path
+            raise Exception.new("'#{path}' exists but is not a directory")
+          end
+        else
+          log.info "Creating directory '#{path}'"
+          FileUtils.mkpath path
         end
-      else
-        log.info "Creating directory '#{path}'"
-        FileUtils.mkpath path
       end
     end
     
@@ -88,8 +99,8 @@ module RubySync
     
     # Return the base_path 
     def base_path
-      @base_path = find_base_path unless defined? @base_path
-      @base_path
+      @@base_path = find_base_path unless @@base_path
+      @@base_path
     end
 
     # Locate a configuration directory by checking the current directory and
@@ -97,14 +108,14 @@ module RubySync
     # directory.
     # Returns false if no suitable directory was found
     def find_base_path
-      base_path = File.expand_path(".")
+      bp = File.expand_path(".")
       last = nil
       # Keep going up until we start repeating ourselves
-      while File.directory?(base_path) && base_path != last && base_path != "/"
-        return base_path if File.directory?("#{base_path}/pipelines") &&
-                            File.directory?("#{base_path}/connectors")
-        last = base_path
-        base_path = File.expand_path("#{base_path}/..")
+      while File.directory?(bp) && bp != last && bp != "/"
+        return bp if File.directory?("#{bp}/pipelines") &&
+                            File.directory?("#{bp}/connectors")
+        last = bp
+        bp = File.expand_path("#{bp}/..")
       end
       return false
     end

data/lib/ruby_sync.rb

@@ -13,6 +13,7 @@
 # You should have received a copy of the GNU General Public License along with RubySync; if not, write to the
 # Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 
+
 lib_path = File.dirname(__FILE__)
 $:.unshift lib_path unless $:.include?(lib_path) || $:.include?(File.expand_path(lib_path))
 
@@ -67,10 +68,15 @@ class Configuration
   def initialize
     include_in_search_path "#{base_path}/pipelines"
     include_in_search_path "#{base_path}/connectors"
+    include_in_search_path "#{base_path}/shared/connectors"
+    include_in_search_path "#{base_path}/shared/pipelines"    
+    include_in_search_path "#{base_path}/shared/lib"
 
     lib_path = File.dirname(__FILE__)
     require_all_in_dir "#{lib_path}/ruby_sync/connectors", "*_connector.rb"
+    require_all_in_dir "#{base_path}/shared/connectors", "*_connector.rb"
     require_all_in_dir "#{lib_path}/ruby_sync/pipelines", "*_pipeline.rb"
+    require_all_in_dir "#{base_path}/shared/pipelines", "*_pipeline.rb"
   end
 
   # We find the first directory in the search path that is a parent of the specified
@@ -78,11 +84,14 @@ class Configuration
   # that duplicate requires will be recognised.
   def require_all_in_dir(dir, glob="*.rb")
     expanded = File.expand_path dir
+    return unless File.directory? expanded
+    
     base = $:.detect do |path_dir|
       expanded_pd = File.expand_path(path_dir)
       expanded[0, expanded_pd.length] == expanded_pd
     end
-    prefix = (base)? expanded[File.expand_path(base).length+1, expanded.length]+"/" : ""
+    
+    prefix = (base && File.expand_path(base) != expanded)? expanded[File.expand_path(base).length+1, expanded.length]+"/" : ""
 
     # puts $:.join "\n"
     # puts "expanded = '#{expanded}'"

data/lib/rubysync.rb

@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby -w
+#
+#  Copyright (c) 2007 Ritchie Young. All rights reserved.
+#
+# This file is part of RubySync.
+# 
+# RubySync is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+# 
+# RubySync is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License along with RubySync; if not, write to the
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+
+
+class Rubysync
+  VERSION = '0.0.3'
+end

data/nbproject/private/private.properties

@@ -0,0 +1,3 @@
+file.reference.rubysync-bin=/Users/ritchiey/Projects/rubysync/bin
+file.reference.rubysync-lib=/Users/ritchiey/Projects/rubysync/lib
+file.reference.rubysync-test=/Users/ritchiey/Projects/rubysync/test

data/nbproject/project.properties

@@ -0,0 +1,8 @@
+bin.dir=${file.reference.rubysync-bin}
+file.reference.rubysync-bin=bin
+file.reference.rubysync-lib=lib
+file.reference.rubysync-test=test
+main.file=
+source.encoding=UTF-8
+src.dir=${file.reference.rubysync-lib}
+test.src.dir=${file.reference.rubysync-test}

data/nbproject/project.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.ruby.rubyproject</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/ruby-project/1">
+            <name>RubySync</name>
+            <source-roots>
+                <root id="src.dir"/>
+                <root id="bin.dir"/>
+            </source-roots>
+            <test-roots>
+                <root id="test.src.dir"/>
+            </test-roots>
+        </data>
+    </configuration>
+</project>