og 0.20.0 → 0.21.0

data/lib/vendor/mysql411.rb

@@ -189,9 +189,9 @@ class Mysql
     field_count.times do
       len = get_length data
       if len == nil then
-	rec << len
+  rec << len
       else
-	rec << data.slice!(0,len)
+  rec << data.slice!(0,len)
       end
     end
     rec
@@ -213,8 +213,8 @@ class Mysql
   def skip_result_41()
     if @status == :STATUS_USE_RESULT then
       loop do
-	data = read
-	break if data[0] == 254 and data.length == 1
+  data = read
+  break if data[0] == 254 and data.length == 1
       end
       @status = :STATUS_READY
     end
@@ -277,11 +277,11 @@ class Mysql
   def read_query_result_41
     data = read
     @field_count = get_length(data)
-    if @field_count == nil then		# LOAD DATA LOCAL INFILE
+    if @field_count == nil then    # LOAD DATA LOCAL INFILE
       File::open(data) do |f|
-	write f.read
+  write f.read
       end
-      write ""		# mark EOF
+      write ""    # mark EOF
       data = read
       @field_count = get_length(data)
     end
@@ -289,11 +289,11 @@ class Mysql
       @affected_rows = get_length(data, true)
       @insert_id = get_length(data, true)
       if @server_capabilities & CLIENT_TRANSACTIONS != 0 then
-	a = data.slice!(0,2)
-	@server_status = a[0]+a[1]*256
+  a = data.slice!(0,2)
+  @server_status = a[0]+a[1]*256
       end
       if data.size > 0 and get_length(data) then
-	@info = data
+  @info = data
       end
     else
       @extra_info = get_length(data, true)

data/test/og/mixin/tc_hierarchical.rb

@@ -7,74 +7,74 @@ require 'og'
 require 'og/mixin/hierarchical'
 
 $og = Og.setup(
-	:store => 'mysql',
-	:name => 'test',
-	:user => 'root',
-	:password => 'navelrulez',
-	:destroy => true
+  :store => 'mysql',
+  :name => 'test',
+  :user => 'root',
+  :password => 'navelrulez',
+  :destroy => true
 )
 
 class TC_OgHierarchical < Test::Unit::TestCase # :nodoc: all
 
-	class Comment 
-		property :body, String
-		property :create_time, Time
-		
-		include Og::NestedSets
+  class Comment 
+    property :body, String
+    property :create_time, Time
+    
+    include Og::NestedSets
 
-		def initialize(body = nil)
-			@body = body
-			@create_time = Time.now
-		end
+    def initialize(body = nil)
+      @body = body
+      @create_time = Time.now
+    end
 
-		def to_s
-			sprintf("%3d %3d %s", @lft, @rgt, @body)
-		end
-	end
+    def to_s
+      sprintf("%3d %3d %s", @lft, @rgt, @body)
+    end
+  end
 
-	def test_all
-		$og.manage_classes		
+  def test_all
+    $og.manage_classes    
 
-		root = Comment.create('root')
-		c1 = Comment.new('1')
-		root.add_comment c1
-		c2 = Comment.new('1.1')
-		c1.add_comment c2
-		c3 = Comment.new('1.2')
-		c1.add_comment c3
-		c4 = Comment.new('1.1.1')
-		c2.add_comment c4
-		c5 = Comment.new('1.2.1')
-		c3.add_comment c5
-		c6 = Comment.new('1.1.1.1')
-		c4.add_comment c6
-		c7 = Comment.new('2')
-		root.add_comment c7
-		c8 = Comment.new('3')
-		root.add_comment c8
-		c9 = Comment.new('2.1')
-		c7.add_comment c9
+    root = Comment.create('root')
+    c1 = Comment.new('1')
+    root.add_comment c1
+    c2 = Comment.new('1.1')
+    c1.add_comment c2
+    c3 = Comment.new('1.2')
+    c1.add_comment c3
+    c4 = Comment.new('1.1.1')
+    c2.add_comment c4
+    c5 = Comment.new('1.2.1')
+    c3.add_comment c5
+    c6 = Comment.new('1.1.1.1')
+    c4.add_comment c6
+    c7 = Comment.new('2')
+    root.add_comment c7
+    c8 = Comment.new('3')
+    root.add_comment c8
+    c9 = Comment.new('2.1')
+    c7.add_comment c9
 
