pg_ltree 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e203fa640f7e8c7f0bcacd2f8b37fe7be5b48a78
-  data.tar.gz: cf431e9086557ab80ddb9bc4aa5bc37ebe8ff42a
+  metadata.gz: e6ebb7f510340a66069f3b5adc839f817d7a89be
+  data.tar.gz: 44c43b19e281f1eed03243c35e3f41bdbce11b9e
 SHA512:
-  metadata.gz: 4f034ae0258542eb7c281b162f51cdc5d47a4e738be3fef8a9d4d1328039a6d95bfe90102fae29d356ff3ce5ab2ba676bc2560dc39dfb2abb16bf51101d61fbf
-  data.tar.gz: 6fb91eb800f10edf5021993f8c411659d7f2c7c3123a2dcaf65bb0117bb6f0b531cdf80bb33e26544e106dd7c2247b823d309f0ef55d42a7d69fa5d32d1497a1
+  metadata.gz: b073089f1f9232bbc55032bb50f8c4c2ccad63530237660d5f255a72b3ac8020a9fd69897c28134118b34f92ac84b53440df7391ffe0801d806ffdae85d11f7f
+  data.tar.gz: 7d0cf44472a6916c49554f7d524db7ec98ba834a73c8b191307637ab12292aae8b29e116f88033b278d84271923c04442c9eee1ee356775c511f3ffe162bb107

data/Rakefile

@@ -1,11 +1,10 @@
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
+require 'bundler/gem_tasks'
 
+require 'rake/testtask'
 require 'rdoc/task'
 
+gemspec = eval(File.read(Dir['*.gemspec'].first))
+
 RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'PgLtree'
@@ -14,10 +13,6 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-Bundler::GemHelper.install_tasks
-
-require 'rake/testtask'
-
 Rake::TestTask.new(:test) do |t|
   t.libs << 'lib'
   t.libs << 'test'
@@ -25,4 +20,30 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = false
 end
 
-task default: :test
+desc 'Default: run unit tests.'
+task default: 'test:all'
+
+namespace :test do
+  AVAILABLE_CASES = %w(
+    activerecord_40_pg_017 activerecord_40_pg_018
+    activerecord_41_pg_017 activerecord_41_pg_018
+    activerecord_42_pg_017 activerecord_42_pg_018
+    activerecord_50_pg_018 activerecord_51_pg_020
+  ).freeze
+
+  AVAILABLE_CASES.each do |version|
+    desc "Test pg_ltree against #{version}"
+    task version do
+      sh "BUNDLE_GEMFILE='gemfiles/#{version}.gemfile' bundle install --quiet"
+      sh "BUNDLE_GEMFILE='gemfiles/#{version}.gemfile' bundle exec rake -t test"
+    end
+  end
+
+  desc 'Run all tests for pg_ltree'
+  task :all do
+    AVAILABLE_CASES.each do |version|
+      sh "BUNDLE_GEMFILE='gemfiles/#{version}.gemfile' bundle install --quiet"
+      sh "BUNDLE_GEMFILE='gemfiles/#{version}.gemfile' bundle exec rake -t test"
+    end
+  end
+end

data/lib/pg_ltree/ltree.rb

@@ -59,6 +59,14 @@ module PgLtree
       def where_path_liked(lquery)
         where "#{ltree_path_column} ~ ?", lquery
       end
+
+      # Get all nodes with path matching full-text-search-like pattern
+      #
+      # @param ltxtquery [String] ltree search query
+      # @return [ActiveRecord::Relation] of matching nodes
+      def where_path_matches_ltxtquery(ltxtquery)
+        where "#{ltree_path_column} @ ?", ltxtquery
+      end
     end
 
     # Define instance methods
@@ -114,7 +122,7 @@ module PgLtree
       #
       # @return [Integer] node depth
       def depth
-        ActiveRecord::Base.connection.select_all("SELECT NLEVEL('#{ltree_path}')").cast_values.first
+        ActiveRecord::Base.connection.select_all("SELECT NLEVEL('#{ltree_path}')").rows.flatten.first.to_i
       end
 
       # Get root of the node

data/lib/pg_ltree/version.rb

@@ -1,7 +1,7 @@
-# Organise ActiveRecord model into a tree structure with PostgreSQL LTree
+# Organize ActiveRecord model into a tree structure with PostgreSQL LTree
 #
 # @author a.ponomarenko
 module PgLtree
   # Gem Version
-  VERSION = '1.1.3'.freeze
+  VERSION = '1.1.4'.freeze
 end

data/test/database.yml.sample

