rubysync 0.0.3 → 0.0.4

data/test/.LCKts_rubysync.rb~

@@ -0,0 +1 @@
+/Users/ritchiey/Projects/rubysync/test/.LCKts_rubysync.rb~

data/test/ruby_sync_test.rb

@@ -22,10 +22,12 @@ require 'test/unit'
 
 module RubySyncTest
 
+  
+  include RubySync::Utilities
 
   def initialize(test)
     super(test)
-    @bob_details = {'givenName'=>['Robert'],
+    @bob_details = {'givenName'=>['bob'],
                     'sn'=>['Smith'],
                     'interests'=>['music', 'makeup']
     }
@@ -33,14 +35,17 @@ module RubySyncTest
   
 
   def setup
-    @pipeline = TestPipeline.new
+    @pipeline = testPipeline.new
     @client = @pipeline.client
     @vault = @pipeline.vault
-    @client.delete(client_path) if @client[client_path]
-    @vault.delete(vault_path) if @vault[vault_path]
     @client.clean
     @vault.clean
+    @pipeline.started
+    @client.delete(client_path) if @client[client_path]
+    @vault.delete(vault_path) if @vault[vault_path]
+    @pipeline.stopped
   end
+
   
   def teardown
     @vault.clean

data/test/{test_active_record_vault.rb → tc_active_record_connector.rb}

@@ -19,19 +19,19 @@ $:.unshift lib_path unless $:.include?(lib_path) || $:.include?(File.expand_path
 
 require 'ruby_sync_test'
 
-class MyActiveRecordConnector < RubySync::Connectors::ActiveRecordConnector
+class ArActiveRecordConnector < RubySync::Connectors::ActiveRecordConnector
     model :person
     application "#{File.dirname(__FILE__)}/../examples/ar_webapp"
     dbm_path "/tmp/rubysync_ar_test"
 end
 
-class MyMemoryConnector < RubySync::Connectors::MemoryConnector
+class ArMemoryConnector < RubySync::Connectors::MemoryConnector
   dbm_path "/tmp/rubysync_memory_test"
 end
 
-class TestPipeline < RubySync::Pipelines::BasePipeline
-  client :my_memory
-  vault :my_active_record
+class ArTestPipeline < RubySync::Pipelines::BasePipeline
+  client :ar_memory
+  vault :ar_active_record
   
   allow_in :first_name, :last_name
   allow_out :first_name, :last_name
@@ -42,10 +42,14 @@ end
 
 
 
-class TestActiveRecordVault < Test::Unit::TestCase
+class TcActiveRecordConnector < Test::Unit::TestCase
 
   include RubySyncTest
 
+  def testPipeline
+    ArTestPipeline
+  end  
+  
   def client_path
     'bob'
   end
@@ -109,7 +113,7 @@ class TestActiveRecordVault < Test::Unit::TestCase
   end
   
   def test_fields
-    assert_equal(%w{first_name last_name}.sort, ::MyActiveRecordConnector.fields.sort)
+    assert_equal(%w{first_name last_name}.sort, ::ArActiveRecordConnector.fields.sort)
   end
   
 end

data/test/{test_base_connector.rb → tc_base_connector.rb}

@@ -24,7 +24,7 @@ class MyConnector < RubySync::Connectors::BaseConnector
   
 end
 
-class TestBaseConnector < Base::Test::Unit
+class TcBaseConnector < Base::Test::Unit
   
   def setup
     @c  = MyConnector.new

data/test/{test_base_pipeline.rb → tc_base_pipeline.rb}

@@ -41,7 +41,7 @@ class TestPipeline < RubySync::Pipelines::BasePipeline
                       
 end
 
-class TestBasePipeline < Test::Unit::TestCase
+class TcBasePipeline < Test::Unit::TestCase
   
   
   def setup

data/test/tc_changelog_ldap_connector.rb

@@ -0,0 +1,93 @@
+#!/usr/bin/env ruby
+#
+#  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_test'
+require 'hashlike_tests'
+require 'ruby_sync/connectors/ldap_connector'
+require 'ruby_sync/connectors/ldap_changelog_connector'
+require 'ruby_sync/connectors/memory_connector'
+
+
+class MyChangeLogConnector < RubySync::Connectors::LdapChangelogConnector
+  host        'changelog_ldap'
+  port        389
+  username    'cn=directory manager'
+  password    'password'
+  changelog_dn 'cn=changelog'
+  search_filter "cn=*"
+  search_base   "ou=people,dc=9to5magic,dc=com,dc=au"
+end
+
+class MyMemoryConnector < RubySync::Connectors::MemoryConnector; end
+
+class TcPipeline < RubySync::Pipelines::BasePipeline
+  
+  client :my_changelog
+
+  vault :my_memory
+  
+  allow_out :cn, :givenName, :sn
+  
+  out_transform do
+    if type == :add or type == :modify
+      each_operation_on("givenName") { |operation| append operation.same_but_on('cn') }
+      append RubySync::Operation.new(:add, "objectclass", ['inetOrgPerson'])
+    end
+  end
+
+end
+
+
+
+class TestLdapChangelogConnector < Test::Unit::TestCase
+    
+  include RubySyncTest
+  include HashlikeTests
+
+  def unsynchable
+    [:objectclass, :interests, :cn, :dn]
+  end
+
+
+  def vault_path
+    'uid=bob,ou=People,dc=9to5magic,dc=com,dc=au'
+  end
+
+
+  def client_path
+    'uid=bob,ou=People,dc=9to5magic,dc=com,dc=au'
+  end
+
+
+  def test_ldap_add
+    assert_nil @client[client_path], "#{client_path} already exists on client"
+    @client.add client_path, @client.create_operations_for(ldap_attr)
+    assert_not_nil @client[client_path], "#{client_path} wasn't created"
+  end
+
+  def test_client_to_vault
+  end
+
+
+
+private
+
+
+
+end

data/test/{test_csv_file_connector.rb → tc_csv_file_connector.rb}

@@ -17,23 +17,27 @@ lib_path = File.dirname(__FILE__) + '/../lib'
 $:.unshift lib_path unless $:.include?(lib_path) || $:.include?(File.expand_path(lib_path))
 
 require 'ruby_sync_test'
+require 'ruby_sync/connectors/file_connector'
 require 'ruby_sync/connectors/csv_file_connector'
 require 'ruby_sync/connectors/memory_connector'
 require 'csv'
 
 
 class TestCsvFileConnector < RubySync::Connectors::CsvFileConnector
+  dbm_path "/tmp/rubysync_csv"  
   field_names ['id', 'given name', 'last name', 'email']
   path_field  'id'
   in_path     File.expand_path("~/rubysync/csv_test/in")
   out_path    File.expand_path("~/rubysync/csv_test/out")
+  header_line false
 end
 
 class TestMemoryConnector < RubySync::Connectors::MemoryConnector
+  dbm_path "/tmp/rubysync_memory"  
 end
 
 
-class TestPipeline < RubySync::Pipelines::BasePipeline
+class CsvTestPipeline < RubySync::Pipelines::BasePipeline
   client :test_csv_file
          
   vault :test_memory
@@ -45,20 +49,25 @@ class TestPipeline < RubySync::Pipelines::BasePipeline
   
 end
 
-class TestCsvConnector < Test::Unit::TestCase
+class TcCsvConnector < Test::Unit::TestCase
   
   include RubySyncTest
     
   def setup
-    @pipeline = TestPipeline.new
+    @pipeline = CsvTestPipeline.new
     @client = @pipeline.client
     @vault = @pipeline.vault
     @filename = "#{@client.in_path}/client_to_vault.csv"
-    @pipeline.run_once # create the in and out directories if necessary
     File.delete @filename if File.exists? @filename
+    @pipeline.run_once # create the in and out directories if necessary
     @bob_details = {:cn=>'bob', :givenName=>"Robert", :sn=>"Smith", :mail=>'bob@thecure.com'}
   end
 
+  
+#  def testPipeline
+#    CsvTestPipeline
+#  end
+  
   def test_client_to_vault
     banner :test_client_to_vault
     CSV.open(@filename, 'w') do |csv|
@@ -67,7 +76,7 @@ class TestCsvConnector < Test::Unit::TestCase
     assert_nil @vault["bob"], "Vault already contains bob"
     @pipeline.run_once
     assert_not_nil @vault["bob"], "Bob wasn't created in vault"
-    modded_bob={}; @bob_details.each_pair {|k,v| modded_bob[k.to_s]=v.as_array}
+    modded_bob={}; @bob_details.each_pair {|k,v| modded_bob[k.to_s]=as_array(v)}
     assert_equal modded_bob, @vault["bob"].reject {|k,v| ['modifier',:association].include? k}
     @pipeline.run_once
   end

data/test/{test_event.rb → tc_event.rb}

@@ -20,7 +20,7 @@ $:.unshift lib_path unless $:.include?(lib_path) || $:.include?(File.expand_path
 require 'ruby_sync'
 require 'test/unit'
 
-class TestEvent < Test::Unit::TestCase
+class TcEvent < Test::Unit::TestCase
   
   def setup
     payload = [

data/test/{test_ldap_changelog.rb → tc_ldap_changelog.rb}

@@ -33,7 +33,7 @@ class ChangeLogConnector < RubySync::Connectors::LdapConnector
   search_base   "ou=people,dc=9to5magic,dc=com,dc=au"
 end
 
-class TestLdapChangelog <  Test::Unit::TestCase
+class TcLdapChangelog <  Test::Unit::TestCase
 
   include RubySyncTest
 

data/test/{test_ldap_connector.rb → tc_ldap_connector.rb}

@@ -23,28 +23,18 @@ require 'ruby_sync/connectors/ldap_connector'
 require 'ruby_sync/connectors/memory_connector'
 
 
-class ChangeLogConnector < RubySync::Connectors::LdapConnector
-  host        'changelog_ldap'
-  port        389
-  username    'cn=directory manager'
-  password    'password'
-  changelog_dn 'cn=changelog'
-  search_filter "cn=*"
-  search_base   "ou=people,dc=9to5magic,dc=com,dc=au"
-end
-
 class MyLdapConnector < RubySync::Connectors::LdapConnector
   host          'any_ldap'
-  port          10389
-  username      'uid=admin,ou=system'
+  port          389
+  username      'cn=Manager,dc=my-domain,dc=com'
   password      'secret'
   search_filter "cn=*"
-  search_base   "dc=example,dc=com"
+  search_base   "ou=users,o=my-organization,dc=my-domain,dc=com"
 end
 
 class MyMemoryConnector < RubySync::Connectors::MemoryConnector; end
 
-class TestPipeline < RubySync::Pipelines::BasePipeline
+class LdapTestPipeline < RubySync::Pipelines::BasePipeline
   
   client :my_ldap
 
@@ -62,10 +52,14 @@ class TestPipeline < RubySync::Pipelines::BasePipeline
 end
 
 
-class TestLdapConnector < Test::Unit::TestCase
+class TCLdapConnector < Test::Unit::TestCase
     
   include RubySyncTest
   include HashlikeTests
+  
+  def testPipeline
+    LdapTestPipeline
+  end
 
   def unsynchable
     [:objectclass, :interests, :cn, :dn]
@@ -74,12 +68,12 @@ class TestLdapConnector < Test::Unit::TestCase
 
   def vault_path
     # TODO: Try using a different path for the vault that's derived from the client source path
-    'cn=bob,dc=example,dc=com'
+    'cn=bob,ou=users,o=my-organization,dc=my-domain,dc=com'
   end
 
 
   def client_path
-    'cn=bob,dc=example,dc=com'
+    'cn=bob,ou=users,o=my-organization,dc=my-domain,dc=com'
   end
 
 
@@ -92,10 +86,14 @@ class TestLdapConnector < Test::Unit::TestCase
   def test_client_to_vault
   end
 
+  private
 
-
-private
-
-
-
+  def ldap_attr
+    {
+      "objectclass"=>['inetOrgPerson'],
+      "cn"=>'bob',
+      "sn"=>'roberts'
+      #"mail"=>"bob@roberts.com"
+    }
+  end
 end

data/test/{test_ldap_vault.rb → tc_ldap_vault.rb}

@@ -62,14 +62,14 @@ class TestPipeline < RubySync::Pipelines::BasePipeline
   in_transform do
     if type == :add or type == :modify
       each_operation_on("givenName") { |operation| append operation.same_but_on('cn') }
-      append RubySync::Operation.new(:add, "objectclass", ['inetOrgPerson', 'organizationalPerson', 'person', 'top', 'RubySyncSynchable'])
+      append RubySync::Operation.new(:add, "objectclass", ['organizationalPerson', 'RubySyncSynchable'])
     end
   end
 
 end
 
 
-class TestLdapVault < Test::Unit::TestCase
+class TcLdapVault < Test::Unit::TestCase
 
   include RubySyncTest
   include HashlikeTests

data/test/{test_ldif.rb → tc_ldif.rb}

@@ -21,7 +21,7 @@ require 'net/ldif'
 require 'test/unit'
 
 # TODO: Work out a cross platform method for testing file:// URL imports
-class TestLDIF < Test::Unit::TestCase
+class TcLDIF < Test::Unit::TestCase
   
   def setup
     @ldif = Net::LDIF    

data/test/{test_memory_connectors.rb → tc_memory_connectors.rb}

@@ -24,22 +24,26 @@ require 'hashlike_tests'
 require 'ruby_sync/connectors/memory_connector'
 
 
-class TestAConnector < RubySync::Connectors::MemoryConnector
+class MemoryTestAConnector < RubySync::Connectors::MemoryConnector
   dbm_path "/tmp/rubysync_a"
 end
 
-class TestBConnector < RubySync::Connectors::MemoryConnector
+class MemoryTestBConnector < RubySync::Connectors::MemoryConnector
   dbm_path "/tmp/rubysync_b"
 end
 
-class TestPipeline < RubySync::Pipelines::BasePipeline
-  client :test_a
-  vault :test_b
+class MemoryTestPipeline < RubySync::Pipelines::BasePipeline
+  client :memory_test_a
+  vault :memory_test_b
 end
 
-class TestMemoryConnectors < Test::Unit::TestCase
+class TcMemoryConnectors < Test::Unit::TestCase
   
   include RubySyncTest
   include HashlikeTests
 
+  def testPipeline
+    MemoryTestPipeline
+  end
+  
 end

data/test/{test_rubysync.rb → tc_rubysync.rb}

@@ -20,9 +20,9 @@ $:.unshift lib_path unless $:.include?(lib_path) || $:.include?(File.expand_path
 require 'ruby_sync'
 require 'test/unit'
 
-require 'test_csv_file_connector'
-require 'test_memory_connectors'
-require 'test_ldif'
-require 'test_base_pipeline'
+require 'tc_csv_file_connector'
+require 'tc_memory_connectors'
+require 'tc_ldif'
+require 'tc_base_pipeline'
 #require 'test_ldap_connector'
 #require 'test_active_record_connector'