glebtv-mongoid_nested_set 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06f74b01b36e9f6e96dbc59aacdc68b68069182d
-  data.tar.gz: 7acff99227594a6601f8141a99bf60408987d16d
+  metadata.gz: c33f021b3089d426f8cd762d26c1527892c483c2
+  data.tar.gz: a2c4b42b74fac204f78bdead4dab8ded122389ff
 SHA512:
-  metadata.gz: 0cb2a314591b0f6b80c1c6caa626c6b249980c2a6c91a8fef10921abc930f91d8370aa54494ac7b1f4f7b18d686ee5a963f934f8ac8a2747ca8d988c3cf59a9d
-  data.tar.gz: 36eca30d0546e7f262cc103731500a528c341ff2e5a9ae00ddd86f3880dde97e6886155295b8c16d429c0e8f64ff6045ae86b78ac8173c58c8a909016670f07e
+  metadata.gz: 28bec66a742952b69fe7fbedbeeac8e4377a8ff33330c5e81767314f34a78cc5dd9519806424cc43657d8fd33afeb7bc87833b1d59412c4917082949acc13743
+  data.tar.gz: 7b60408b936e2adc0bf80138b316a7a6255c85a721a451a4c56d64afef3e46f93486c2ae147ce50f3b8d747b56b6578883f7742ec6b10f862e8ce486d008c410

data/.ruby-version

@@ -1 +1 @@
-2.0.0-p247
+2.0.0-p353

data/.travis.yml

@@ -0,0 +1,16 @@
+language: ruby
+services: mongodb
+
+notifications:
+  email: false
+
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - 2.1.0
+  - jruby-20mode
+
+gemfile:
+  - gemfiles/mongoid-3.1.gemfile
+  - gemfiles/mongoid-4.0.gemfile
+  - gemfiles/am-4.1.gemfile

data/Gemfile

@@ -1,10 +1,8 @@
 source "http://rubygems.org"
 
+#gem "activemodel", "~> 4.1.0.beta1"
+#gem "mongoid", "~> 4.0.0.beta1"
+
 # Specify your gem's dependencies in glebtv-mongoid_nested_set.gemspec
 gemspec
 
-group :test do
-  gem 'rspec-expectations', "~> 2.0"
-  gem 'rr'
-  gem 'remarkable_mongoid'
-end

data/README.markdown

@@ -1,9 +1,13 @@
 Mongoid Nested Set
 ==================
 
