parentry 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 338c1bb54b4ba0d2899eb63fc7c3c91c7188c5f7
-  data.tar.gz: c2f19d677f76b94aa37e5990ecd5de3202574501
+  metadata.gz: d72a63d23c7ea716a1e48b987809b5604b986cc5
+  data.tar.gz: bad7908ccd887716a2a509f41db27f140e696afd
 SHA512:
-  metadata.gz: 1364062a29ed0bbd53a57ca25067f0db06deda7ab6fe3fbcc0b787583a92e8ec2be6a5cc9026d594de6331efae0883f7795c4a421d5024a7aaf39e6fc0b713f3
-  data.tar.gz: 0f5aeda294cb23768a2df88e9f63b64d707acdca9edc5bc037b9ead5edec3ed19f3257082ddfa5c3d2df5cbd1c06ef4df37896766acb7395a8767b792e5e67d5
+  metadata.gz: d2bfbe9735c5b918030c0d88738b01de8280c82c9fd68a9ba726f49f746252c1994ab5a8c6830761b1b354d4343ad572b503aed30c4f29d6e37294d00a32ddb7
+  data.tar.gz: 01ea72bc0c644edfd75a46164f69a2fddd10df2e7c89420463fd5a8bee83c795457a4b0e8ced1a89fd729750b546229215ed8dfdcc65fef853aff12212f628ca

data/.gitignore

@@ -1,4 +1,4 @@
-/.bundle/
+.bundle/
 /.yardoc
 /Gemfile.lock
 /_yardoc/
@@ -10,3 +10,5 @@
 .idea
 .ruby-gemset
 .ruby-version
