snapshot_tree 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0018746e8e55359abadcbde7ccb11c56a5d9f210
-  data.tar.gz: 307c4a6432b98209ef0013a05e7dbadd26a8c8cb
+  metadata.gz: 02b62dd5d7f83c773944423a457e03cd97329781
+  data.tar.gz: 6b37881390a459105e9a64e89e157592212f10b3
 SHA512:
-  metadata.gz: 5dccea303d126864ddd0f7e0cd270ed44dbf9e5cf3f034349886a8116a51ef76cd43f6a8574664a8a95639a4634f0c3598375ca2bf1ddc25eb786d3dd73b6ca5
-  data.tar.gz: d716d2878223bb8dc49fd51c6d7c071e0aee335992a8014de6c3f4afab3a0ebeefb48cc257819823e9be616c83bab9b8e2b4037bc2bd38c4b98c22e2324d578c
+  metadata.gz: 27850f70ecacea9ec9d0715fe6b74d9aea8fc88fd91289ae87e67f377bbd17e75267f4b2a6986cd07bd64c281dbed084be9d46e1d2f7ff6e3615611591f3b4ec
+  data.tar.gz: 3af68ba8f21d56bc8e1ff5190cad4ef384bd24842266b4c7a08fa1fc845a9dbce0f4279acabf72f51b9bb49248c2e395bfe33368c2907a228a7957997babf1ff

data/README.md

@@ -113,6 +113,14 @@ When calling the class methods, you must pass an model or model id in order to q
 
 ```Node.descendent_nodes(grandpa, :depth => 1, :as_of => '2010-01-01')```
 
+
+## Gem testing
+
+1. Copy spec/database.yml.sample to spec/database.yml and edit to appropriate values
+2. Create table 'tree_testing'
+3. Run ```load 'spec/db/schema.rb'``` in console
+4. ```bundle exec rspec spec/acts_as_tree_spec.rb```
+
 ## Contributing
 
 1. Fork it

data/lib/snapshot_tree/acts_as_tree.rb

@@ -59,18 +59,18 @@ module SnapshotTree
         instance_variable_set :@tree_helper, TreeHelper.new(options)
 
         has_many :parent_tree_nodes,
+          -> { where(options[:is_active_field].to_sym => true) if options[:is_active_field] },
           class_name:  options[:join_class],
           foreign_key: options[:child_key],
           autosave:    true,
-          dependent:   options[:dependent],
-          conditions:  options[:is_active_field] ? {options[:is_active_field].to_sym => true} : nil
+          dependent:   options[:dependent]
 
         has_many :child_tree_nodes,
+          -> { where(options[:is_active_field].to_sym => true) if options[:is_active_field] },
           class_name:  options[:join_class],
           foreign_key: options[:parent_key],
           autosave:    true,
-          dependent:   options[:dependent],
-          conditions:  options[:is_active_field] ? {options[:is_active_field].to_sym => true} : nil
+          dependent:   options[:dependent]
 
         "#{options[:node_prefix]}_depth".to_sym.tap do |field|
           define_method(field) do
@@ -140,7 +140,7 @@ module SnapshotTree
       def nodes_query(query_type)
         return @query[query_type] if @query[query_type]
 
-        @query[query_type] = Handlebars.compile(
+        @query[query_type] = Handlebars::Context.new.compile(
           @template["#{query_type}_query"]
         ).call(
           {

data/lib/snapshot_tree/version.rb

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

data/snapshot_tree.gemspec

@@ -15,13 +15,13 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = SnapshotTree::VERSION
 
-  gem.add_dependency "activerecord", ">= 3.0.0"
-  gem.add_dependency "activesupport", ">= 3.0.0"
-  gem.add_dependency "pg", ">= 0.11.0"
-  gem.add_dependency "handlebars", "~> 0.4.0"
+  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_development_dependency "rake"
-  gem.add_development_dependency "rspec", "~> 2.6"
+  gem.add_development_dependency "rspec", "~> 2.14"
   gem.add_development_dependency "guard-rspec"
   gem.add_development_dependency "pry"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: snapshot_tree
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Szetobo
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.17.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.17.1
 - !ruby/object:Gem::Dependency
   name: handlebars
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement