edge 0.4.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbe295739f4d8428d51ab51caaf1ea299388ff1a
-  data.tar.gz: 05b0a917146b57191b1a0accc561a90ee457df38
+  metadata.gz: 156f34d8f9c1f130ba86b2098d2867fff9d53167
+  data.tar.gz: abff9315dd010abfcc006b93ec6533964fb4964d
 SHA512:
-  metadata.gz: ad2b80707a647c3dadf1bb06b60ca5f4b002b56f5ac9577cbed2c353ab2a08fcf6fa3042999ae07958cc06b6c11a67cd5b2c66ebce5783bbd9336282ee8d235e
-  data.tar.gz: 46942d09d2066d6bf901146d3d8d86eb38d341aaa598c77cd57758a5538278e5159f992e62e9981769ccbf16e8bbd809874c1f9c2abdfd1f53e24f0be724ae1b
+  metadata.gz: b35e2189d626e521ac419f03b04dd0aa24d4891b1fd5060d346d83a5c87d97ef727d7fd5fd4a145cd63f0bd6f8671b50b2e089fec2989e05b899e61516cf40e6
+  data.tar.gz: 3fe88512f796388583c763447a79d6e1a09ab21aa732f7f514c8b2406059bf81df5553aeb10503ffaab8c0cb183c4845676bcf8029f03163ffb2ce2cd43cff62

data/.travis.yml

@@ -1,12 +1,12 @@
 language: ruby
 rvm:
-  - 2.2.0
-  - 2.1.5
-  - 2.0.0
+  - 2.3.1
+  - 2.2.5
+  - 2.1.9
 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,9 @@
+# 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)

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', ">= 4.1.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"
 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.rc1"
 
 gemspec :path=>"../"

data/lib/edge/forest.rb

@@ -49,22 +49,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
-
-        bind_values = current_scope ? current_scope.bind_values : []
-
-        # This is a nasty hack to work around
-        # https://github.com/jackc/edge/issues/14 The MRI pg gem and the JRuby
-        # activerecord-jdbcpostgresql-adapter gem bind values into the prepared
-        # statement at different times. If the binds are still '?' then the bind
-        # isn't processed yet. But if it is '$1', '$2', etc. then is has been
-        # processed. This determines how we pass the values to find_by_sql.
-        records = if connection.respond_to? :jdbc_connection_class
-          find_by_sql [manager.to_sql, bind_values.map(&:last)]
-        else
-          find_by_sql manager.to_sql, bind_values
-        end
+        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
+
+        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 }
 
@@ -108,32 +100,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_column_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.4"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: edge
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors:
 - Jack Christensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-29 00:00:00.000000000 Z
+date: 2016-05-14 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: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -80,34 +80,6 @@ dependencies:
     - - "~>"
       - !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
 description: Graph functionality for ActiveRecord
 email:
 - jack@jackchristensen.com
@@ -129,9 +101,9 @@ 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
@@ -164,9 +136,4 @@ signing_key:
 specification_version: 4
 summary: Graph functionality for ActiveRecord. Provides tree/forest modeling structure
   that can load entire trees in a single query.
-test_files:
-- spec/database.yml
-- spec/database.yml.travis
-- spec/database_structure.sql
-- spec/forest_spec.rb
-- spec/spec_helper.rb
+test_files: []