edge 0.2.0 → 0.2.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c25599a81a0c7af695a8155fda82079ab4bb21d5
+  data.tar.gz: d870f4eb3cf382ca5e1e828da2a5b1235939a44e
+SHA512:
+  metadata.gz: 7528d8b4bf34d7bd2f93cead42b34290b3bce459975d885a32e35e6e9ebc4d27440492e7b3a01e66c85ee2a278a5ab20db68dab7d41321cf10724a636a3e5541
+  data.tar.gz: cf043a89a0b47ba43a49270403acef578313cd618b0efc73b79c0f6f0f7e11aee5c0952d1a5705f4d381be081737b894c57fe67f8aa3f4d8ec7bdb2986da6d0e

data/CHANGELOG.md

@@ -0,0 +1,11 @@
+# 0.2.1 (March 6, 2013)
+
+* Fix: acts_as_forest survives multiple calls
+
+# 0.2.0 (February 22, 2013)
+
+* Added with_descendents
+
+# 0.1.0 (March 11, 2012)
+
+* Initial release

data/README.md

@@ -45,7 +45,7 @@ acts_as_forest.
     Location.find_tree usa.id # load a single tree.
 
 It also provides the with_descendents scope to get all currently selected
-nodes and all there descendents. It can be chained after where scopes, but
+nodes and all their descendents. It can be chained after where scopes, but
 must not be used after any other type of scope.
 
     Location.where(name: "Illinois").with_descendents.all # [illinois, chicago]

data/lib/edge/forest.rb

@@ -1,7 +1,7 @@
 module Edge
   module Forest
     # acts_as_forest models a tree/multi-tree structure.
-    module ClassMethods
+    module ActsAsForest
       # options:
       #
       # * foreign_key - column name to use for parent foreign_key (default: parent_id)
@@ -33,86 +33,89 @@ module Edge
         scope :root, where(forest_foreign_key => nil)
 
         include Edge::Forest::InstanceMethods
+        extend Edge::Forest::ClassMethods
+      end
+    end
 
-        # Finds entire forest and preloads all associations. It can be used at
-        # the end of an ActiveRecord finder chain.
-        #
-        # Example:
-        #    # loads all locations
-        #    Location.find_forest
-        #
-        #    # loads all nodes with matching names and all there descendants
-        #    Category.where(:name => %w{clothing books electronics}).find_forest
-        def find_forest
-          manager = recursive_manager.project(Arel.star)
-          manager.order(forest_order) if forest_order
-
-          records = find_by_sql manager.to_sql
-
-          records_by_id = records.each_with_object({}) { |r, h| h[r.id] = r }
-
-          # Set all children associations to an empty array
-          records.each do |r|
-            children_association = r.association(:children)
-            children_association.target = []
-          end
+    module ClassMethods
+      # Finds entire forest and preloads all associations. It can be used at
+      # the end of an ActiveRecord finder chain.
+      #
+      # Example:
+      #    # loads all locations
+      #    Location.find_forest
+      #
+      #    # loads all nodes with matching names and all there descendants
+      #    Category.where(:name => %w{clothing books electronics}).find_forest
+      def find_forest
+        manager = recursive_manager.project(Arel.star)
+        manager.order(forest_order) if forest_order
 
-          top_level_records = []
+        records = find_by_sql manager.to_sql
 
-          records.each do |r|
-            parent = records_by_id[r[forest_foreign_key]]
-            if parent
-              r.association(:parent).target = parent
-              parent.association(:children).target.push(r)
-            else
-              top_level_records.push(r)
-            end
-          end
+        records_by_id = records.each_with_object({}) { |r, h| h[r.id] = r }
 
-          top_level_records
+        # Set all children associations to an empty array
+        records.each do |r|
+          children_association = r.association(:children)
+          children_association.target = []
         end
 
-        # Finds an a tree or trees by id.
-        #
-        # If any requested ids are not found it raises
-        # ActiveRecord::RecordNotFound.
-        def find_tree(id_or_ids)
-          trees = where(:id => id_or_ids).find_forest
-          if id_or_ids.kind_of?(Array)
-            raise ActiveRecord::RecordNotFound unless trees.size == id_or_ids.size
-            trees
+        top_level_records = []
+
+        records.each do |r|
+          parent = records_by_id[r[forest_foreign_key]]
+          if parent
+            r.association(:parent).target = parent
+            parent.association(:children).target.push(r)
           else
