pg_ltree 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3c9f5f562cec7107813d4226e0e95bd46a6008f
-  data.tar.gz: a65946fd2274101195d093a70a683620551ac1f2
+  metadata.gz: 86eb4659eb67788f154e6000003da2005f206a29
+  data.tar.gz: 9294b256348decfa94675ddc0f55ce27b80383b9
 SHA512:
-  metadata.gz: d744c41fb752216ef58c3766fcbd3cd873bb0d047acdc84b17fb359a95c84797b4d1770ccd9e2cfdc4ab509ead2fdfe07cbd906e1e6d7220f44fe4cc8dc8fc2d
-  data.tar.gz: 1c116e1dce41607d81b969ff611f922327da26aec6588cac084e391d7419a3b6db069a647e7820ee342aea9688595a050fb474e7e8e851775809c4a4d8bb6bf1
+  metadata.gz: 74f7c0d93de986082dfa58ace51c08b04547a4546931a90b85650ac4b0d6a7856b91b93717ac81e0b809e9d29afd057da5f310278ede780eeef0bc1869286eb5
+  data.tar.gz: 842aa9982361a6e317ad7de969752701ca2b52c2748b177cf2157f279d287f5f34580e580d46c3ce574af7cca86f0ebadce686d01aa5de8a757ac97351a539d2

data/lib/pg_ltree/ltree.rb

@@ -46,10 +46,11 @@ module PgLtree
       # @return [ActiveRecord::Relation] relations of node's leaves
       def leaves
         subquery =
-          select("COUNT(subquery.#{ltree_path_column}) = 1")
+          unscoped.select("COUNT(subquery.#{ltree_path_column}) = 1")
           .from("#{table_name} AS subquery")
-          .where("subquery.#{ltree_path_column} <@ #{table_name}.#{ltree_path_column}").to_sql
-        where subquery
+          .where("subquery.#{ltree_path_column} <@ #{table_name}.#{ltree_path_column}")
+        subquery = subquery.where(subquery: current_scope.where_values_hash) if current_scope
+        where subquery.to_sql
       end
 
       # Get all with nodes when path liked the lquery

data/lib/pg_ltree/scoped_for.rb

@@ -13,25 +13,9 @@ module PgLtree
 
       self.ltree_scoped_for = Array.wrap(columns)
 
-      extend ClassMethods
       include InstanceMethods
     end
 
-    # Define class methods
-    module ClassMethods
-
-      # Get all leaves
-      #
-      # @return [ActiveRecord::Relation] relations of node's leaves
-      def leaves
-        subquery =
-          select("COUNT(subquery.#{ltree_path_column}) = (SELECT COUNT(DISTINCT #{ltree_scoped_for.first}) FROM #{table_name})")
-          .from("#{table_name} AS subquery")
-          .where("subquery.#{ltree_path_column} <@ #{table_name}.#{ltree_path_column}").to_sql
-        where subquery
-      end
-    end
-
     # Define instance methods
     module InstanceMethods
 

data/lib/pg_ltree/version.rb

@@ -4,5 +4,5 @@
 module PgLtree
 
   # Gem Version
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: pg_ltree
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Andrei Panamarenka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-04 00:00:00.000000000 Z
+date: 2015-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.17.0
 description: Organise ActiveRecord model into a tree structure with PostgreSQL LTree
@@ -45,14 +45,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- MIT-LICENSE
-- Rakefile
-- lib/pg_ltree.rb
 - lib/pg_ltree/ltree.rb
 - lib/pg_ltree/scoped_for.rb
 - lib/pg_ltree/version.rb
-- test/dummy/README.rdoc
-- test/dummy/Rakefile
+- lib/pg_ltree.rb
+- MIT-LICENSE
+- Rakefile
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/controllers/application_controller.rb
@@ -64,7 +62,6 @@ files:
 - 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
@@ -84,6 +81,7 @@ files:
 - 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
@@ -94,6 +92,8 @@ files:
 - test/dummy/public/422.html
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
+- test/dummy/Rakefile
+- test/dummy/README.rdoc
 - test/pg_ltree/ltree_test.rb
 - test/pg_ltree/scoped_for_test.rb
 - test/pg_ltree_test.rb
@@ -108,17 +108,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Organise ActiveRecord model into a tree structure with PostgreSQL LTree
@@ -170,4 +170,3 @@ test_files:
 - test/pg_ltree/scoped_for_test.rb
 - test/pg_ltree_test.rb
 - test/test_helper.rb
-has_rdoc: