ltree_hierarchy 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ddf71fca7fa2fce2c558501cbb85eea76a98b2a8
-  data.tar.gz: 2b94b34ba4601dabaff8b0499615a9e9b9250118
+  metadata.gz: c0585962140ffc7543e0575b23b594e45a6fa3fe
+  data.tar.gz: a56c281183b6e21796066fa59e391a4d95b4f874
 SHA512:
-  metadata.gz: 14442c8f23722c9eb7019e93f15d64307114323b2eb57ba0dcb4193b62db142ff251a98b8c38c97994f9b3a9a5a8128770ef3a0a53d9b16b5786189044700c25
-  data.tar.gz: b9efa3414d82f84d940fb889c675819b7812a51cdffcff4da91945c2724f739fbb1af181cb456495a9f22bf5394bdc747750c67700dab437ec40a4865d46e9a1
+  metadata.gz: 550602c092d26f7655ffaf3f657496c44f75d5684263b80729a39a9a9de5030687bcaeab097f0ba7d2db0707bf5c66107de987ac92d338d6e6e154b2c0424b8a
+  data.tar.gz: d18adbfe3ef8cca05cda4a4a9138dcec0f40522faee33f805ed17e0234d1cd44af55aff7ef1996b0492e41dac49d9b1fb8f09db82f0df6b32d33bdff5ac188cf

data/CHANGELOG.md

@@ -0,0 +1,7 @@
+## 0.0.7
+
+* fix `#leaves` method
+
+## 0.0.6
+
+* no changes history

data/Gemfile.lock

@@ -1,34 +1,43 @@
 PATH
   remote: .
   specs:
-    ltree_hierarchy (0.0.5)
+    ltree_hierarchy (0.0.6)
       activerecord (>= 3.1.0)
       pg
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.1.6)
-      activesupport (= 4.1.6)
+    activemodel (4.2.1)
+      activesupport (= 4.2.1)
       builder (~> 3.1)
-    activerecord (4.1.6)
-      activemodel (= 4.1.6)
-      activesupport (= 4.1.6)
-      arel (~> 5.0.0)
-    activesupport (4.1.6)
-      i18n (~> 0.6, >= 0.6.9)
+    activerecord (4.2.1)
+      activemodel (= 4.2.1)
+      activesupport (= 4.2.1)
+      arel (~> 6.0)
+    activesupport (4.2.1)
+      i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    arel (5.0.1.20140414130214)
+    arel (6.0.0)
     builder (3.2.2)
+    coderay (1.1.0)
     i18n (0.7.0)
     json (1.8.2)
-    minitest (5.5.1)
-    pg (0.17.1)
+    method_source (0.8.2)
+    minitest (5.6.1)
+    pg (0.18.2)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    pry-nav (0.2.4)
+      pry (>= 0.9.10, < 0.11.0)
     rake (10.4.2)
-    thread_safe (0.3.4)
+    slop (3.6.0)
+    thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
 
@@ -37,4 +46,7 @@ PLATFORMS
 
 DEPENDENCIES
   ltree_hierarchy!
+  minitest
+  pry
+  pry-nav
   rake

data/Rakefile

@@ -1,12 +1,12 @@
-require 'rake'
-require 'rake/testtask'
+require "rake"
+require "rake/testtask"
 
-desc 'Default: run unit tests.'
-task :default => :test
+desc "Default: run unit tests."
+task default: :test
 
-desc 'Test the ltree_hierarchy plugin.'
+desc "Test the ltree_hierarchy plugin."
 Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.pattern = 'test/**/*_test.rb'
+  t.libs << "lib"
+  t.pattern = "test/**/*_test.rb"
   t.verbose = true
 end

data/init.rb

@@ -0,0 +1 @@
+require "ltree_hierarchy"

data/lib/ltree_hierarchy/hierarchy.rb

@@ -2,49 +2,51 @@ module Ltree
   module Hierarchy
     def has_ltree_hierarchy(options = {})
       options = {
-        :fragment => :id,
-        :parent_fragment => :parent_id,
-        :path => :path
+        fragment: :id,
+        parent_fragment: :parent_id,
+        path: :path
       }.merge(options)
 
       options.assert_valid_keys(:fragment, :parent_fragment, :path)
 
       cattr_accessor :ltree_fragment_column, :ltree_parent_fragment_column, :ltree_path_column
 
-      self.ltree_fragment_column        = options[:fragment]
+      self.ltree_fragment_column = options[:fragment]
       self.ltree_parent_fragment_column = options[:parent_fragment]
-      self.ltree_path_column            = options[:path]
+      self.ltree_path_column = options[:path]
 
-      belongs_to :parent, :class_name => self.name, :foreign_key => self.ltree_parent_fragment_column
+      belongs_to :parent, class_name: name, foreign_key: ltree_parent_fragment_column
 
-      validate :prevent_circular_paths, :if => :ltree_parent_fragment_changed?
+      validate :prevent_circular_paths, if: :ltree_parent_fragment_changed?
 
-      after_create  :commit_path
-      before_update :assign_path, :cascade_path_change, :if => :ltree_parent_fragment_changed?
+      after_create :commit_path
+      before_update :assign_path, :cascade_path_change, if: :ltree_parent_fragment_changed?
 
       include InstanceMethods
     end
 
     def roots
-      where(self.ltree_parent_fragment_column => nil)
+      where(ltree_parent_fragment_column => nil)
     end
 
     def at_depth(depth)
-      where(["nlevel(#{ltree_path_column}) = ?", depth])
+      where(["NLEVEL(#{ltree_path_column}) = ?", depth])
     end
 
     def leaves
-      subquery = select("DISTINCT #{ltree_parent_fragment_column}")
+      subquery = where("#{ltree_parent_fragment_column} IS NOT NULL")
+        .select("DISTINCT #{ltree_parent_fragment_column}")
+
       where("#{ltree_fragment_column} NOT IN(#{subquery.to_sql})")
     end
 
     def lowest_common_ancestor_paths(paths)
       sql = if paths.respond_to?(:to_sql)
-        "SELECT lca(array(#{paths.to_sql}))"
+        "SELECT LCA(ARRAY(#{paths.to_sql}))"
       else
         return [] if paths.empty?
         safe_paths = paths.map { |p| "#{connection.quote(p)}::ltree" }
-        "SELECT lca(ARRAY[#{safe_paths.join(', ')}])"
+        "SELECT LCA(ARRAY[#{safe_paths.join(", ")}])"
       end
       connection.select_values(sql)
     end
@@ -63,7 +65,7 @@ module Ltree
       end
 
       def ltree_fragment
-        send(self.ltree_fragment_column)
+        send(ltree_fragment_column)
       end
 
       def ltree_parent_fragment_column
@@ -91,7 +93,7 @@ module Ltree
       end
 
       def prevent_circular_paths
-        if parent && parent.ltree_path.split('.').include?(ltree_fragment.to_s)
+        if parent && parent.ltree_path.split(".").include?(ltree_fragment.to_s)
           errors.add(ltree_parent_fragment_column, :invalid)
         end
       end
@@ -118,14 +120,14 @@ module Ltree
         #  SET    path = NEW.path || subpath(path, nlevel(OLD.path))
         #  WHERE  path <@ OLD.path AND id != NEW.id;
         ltree_scope.where(
-          ["#{ltree_path_column} <@ :old_path AND #{ltree_fragment_column} != :id", :old_path => ltree_path_was, :id => ltree_fragment]
+          ["#{ltree_path_column} <@ :old_path AND #{ltree_fragment_column} != :id", old_path: ltree_path_was, id: ltree_fragment]
         ).update_all(
-          ["#{ltree_path_column} = :new_path || subpath(#{ltree_path_column}, nlevel(:old_path))", :new_path => ltree_path, :old_path => ltree_path_was]
+          ["#{ltree_path_column} = :new_path || subpath(#{ltree_path_column}, nlevel(:old_path))", new_path: ltree_path, old_path: ltree_path_was]
         )
       end
 
       def root?
-        if self.ltree_parent_fragment
+        if ltree_parent_fragment
           false
         else
           parent.nil?
@@ -136,18 +138,18 @@ module Ltree
         !children.exists?
       end
 
