ordered_tree 0.1.8 → 0.1.9

data/VERSION

@@ -1 +1 @@
-0.1.8
+0.1.9

data/lib/ordered_tree.rb

@@ -30,29 +30,19 @@ module OrderedTree #:nodoc:
     belongs_to :parent_node,
       :class_name => self.name,
       :foreign_key => ordered_tree_config[:foreign_key],
-      :primary_key => ordered_tree_config[:primary_key]
+      :primary_key => ordered_tree_config[:primary_key],
+      :conditions => proc {scope_condition}
     has_many :child_nodes,
       :class_name => self.name,
       :foreign_key => ordered_tree_config[:foreign_key],
       :primary_key => ordered_tree_config[:primary_key],
+      :conditions => proc {scope_condition},
       :order => ordered_tree_config[:order]
     scope :roots, lambda { |*args|
       scope_condition = args[0]
       where(scope_condition).where(self.ordered_tree_config[:foreign_key].to_sym => 0).order(self.ordered_tree_config[:order])
     }
 
-    # If the scope is something like :person, then turn it into :person_id
-    if self.ordered_tree_config[:scope].is_a?(Symbol) && self.ordered_tree_config[:scope].to_s !~ /_id$/
-      self.ordered_tree_config[:scope] = "#{self.ordered_tree_config[:scope]}_id".intern
-    end
-
-    if self.ordered_tree_config[:scope].is_a?(Symbol) # ie :person_id
-      define_method "scope_condition" do
-        hash = {self.class.ordered_tree_config[:scope].to_sym => send(self.class.ordered_tree_config[:scope].to_sym)}
-        self.class.send(:sanitize_sql_hash_for_conditions, hash)
-      end
-    end
-
     include OrderedTree::ClassMethods
     include OrderedTree::InstanceMethods
   end #ordered_tree

data/lib/ordered_tree/instance_methods/misc.rb

@@ -13,9 +13,17 @@ module OrderedTree
 
       private
 
-      # Overwrite this method to define the scope of the list changes
       def scope_condition
-        "1=1"
+        return @scope_condition if defined?(@scope_condition)
+        scope = self.class.ordered_tree_config[:scope]
+        # If the scope is something like :person, then turn it into :person_id
+        scope = :"#{scope}_id" if scope.is_a?(Symbol) && scope.to_s !~ /_id$/
+
+        @scope_condition = if scope
+          self.class.send(:sanitize_sql_hash_for_conditions, {scope => send(scope)})
+        else
+          "1=1"
+        end
       end
     end
   end

data/ordered_tree.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ordered_tree}
-  s.version = "0.1.8"
+  s.version = "0.1.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ramon Tayag"]

data/spec/fixtures/category.rb

@@ -1,3 +1,3 @@
 class Category < ActiveRecord::Base
-  ordered_tree :primary_key => :alt_id
+  ordered_tree :primary_key => :alt_id, :scope => :person_id
 end

data/spec/ordered_tree_spec.rb

@@ -8,10 +8,20 @@ describe OrderedTree do
 
   describe "when a primary_key is supplied" do
     it "should use the parent_id to point to the primary_key instead of :id" do
-      c1 = Category.create(:alt_id => 10)
-      c2 = Category.create(:parent_id => 10)
+      c1 = Category.create(:person_id => 1, :alt_id => 10)
+      c2 = Category.create(:person_id => 1, :parent_id => 10)
+      d1 = Category.create(:person_id => 2, :alt_id => 10)
+      d2 = Category.create(:person_id => 2, :parent_id => 10)
+
       c2.parent.should == c1
       c1.children.should include(c2)
+      d1.children.should_not include(c2)
+      c2.root.should == c1
+
+      d2.parent.should == d1
+      d1.children.should include(d2)
+      c1.children.should_not include(d2)
+      d2.root.should == d1
     end
   end
 

data/spec/spec_helper.rb

@@ -41,6 +41,7 @@ def reset_database
     t.integer :parent_id, :null => false, :default => 0
     t.integer :position
     t.integer :alt_id
+    t.integer :person_id
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ordered_tree
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 1
-  - 8
-  version: 0.1.8
+  - 9
+  version: 0.1.9
 platform: ruby
 authors: 
 - Ramon Tayag
@@ -19,8 +19,9 @@ date: 2011-08-07 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: activerecord
   type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -31,12 +32,12 @@ dependencies:
         - 0
         - 0
         version: 3.0.0
-  name: activerecord
-  version_requirements: *id001
   prerelease: false
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
+  name: rspec
   type: :development
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -47,12 +48,12 @@ dependencies:
         - 6
         - 0
         version: 2.6.0
-  name: rspec
-  version_requirements: *id002
   prerelease: false
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
+  name: bundler
   type: :development
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -63,12 +64,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  name: bundler
-  version_requirements: *id003
   prerelease: false
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
+  name: jeweler
   type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -79,12 +80,12 @@ dependencies:
         - 6
         - 2
         version: 1.6.2
-  name: jeweler
-  version_requirements: *id004
   prerelease: false
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
+  name: rcov
   type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -93,12 +94,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rcov
-  version_requirements: *id005
   prerelease: false
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
+  name: sqlite3
   type: :development
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -107,12 +108,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: sqlite3
-  version_requirements: *id006
   prerelease: false
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
+  name: guard-rspec
   type: :development
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -121,12 +122,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: guard-rspec
-  version_requirements: *id007
   prerelease: false
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
+  name: libnotify
   type: :development
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -135,12 +136,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: libnotify
-  version_requirements: *id008
   prerelease: false
+  requirement: *id008
 - !ruby/object:Gem::Dependency 
+  name: rb-inotify
   type: :development
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -149,9 +150,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rb-inotify
-  version_requirements: *id009
   prerelease: false
+  requirement: *id009
 description: Uses parent_id and position to create an ordered tree.
 email: ramon@tayag.net
 executables: []