Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Add support to Rails 4
  • Loading branch information
grzlus committed Jun 9, 2013
1 parent 19adff9 commit b6ee732
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion acts_as_nested_interval.gemspec
Expand Up @@ -16,7 +16,7 @@ Gem::Specification.new do |s|
s.files = Dir["{app,config,db,lib}/**/*"] + ["MIT-LICENSE", "Rakefile", "README.md"]
s.test_files = Dir["test/**/*"]

s.add_dependency "rails", "~> 3.2.1"
s.add_dependency "rails", ">= 3.2.1", "< 5"

s.add_development_dependency "sqlite3"
s.add_development_dependency "mysql2"
Expand Down
8 changes: 4 additions & 4 deletions lib/acts_as_nested_interval.rb
Expand Up @@ -37,14 +37,14 @@ def acts_as_nested_interval(options = {})
belongs_to :parent, class_name: name, foreign_key: nested_interval_foreign_key
has_many :children, class_name: name, foreign_key: nested_interval_foreign_key,
dependent: nested_interval_dependent
scope :roots, where(nested_interval_foreign_key => nil)
scope :roots, -> { where(nested_interval_foreign_key => nil) }

if columns_hash["rgt"]
scope :preorder, order('rgt DESC, lftp ASC')
scope :preorder, -> { order('rgt DESC, lftp ASC') }
elsif columns_hash["rgtp"] && columns_hash["rgtq"]
scope :preorder, order('1.0 * rgtp / rgtq DESC, lftp ASC')
scope :preorder, -> { order('1.0 * rgtp / rgtq DESC, lftp ASC') }
else
scope :preorder, order('nested_interval_rgt(lftp, lftq) DESC, lftp ASC')
scope :preorder, -> { order('nested_interval_rgt(lftp, lftq) DESC, lftp ASC') }
end

before_create :create_nested_interval
Expand Down

0 comments on commit b6ee732

Please sign in to comment.