snapshot_tree 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02b62dd5d7f83c773944423a457e03cd97329781
-  data.tar.gz: 6b37881390a459105e9a64e89e157592212f10b3
+  metadata.gz: 05a07d646ae3dc57c2788ed5019c17cbd7dc66be
+  data.tar.gz: f1fdaebf5eb6d43815c2dbe8cb9de282422160cb
 SHA512:
-  metadata.gz: 27850f70ecacea9ec9d0715fe6b74d9aea8fc88fd91289ae87e67f377bbd17e75267f4b2a6986cd07bd64c281dbed084be9d46e1d2f7ff6e3615611591f3b4ec
-  data.tar.gz: 3af68ba8f21d56bc8e1ff5190cad4ef384bd24842266b4c7a08fa1fc845a9dbce0f4279acabf72f51b9bb49248c2e395bfe33368c2907a228a7957997babf1ff
+  metadata.gz: 1d8a33504e55b3782ebc2b7cec8e408765128f7d499833c08d92c21345cfe4c1584a2335f502e99635f0404e8c9f1a35e0de6201dc834a9c78c4fbbd334c08cd
+  data.tar.gz: 51d08907178958e822716ebe4ffe5680ade9fa6cdadb82bf51a5faf4b174a1d1390ac7165a3a9fe52e685794ac76009cbab1cca434838705508173f4ec88c1f8

data/lib/snapshot_tree/acts_as_tree.rb

@@ -66,7 +66,7 @@ module SnapshotTree
           dependent:   options[:dependent]
 
         has_many :child_tree_nodes,
-          -> { where(options[:is_active_field].to_sym => true) if options[:is_active_field] },
+          -> { where(optoins[:is_active_field].to_sym => true) if options[:is_active_field] },
           class_name:  options[:join_class],
           foreign_key: options[:parent_key],
           autosave:    true,
@@ -140,10 +140,8 @@ module SnapshotTree
       def nodes_query(query_type)
         return @query[query_type] if @query[query_type]
 