-		c1.reload
-		
-		Comment.all(:order => "lft, rgt").each { |c|
-			puts sprintf("%3d %3d %s", c.lft, c.rgt, c.body)
-			# p c	
-		}
-		puts '--1'
-		c1.comments(:order => "lft, rgt").each { |c| puts c.body }
-		puts '--2'
-		c1.full_comments(:order => "lft, rgt").each { |c| puts c.body }
-		puts '--3'
-		c1.direct_comments(:order => "lft, rgt").each { |c| puts c.body }
+    c1.reload
+    
+    Comment.all(:order => "lft, rgt").each { |c|
+      puts sprintf("%3d %3d %s", c.lft, c.rgt, c.body)
+      # p c  
+    }
+    puts '--1'
+    c1.comments(:order => "lft, rgt").each { |c| puts c.body }
+    puts '--2'
+    c1.full_comments(:order => "lft, rgt").each { |c| puts c.body }
+    puts '--3'
+    c1.direct_comments(:order => "lft, rgt").each { |c| puts c.body }
 
-		assert_equal 6, c1.full_comments.size
-		assert_equal 5, c1.comments.size
-		assert_equal 2, c1.direct_comments.size
-		
-		c8.reload
-		
-		assert_equal 'root', c8.parent.body
-	end
+    assert_equal 6, c1.full_comments.size
+    assert_equal 5, c1.comments.size
+    assert_equal 2, c1.direct_comments.size
+    
+    c8.reload
+    
+    assert_equal 'root', c8.parent.body
+  end
 
 end

data/test/og/mixin/tc_optimistic_locking.rb

@@ -8,49 +8,49 @@ require 'og'
 require 'og/mixin/optimistic_locking'
 
 $og = Og.setup(
-	:store => 'psql',
-	:name => 'test',
-	:user => 'postgres',
-	:password => 'navelrulez',
-	:destroy => true
+  :store => 'psql',
+  :name => 'test',
+  :user => 'postgres',
+  :password => 'navelrulez',
+  :destroy => true
 )
 
 class TC_OgLocking < Test::Unit::TestCase # :nodoc: all
-	include Og
-	
-	class Article
-		property :body, String
-		include Og::Locking
-		
-		def initialize(body)
-			@body = body
-		end
-	end
-		
-	def test_all
-		$og.manage_classes		
-		
-		Article.create('test')
+  include Og
+  
+  class Article
+    property :body, String
+    include Og::Locking
+    
+    def initialize(body)
+      @body = body
+    end
+  end
+    
+  def test_all
+    $og.manage_classes    
+    
+    Article.create('test')
 
-		a = Article[1]
-		
-		b = Article[1]
-		
-		a.body = 'Changed'
-		assert_nothing_raised do
-			a.save
-		end
-		
-		b.body = 'Ooops'
-		assert_raise(Og::StaleObjectError) do
-			b.update
-		end
-		
-		c = Article[1]
-		a.body = 'Changed again'
-		assert_nothing_raised do
-			a.update
-		end
-	end
+    a = Article[1]
+    
+    b = Article[1]
+    
+    a.body = 'Changed'
+    assert_nothing_raised do
+      a.save
+    end
+    
+    b.body = 'Ooops'
+    assert_raise(Og::StaleObjectError) do
+      b.update
+    end
+    
+    c = Article[1]
+    a.body = 'Changed again'
+    assert_nothing_raised do
+      a.update
+    end
+  end
 
 end

data/test/og/mixin/tc_orderable.rb

@@ -7,101 +7,101 @@ require 'og'
 require 'og/mixin/orderable'
 
 $og = Og.setup(
-	:store => 'psql',
-#	:store => :memory,
-	:name => 'test',
-	:user => 'postgres',
-	:password => 'navelrulez',
-	:destroy => true
+  :store => 'psql',
+#  :store => :memory,
+  :name => 'test',
+  :user => 'postgres',
+  :password => 'navelrulez',
+  :destroy => true
 )
 
 class TestCaseOgOrderable < Test::Unit::TestCase # :nodoc: all
 
-	class Comment; end
+  class Comment; end
 
-	class Article
-		property :title, :body, String
-		has_many :comments, Comment, :list => true, :order => 'position DESC'
+  class Article
+    property :title, :body, String
+    has_many :comments, Comment, :list => true, :order => 'position DESC'
 
-		def initialize(title = nil)
-			@title = title
-		end
-	end
+    def initialize(title = nil)
+      @title = title
+    end
+  end
 
-	class Comment 
-		property :body, String
-		belongs_to :article, Article
-		
-		include Og::Orderable #, :scope => :article
+  class Comment 
+    property :body, String
+    belongs_to :article, Article
+    
+    include Og::Orderable #, :scope => :article
 
-		def initialize(body = nil)
-			@body = body
-		end
-	end
+    def initialize(body = nil)
+      @body = body
+    end
+  end
 
-	def test_all
-		$og.manage_classes		
+  def test_all
+    $og.manage_classes    
 
-		a = Article.create('article')
-		a.save
+    a = Article.create('article')
+    a.save
 
-		c1 = Comment.create('1')
-		a.comments << c1
-		c2 = Comment.create('2')
-		a.comments << c2
-		c3 = Comment.create('3')
-		a.comments << c3
+    c1 = Comment.create('1')
+    a.comments << c1
+    c2 = Comment.create('2')
+    a.comments << c2
+    c3 = Comment.create('3')
+    a.comments << c3
 
-		assert_equal 1, c1.position
-		assert_equal 2, c2.position
-		assert_equal 3, c3.position
+    assert_equal 1, c1.position
+    assert_equal 2, c2.position
+    assert_equal 3, c3.position
 
-		c3.move_higher
+    c3.move_higher
 
-		c1.reload
-		c2.reload
-		c3.reload
+    c1.reload
+    c2.reload
+    c3.reload
 
-		assert_equal 1, c1.position
+    assert_equal 1, c1.position
 
-		assert_equal 2, c3.position
-		assert_equal 3, c2.position
+    assert_equal 2, c3.position
+    assert_equal 3, c2.position
 
-		c2.move_to_top
+    c2.move_to_top
 
-		c1.reload
-		c2.reload
-		c3.reload
+    c1.reload
+    c2.reload
+    c3.reload
 
-		assert_equal 1, c2.position
-		assert_equal 2, c1.position
-		assert_equal 3, c3.position
+    assert_equal 1, c2.position
+    assert_equal 2, c1.position
+    assert_equal 3, c3.position
 
-		c2.move_to_bottom
+    c2.move_to_bottom
 
-		c1.reload
-		c2.reload
-		c3.reload
+    c1.reload
+    c2.reload
+    c3.reload
 
-		assert_equal 1, c1.position
-		assert_equal 2, c3.position
-		assert_equal 3, c2.position
+    assert_equal 1, c1.position
+    assert_equal 2, c3.position
+    assert_equal 3, c2.position
 
-		c3.delete!
+    c3.delete!
 
-		c1.reload
-		c2.reload
+    c1.reload
+    c2.reload
 
-		assert_equal 1, c1.position
-		assert_equal 2, c2.position
+    assert_equal 1, c1.position
+    assert_equal 2, c2.position
 
-		c2.delete!
+    c2.delete!
 
-		c1.reload
+    c1.reload
 
-		assert_equal 1, c1.position
+    assert_equal 1, c1.position
 
-		c1.delete!
-	end
+    c1.delete!
+  end
 
 end

data/test/og/mixin/tc_timestamped.rb

@@ -7,32 +7,32 @@ require 'og'
 require 'og/mixin/timestamped'
 
 $og = Og.setup(
-	:store => 'psql',
-	:name => 'test',
-	:user => 'postgres',
-	:password => 'navelrulez',
-	:destroy => true
+  :store => 'psql',
+  :name => 'test',
+  :user => 'postgres',
+  :password => 'navelrulez',
+  :destroy => true
 )
 
 class TestCaseOgTimestamped < Test::Unit::TestCase # :nodoc: all
 
-	class Article 
-		include Og::Timestamped
-		property :body, String
+  class Article 
+    include Og::Timestamped
+    property :body, String
 
-		def initialize(body = nil)
-			@body = body
-		end
-	end
+    def initialize(body = nil)
+      @body = body
+    end
+  end
 
-	def test_all
-		$og.manage_classes		
+  def test_all
+    $og.manage_classes    
 
-		a = Article.create('article')
-		a.save
+    a = Article.create('article')
+    a.save
 
-		a = Article[1]
-		assert a.create_time
-	end
+    a = Article[1]
+    assert a.create_time
+  end
 
 end