@@ -0,0 +1,5 @@
+adapter:  postgresql
+host:     localhost
+username: postgres
+password:
+database: pg_ltree_test

data/test/pg_ltree/ltree_test.rb

@@ -1,8 +1,8 @@
 require 'test_helper'
 
-class PgLtree::LtreeTest < ActiveSupport::TestCase
-
+class PgLtree::LtreeTest < BaseTest
   def setup
+    super
     %w(
       Top
       Top.Science
@@ -22,15 +22,11 @@ class PgLtree::LtreeTest < ActiveSupport::TestCase
     end
   end
 
-  def teardown
-    TreeNode.delete_all
-  end
-
-  test "Default configuration" do
+  test 'Default configuration' do
     assert_equal TreeNode.ltree_path_column, :path
   end
 
-  test "Custom configuration" do
+  test 'Custom configuration' do
     assert_equal NotUniqTreeNode.ltree_path_column, :new_path
   end
 
@@ -64,6 +60,15 @@ class PgLtree::LtreeTest < ActiveSupport::TestCase
     )
   end
 
+  test '#where_path_matches_ltxtquery' do
+    assert_equal TreeNode.where_path_matches_ltxtquery('Astro*% & !pictures@').pluck(:path), %w(
+      Top.Science.Astronomy
+      Top.Science.Astronomy.Astrophysics
+      Top.Science.Astronomy.Cosmology
+      Top.Hobbies.Amateurs_Astronomy
+    )
+  end
+
   test '.root?' do
     assert TreeNode.find_by(path: 'Top').root?
     assert_not TreeNode.find_by(path: 'Top.Science').root?
@@ -93,7 +98,7 @@ class PgLtree::LtreeTest < ActiveSupport::TestCase
 
   test '.parent' do
     assert_equal TreeNode.find_by(path: 'Top.Collections.Pictures.Astronomy.Astronauts').parent.path,
-      'Top.Collections.Pictures.Astronomy'
+                 'Top.Collections.Pictures.Astronomy'
   end
 
   test '.leaves' do
@@ -152,7 +157,6 @@ class PgLtree::LtreeTest < ActiveSupport::TestCase
     )
   end
 