+[![Gem Version](https://badge.fury.io/rb/glebtv-mongoid_nested_set.png)](http://badge.fury.io/rb/glebtv-mongoid_nested_set)
+[![Build Status](https://travis-ci.org/glebtv/mongoid_nested_set.png?branch=master)](https://travis-ci.org/glebtv/mongoid_nested_set)
+[![Dependency Status](https://gemnasium.com/glebtv/mongoid_nested_set.png)](https://gemnasium.com/glebtv/mongoid_nested_set)
+
 Mongoid Nested Set is an implementation of the nested set pattern for Mongoid.
 It is a port of [AwesomeNestedSet for ActiveRecord](https://github.com/galetahub/awesome_nested_set).
-It supports Mongoid 2 and Rails 3.
+It supports Mongoid 3/4 and Rails 3/4.
 
 Nested Set represents hierarchies of trees in MongoDB using references rather
 than embedded documents.  A tree is stored as a flat list of documents in a
@@ -18,11 +22,11 @@ For more on the nested set pattern: <http://en.wikipedia.org/wiki/Nested_set_mod
 
 Install as Gem
 
-    gem install mongoid_nested_set
+    gem install glebtv-mongoid_nested_set
 
 via Gemfile
 
-    gem 'mongoid_nested_set', '0.1.3'
+    gem 'glebtv-mongoid_nested_set', '~> 0.4.2'
 
 
 ## Usage

data/Rakefile

@@ -1 +1,9 @@
-require 'bundler/gem_tasks'
+require "bundler/gem_tasks"
+
+require 'rspec/core/rake_task'
+
+desc 'Default: run specs.'
+task :default => :spec
+
+desc "Run specs"
+RSpec::Core::RakeTask.new

data/gemfiles/am-4.1.gemfile

@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+gem "activemodel", "~> 4.1.0.beta1"
+gem "mongoid", "~> 4.0.0.beta1"
+
+gemspec path: "../"

data/gemfiles/mongoid-3.1.gemfile

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem "mongoid", github: "mongoid/mongoid", branch: "3.1.0-stable"
+
+gemspec path: "../"

data/gemfiles/mongoid-4.0.gemfile

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem "mongoid", "~> 4.0.0.beta1"
+
+gemspec path: "../"

data/glebtv-mongoid_nested_set.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.version     = MongoidNestedSet::VERSION
   s.authors     = ["GlebTV", "Brandon Turner"]
   s.email       = ["bt@brandonturner.net"]
-  s.homepage    = "http://github.com/55ideas/mongoid_nested_set"
+  s.homepage    = "http://github.com/glebtv/mongoid_nested_set"
   s.summary     = %q{Nested set based tree implementation for Mongoid}
   s.description = %q{Fully featured tree implementation for Mongoid using the nested set model}
   s.licenses    = ["MIT"]
@@ -19,11 +19,16 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency(%q<mongoid>, [">= 3.0.0"])
+  s.add_runtime_dependency 'mongoid', [">= 3.1.0", "< 4.1"]
 
-  s.add_development_dependency(%q<rspec>, [">= 2.7.0"])
-  s.add_development_dependency(%q<bundler>, [">= 1.0.21"])
-  s.add_development_dependency(%q<simplecov>)
-  s.add_development_dependency(%q<simplecov-rcov>)
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'bundler'
+  s.add_development_dependency 'simplecov'
+  s.add_development_dependency 'simplecov-rcov'
+
+  s.add_development_dependency 'rspec-expectations', "~> 2.0"
+  s.add_development_dependency 'rr'
+  s.add_development_dependency 'remarkable_mongoid'
 end
 

data/lib/mongoid_nested_set/base.rb

@@ -1,7 +1,5 @@
 module Mongoid::Acts::NestedSet
-
   module Base
-
     # Configuration options are:
     #
     # * +:parent_field+ - field name to use for keeping the parent id (default: parent_id)
@@ -53,15 +51,7 @@ module Mongoid::Acts::NestedSet
 
         attr_accessor :skip_before_destroy
 
-        # Rails 4 no longer uses "attr_protected" and "attr_accessible" for
-        # mass assignment control by default, but this methods can be restored 
-        # by installing 'protected_attributes' gem. So here we just check
-        # accessible_attributes method presence
-        if respond_to?(:accessible_attributes) && accessible_attributes.blank?
-          attr_protected left_field_name.intern, right_field_name.intern
-        end
-
-        define_callbacks :move, :terminator => "result == false"
+        define_callbacks :move, :terminator => callback_terminator
 
         before_create  :set_default_left_and_right
         before_save    :store_new_parent
@@ -89,6 +79,15 @@ module Mongoid::Acts::NestedSet
 
       end
     end
-  end
 
+    private
+    def callback_terminator
+      if ::ActiveSupport::VERSION::STRING >= '4.1'
+        lambda { |target, result| result == false }
+      else
+        'result == false'
+      end
+    end
+  end
 end
+

data/lib/mongoid_nested_set/document.rb

@@ -105,7 +105,11 @@ module Mongoid::Acts::NestedSet
         conditions = parents.map do |parent|
           {left_field_name => {"$gt" => parent.left}, right_field_name => {"$lt" => parent.right}}
         end
-        where("$or" => conditions)
+        if conditions.empty?
+          where({})
+        else
+          where("$or" => conditions)
+        end
       end
 
 

data/lib/mongoid_nested_set/version.rb

@@ -1,3 +1,3 @@
 module MongoidNestedSet
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/spec/models/test_document.rb

@@ -22,11 +22,7 @@ module Mongoid::Acts::NestedSet
       def test_set_attributes(attrs)
         attrs.each do |key, val|
           key = key.to_s
-          if Mongoid.allow_dynamic_fields ||
-              fields.keys.any? { |k| k.to_s == key } ||
-              associations.any? { |a| a[0].to_s == key || a[1].foreign_key.to_s == key }
-            @attributes[key] = fields[key].mongoize(val)
-          end
+          @attributes[key] = val
         end
         self
       end

data/spec/mongoid_nested_set_spec.rb

@@ -191,13 +191,17 @@ describe "A Mongoid::Document" do
     end
 
     it "does not allow assigning the left field" do
-      expect { Node.new.lft = 1 }.to raise_error(NameError)
-      expect { RenamedFields.new.red = 1 }.to raise_error(NameError)
+      # expect { Node.new.lft = 1 }.to raise_error(NameError)
+      # expect { RenamedFields.new.red = 1 }.to raise_error(NameError)
+      expect { Node.new.lft = 1 }.to raise_error
+      expect { RenamedFields.new.red = 1 }.to raise_error
     end
 
     it "does not allow assigning the right field" do
-      expect { Node.new.rgt = 1 }.to raise_error(NameError)
-      expect { RenamedFields.new.black = 1 }.to raise_error(NameError)
+      # expect { Node.new.rgt = 1 }.to raise_error(NameError)
+      # expect { RenamedFields.new.black = 1 }.to raise_error(NameError)
+      expect { Node.new.rgt = 1 }.to raise_error
+      expect { RenamedFields.new.black = 1 }.to raise_error
     end
 
 
@@ -360,7 +364,7 @@ describe "A Mongoid::Document" do
       # Scopes
 
       it "fetches all root nodes" do
-        Node.roots.should have(2).entries
+        Node.roots.entries.size.should eq(2)
       end
 
       it "fetches all leaf nodes in order" do
@@ -376,7 +380,7 @@ describe "A Mongoid::Document" do
 
       it "fetches descendants of multiple parents" do
         parents = Node.any_in(:name => %w[Men's Dresses])
-        Node.where(:root_id=>1).descendants_of(parents).should have(5).entries
+        Node.where(:root_id=>1).descendants_of(parents).entries.size.should eq(5)
       end
 
       it "fetches self and ancestors in order" do
@@ -478,7 +482,11 @@ describe "A Mongoid::Document" do
       end
 
       it "cannot move a node to a non-existent target" do
-        @nodes[:mens].parent_id = Moped::BSON::ObjectId.new
+        if defined?(Moped::BSON)
+          @nodes[:mens].parent_id = Moped::BSON::ObjectId.new
+        else
+          @nodes[:mens].parent_id = BSON::ObjectId.new
+        end
         expect {
           @nodes[:mens].save
         }.to raise_error(Mongoid::Errors::MongoidError, /possible.*(exist|found)/)

data/spec/spec_helper.rb

@@ -2,6 +2,8 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'
 require 'rr'
+require 'active_support'
+require 'active_support/deprecation'
 require 'mongoid'
 require 'mongoid_nested_set'
 require 'remarkable/mongoid'
@@ -24,17 +26,20 @@ end
 module Mongoid::Acts::NestedSet::Matchers
 end
 
+#Mongoid.logger = Logger.new($stdout)
+#Moped.logger = Logger.new($stdout)
+#Moped.logger.level = Logger::DEBUG
+
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 Dir["#{File.dirname(__FILE__)}/models/*.rb"].each {|file| require file }
 Dir["#{File.dirname(__FILE__)}/matchers/*.rb"].each {|file| require file }
 
 Mongoid.configure do |config|
   config.connect_to("mongoid_nested_set_test")
-  config.allow_dynamic_fields = false
 end
 
 RSpec.configure do |config|
-  config.mock_with :rr
+  #config.mock_with :rr
   config.include(Mongoid::Acts::NestedSet::Matchers)
 
   config.after(:each) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glebtv-mongoid_nested_set
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - GlebTV
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-07 00:00:00.000000000 Z
+date: 2014-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -17,42 +17,62 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: '4.1'
+- !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: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.21
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.21
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -81,6 +101,48 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-expectations
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: rr
+  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: remarkable_mongoid
+  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: Fully featured tree implementation for Mongoid using the nested set model
 email:
 - bt@brandonturner.net
@@ -93,10 +155,14 @@ files:
 - .rspec
 - .ruby-gemset
 - .ruby-version
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.markdown
 - Rakefile
+- gemfiles/am-4.1.gemfile
+- gemfiles/mongoid-3.1.gemfile
+- gemfiles/mongoid-4.0.gemfile
 - glebtv-mongoid_nested_set.gemspec
 - lib/glebtv-mongoid_nested_set.rb
 - lib/mongoid_nested_set.rb
@@ -122,7 +188,7 @@ files:
 - spec/models/unscoped_node.rb
 - spec/mongoid_nested_set_spec.rb
 - spec/spec_helper.rb
-homepage: http://github.com/55ideas/mongoid_nested_set
+homepage: http://github.com/glebtv/mongoid_nested_set
 licenses:
 - MIT
 metadata: {}
@@ -142,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: mongoid_nested_set
-rubygems_version: 2.0.6
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Nested set based tree implementation for Mongoid