edge 0.4.3 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: de6a7e89e268d6a04bcb12ea49f331c0492a12c0
-  data.tar.gz: d3223c0995b78bc3c9de539948b225ee2c0a148a
+SHA256:
+  metadata.gz: 9ee55cbc8cd29fcd367b1423df3ecef782eb3ab3f6cc054f86373e35518fbbea
+  data.tar.gz: a8565592a8020190a13a04291252508b459c63deb270f220a91f54333a244779
 SHA512:
-  metadata.gz: e906301864501743b6848b67a40b33d60e5447c7a34c39023327d577e03e43b0ad926834435c31dbaa5b924f16a1b4dcf3bf095565d18779d8cd180b9b4e3776
-  data.tar.gz: 85d2f8ea8e2e95dd163f17a2e436cec52b50bb80cc8bda6afc012cedba282548cd23991ea0bb4917b91847832ea9a7fb51734ff9a34bfc1b4a5df9011cd1f115
+  metadata.gz: cb8afdfdadae80f8e073a3ce094d2361dc5f47de9ed540b3ff309d40a8b9a9c12cc60c6beb2946a752a7938c7246e4841b66374d111b910ffa8f2e523c7b4cde
+  data.tar.gz: c540a358d7cb3c4424472a4b1c80354855673d262622cc3813c3cde9fab12c1c685638fa2083cfefed51658f2ec7917de0e993b0587a7797f57bb8f6fa397333

data/.travis.yml

@@ -1,12 +1,10 @@
 language: ruby
 rvm:
-  - 2.2.0
-  - 2.1.5
-  - 2.0.0
+  - 2.5.3
+  - 2.4.5
+  - 2.3.8
 gemfile:
-  - gemfiles/4.0.gemfile
-  - gemfiles/4.1.gemfile
-  - gemfiles/4.2.gemfile
+  - gemfiles/5.0.gemfile
 
 addons:
   postgresql: "9.2"

data/CHANGELOG.md

@@ -1,3 +1,26 @@
+# 0.6.1 (February 20, 2021)
+
+* Add Ruby 3 compatibility (Martins Polakovs)
+
+# 0.6.0 (December 13, 2018)
+
+* Fix usage when table name includes schema
+* Drop Rails 4.x support
+
+# 0.5.1 (August 4, 2017)
+
+* Allow use of 'optional' option for belongs_to (Yuji Yaginuma)
+
+# 0.5.0 (May 14, 2016)
+
+* Add Rails 5.0 support
+* Drop Rails 4.0 support
+* Replace using internal arel with SQL string building
+
+# 0.4.4 (January 29, 2016)
+
+* Fix JRuby compatibility (jackc)
+
 # 0.4.3 (October 23, 2015)
 
 * Allow dependent option to acts_as_forest (WANG QUANG)

data/edge.gemspec

@@ -15,12 +15,10 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Edge::VERSION
 
-  gem.add_dependency 'activerecord', ">= 4.0.0"
+  gem.add_dependency 'activerecord', ">= 5.0.0"
 
   gem.add_development_dependency 'pg'
   gem.add_development_dependency 'pry'
   gem.add_development_dependency 'rake'
-  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"
+  gem.add_development_dependency 'rspec', "~> 3.6.0"
 end

data/gemfiles/{4.0.gemfile → 5.0.gemfile}

@@ -1,5 +1,5 @@
 source "https://rubygems.org"
 
-gem "activerecord", "4.0.13"
+gem "activerecord", "~> 5.0.0"
 
 gemspec :path=>"../"

data/lib/edge/forest.rb

@@ -7,8 +7,9 @@ module Edge
       # * dependent - passed to children has_many (default: none)
       # * foreign_key - column name to use for parent foreign_key (default: parent_id)
       # * order - how to order children (default: none)
+      # * optional - passed to belongs_to (default: none)
       def acts_as_forest(options={})
