og 0.20.0 → 0.21.0

data/lib/og/mixin/optimistic_locking.rb

@@ -16,42 +16,42 @@ end
 # http://en.wikipedia.org/wiki/Optimistic_concurrency_control
 
 module Locking
-	property :lock_version, Fixnum, :default => 0
-	pre "@lock_version = 0", :on => :og_insert
-
-	def self.append_features(base) #:nodoc:
-		PropertyUtils.copy_features(self, base)
-
-		super
-
-		base.module_eval do
-			def self.enchant
-				self.send :alias_method, :update_without_lock, :update
-				self.send :alias_method, :update, :update_with_lock
-				self.send :alias_method, :save_without_lock, :save
-				self.send :alias_method, :save, :save_with_lock
-			end
-		end
-	end
-	
-	def update_with_lock
-		lock = @lock_version
-		@lock_version += 1
-
-		unless update_without_lock(:condition => "lock_version=#{lock}") == 1	
-			raise(StaleObjectError, 'Attempted to update a stale object')
-		end
-	end
-
-	def save_with_lock
-		lock = @lock_version
-		@lock_version += 1
-
-		unless save_without_lock(:condition => "lock_version=#{lock}") == 1	
-			raise(StaleObjectError, 'Attempted to update a stale object')
-		end
-	end
-	
+  property :lock_version, Fixnum, :default => 0
+  pre "@lock_version = 0", :on => :og_insert
+
+  def self.append_features(base) #:nodoc:
+    PropertyUtils.copy_features(self, base)
+
+    super
+
+    base.module_eval do
+      def self.enchant
+        self.send :alias_method, :update_without_lock, :update
+        self.send :alias_method, :update, :update_with_lock
+        self.send :alias_method, :save_without_lock, :save
+        self.send :alias_method, :save, :save_with_lock
+      end
+    end
+  end
+  
+  def update_with_lock
+    lock = @lock_version
+    @lock_version += 1
+
+    unless update_without_lock(:condition => "lock_version=#{lock}") == 1  
+      raise(StaleObjectError, 'Attempted to update a stale object')
+    end
+  end
+
+  def save_with_lock
+    lock = @lock_version
+    @lock_version += 1
+
+    unless save_without_lock(:condition => "lock_version=#{lock}") == 1  
+      raise(StaleObjectError, 'Attempted to update a stale object')
+    end
+  end
+  
 end
 
 end

data/lib/og/mixin/orderable.rb

@@ -6,154 +6,154 @@ module Og
 
 module Orderable
 