-        @query[query_type] = Handlebars::Context.new.compile(
-          @template["#{query_type}_query"]
-        ).call(
-          {
+        @query[query_type] = Mustache.render(
+          @template["#{query_type}_query"], {
             model_table:     @opts[:model_table],
             join_table:      @opts[:join_table],
             child_key:       "#{@opts[:child_key]}",

data/lib/snapshot_tree/template.yml

@@ -1,36 +1,38 @@
 root_query: |
   (
     SELECT model.* FROM {{model_table}} model
-    {{#if snapshot_field}}
+    {{#snapshot_field}}
       LEFT JOIN (
         SELECT {{child_key}}, {{parent_key}}, {{snapshot_field}}, id,
-          {{#is_active_field}}{{this}}, {{/is_active_field}}
+          {{#is_active_field}}{{is_active_field}}, {{/is_active_field}}
           RANK() OVER (PARTITION BY {{child_key}} ORDER BY {{snapshot_field}} DESC, id DESC)
         FROM {{join_table}}
         WHERE {{snapshot_field}} <= '__snapshot_value__'
-        {{#is_active_field}}AND {{this}}{{/is_active_field}}
+        {{#is_active_field}}AND {{is_active_field}}{{/is_active_field}}
       ) AS tree ON tree.{{child_key}} = model.id AND COALESCE(tree.rank, 1) = 1
-    {{else}}
+    {{/snapshot_field}}
+    {{^snapshot_field}}
       LEFT JOIN {{join_table}} tree ON tree.{{child_key}} = model.id
-    {{/if}}
+    {{/snapshot_field}}
     WHERE tree.{{parent_key}} IS NULL
   ) AS {{model_table}}
 
 leaf_query: |
   (
     SELECT model.* FROM {{model_table}} model
-    {{#if snapshot_field}}
+    {{#snapshot_field}}
       LEFT JOIN (
         SELECT {{child_key}}, {{parent_key}}, {{snapshot_field}}, id,
-          {{#is_active_field}}{{this}}, {{/is_active_field}}
+          {{#is_active_field}}{{is_active_field}}, {{/is_active_field}}
           RANK() OVER (PARTITION BY {{child_key}} ORDER BY {{snapshot_field}} DESC, id DESC)
         FROM {{join_table}}
         WHERE {{snapshot_field}} <= '__snapshot_value__'
-        {{#is_active_field}}AND {{this}}{{/is_active_field}}
+        {{#is_active_field}}AND {{is_active_field}}{{/is_active_field}}
       ) AS tree ON tree.{{parent_key}} = model.id AND COALESCE(tree.rank, 1) = 1
-    {{else}}
+    {{/snapshot_field}}
+    {{^snapshot_field}}
       LEFT JOIN {{join_table}} tree ON tree.{{parent_key}} = model.id
-    {{/if}}
+    {{/snapshot_field}}
     WHERE tree.{{child_key}} IS NULL
   ) AS {{model_table}}
 
@@ -41,7 +43,7 @@ descendent_query: |
         alias.{{child_key}}, alias.{{parent_key}},
         ARRAY[alias.{{parent_key}}] AS {{path}}, 1 AS {{depth}}, false AS {{cycle}}
       FROM {{join_table}} alias
-        {{#if snapshot_field}}JOIN snapshot ON snapshot.id = alias.id{{/if}}
+        {{#snapshot_field}}JOIN snapshot ON snapshot.id = alias.id{{/snapshot_field}}
       WHERE alias.{{parent_key}} = __model_id__
       UNION ALL
       SELECT
@@ -51,24 +53,25 @@ descendent_query: |
         alias.{{child_key}} = ANY(tree.{{path}}) AS {{cycle}}
       FROM tree
         JOIN {{join_table}} alias ON alias.{{parent_key}} = tree.{{child_key}}
-        {{#if snapshot_field}}JOIN snapshot ON snapshot.id = alias.id{{/if}}
+        {{#snapshot_field}}JOIN snapshot ON snapshot.id = alias.id{{/snapshot_field}}
       WHERE NOT tree.{{cycle}}
     )
     ,snapshot AS (
       SELECT alias.id
       FROM {{model_table}} model
-      {{#if snapshot_field}}
+      {{#snapshot_field}}
         LEFT JOIN (
           SELECT {{child_key}}, {{parent_key}}, {{snapshot_field}}, id,
-            {{#is_active_field}}{{this}}, {{/is_active_field}}
+            {{#is_active_field}}{{is_active_field}}, {{/is_active_field}}
             RANK() OVER (PARTITION BY {{child_key}} ORDER BY {{snapshot_field}} DESC, id DESC)
           FROM {{join_table}}
           WHERE {{snapshot_field}} <= '__snapshot_value__'
-          {{#is_active_field}}AND {{this}}{{/is_active_field}}
+          {{#is_active_field}}AND {{is_active_field}}{{/is_active_field}}
         ) AS alias ON alias.{{child_key}} = model.id AND COALESCE(rank, 1) = 1
-      {{else}}
+      {{/snapshot_field}}
+      {{^snapshot_field}}
         LEFT JOIN {{join_table}} alias ON alias.{{child_key}} = model.id
-      {{/if}}
+      {{/snapshot_field}}
       WHERE alias.{{parent_key}} IS NOT NULL
     )
     SELECT model.*, tree.*
@@ -84,7 +87,7 @@ ancestor_query: |
         alias.{{child_key}}, alias.{{parent_key}},
         ARRAY[alias.{{parent_key}}] AS {{path}}, 1 AS {{depth}}, false AS {{cycle}}
       FROM {{join_table}} alias
-        {{#if snapshot_field}}JOIN snapshot ON snapshot.id = alias.id{{/if}}
+        {{#snapshot_field}}JOIN snapshot ON snapshot.id = alias.id{{/snapshot_field}}
       WHERE alias.{{child_key}} = __model_id__
       UNION ALL
       SELECT
@@ -94,24 +97,25 @@ ancestor_query: |
         alias.{{parent_key}} = ANY(tree.{{path}}) AS {{cycle}}
       FROM tree
         JOIN {{join_table}} alias ON alias.{{child_key}} = tree.{{parent_key}}
-        {{#if snapshot_field}}JOIN snapshot ON snapshot.id = alias.id{{/if}}
+        {{#snapshot_field}}JOIN snapshot ON snapshot.id = alias.id{{/snapshot_field}}
       WHERE NOT tree.{{cycle}}
     )
     ,snapshot AS (
       SELECT alias.id
       FROM {{model_table}} model
-      {{#if snapshot_field}}
+      {{#snapshot_field}}
         LEFT JOIN (
           SELECT {{child_key}}, {{parent_key}}, {{snapshot_field}}, id,
-            {{#is_active_field}}{{this}}, {{/is_active_field}}
+            {{#is_active_field}}{{is_active_field}}, {{/is_active_field}}
             RANK() OVER (PARTITION BY {{child_key}} ORDER BY {{snapshot_field}} DESC, id DESC)
           FROM {{join_table}}
           WHERE {{snapshot_field}} <= '__snapshot_value__'
-          {{#is_active_field}}AND {{this}}{{/is_active_field}}
+          {{#is_active_field}}AND {{is_active_field}}{{/is_active_field}}
         ) AS alias ON alias.{{child_key}} = model.id AND COALESCE(rank, 1) = 1
-      {{else}}
+      {{/snapshot_field}}
+      {{^snapshot_field}}
         LEFT JOIN {{join_table}} alias ON alias.{{child_key}} = model.id
-      {{/if}}
+      {{/snapshot_field}}
       WHERE alias.{{parent_key}} IS NOT NULL
     )
     SELECT model.*, tree.*

data/lib/snapshot_tree/version.rb

@@ -1,3 +1,3 @@
 module SnapshotTree
-  VERSION = "2.0.0"
+  VERSION = "3.0.0"
 end

data/lib/snapshot_tree.rb

@@ -1,5 +1,5 @@
 require "active_record"
-require 'handlebars'
+require 'mustache'
 
 require "snapshot_tree/version"
 require "snapshot_tree/acts_as_tree"

data/snapshot_tree.gemspec

@@ -4,7 +4,7 @@ require File.expand_path('../lib/snapshot_tree/version', __FILE__)
 Gem::Specification.new do |gem|
   gem.authors       = ["Szetobo"]
   gem.email         = ["szetobo@gmail.com"]
-  gem.homepage      = "https://github.com/szetobo/snapshot_tree"
+  gem.homepage      = "https://github.com/ABAgile/snapshot_tree"
   gem.summary       = "Mutliple snapshot hierarchical tree implementation of adjacency list using recursive query of Postgresql"
   gem.description   = "Mutliple snapshot hierarchical tree implementation of adjacency list using recursive query of Postgresql"
 
@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "activerecord", ">= 4.0.0"
   gem.add_dependency "activesupport", ">= 4.0.0"
   gem.add_dependency "pg", ">= 0.17.1"
-  gem.add_dependency "handlebars", "~> 0.6.0"
+  gem.add_dependency "mustache", "~> 1.0"
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency "rspec", "~> 2.14"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: snapshot_tree
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Szetobo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-20 00:00:00.000000000 Z
+date: 2022-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.17.1
 - !ruby/object:Gem::Dependency
-  name: handlebars
+  name: mustache
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -146,7 +146,7 @@ files:
 - spec/db/schema.rb
 - spec/setup.rb
 - spec/spec_helper.rb
-homepage: https://github.com/szetobo/snapshot_tree
+homepage: https://github.com/ABAgile/snapshot_tree
 licenses: []
 metadata: {}
 post_install_message: 
@@ -165,9 +165,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.14.3
 signing_key: 
 specification_version: 4
 summary: Mutliple snapshot hierarchical tree implementation of adjacency list using
   recursive query of Postgresql
-test_files: []
+test_files:
+- spec/acts_as_tree_spec.rb
+- spec/db/database.yml.sample
+- spec/db/schema.rb
+- spec/setup.rb
+- spec/spec_helper.rb