edge 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1fe550a31afecff13aad7e57f96d370bfa89e914
-  data.tar.gz: ee8c1457895a5bfb1fd2a6478ce52ee64a600a62
+  metadata.gz: 1eb4aa8563c1847f2ecd36c8507834a80f81a80c
+  data.tar.gz: 1a08d6bca601260f9c1f4bad477357d2f6770cb8
 SHA512:
-  metadata.gz: a5d301a74705822566be807f9e65ce0699450a125d9268ce1a8e3729e94846ab19deaa7faa68303c45d516df2c7de8b351aa638381cac0b4c86b05a5ca9c2f83
-  data.tar.gz: bb0bd66741d85b26057fb90d4d2ba4d39dad1b59fec902ad80daccc4490f186079da87697426d6fac358e711ce330c32e5382fbc32c0e6b216be6a1bdba97187
+  metadata.gz: c9460fc7955f919c88b240e4bd426d228d8b1451241530ced75b02d950093ca6c65d336f15baa501df85d9d87422eae9141a493117feee1f69c54d07565a69cd
+  data.tar.gz: 3634da19a17379187e192470ba7e73ee991cc197fe32347ab47a6b061f571689d5066026259e72239d31df555c5b56492e63e0564c7191e3df181a438f78d1ed

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.4.0 (December 23, 2014)
+
+* Fix failure with bind_values
+* Fix README typos (y-yagi)
+* Improve performance by using flat_map (TheKidCoder)
+
 # 0.3.2 (March 1, 2014)
 
 * Set inverse_of on parent and children associations (Systho)

data/README.md

@@ -44,11 +44,11 @@ acts_as_forest.
     Location.find_forest # [usa, canada] with all children and parents preloaded
     Location.find_tree usa.id # load a single tree.
 
-It also provides the with_descendents scope to get all currently selected
+It also provides the with_descendants scope to get all currently selected
 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]
+    Location.where(name: "Illinois").with_descendants.all # [illinois, chicago]
 
 ## Benchmarks
 
@@ -94,4 +94,4 @@ Even on slower machines entire trees can be loaded quickly.
 
 ## License
 
-MIT
+MIT

data/edge.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency 'pg'
   gem.add_development_dependency 'pry'
-  gem.add_development_dependency 'rspec', "~> 2.8.0"
+  gem.add_development_dependency 'rspec', "~> 3.1.0"
   gem.add_development_dependency 'guard', ">= 0.10.0"
   gem.add_development_dependency 'guard-rspec', ">= 0.6.0"
 end

data/lib/edge/forest.rb

@@ -50,7 +50,8 @@ module Edge
         manager = recursive_manager.project(Arel.star)
         manager.order(forest_order) if forest_order
 
-        records = find_by_sql manager.to_sql
+        bind_values = current_scope ? current_scope.bind_values : []
+        records = find_by_sql manager.to_sql, bind_values
 
         records_by_id = records.each_with_object({}) { |r, h| h[r.id] = r }
 
@@ -95,7 +96,9 @@ module Edge
       # Only where scopes can precede this in a scope chain
       def with_descendants
         manager = recursive_manager.project(arel_table[:id])
-        unscoped.where("#{table_name}.id in (#{manager.to_sql})")
+        scope = unscoped.where("#{table_name}.id in (#{manager.to_sql})")
+        scope.bind_values = current_scope.bind_values if current_scope
+        scope
       end
 
       private
@@ -152,7 +155,7 @@ module Edge
       # Returns all descendants
       def descendants
         if children.present?
-          children + children.map(&:descendants).flatten
+          children + children.flat_map(&:descendants)
         else
           []
         end

data/lib/edge/version.rb

@@ -1,3 +1,3 @@
 module Edge
-  VERSION = "0.3.2"
+  VERSION = "0.4.0"
 end

data/spec/forest_spec.rb

@@ -17,19 +17,19 @@ describe "Edge::Forest" do
   describe "root?" do
     context "of root node" do
       it "should be true" do
-        usa.root?.should == true
+        expect(usa.root?).to eq true
       end
     end
 
     context "of child node" do
       it "should be false" do
-        illinois.root?.should == false
+        expect(illinois.root?).to eq false
       end
     end
 
     context "of leaf node" do
       it "should be root node" do
-        chicago.root?.should == false
+        expect(chicago.root?).to eq false
       end
     end
   end
@@ -37,19 +37,19 @@ describe "Edge::Forest" do
   describe "root" do
     context "of root node" do
       it "should be self" do
-        usa.root.should == usa
+        expect(usa.root).to eq usa
       end
     end
 
     context "of child node" do
       it "should be root node" do
-        illinois.root.should == usa
+        expect(illinois.root).to eq usa
       end
     end
 
     context "of leaf node" do
       it "should be root node" do
-        chicago.root.should == usa
+        expect(chicago.root).to eq usa
       end
     end
   end
@@ -57,19 +57,19 @@ describe "Edge::Forest" do
   describe "parent" do
     context "of root node" do
       it "should be nil" do
-        usa.parent.should == nil
+        expect(usa.parent).to eq nil
       end
     end
 
     context "of child node" do
       it "should be parent" do