-	def self.append_dynamic_features(base, options)
-		o = { 
-			:position => 'position', 
-			:type => Fixnum, 
-		}
-		o.update(options) if options
-
-		if o[:scope].is_a?(Symbol) && o[:scope].to_s !~ /_oid$/		
-			o[:scope] = "#{o[:scope]}_oid".intern 
-		end
-
-		position = o[:position]
-		scope = o[:scope]
-
-		if scope
-			if scope.is_a?(Symbol)
-				scope = %{(#{scope} ? "#{scope} = \#{@#{scope}}" : "#{scope} IS NULL")}
-			end
-		
-			cond = 'condition => ' + scope
-			cond_and = ':condition => ' + scope + ' + " AND " +'
-		else
-			cond = ':condition => nil'
-			cond_and = ':condition => '
-		end		
-
-		code = %{		
-			property :#{position}, #{o[:type]}
-
-			pre "add_to_bottom", :on => :og_insert	
-			pre "decrement_position_of_lower_items", :on => :og_delete
-			
-			def move_higher
-				if higher = higher_item
-					#{base}.transaction do
-						higher.increment_position
-						decrement_position
-					end
-				end
-			end
-
-			def move_lower
-				if lower = lower_item
-					#{base}.transaction do
-						lower.decrement_position
-						increment_position
-					end
-				end
-			end
-
-			def move_to_top
-				#{base}.transaction do
-					increment_position_of_higher_items
-					set_top_position
-				end
-			end
-
-			def move_to_bottom
-				#{base}.transaction do
-					decrement_position_of_lower_items
-					set_bottom_position
-				end											
-			end
-
-			def move_to
-			end
-
-			def add_to_top
-				increment_position_of_all_items
-			end
-
-			def add_to_bottom
-				@#{position} = bottom_position + 1
-			end
-
-			def add_to
-			end
-
-			def higher_item
-				#{base}.one(#{cond_and}"#{position}=\#\{@#{position} - 1\}")
-			end
-			alias_method :previous_item, :higher_item
-
-			def lower_item
-				#{base}.one(#{cond_and}"#{position}=\#\{@#{position} + 1\}")
-			end
-			alias_method :next_item, :lower_item
-
-			def top_item
-			end
-			alias_method :first_item, :top_item
-
-			def bottom_item
-				#{base}.one(#{cond}, :order => "#{position} DESC", :limit => 1)
-			end
-			alias_method :last_item, :last_item
-
-			def top?
-				@#{position} == 1
-			end
-			alias_method :first?, :top?
-
-			def bottom?
-				@#{position} == bottom_position
-			end
-			alias_method :last?, :bottom?
-
-			def increment_position
-				@#{position} += 1
-				update(:#{position})
-			end
-		
-			def decrement_position
-				@#{position} -= 1
-				update(:#{position})
-			end
-
-			def bottom_position
-				item = bottom_item
-				item ? item.#{position} : 0
-			end
-
-			def set_top_position
-				@#{position} = 1
-				update(:#{position})
-			end
-
-			def set_bottom_position
-				@#{position} = bottom_position + 1
-				update(:#{position})
-			end
-
-			def increment_position_of_higher_items
-				#{base}.update_property("#{position}=(#{position} + 1)", #{cond_and}"#{position} < \#\{@#{position}\}")
-			end
-
-			def increment_position_of_all_items
-				#{base}.update_property("#{position}=(#{position} + 1)", #{cond})
-			end
-			
-			def decrement_position_of_lower_items
-				#{base}.update_property("#{position}=(#{position} - 1)", #{cond_and}"#{position} > \#\{@#{position}\}")
-			end
-		}		
-		
-		base.module_eval(code)
-	end
-	
+  def self.append_dynamic_features(base, options)
+    o = { 
+      :position => 'position', 
+      :type => Fixnum, 
+    }
+    o.update(options) if options
+
+    if o[:scope].is_a?(Symbol) && o[:scope].to_s !~ /_oid$/    
+      o[:scope] = "#{o[:scope]}_oid".intern 
+    end
+
+    position = o[:position]
+    scope = o[:scope]
+
+    if scope
+      if scope.is_a?(Symbol)
+        scope = %{(#{scope} ? "#{scope} = \#{@#{scope}}" : "#{scope} IS NULL")}
+      end
+    
+      cond = 'condition => ' + scope
+      cond_and = ':condition => ' + scope + ' + " AND " +'
+    else
+      cond = ':condition => nil'
+      cond_and = ':condition => '
+    end    
+
+    code = %{    
+      property :#{position}, #{o[:type]}
+
+      pre "add_to_bottom", :on => :og_insert  
+      pre "decrement_position_of_lower_items", :on => :og_delete
+      
+      def move_higher
+        if higher = higher_item
+          #{base}.transaction do
+            higher.increment_position
+            decrement_position
+          end
+        end
+      end
+
+      def move_lower
+        if lower = lower_item
+          #{base}.transaction do
+            lower.decrement_position
+            increment_position
+          end
+        end
+      end
+
+      def move_to_top
+        #{base}.transaction do
+          increment_position_of_higher_items
+          set_top_position
+        end
+      end
+
+      def move_to_bottom
+        #{base}.transaction do
+          decrement_position_of_lower_items
+          set_bottom_position
+        end                      
+      end
+
+      def move_to
+      end
+
+      def add_to_top
+        increment_position_of_all_items
+      end
+
+      def add_to_bottom
+        @#{position} = bottom_position + 1
+      end
+
+      def add_to
+      end
+
+      def higher_item
+        #{base}.one(#{cond_and}"#{position}=\#\{@#{position} - 1\}")
+      end
+      alias_method :previous_item, :higher_item
+
+      def lower_item
+        #{base}.one(#{cond_and}"#{position}=\#\{@#{position} + 1\}")
+      end
+      alias_method :next_item, :lower_item
+
+      def top_item
+      end
+      alias_method :first_item, :top_item
+
+      def bottom_item
+        #{base}.one(#{cond}, :order => "#{position} DESC", :limit => 1)
+      end
+      alias_method :last_item, :last_item
+
+      def top?
+        @#{position} == 1
+      end
+      alias_method :first?, :top?
+
+      def bottom?
+        @#{position} == bottom_position
+      end
+      alias_method :last?, :bottom?
+
+      def increment_position
+        @#{position} += 1
+                          update(:only=>[:#{position}])
+      end
+    
+      def decrement_position
+        @#{position} -= 1
+        update(:only=>[:#{position}])
+      end
+
+      def bottom_position
+        item = bottom_item
+        item ? item.#{position} : 0
+      end
+
+      def set_top_position
+        @#{position} = 1
+        update(:only=>[:#{position}])
+      end
+
+      def set_bottom_position
+        @#{position} = bottom_position + 1
+        update(:only=>[:#{position}])
+      end
+
+      def increment_position_of_higher_items
+        #{base}.update_property("#{position}=(#{position} + 1)", #{cond_and}"#{position} < \#\{@#{position}\}")
+      end
+
+      def increment_position_of_all_items
+        #{base}.update_property("#{position}=(#{position} + 1)", #{cond})
+      end
+      
+      def decrement_position_of_lower_items
+        #{base}.update_property("#{position}=(#{position} - 1)", #{cond_and}"#{position} > \#\{@#{position}\}")
+      end
+    }    
+    
+    base.module_eval(code)
+  end
+  
 end
 
 end 

data/lib/og/mixin/timestamped.rb

@@ -3,16 +3,16 @@ module Og
 # Adds timestamping functionality.
 
 module Timestamped
-	property :create_time, Time
-	property :update_time, Time
-	property :access_time, Time
+  property :create_time, Time
+  property :update_time, Time
+  property :access_time, Time
 
-	pre "@create_time = @update_time = Time.now", :on => :og_insert
-	pre "@update_time = Time.now", :on => :og_update
+  pre "@create_time = @update_time = Time.now", :on => :og_insert
+  pre "@update_time = Time.now", :on => :og_update
 
-	def touch!
-		@access_time = Time.now
-	end
+  def touch!
+    @access_time = Time.now
+  end
 end
 
 end 

data/lib/og/mixin/tree.rb

@@ -11,16 +11,16 @@ module Og
 # article (http://www.dbazine.com/tropashko4.shtml)
 
 module TreeTraversal
-	
-	# The default prefix for the tree traversal helpers.
-	
-	cattr_accessor :prefix, 'tree'	
+  
+  # The default prefix for the tree traversal helpers.
+  
+  cattr_accessor :prefix, 'tree'  
 
-	def self.child(sum, n)
-		power = 2 ** n
+  def self.child(sum, n)
+    power = 2 ** n
 
-		return sum * power
-	end
+    return sum * power
+  end
 
 end
 
@@ -30,15 +30,15 @@ end
 __END__
 
 def xcoord(numer, denom)
-	num = numer + 1
-	den = denom * 2
+  num = numer + 1
+  den = denom * 2
 
-	while (num / 2).floor == (num / 2)
-		num /= 2
-		den /= 2
-	end
+  while (num / 2).floor == (num / 2)
+    num /= 2
+    den /= 2
+  end
 
-	return num, den
+  return num, den
 end
 
 #--
@@ -46,111 +46,111 @@ end
 #++
 
 def ycoord(numer, denom)
-	num, den = xcoord(numer, denom)
+  num, den = xcoord(numer, denom)
 
-	while den < denom
-		num *= 2
-		den *= 2
-	end
+  while den < denom
+    num *= 2
+    den *= 2
+  end
 
-	num = numer - num
+  num = numer - num
 
-	while (num / 2).floor == (num / 2)
-		num /= 2
-		den /= 2
-	end
+  while (num / 2).floor == (num / 2)
+    num /= 2
+    den /= 2
+  end
 
-	return num, den
+  return num, den
 end
 
 def parent(numer, denom)
-	return nil if numer == 3
+  return nil if numer == 3
 
-	num = (numer - 1) / 2
-	den = denom / 2
+  num = (numer - 1) / 2
+  den = denom / 2
 
-	while ((num-1)/4).floor == ((num-1)/4)
-		num = (num + 1) / 2
-		den = den / 2
-	end
-	
-	return num, den
+  while ((num-1)/4).floor == ((num-1)/4)
+    num = (num + 1) / 2
+    den = den / 2
+  end
+  
+  return num, den
 end
 
 def sibling(numer, denom)
-	return nil if numer == 3
-
-	num = (numer - 1) / 2
-	den = denom / 2
-	sib = 1
-	
-	while ((num-1)/4).floor == ((num-1)/4)
-		return sib if num == 1 and den == 1
-		num = (num + 1) / 2
-		den /= 2
-		sib += 1
-	end
-	
-	return sib
+  return nil if numer == 3
+
+  num = (numer - 1) / 2
+  den = denom / 2
+  sib = 1
+  
+  while ((num-1)/4).floor == ((num-1)/4)
+    return sib if num == 1 and den == 1
+    num = (num + 1) / 2
+    den /= 2
+    sib += 1
+  end
+  
+  return sib
 end
 
 def child(numer, denom, n)
-	power = 2 ** n
+  power = 2 ** n
 
-	num =  (numer * power) + 3 - power
-	den = denom * power
+  num =  (numer * power) + 3 - power
+  den = denom * power
 
-	return num, den
+  return num, den
 end
 
 def path(numer, denom)
-	return '' if numer == nil
-	n, d = parent(numer, denom)
-	return "#{path(n, d)}.#{sibling(numer, denom)}"
+  return '' if numer == nil
+  n, d = parent(numer, denom)
+  return "#{path(n, d)}.#{sibling(numer, denom)}"
 end
 
 def encode(path)
-	num = den = 1
-	postfix = ".#{path}."
+  num = den = 1
+  postfix = ".#{path}."
 
-	while postfix.length > 1
-		sibling, postfix = postfix.split('.', 2)
-		num, den = child(num, den, sibling.to_i)
-	end
+  while postfix.length > 1
+    sibling, postfix = postfix.split('.', 2)
+    num, den = child(num, den, sibling.to_i)
+  end
 
-	return num, den
+  return num, den
 end
 
 
 require 'og'
 
 class Comment
-	property :path, String
-	property :x, :y, Float
+  property :path, String
+  property :x, :y, Float
 
-	def initialize(path = nil, x = nil, y = nil)
-		@path, @x, @y = path, x, y
-	end
+  def initialize(path = nil, x = nil, y = nil)
+    @path, @x, @y = path, x, y
+  end
 end
 
 Og::Database.new(
-	:database => 'test',
-	:adapter => 'psql',
-	:user => 'postgres',
-	:password => 'navelrulez',
-	:connection_count => 1,
-	:drop => true
+  :database => 'test',
+  :adapter => 'psql',
+  :user => 'postgres',
+  :password => 'navelrulez',
+  :connection_count => 1,
+  :drop => true
 )
 
 def dp(path)
-	n, d =  encode(path)
-	n, d = Float(n), Float(d)
-	# puts "#{path} -> n: #{n} d: #{d} c: #{n/d}"
-	p = path(n, d)
-	# puts "=== #{p}"
-	xn, xd = xcoord(n, d)
-	yn, yd = ycoord(n, d)
-	Comment.create(path, xn/xd, yn/yd)
+  n, d =  encode(path)
+  n, d = Float(n), Float(d)
+  # puts "#{path} -> n: #{n} d: #{d} c: #{n/d}"
+  p = path(n, d)
+  # puts "=== #{p}"
+  xn, xd = xcoord(n, d)
+  yn, yd = ycoord(n, d)
+  Comment.create(path, xn/xd, yn/yd)
 end
 
 dp '1.1'
@@ -168,20 +168,20 @@ dp '1.5'
 dp '1.5.1'
 
 for c in Comment.all('ORDER BY x DESC, y ASC')
-	puts "#{c.path.ljust(16)}#{c.inspect}"
+  puts "#{c.path.ljust(16)}#{c.inspect}"
 end
 
 class Article
-	property :title, :body, String
-	has_many: :comments, Comment, :tree => true
+  property :title, :body, String
+  has_many: :comments, Comment, :tree => true
 end
 
 class Comment
-	property :body, String
-	belongs_to :article, Article
-	belongs_to :parent, Comment
-	has_many :children, Comment, :tree => true
-	has_many :roles, Role, :list => true
+  property :body, String
+  belongs_to :article, Article
+  belongs_to :parent, Comment
+  has_many :children, Comment, :tree => true
+  has_many :roles, Role, :list => true
 end
 
 
@@ -190,37 +190,37 @@ comment.add_child(Comment.new('hello'))
 comment.children_tree
 comment.children
 
-		if options[:tree]
-			code << %{
-				property :#{prefix}_x, Fixnum
-				property :#{prefix}_y, Fixnum
-				sql_index '#{prefix}_x, #{prefix}_y'
-			}
-		end
-
-		if options[:tree]
-
-			code << %{
-				def #{name}_tree(extrasql = nil)
-					Og.db.select("SELECT * FROM #{Og::Adapter.table(klass)} WHERE #{linkback}=\#\@oid \#\{extrasql\} ORDER BY #{prefix}_x DESC, #{prefix}_y ASC", #{klass})
-				end
-			}
-
-		elsif options[:list]
-
-		else
-
-		end
-
-		}
-		
-		if options[:tree]
-			code << %{
-				n = Og.db.count("#{linkback}=\#\@oid", #{klass})
-				ptx = @#{prefix}_x || 0
-				pty = @#{prefix}_y || 0
-				obj.#{prefix}_x, obj.#{prefix}_y = TreeTraversal.child(ptx + pty, n)
-			}
-		end
-		
-		code << %{
+    if options[:tree]
+      code << %{
+        property :#{prefix}_x, Fixnum
+        property :#{prefix}_y, Fixnum
+        sql_index '#{prefix}_x, #{prefix}_y'
+      }
+    end
+
+    if options[:tree]
+
+      code << %{
+        def #{name}_tree(extrasql = nil)
+          Og.db.select("SELECT * FROM #{Og::Adapter.table(klass)} WHERE #{linkback}=\#\@oid \#\{extrasql\} ORDER BY #{prefix}_x DESC, #{prefix}_y ASC", #{klass})
+        end
+      }
+
+    elsif options[:list]
+
+    else
+
+    end
+
+    }
+    
+    if options[:tree]
+      code << %{
+        n = Og.db.count("#{linkback}=\#\@oid", #{klass})
+        ptx = @#{prefix}_x || 0
+        pty = @#{prefix}_y || 0
+        obj.#{prefix}_x, obj.#{prefix}_y = TreeTraversal.child(ptx + pty, n)
+      }
+    end
+    
+    code << %{