-        options.assert_valid_keys :foreign_key, :order, :dependent
+        options.assert_valid_keys :foreign_key, :order, :dependent, :optional
 
         class_attribute :forest_foreign_key
         self.forest_foreign_key = options[:foreign_key] || "parent_id"
@@ -23,12 +24,14 @@ module Edge
 
         dependent_options = options[:dependent] ? { dependent: options[:dependent] } : {}
 
-        belongs_to :parent, common_options.merge(inverse_of: :children)
+        optional_options = options[:optional] ? { optional: options[:optional] } : {}
+
+        belongs_to :parent, **common_options.merge(inverse_of: :children).merge(optional_options)
 
         if forest_order
-          has_many :children, -> { order(forest_order) }, common_options.merge(inverse_of: :parent).merge(dependent_options)
+          has_many :children, -> { order(forest_order) }, **common_options.merge(inverse_of: :parent).merge(dependent_options)
         else
-          has_many :children, common_options.merge(inverse_of: :parent).merge(dependent_options)
+          has_many :children, **common_options.merge(inverse_of: :parent).merge(dependent_options)
         end
 
         scope :root, -> { where(forest_foreign_key => nil) }
@@ -49,11 +52,14 @@ module Edge
       #    # 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
+        new_scope = unscoped.joins("INNER JOIN all_nodes USING(#{connection.quote_column_name primary_key})")
+        new_scope = new_scope.order(forest_order) if forest_order
 
-        bind_values = current_scope ? current_scope.bind_values : []
-        records = find_by_sql manager.to_sql, bind_values
+        sql = <<-SQL
+          #{cte_sql}
+          #{new_scope.to_sql}
+        SQL
+        records = find_by_sql sql
 
         records_by_id = records.each_with_object({}) { |r, h| h[r.id] = r }
 
@@ -97,32 +103,33 @@ module Edge
       #
       # Only where scopes can precede this in a scope chain
       def with_descendants
-        manager = recursive_manager.project(arel_table[:id])
-        scope = unscoped.where(arel_table[:id].in manager)
-        scope.bind_values = current_scope.bind_values if current_scope
-        scope
+        subquery_scope = unscoped
+          .joins("INNER JOIN all_nodes USING(#{connection.quote_column_name primary_key})")
+          .select(primary_key)
+
+        subquery_sql = <<-SQL
+          #{cte_sql}
+          #{subquery_scope.to_sql}
+        SQL
+
+        unscoped.where <<-SQL
+          #{connection.quote_column_name primary_key} IN (#{subquery_sql})
+        SQL
       end
 
       private
-      def recursive_manager
-        all_nodes = Arel::Table.new(:all_nodes)
-
-        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[primary_key.to_sym], arel_table[forest_foreign_key.to_sym]])
-          .join(all_nodes)
-          .on(arel_table[forest_foreign_key].eq all_nodes[:id])
-
-        union = original_term.union(iterated_term)
-
-        as_statement = Arel::Nodes::As.new all_nodes, union
-
-        Arel::SelectManager.new(Arel::Table.engine)
-          .with(:recursive, as_statement)
-          .from(all_nodes)
-          .join(arel_table)
-          .on(all_nodes[:id].eq(arel_table[:id]))
+      def cte_sql
+        quoted_table_name = '"locations"'
+        original_scope = (current_scope || all).select(primary_key, forest_foreign_key)
+        iterated_scope = unscoped.select(primary_key, forest_foreign_key)
+          .joins("INNER JOIN all_nodes ON #{connection.quote_table_name table_name}.#{connection.quote_column_name forest_foreign_key}=all_nodes.#{connection.quote_column_name primary_key}")
+        <<-SQL
+          WITH RECURSIVE all_nodes AS (
+            #{original_scope.to_sql}
+            UNION
+            #{iterated_scope.to_sql}
+          )
+        SQL
       end
     end
 

data/lib/edge/version.rb

@@ -1,3 +1,3 @@
 module Edge
-  VERSION = "0.4.3"
+  VERSION = "0.6.1"
 end