-      def depth # 1-based, for compatibility with ltree's nlevel().
+      def depth # 1-based, for compatibility with ltree's NLEVEL().
         if root?
           1
         elsif ltree_path
-          ltree_path.split('.').length
+          ltree_path.split(".").length
         elsif parent
           parent.depth + 1
         end
       end
 
       def root
-        ltree_scope.where("#{ltree_path_column} = subpath(?, 0, 1)", ltree_path).first
+        ltree_scope.where("#{ltree_path_column} = SUBPATH(?, 0, 1)", ltree_path).first
       end
 
       def ancestors
@@ -160,7 +162,10 @@ module Ltree
       alias :and_ancestors :self_and_ancestors
 
       def siblings
-        ltree_scope.where("#{ltree_parent_fragment_column} = ? AND #{ltree_fragment_column} != ?", ltree_parent_fragment, ltree_fragment)
+        ltree_scope.where(
+          "#{ltree_parent_fragment_column} = ? AND #{ltree_fragment_column} != ?",
+          ltree_parent_fragment, ltree_fragment
+        )
       end
 
       def self_and_siblings
@@ -182,7 +187,7 @@ module Ltree
       end
 
       def self_and_children
-        ltree_scope.where("#{ltree_fragment_column} = :id OR #{ltree_parent_fragment_column} = :id", :id => ltree_fragment)
+        ltree_scope.where("#{ltree_fragment_column} = :id OR #{ltree_parent_fragment_column} = :id", id: ltree_fragment)
       end
       alias :and_children :self_and_children
 

data/lib/ltree_hierarchy/version.rb

@@ -1,5 +1,5 @@
 module Ltree
   module Hierarchy
-    VERSION = "0.0.6"
+    VERSION = "0.0.7"
   end
 end

data/ltree_hierarchy.gemspec

@@ -0,0 +1,31 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "ltree_hierarchy/version"
+
+Gem::Specification.new do |s|
+  s.name = "ltree_hierarchy"
+  s.version = Ltree::Hierarchy::VERSION
+  s.authors = ["Rob Worley", "Leadformance"]
+  s.email = ["dev@leadformance.com"]
+  s.homepage = "https://github.com/Leadformance/ltree_hierarchy"
+  s.summary = "Organize ActiveRecord models into a tree using PostgreSQL's ltree datatype"
+  s.description = "Organizes ActiveRecord models into a tree/hierarchy using a materialized path implementation based around PostgreSQL's ltree datatype. ltree's operators ensure that queries are fast and easily understood."
+
+  s.rubyforge_project = "ltree_hierarchy"
+
+  s.files = Dir["{lib/**/*,[A-Z]*}"]
+  s.platform = Gem::Platform::RUBY
+  s.license = "MIT"
+  s.require_paths = ["lib"]
+
+  if RUBY_PLATFORM == "java"
+    s.add_dependency "activerecord-jdbcpostgresql-adapter"
+  else
+    s.add_dependency "pg"
+  end
+
+  s.add_dependency "activerecord", ">= 3.1.0"
+
+  s.add_development_dependency "minitest"
+  s.add_development_dependency "rake"
+end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: ltree_hierarchy
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Rob Worley
+- Leadformance
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-26 00:00:00.000000000 Z
+date: 2015-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -70,20 +71,23 @@ description: Organizes ActiveRecord models into a tree/hierarchy using a materia
   path implementation based around PostgreSQL's ltree datatype. ltree's operators
   ensure that queries are fast and easily understood.
 email:
-- robert.worley@gmail.com
+- dev@leadformance.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - MIT-LICENSE
 - README.md
 - Rakefile
+- init.rb
 - lib/ltree_hierarchy.rb
 - lib/ltree_hierarchy/hierarchy.rb
 - lib/ltree_hierarchy/version.rb
-homepage: https://github.com/robworley/ltree_hierarchy
+- ltree_hierarchy.gemspec
+homepage: https://github.com/Leadformance/ltree_hierarchy
 licenses:
 - MIT
 metadata: {}
@@ -103,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ltree_hierarchy
-rubygems_version: 2.4.7
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Organize ActiveRecord models into a tree using PostgreSQL's ltree datatype