Merge pull request #204 from jayfredlund/master

adds ActiveRecord >= 5.0.0.beta1 support for tree roots; fixes #195

Author: seuros

lib/closure_tree/model.rb

@@ -5,11 +5,13 @@ module Model
     extend ActiveSupport::Concern
 
     included do
-      belongs_to :parent,
-                 class_name: _ct.model_class.to_s,
-                 foreign_key: _ct.parent_column_name,
-                 inverse_of: :children,
-                 touch: _ct.options[:touch]
+
+      belongs_to :parent, nil, *_ct.belongs_to_with_optional_option(
+        class_name: _ct.model_class.to_s,
+        foreign_key: _ct.parent_column_name,
+        inverse_of: :children,
+        touch: _ct.options[:touch],
+        optional: true)
 
       order_by_generations = "#{_ct.quoted_hierarchy_table_name}.generations asc"
 

lib/closure_tree/support.rb

@@ -76,6 +76,10 @@ def scope_with_order(scope, additional_order_by = nil)
       end
     end
 
+    def belongs_to_with_optional_option(opts)
+      [ActiveRecord::VERSION::MAJOR < 5 ? opts.except(:optional) : opts]
+    end
+
     # lambda-ize the order, but don't apply the default order_option
     def has_many_without_order_option(opts)
         [lambda { order(opts[:order]) }, opts.except(:order)]