data/spec/forest_spec.rb

@@ -164,7 +164,8 @@ describe "Edge::Forest" do
 
     it "works when scoped" do
       forest = Location.where(:name => "USA").find_forest
-      expect(forest).to include(usa)
+      expect(forest).to match_array([usa])
+      expect(forest.first.children).to match_array([illinois, indiana])
     end
 
     it "preloads children in proper order" do
@@ -257,4 +258,26 @@ describe "Edge::Forest" do
     end
 
   end
+
+  if ActiveRecord::VERSION::MAJOR >= 5
+    describe "optional option" do
+      before do
+        @original_value = ActiveRecord::Base.belongs_to_required_by_default
+        ActiveRecord::Base.belongs_to_required_by_default = true
+      end
+
+      after do
+        ActiveRecord::Base.belongs_to_required_by_default = @original_value
+      end
+
+      it 'parent can be nil' do
+        class Location4 < ActiveRecord::Base
+          self.table_name = "locations"
+          acts_as_forest optional: true
+        end
+
+        expect(Location4.new(name: "Iceland").valid?).to eq true
+      end
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -6,36 +6,18 @@ require 'rspec'
 database_config = YAML.load_file(File.expand_path("../database.yml", __FILE__))
 ActiveRecord::Base.establish_connection database_config["test"]
 
-
-
-# class HstoreRecord < ActiveRecord::Base
-  # serialize :properties, Surus::Hstore::Serializer.new
-# end
-
-# class TextArrayRecord < ActiveRecord::Base
-  # serialize :texts, Surus::Array::TextSerializer.new
-# end
-
-# class IntegerArrayRecord < ActiveRecord::Base
-  # serialize :integers, Surus::Array::IntegerSerializer.new
-# end
-
-# class FloatArrayRecord < ActiveRecord::Base
-  # serialize :floats, Surus::Array::FloatSerializer.new
-# end
-
-# class DecimalArrayRecord < ActiveRecord::Base
-  # serialize :decimals, Surus::Array::DecimalSerializer.new
-# end
-
-
-
 RSpec.configure do |config|
-  config.around :disable_transactions => nil do |example|
+  config.before(:all) do |example|
+    ActiveRecord::Base.connection.execute <<-SQL
+      truncate body_parts;
+      truncate locations;
+    SQL
+  end
+
+  config.around do |example|
     ActiveRecord::Base.transaction do
       example.call
       raise ActiveRecord::Rollback
     end
   end
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: edge
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.6.1
 platform: ruby
 authors:
 - Jack Christensen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-10-23 00:00:00.000000000 Z
+date: 2021-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -72,42 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        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
+        version: 3.6.0
 description: Graph functionality for ActiveRecord
 email:
 - jack@jackchristensen.com
@@ -129,9 +101,7 @@ files:
 - bench/database_structure.sql
 - bench/forest_find.rb
 - edge.gemspec
-- gemfiles/4.0.gemfile
-- gemfiles/4.1.gemfile
-- gemfiles/4.2.gemfile
+- gemfiles/5.0.gemfile
 - lib/edge.rb
 - lib/edge/forest.rb
 - lib/edge/version.rb
@@ -143,7 +113,7 @@ files:
 homepage: https://github.com/JackC/edge
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -158,9 +128,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
-signing_key: 
+rubygems_version: 3.0.6
+signing_key:
 specification_version: 4
 summary: Graph functionality for ActiveRecord. Provides tree/forest modeling structure
   that can load entire trees in a single query.

data/gemfiles/4.1.gemfile

@@ -1,5 +0,0 @@
-source "https://rubygems.org"
-
-gem "activerecord", "~> 4.1.13"
-
-gemspec :path=>"../"

data/gemfiles/4.2.gemfile

@@ -1,5 +0,0 @@
-source "https://rubygems.org"
-
-gem "activerecord", "~> 4.2.4"
-
-gemspec :path=>"../"