-
   test '.siblings' do
     assert_equal TreeNode.find_by(path: 'Top.Collections.Pictures.Astronomy.Stars').siblings.pluck(:path), %w(
       Top.Collections.Pictures.Astronomy.Galaxies

data/test/pg_ltree/scoped_for_test.rb

@@ -1,7 +1,8 @@
 require 'test_helper'
 
-class PgLtree::ScopedForTest < ActiveSupport::TestCase
+class PgLtree::ScopedForTest < BaseTest
   def setup
+    super
     %w(
       Top
       Top.Science
@@ -23,12 +24,8 @@ class PgLtree::ScopedForTest < ActiveSupport::TestCase
     end
   end
 
-  def teardown
-    NotUniqTreeNode.delete_all
-  end
-
   test '#roots' do
-    assert_equal NotUniqTreeNode.roots.pluck(:new_path), ['Top', 'Top']
+    assert_equal NotUniqTreeNode.roots.pluck(:new_path), %w(Top Top)
   end
 
   test '#at_depth' do
@@ -81,7 +78,7 @@ class PgLtree::ScopedForTest < ActiveSupport::TestCase
 
   test '.parent' do
     assert_equal not_uniq_tree_node_find_by_path('Top.Collections.Pictures.Astronomy.Astronauts').parent.new_path,
-      'Top.Collections.Pictures.Astronomy'
+                 'Top.Collections.Pictures.Astronomy'
   end
 
   test '.leaves' do
@@ -140,7 +137,6 @@ class PgLtree::ScopedForTest < ActiveSupport::TestCase
     )
   end
 
-
   test '.siblings' do
     assert_equal not_uniq_tree_node_find_by_path('Top.Collections.Pictures.Astronomy.Stars').siblings.pluck(:new_path), %w(
       Top.Collections.Pictures.Astronomy.Galaxies

data/test/pg_ltree_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 class PgLtreeTest < ActiveSupport::TestCase
-  test "truth" do
+  test 'truth' do
     assert_kind_of Module, PgLtree
   end
 end

data/test/test_helper.rb

@@ -1,19 +1,71 @@
-# Configure Rails Environment
-ENV["RAILS_ENV"] = "test"
+require 'bundler'
+begin
+  Bundler.require(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts 'Run `bundle install` to install missing gems'
+  exit e.status_code
+end
+
+require 'pg'
+require 'pg_ltree'
+require 'minitest/autorun'
+
+class BaseTest < ActiveSupport::TestCase
+  def setup
+    prepare_db
+  end
+
+  def teardown
+    drop_db
+  end
+
+  private
+
+  def prepare_db
+    begin
+      db_connection = YAML.load_file(File.expand_path('../database.yml', __FILE__))
+    rescue => e
+      $stderr.puts e.message
+      $stderr.puts 'Copy `test/database.yml.sample` to `test/database.yml` and configure connection to DB'
+      exit 0
+    end
 
-require File.expand_path("../../test/dummy/config/environment.rb",  __FILE__)
-ActiveRecord::Migrator.migrations_paths = [File.expand_path("../../test/dummy/db/migrate", __FILE__)]
-require "rails/test_help"
+    ActiveRecord::Base.establish_connection db_connection
+    ActiveRecord::Schema.verbose = false
 
-# Filter out Minitest backtrace while allowing backtrace from other libraries
-# to be shown.
-Minitest.backtrace_filter = Minitest::BacktraceFilter.new
+    ActiveRecord::Schema.define(version: 1) do
+      enable_extension 'plpgsql'
+      enable_extension 'ltree'
 
-# Load support files
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
+      create_table 'not_uniq_tree_nodes', force: :cascade do |t|
+        t.string 'status'
+        t.ltree  'new_path'
+      end
+
+      create_table 'tree_nodes', force: :cascade do |t|
+        t.ltree 'path'
+      end
+    end
+  end
+
+  def drop_db
+    tables = if ActiveRecord::VERSION::MAJOR < 5
+               ActiveRecord::Base.connection.tables
+             else
+               ActiveRecord::Base.connection.data_sources
+             end
+    tables.each { |table| ActiveRecord::Base.connection.drop_table(table) }
+  end
+end
+
+class NotUniqTreeNode < ActiveRecord::Base
+  extend PgLtree::ScopedFor
+
+  ltree :new_path
+  ltree_scoped_for :status
+end
 
-# Load fixtures from the engine
-if ActiveSupport::TestCase.respond_to?(:fixture_path=)
-  ActiveSupport::TestCase.fixture_path = File.expand_path("../fixtures", __FILE__)
-  ActiveSupport::TestCase.fixtures :all
+class TreeNode < ActiveRecord::Base
+  ltree
 end

metadata

@@ -1,22 +1,25 @@
 --- !ruby/object:Gem::Specification
 name: pg_ltree
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Andrei Panamarenka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-10 00:00:00.000000000 Z
+date: 2017-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -31,6 +37,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.17.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.21'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -38,6 +47,79 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.17.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.21'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  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: rake
+  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: 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: yard
+  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: minitest
+  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'
 description: Organise ActiveRecord model into a tree structure with PostgreSQL LTree
 email:
 - andrei.panamarenka@gmail.com
@@ -51,46 +133,7 @@ files:
 - lib/pg_ltree/ltree.rb
 - lib/pg_ltree/scoped_for.rb
 - lib/pg_ltree/version.rb
-- test/dummy/README.rdoc
-- test/dummy/Rakefile
-- test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/assets/stylesheets/application.css
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/models/not_uniq_tree_node.rb
-- test/dummy/app/models/tree_node.rb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/bin/bundle
-- test/dummy/bin/rails
-- test/dummy/bin/rake
-- test/dummy/bin/setup
-- test/dummy/config.ru
-- test/dummy/config/application.rb
-- test/dummy/config/boot.rb
-- test/dummy/config/database.yml.example
-- test/dummy/config/environment.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/initializers/assets.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/cookies_serializer.rb
-- test/dummy/config/initializers/filter_parameter_logging.rb
-- test/dummy/config/initializers/inflections.rb
-- test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/session_store.rb
-- test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/locales/en.yml
-- test/dummy/config/routes.rb
-- test/dummy/config/secrets.yml
-- test/dummy/db/migrate/20150809114511_enable_postgres_ltree.rb
-- test/dummy/db/migrate/20150809114528_create_tree_node.rb
-- test/dummy/db/migrate/20150809114547_create_not_uniq_tree_node.rb
-- test/dummy/db/schema.rb
-- test/dummy/public/404.html
-- test/dummy/public/422.html
-- test/dummy/public/500.html
-- test/dummy/public/favicon.ico
+- test/database.yml.sample
 - test/pg_ltree/ltree_test.rb
 - test/pg_ltree/scoped_for_test.rb
 - test/pg_ltree_test.rb
@@ -120,47 +163,9 @@ signing_key:
 specification_version: 4
 summary: Organise ActiveRecord model into a tree structure with PostgreSQL LTree
 test_files:
-- test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/assets/stylesheets/application.css
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/models/not_uniq_tree_node.rb
-- test/dummy/app/models/tree_node.rb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/bin/bundle
-- test/dummy/bin/rails
-- test/dummy/bin/rake
-- test/dummy/bin/setup
-- test/dummy/config/application.rb
-- test/dummy/config/boot.rb
-- test/dummy/config/database.yml.example
-- test/dummy/config/environment.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/initializers/assets.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/cookies_serializer.rb
-- test/dummy/config/initializers/filter_parameter_logging.rb
-- test/dummy/config/initializers/inflections.rb
-- test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/session_store.rb
-- test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/locales/en.yml
-- test/dummy/config/routes.rb
-- test/dummy/config/secrets.yml
-- test/dummy/config.ru
-- test/dummy/db/migrate/20150809114511_enable_postgres_ltree.rb
-- test/dummy/db/migrate/20150809114528_create_tree_node.rb
-- test/dummy/db/migrate/20150809114547_create_not_uniq_tree_node.rb
-- test/dummy/db/schema.rb
-- test/dummy/public/404.html
-- test/dummy/public/422.html
-- test/dummy/public/500.html
-- test/dummy/public/favicon.ico
-- test/dummy/Rakefile
-- test/dummy/README.rdoc
+- test/database.yml.sample
 - test/pg_ltree/ltree_test.rb
 - test/pg_ltree/scoped_for_test.rb
 - test/pg_ltree_test.rb
 - test/test_helper.rb
+has_rdoc: 

data/test/dummy/README.rdoc

@@ -1,28 +0,0 @@
-== README
-
-This README would normally document whatever steps are necessary to get the
-application up and running.
-
-Things you may want to cover:
-
-* Ruby version
-
-* System dependencies
-
-* Configuration
-
-* Database creation
-
-* Database initialization
-
-* How to run the test suite
-
-* Services (job queues, cache servers, search engines, etc.)
-
-* Deployment instructions
-
-* ...
-
-
-Please feel free to use a different markup language if you do not plan to run
-<tt>rake doc:app</tt>.

data/test/dummy/Rakefile

@@ -1,6 +0,0 @@
-# Add your own tasks in files placed in lib/tasks ending in .rake,
-# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
-
-require File.expand_path('../config/application', __FILE__)
-
-Rails.application.load_tasks

data/test/dummy/app/assets/javascripts/application.js

@@ -1,13 +0,0 @@
-// This is a manifest file that'll be compiled into application.js, which will include all the files
-// listed below.
-//
-// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-// or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path.
-//
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// compiled file.
-//
-// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
-// about supported directives.
-//
-//= require_tree .

data/test/dummy/app/assets/stylesheets/application.css

@@ -1,15 +0,0 @@
-/*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the bottom of the
- * compiled file so the styles you add here take precedence over styles defined in any styles
- * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
- * file per style scope.
- *
- *= require_tree .
- *= require_self
- */

data/test/dummy/app/controllers/application_controller.rb

@@ -1,5 +0,0 @@
-class ApplicationController < ActionController::Base
-  # Prevent CSRF attacks by raising an exception.
-  # For APIs, you may want to use :null_session instead.
-  protect_from_forgery with: :exception
-end

data/test/dummy/app/helpers/application_helper.rb

@@ -1,2 +0,0 @@
-module ApplicationHelper
-end

data/test/dummy/app/models/not_uniq_tree_node.rb

@@ -1,6 +0,0 @@
-class NotUniqTreeNode < ActiveRecord::Base
-  extend PgLtree::ScopedFor
-
-  ltree :new_path
-  ltree_scoped_for :status
-end

data/test/dummy/app/models/tree_node.rb

@@ -1,3 +0,0 @@
-class TreeNode < ActiveRecord::Base
-  ltree
-end

data/test/dummy/app/views/layouts/application.html.erb

@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>Dummy</title>
-  <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true %>
-  <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
-  <%= csrf_meta_tags %>
-</head>
-<body>
-
-<%= yield %>
-
-</body>
-</html>

data/test/dummy/bin/bundle

@@ -1,3 +0,0 @@
-#!/usr/bin/env ruby
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
-load Gem.bin_path('bundler', 'bundle')

data/test/dummy/bin/rails

@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-APP_PATH = File.expand_path('../../config/application', __FILE__)
-require_relative '../config/boot'
-require 'rails/commands'

data/test/dummy/bin/rake

@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-require_relative '../config/boot'
-require 'rake'
-Rake.application.run