-            raise ActiveRecord::RecordNotFound if trees.empty?
-            trees.first
+            top_level_records.push(r)
           end
         end
 
-        # Returns a new scope that includes previously scoped records and their descendants by subsuming the previous scope into a subquery
-        #
-        # Only where scopes can precede this in a scope chain
-        def with_descendants
-          manager = recursive_manager.project('id')
-          unscoped.where(id: manager)
+        top_level_records
+      end
+
+      # Finds an a tree or trees by id.
+      #
+      # If any requested ids are not found it raises
+      # ActiveRecord::RecordNotFound.
+      def find_tree(id_or_ids)
+        trees = where(:id => id_or_ids).find_forest
+        if id_or_ids.kind_of?(Array)
+          raise ActiveRecord::RecordNotFound unless trees.size == id_or_ids.size
+          trees
+        else
+          raise ActiveRecord::RecordNotFound if trees.empty?
+          trees.first
         end
+      end
 
-        private
-        def recursive_manager
-          all_nodes = Arel::Table.new(:all_nodes)
+      # Returns a new scope that includes previously scoped records and their descendants by subsuming the previous scope into a subquery
+      #
+      # Only where scopes can precede this in a scope chain
+      def with_descendants
+        manager = recursive_manager.project('id')
+        unscoped.where(id: manager)
+      end
 
-          original_term = (current_scope || scoped).arel
-          iterated_term = Arel::SelectManager.new Arel::Table.engine
-          iterated_term.from(arel_table)
-            .project(arel_table.columns)
-            .join(all_nodes)
-            .on(arel_table[forest_foreign_key].eq all_nodes[:id])
+      private
+      def recursive_manager
+        all_nodes = Arel::Table.new(:all_nodes)
 
-          union = original_term.union(iterated_term)
+        original_term = (current_scope || scoped).arel
+        iterated_term = Arel::SelectManager.new Arel::Table.engine
+        iterated_term.from(arel_table)
+          .project(arel_table.columns)
+          .join(all_nodes)
+          .on(arel_table[forest_foreign_key].eq all_nodes[:id])
 
-          as_statement = Arel::Nodes::As.new all_nodes, union
+        union = original_term.union(iterated_term)
 
-          manager = Arel::SelectManager.new Arel::Table.engine
-          manager.with(:recursive, as_statement).from(all_nodes)
-        end
+        as_statement = Arel::Nodes::As.new all_nodes, union
+
+        manager = Arel::SelectManager.new Arel::Table.engine
+        manager.with(:recursive, as_statement).from(all_nodes)
       end
     end
 
@@ -156,4 +159,4 @@ module Edge
   end
 end
 
-ActiveRecord::Base.extend Edge::Forest::ClassMethods
+ActiveRecord::Base.extend Edge::Forest::ActsAsForest

data/lib/edge/version.rb

@@ -1,3 +1,3 @@
 module Edge
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/forest_spec.rb

@@ -212,4 +212,14 @@ describe "Edge::Forest" do
       end
     end
   end
+
+  describe "self.acts_as_forest" do
+    it 'can be used twice' do
+      Location2 = Class.new(ActiveRecord::Base) do
+        self.table_name = 'locations'
+        acts_as_forest :order => "name"
+      end
+      Location2.find_forest
+    end
+  end
 end

metadata

@@ -1,52 +1,46 @@
 --- !ruby/object:Gem::Specification
 name: edge
 version: !ruby/object:Gem::Version
-  version: 0.2.0
-  prerelease: 
+  version: 0.2.1
 platform: ruby
 authors:
 - Jack Christensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-22 00:00:00.000000000 Z
+date: 2013-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,33 +55,29 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.6.0
 description: Graph functionality for ActiveRecord
@@ -100,6 +89,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- CHANGELOG.md
 - Gemfile
 - Guardfile
 - LICENSE
@@ -119,27 +109,26 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/JackC/edge
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Graph functionality for ActiveRecord. Provides tree/forest modeling structure
   that can load entire trees in a single query.
 test_files: