Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

updating to new gem versions #232

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.2.0.beta2
2.2.0.beta4
10 changes: 5 additions & 5 deletions couchrest_model.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@ Gem::Specification.new do |s|
s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
s.require_paths = ["lib"]

s.add_dependency("couchrest", "2.0.1")
s.add_dependency("activemodel", ">= 4.0.2")
s.add_dependency("tzinfo", ">= 0.3.22")
s.add_dependency("hashdiff", "~> 0.3")
s.add_runtime_dependency("couchrest", "2.0.1")
s.add_runtime_dependency("activemodel", ">= 4.0.2")

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe its time to drop < 5.2

s.add_runtime_dependency("tzinfo", ">= 0.3.22")
s.add_runtime_dependency("hashdiff", ">= 1.0.0")
s.add_development_dependency("rspec", "~> 3.5.0")
s.add_development_dependency("rack-test", ">= 0.5.7")
s.add_development_dependency("rake", ">= 0.8.0", "< 11.0")
s.add_development_dependency("test-unit")
s.add_development_dependency("minitest", "> 4.1") #, "< 5.0") # For Kaminari and activesupport, pending removal
s.add_development_dependency("kaminari", ">= 0.14.1", "< 0.16.0")
s.add_development_dependency("kaminari", ">= 1.1")
s.add_development_dependency("mime-types", "< 3.0") # Mime-types > 3.0 don't bundle properly on JRuby
end
2 changes: 2 additions & 0 deletions lib/couchrest/model/designs/view.rb
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,8 @@ def count
limit(0).total_rows
end
end

alias :size :count

# Check to see if the array of documents is empty. This *will*
# perform the query and return all documents ready to use, if you don't
Expand Down
2 changes: 1 addition & 1 deletion lib/couchrest/model/dirty.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def changes
if original_change_data.nil?
nil
else
HashDiff.diff(original_change_data, current_change_data)
Hashdiff.diff(original_change_data, current_change_data)
end
end

Expand Down