+/vendor/
+/spec/internal/log/*

data/.travis.yml

@@ -1,4 +1,11 @@
 language: ruby
 rvm:
-  - 2.2.2
+  - 2.2.5
+  - 2.3.4
+  - 2.4.1
+env:
+  - STRATEGY=array
+  - STRATEGY=ltree
+gemfile:
+  - gemfiles/activerecord_5.0.gemfile
 before_install: gem install bundler -v 1.10.6

data/Appraisals

@@ -0,0 +1,3 @@
+appraise 'activerecord-5.0' do
+  gem 'activerecord', '~> 5.0'
+end

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in parentry.gemspec
 gemspec
+
+gem 'appraisal'

data/README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/hasghari/parentry.svg?branch=master)](https://travis-ci.org/hasghari/parentry)
+
 # Parentry
 
 Parentry in its current incarnation is an ActiveRecord extension for the [PostgreSQL ltree](http://www.postgresql.org/docs/9.4/static/ltree.html) module.

data/Rakefile

@@ -1,3 +1,6 @@
+require 'rubygems'
+require 'bundler/setup'
+
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 

data/gemfiles/activerecord_5.0.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "activerecord", "~> 5.0"
+
+gemspec path: "../"

data/gemfiles/activerecord_5.0.gemfile.lock

@@ -0,0 +1,117 @@
+PATH
+  remote: ..
+  specs:
+    parentry (0.5.0)
+      activerecord (~> 5.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionpack (5.0.6)
+      actionview (= 5.0.6)
+      activesupport (= 5.0.6)
+      rack (~> 2.0)
+      rack-test (~> 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.0.6)
+      activesupport (= 5.0.6)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activemodel (5.0.6)
+      activesupport (= 5.0.6)
+    activerecord (5.0.6)
+      activemodel (= 5.0.6)
+      activesupport (= 5.0.6)
+      arel (~> 7.0)
+    activesupport (5.0.6)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    appraisal (2.2.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    arel (7.1.4)
+    builder (3.2.3)
+    coderay (1.1.2)
+    combustion (0.9.0)
+      activesupport (>= 3.0.0)
+      railties (>= 3.0.0)
+      thor (>= 0.14.6)
+    concurrent-ruby (1.0.5)
+    crass (1.0.3)
+    database_cleaner (1.6.2)
+    diff-lcs (1.3)
+    erubis (2.7.0)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
+    loofah (2.2.2)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    method_source (0.9.0)
+    mini_portile2 (2.3.0)
+    minitest (5.11.3)
+    nokogiri (1.8.2)
+      mini_portile2 (~> 2.3.0)
+    pg (0.21.0)
+    pry (0.11.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    rack (2.0.4)
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (5.0.6)
+      actionpack (= 5.0.6)
+      activesupport (= 5.0.6)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.5.0)
+    rspec-core (3.7.1)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-rails (3.7.2)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.1)
+    thor (0.20.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 5.0)
+  appraisal
+  bundler (~> 1.10)
+  combustion (= 0.9.0)
+  database_cleaner (~> 1.6)
+  parentry!
+  pg (~> 0.21)
+  pry (~> 0.10)
+  rake (~> 10.0)
+  rspec-rails (~> 3.7)
+
+BUNDLED WITH
+   1.14.6

data/lib/parentry.rb

@@ -1,4 +1,5 @@
 require 'parentry/version'
+require 'parentry/strategy'
 
 module Parentry
   autoload :InstanceMethods, 'parentry/instance_methods'
@@ -7,9 +8,9 @@ module Parentry
 
   def self.included(base)
     base.class_eval do
-      mattr_accessor :parentry_column, :depth_offset, :cache_depth, :touch_ancestors
+      mattr_accessor :parentry_strategy, :parentry_column, :depth_offset, :cache_depth, :touch_ancestors
 
-      belongs_to :parent, class_name: base_class.name
+      belongs_to :parent, class_name: base_class.name, optional: true
       has_many :children, class_name: base_class.name, foreign_key: :parent_id, dependent: :destroy
 
       validate do
@@ -31,19 +32,19 @@ module Parentry
       after_touch :touch_ancestors_callback
       after_destroy :touch_ancestors_callback
 
-      scope :order_by_parentry, -> { order("nlevel(#{parentry_column})") }
+      scope :order_by_parentry, -> { order(parentry_depth_function) }
 
-      scope :before_depth, ->(depth) { where("nlevel(#{parentry_column}) - 1 < ?", depth + depth_offset) }
-      scope :to_depth, ->(depth) { where("nlevel(#{parentry_column}) - 1 <= ?", depth + depth_offset) }
-      scope :at_depth, ->(depth) { where("nlevel(#{parentry_column}) - 1 = ?", depth + depth_offset) }
-      scope :from_depth, ->(depth) { where("nlevel(#{parentry_column}) - 1 >= ?", depth + depth_offset) }
-      scope :after_depth, ->(depth) { where("nlevel(#{parentry_column}) - 1 > ?", depth + depth_offset) }
+      scope :before_depth, ->(depth) { where("#{parentry_depth_function} - 1 < ?", depth + depth_offset) }
+      scope :to_depth, ->(depth) { where("#{parentry_depth_function} - 1 <= ?", depth + depth_offset) }
+      scope :at_depth, ->(depth) { where("#{parentry_depth_function} - 1 = ?", depth + depth_offset) }
+      scope :from_depth, ->(depth) { where("#{parentry_depth_function} - 1 >= ?", depth + depth_offset) }
+      scope :after_depth, ->(depth) { where("#{parentry_depth_function} - 1 > ?", depth + depth_offset) }
 
-      scope :roots, -> { where("nlevel(#{parentry_column}) = 1") }
-      scope :ancestors_of, ->(node) { where("#{parentry_column} @> ?", node.parentry).where.not(id: node.id) }
+      scope :roots, -> { where("#{parentry_depth_function} = 1") }
+      scope :ancestors_of, ->(node) { where(node.ancestor_conditions).where.not(id: node.id) }
       scope :children_of, ->(node) { where(parent_id: node.id) }
       scope :descendants_of, ->(node) { subtree_of(node).where.not(id: node.id) }
-      scope :subtree_of, ->(node) { where("#{parentry_column} <@ ?", node.parentry) }
+      scope :subtree_of, ->(node) { where(node.subtree_conditions) }
       scope :siblings_of, ->(node) { where(parent_id: node.parent_id).where.not(id: node.id) }
     end
 

data/lib/parentry/class_methods.rb

@@ -1,10 +1,14 @@
 module Parentry
   module ClassMethods
     def parentry(options = {})
+      self.parentry_strategy = options.fetch(:strategy, 'ltree').to_s
       self.parentry_column = options.fetch(:parentry_column, 'parentry')
       self.depth_offset = options.fetch(:depth_offset, 0)
       self.cache_depth = options.fetch(:cache_depth, false)
       self.touch_ancestors = options.fetch(:touch, false)
+
+      include Strategy::Ltree if parentry_strategy == 'ltree'
+      include Strategy::Array if parentry_strategy == 'array'
     end
 
     def arrange(options = {})

data/lib/parentry/instance_methods.rb

@@ -21,30 +21,10 @@ module Parentry
       write_attribute(:parentry_depth, depth)
     end
 
-    def cascade_parentry
-      old_path, new_path = changes[parentry_column]
-      parentry_scope.where(
-        ["#{parentry_column} <@ :ltree AND id != :id", ltree: old_path, id: id]
-      ).update_all(
-        [
-          "#{parentry_column} = :new_path || subpath(#{parentry_column}, nlevel(:old_path))",
-          new_path: new_path, old_path: old_path
-        ]
-      )
-    end
-
-    def compute_parentry
-      parent.present? ? "#{parent.parentry}.#{id}" : "#{id}"
-    end
-
     def parentry
       read_attribute(parentry_column)
     end
 
-    def parse_parentry(input = parentry)
-      input.to_s.split('.').map(&:to_i)
-    end
-
     def touch_ancestors_callback
       return unless touch_ancestors
       return if touch_callbacks_disabled?

data/lib/parentry/navigation.rb

@@ -63,7 +63,7 @@ module Parentry
 
     def subtree(scopes = {})
       with_depth_scopes(scopes) do
-        parentry_scope.where("#{parentry_column} <@ ?", parentry)
+        parentry_scope.where(subtree_conditions)
       end
     end
 

data/lib/parentry/strategy.rb

@@ -0,0 +1,6 @@
+module Parentry
+  module Strategy
+    autoload :Ltree, 'parentry/strategy/ltree'
+    autoload :Array, 'parentry/strategy/array'
+  end
+end

data/lib/parentry/strategy/array.rb

@@ -0,0 +1,13 @@
+module Parentry
+  module Strategy
+    module Array
+      autoload :InstanceMethods, 'parentry/strategy/array/instance_methods'
+      autoload :ClassMethods, 'parentry/strategy/array/class_methods'
+
+      def self.included(base)
+        base.send :include, InstanceMethods
+        base.extend ClassMethods
+      end
+    end
+  end
+end

data/lib/parentry/strategy/array/class_methods.rb

@@ -0,0 +1,11 @@
+module Parentry
+  module Strategy
+    module Array
+      module ClassMethods
+        def parentry_depth_function
+          "array_length(#{parentry_column}, 1)"
+        end
+      end
+    end
+  end
+end

data/lib/parentry/strategy/array/instance_methods.rb

@@ -0,0 +1,36 @@
+module Parentry
+  module Strategy
+    module Array
+      module InstanceMethods
+        def parse_parentry(input = parentry)
+          input
+        end
+
+        def compute_parentry
+          return [] unless persisted?
+          parent.present? ? parent.parentry + [id] : [id]
+        end
+
+        def cascade_parentry
+          old_path, new_path = changes[parentry_column]
+          parentry_scope.where(
+            ["#{parentry_column} @> ARRAY[:tree] AND id != :id", tree: old_path, id: id]
+          ).update_all(
+            [
+              "#{parentry_column} = array_cat(ARRAY[?], #{parentry_column}[?:array_length(#{parentry_column}, 1)])",
+              new_path, old_path.size + 1
+            ]
+          )
+        end
+
+        def subtree_conditions
+          ["#{parentry_column} @> ARRAY[?]", parentry]
+        end
+
+        def ancestor_conditions
+          ["#{parentry_column} <@ ARRAY[?]", parentry]
+        end
+      end
+    end
+  end
+end

data/lib/parentry/strategy/ltree.rb

@@ -0,0 +1,13 @@
+module Parentry
+  module Strategy
+    module Ltree
+      autoload :InstanceMethods, 'parentry/strategy/ltree/instance_methods'
+      autoload :ClassMethods, 'parentry/strategy/ltree/class_methods'
+
+      def self.included(base)
+        base.send :include, InstanceMethods
+        base.extend ClassMethods
+      end
+    end
+  end
+end

data/lib/parentry/strategy/ltree/class_methods.rb

@@ -0,0 +1,11 @@
+module Parentry
+  module Strategy
+    module Ltree
+      module ClassMethods
+        def parentry_depth_function
+          "nlevel(#{parentry_column})"
+        end
+      end
+    end
+  end
+end

data/lib/parentry/strategy/ltree/instance_methods.rb

@@ -0,0 +1,35 @@
+module Parentry
+  module Strategy
+    module Ltree
+      module InstanceMethods
+        def parse_parentry(input = parentry)
+          input.to_s.split('.').map(&:to_i)
+        end
+
+        def compute_parentry
+          parent.present? ? "#{parent.parentry}.#{id}" : "#{id}"
+        end
+
+        def cascade_parentry
+          old_path, new_path = changes[parentry_column]
+          parentry_scope.where(
+            ["#{parentry_column} <@ :tree AND id != :id", tree: old_path, id: id]
+          ).update_all(
+            [
+              "#{parentry_column} = :new_path || subpath(#{parentry_column}, nlevel(:old_path))",
+              new_path: new_path, old_path: old_path
+            ]
+          )
+        end
+
+        def subtree_conditions
+          ["#{parentry_column} <@ ?", parentry]
+        end
+
+        def ancestor_conditions
+          ["#{parentry_column} @> ?", parentry]
+        end
+      end
+    end
+  end
+end

data/lib/parentry/version.rb

@@ -1,3 +1,3 @@
 module Parentry
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

data/parentry.gemspec

@@ -16,13 +16,13 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activerecord', '>= 3.1.0'
+  spec.add_dependency 'activerecord', '~> 5.0'
 
   spec.add_development_dependency 'bundler', '~> 1.10'
   spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec-rails'
-  spec.add_development_dependency 'pg'
-  spec.add_development_dependency 'combustion', '>= 0.5.2'
-  spec.add_development_dependency 'database_cleaner'
-  spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'rspec-rails', '~> 3.7'
+  spec.add_development_dependency 'pg', '~> 0.21'
+  spec.add_development_dependency 'combustion', '0.9.0'
+  spec.add_development_dependency 'database_cleaner', '~> 1.6'
+  spec.add_development_dependency 'pry', '~> 0.10'
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: parentry
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Hamed Asghari
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-19 00:00:00.000000000 Z
+date: 2018-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -56,72 +56,72 @@ dependencies:
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.21'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.21'
 - !ruby/object:Gem::Dependency
   name: combustion
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 0.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
 description: 
 email:
 - hasghari@gmail.com
@@ -132,6 +132,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- Appraisals
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -139,10 +140,19 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- gemfiles/activerecord_5.0.gemfile
+- gemfiles/activerecord_5.0.gemfile.lock
 - lib/parentry.rb
 - lib/parentry/class_methods.rb
 - lib/parentry/instance_methods.rb
 - lib/parentry/navigation.rb
+- lib/parentry/strategy.rb
+- lib/parentry/strategy/array.rb
+- lib/parentry/strategy/array/class_methods.rb
+- lib/parentry/strategy/array/instance_methods.rb
+- lib/parentry/strategy/ltree.rb
+- lib/parentry/strategy/ltree/class_methods.rb
+- lib/parentry/strategy/ltree/instance_methods.rb
 - lib/parentry/version.rb
 - parentry.gemspec
 homepage: https://github.com/hasghari/parentry
@@ -165,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: ActiveRecord adapter for the Postgres ltree module