-        illinois.parent.should == usa
+        expect(illinois.parent).to eq usa
       end
     end
 
     context "of leaf node" do
       it "should be parent" do
-        chicago.parent.should == illinois
+        expect(chicago.parent).to eq illinois
       end
     end
   end
@@ -77,13 +77,13 @@ describe "Edge::Forest" do
   describe "ancestors" do
     context "of root node" do
       it "should be empty" do
-        usa.ancestors.should be_empty
+        expect(usa.ancestors).to be_empty
       end
     end
 
     context "of leaf node" do
       it "should be ancestors ordered by ascending distance" do
-        chicago.ancestors.should == [illinois, usa]
+        expect(chicago.ancestors).to eq [illinois, usa]
       end
     end
   end
@@ -91,49 +91,49 @@ describe "Edge::Forest" do
   describe "siblings" do
     context "of root node" do
       it "should be empty" do
-        usa.siblings.should be_empty
+        expect(usa.siblings).to be_empty
       end
     end
 
     context "of child node" do
       it "should be other children of parent" do
-        illinois.siblings.should include(indiana)
+        expect(illinois.siblings).to include(indiana)
       end
     end
   end
 
   describe "children" do
     it "should be children" do
-      usa.children.should include(illinois, indiana)
+      expect(usa.children).to include(illinois, indiana)
     end
 
     it "should be ordered" do
       alabama = Location.create! :parent => usa, :name => "Alabama"
-      usa.children.should == [alabama, illinois, indiana]
+      expect(usa.children).to eq [alabama, illinois, indiana]
     end
 
     context "of leaf" do
       it "should be empty" do
-        chicago.children.should be_empty
+        expect(chicago.children).to be_empty
       end
     end
   end
 
   describe "descendants" do
     it "should be all descendants" do
-      usa.descendants.should include(illinois, indiana, chicago)
+      expect(usa.descendants).to include(illinois, indiana, chicago)
     end
 
     context "of leaf" do
       it "should be empty" do
-        chicago.descendants.should be_empty
+        expect(chicago.descendants).to be_empty
       end
     end
   end
 
   describe "root scope" do
     it "returns only root nodes" do
-      Location.root.should include(usa, canada)
+      expect(Location.root).to include(usa, canada)
     end
   end
 
@@ -144,8 +144,8 @@ describe "Edge::Forest" do
       Location.where("purposely fail if any Location find happens here").scoping do
         forest.each do |tree|
           tree.descendants.each do |node|
-            node.parent.should be
-            node.children.should be_kind_of(ActiveRecord::Associations::CollectionProxy)
+            expect(node.parent).to be
+            expect(node.children).to be_kind_of(ActiveRecord::Associations::CollectionProxy)
           end
         end
       end
@@ -153,14 +153,14 @@ describe "Edge::Forest" do
 
     it "works when scoped" do
       forest = Location.where(:name => "USA").find_forest
-      forest.should include(usa)
+      expect(forest).to include(usa)
     end
 
     it "preloads children in proper order" do
       alabama = Location.create! :parent => usa, :name => "Alabama"
       forest = Location.find_forest
       tree = forest.find { |l| l.id == usa.id }
-      tree.children.should == [alabama, illinois, indiana]
+      expect(tree.children).to eq [alabama, illinois, indiana]
     end
 
     context "with an infinite loop" do
@@ -177,12 +177,12 @@ describe "Edge::Forest" do
   describe "find_tree" do
     it "finds by id" do
       tree = Location.find_tree usa.id
-      tree.should == usa
+      expect(tree).to eq usa
     end
 
     it "finds multiple trees by id" do
       trees = Location.find_tree [indiana.id, illinois.id]
-      trees.should include(indiana, illinois)
+      expect(trees).to include(indiana, illinois)
     end
 
     it "raises ActiveRecord::RecordNotFound when id is not found" do
@@ -198,17 +198,20 @@ describe "Edge::Forest" do
   describe "with_descendants" do
     context "unscoped" do
       it "returns all records" do
-        Location.with_descendants.to_a.should =~ Location.all
+        rows = Location.with_descendants.to_a
+        expect(rows).to match_array Location.all
       end
     end
 
     context "scoped" do
       it "returns a new scope that includes previously scoped records and their descendants" do
-        Location.where(id: canada.id).with_descendants.to_a.should =~ [canada, british_columbia]
+        rows = Location.where(id: canada.id).with_descendants.to_a
+        expect(rows).to match_array [canada, british_columbia]
       end
 
       it "is not commutative" do
-        Location.with_descendants.where(id: canada.id).to_a.should == [canada]
+        rows = Location.with_descendants.where(id: canada.id).to_a
+        expect(rows).to eq [canada]
       end
     end
   end

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: edge
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Jack Christensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-01 00:00:00.000000000 Z
+date: 2014-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.0
 description: Graph functionality for ActiveRecord
@@ -101,8 +101,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
 - CHANGELOG.md
 - Gemfile
 - Guardfile
@@ -130,17 +130,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Graph functionality for ActiveRecord. Provides tree/forest modeling structure