Skip to content

Commit

Permalink
Merge pull request #9 from bittersweet/master
Browse files Browse the repository at this point in the history
ActiveRecord 3.2 and up compatibility
  • Loading branch information
Josep M. Bach committed Mar 27, 2012
2 parents 0b77a28 + b992e30 commit 47a07d6
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 8 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Expand Up @@ -5,4 +5,3 @@ rvm:
- ree
- ruby-head
- rbx
- rbx-2.0
10 changes: 5 additions & 5 deletions Readme.md
@@ -1,4 +1,4 @@
#resort
#resort [![Build Status](https://secure.travis-ci.org/codegram/resort.png)](http://travis-ci.org/codegram/resort)

Resort provides sorting capabilities to your Rails 3 models.

Expand Down Expand Up @@ -55,15 +55,15 @@ end

### Concurrency

Multiple users modifying the same list at the same time could be a problem,
Multiple users modifying the same list at the same time could be a problem,
so it's always a good practice to wrap the changes in a transaction:

```ruby
Product.transaction do
my_product.append_to(another_product)
end
```

###API

**Every time a product is created, it will be appended after the last element.**
Expand Down Expand Up @@ -157,7 +157,7 @@ You can also build the documentation with the following command:
rake docs

## Note on Patches/Pull Requests

* Fork the project.
* Make your feature addition or bug fix.
* Add tests for it. This is important so I don't break it in a
Expand Down
3 changes: 1 addition & 2 deletions resort.gemspec
Expand Up @@ -14,8 +14,7 @@ Gem::Specification.new do |s|

s.rubyforge_project = "resort"

s.add_runtime_dependency 'activerecord', '>= 3.0.5', '< 3.2'
# s.add_runtime_dependency 'activerecord', '~> 3.0.5'
s.add_runtime_dependency 'activerecord', '>= 3.0.5'
s.add_development_dependency 'sqlite3'
s.add_development_dependency 'rspec', '~> 2.5.0'
s.add_development_dependency 'yard'
Expand Down

0 comments on commit 47a07d6

Please sign in to comment.