edge 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c25599a81a0c7af695a8155fda82079ab4bb21d5
-  data.tar.gz: d870f4eb3cf382ca5e1e828da2a5b1235939a44e
+  metadata.gz: c44e87734aaa9f415d1fd27dae95c877c975ef0c
+  data.tar.gz: 5339eb867e7383ada9fc7677f89c84eceaa4844a
 SHA512:
-  metadata.gz: 7528d8b4bf34d7bd2f93cead42b34290b3bce459975d885a32e35e6e9ebc4d27440492e7b3a01e66c85ee2a278a5ab20db68dab7d41321cf10724a636a3e5541
-  data.tar.gz: cf043a89a0b47ba43a49270403acef578313cd618b0efc73b79c0f6f0f7e11aee5c0952d1a5705f4d381be081737b894c57fe67f8aa3f4d8ec7bdb2986da6d0e
+  metadata.gz: ce618003724c04a238a18c9f786ebf312f8212da8482ea5b6f1ab5875f61e48a110f0bf4a83a203810a9d71e128cb4dde2e0c4fe6e520f53d82734f1a5e083b1
+  data.tar.gz: 3f324365418e1dbaea369b0806ff1a9d173947018abc45fa13fad78bcd9b985c060834d768973ef2c9e18b541ccce9494effca947f0e3ce933d7dc1679122939

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.3.0 (December 17, 2013)
+
+* Rails 4 support
+* Fix for incomparable column types
+
 # 0.2.1 (March 6, 2013)
 
 * Fix: acts_as_forest survives multiple calls

data/edge.gemspec

@@ -14,11 +14,12 @@ Gem::Specification.new do |gem|
   gem.name          = "edge"
   gem.require_paths = ["lib"]
   gem.version       = Edge::VERSION
-  
+
   gem.add_dependency 'activerecord', ">= 3.2.0"
-  
+
   gem.add_development_dependency 'pg'
+  gem.add_development_dependency 'pry'
   gem.add_development_dependency 'rspec', "~> 2.8.0"
   gem.add_development_dependency 'guard', ">= 0.10.0"
-  gem.add_development_dependency 'guard-rspec', ">= 0.6.0"   
+  gem.add_development_dependency 'guard-rspec', ">= 0.6.0"
 end

data/lib/edge/forest.rb

@@ -22,15 +22,13 @@ module Edge
 
         belongs_to :parent, common_options
 
-        children_options = if forest_order
-          common_options.merge(:order => forest_order)
+        if forest_order
+          has_many :children, -> { order(forest_order) }, common_options
         else
-          common_options
+          has_many :children, common_options
         end
 
-        has_many :children, children_options
-
-        scope :root, where(forest_foreign_key => nil)
+        scope :root, -> { where(forest_foreign_key => nil) }
 
         include Edge::Forest::InstanceMethods
         extend Edge::Forest::ClassMethods
@@ -95,18 +93,18 @@ module Edge
       #
       # Only where scopes can precede this in a scope chain
       def with_descendants
-        manager = recursive_manager.project('id')
-        unscoped.where(id: manager)
+        manager = recursive_manager.project(arel_table[:id])
+        unscoped.where("id in (#{manager.to_sql})")
       end
 
       private
       def recursive_manager
         all_nodes = Arel::Table.new(:all_nodes)
 
-        original_term = (current_scope || scoped).arel
+        original_term = (current_scope || all).select(primary_key, forest_foreign_key).arel
         iterated_term = Arel::SelectManager.new Arel::Table.engine
         iterated_term.from(arel_table)
-          .project(arel_table.columns)
+          .project([arel_table[primary_key.to_sym], arel_table[forest_foreign_key.to_sym]])
           .join(all_nodes)
           .on(arel_table[forest_foreign_key].eq all_nodes[:id])
 
@@ -114,8 +112,11 @@ module Edge
 
         as_statement = Arel::Nodes::As.new all_nodes, union
 
-        manager = Arel::SelectManager.new Arel::Table.engine
-        manager.with(:recursive, as_statement).from(all_nodes)
+        manager = Arel::SelectManager.new(Arel::Table.engine)
+          .with(:recursive, as_statement)
+          .from(all_nodes)
+          .join(arel_table)
+          .on(all_nodes[:id].eq(arel_table[:id]))
       end
     end
 

data/lib/edge/version.rb

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

data/spec/database_structure.sql

@@ -3,5 +3,6 @@ DROP TABLE IF EXISTS locations;
 CREATE TABLE locations(
   id serial PRIMARY KEY,
   parent_id integer REFERENCES locations,
-  name varchar NOT NULL
+  name varchar NOT NULL,
+  attrs json DEFAULT NULL -- include a column that does not have an operator defined that can be used with union
 );

data/spec/forest_spec.rb

@@ -4,6 +4,8 @@ class Location < ActiveRecord::Base
   acts_as_forest :order => "name"
 end
 
+Location.delete_all
+
 describe "Edge::Forest" do
   let!(:usa) { Location.create! :name => "USA" }
   let!(:illinois) { Location.create! :parent => usa, :name => "Illinois" }
@@ -131,7 +133,7 @@ describe "Edge::Forest" do
 
   describe "root scope" do
     it "returns only root nodes" do
-      Location.root.all.should include(usa, canada)
+      Location.root.should include(usa, canada)
     end
   end
 
@@ -139,13 +141,11 @@ describe "Edge::Forest" do
     it "preloads all parents and children" do
       forest = Location.find_forest
 
-      Location.with_scope(
-        :find => Location.where("purposely fail if any Location find happens here")
-      ) 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(Array)
+            node.children.should be_kind_of(ActiveRecord::Associations::CollectionProxy)
           end
         end
       end
@@ -198,17 +198,17 @@ describe "Edge::Forest" do
   describe "with_descendants" do
     context "unscoped" do
       it "returns all records" do
-        Location.with_descendants.all.should =~ Location.all
+        Location.with_descendants.to_a.should =~ 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.all.should =~ [canada, british_columbia]
+        Location.where(id: canada.id).with_descendants.to_a.should =~ [canada, british_columbia]
       end
 
       it "is not commutative" do
-        Location.with_descendants.where(id: canada.id).all.should == [canada]
+        Location.with_descendants.where(id: canada.id).to_a.should == [canada]
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: edge
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Jack Christensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-06 00:00:00.000000000 Z
+date: 2013-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -38,6 +38,20 @@ dependencies:
     - - '>='
       - !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
@@ -126,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Graph functionality for ActiveRecord. Provides tree/forest modeling structure
@@ -136,3 +150,4 @@ test_files:
 - spec/database_structure.sql
 - spec/forest_spec.rb
 - spec/spec_helper.rb
+has_rdoc: