Browse files

+ 4.1.0

  • Loading branch information...
1 parent 5b134f0 commit 8b8296f873e1f4e43c05faff9620f4cb5c69fe06 @floere committed Jan 24, 2012
Showing with 35 additions and 25 deletions.
  1. +4 −0 history.textile
  2. +28 −23 server/Gemfile.lock
  3. +1 −1 server/lib/picky/results.rb
  4. +1 −0 server/spec/integration/sinatra_index_actions_spec.rb
  5. +1 −1 version.rb
View
4 history.textile
@@ -1,5 +1,9 @@
h2. Upcoming Version
+h2. Version 4.1.0 "identification needed"
+
+* hanke: (server) @Picky::Results#ids(only = nil)@ returns the amount of ids originally requested, except if an @only@ amount gets passed in (then that amount is used).
+
h2. Version 4.0.9 "new york new york"
* hanke: (client) @Picky::Client::ActiveRecord.configure(options)@ added as an alias of @new@ (thanks auastro!).
View
51 server/Gemfile.lock
@@ -1,56 +1,61 @@
GEM
remote: http://rubygems.org/
specs:
- activemodel (3.1.3)
- activesupport (= 3.1.3)
+ activemodel (3.2.0)
+ activesupport (= 3.2.0)
builder (~> 3.0.0)
- i18n (~> 0.6)
- activerecord (3.1.3)
- activemodel (= 3.1.3)
- activesupport (= 3.1.3)
- arel (~> 2.2.1)
+ activerecord (3.2.0)
+ activemodel (= 3.2.0)
+ activesupport (= 3.2.0)
+ arel (~> 3.0.0)
tzinfo (~> 0.3.29)
- activesupport (3.1.3)
+ activesupport (3.2.0)
+ i18n (~> 0.6)
multi_json (~> 1.0)
- arel (2.2.1)
+ arel (3.0.0)
builder (3.0.0)
+ cod (0.4.1)
diff-lcs (1.1.3)
highline (1.6.9)
i18n (0.6.0)
mime-types (1.17.2)
multi_json (1.0.4)
- picky-client (3.6.16)
+ picky-client (4.0.9)
activesupport (>= 3.0.0)
yajl-ruby (>= 0.7.8)
- procrastinate (0.4.0)
+ procrastinate (0.4.1)
+ cod (~> 0.4)
state_machine (~> 0.9.4)
- rack (1.3.5)
+ rack (1.4.1)
rack-mount (0.8.3)
rack (>= 1.0.0)
+ rack-protection (1.2.0)
+ rack
rack_fast_escape (2009.06.24)
url_escape
rake (0.9.2.2)
redis (2.2.2)
rest-client (1.6.7)
mime-types (>= 1.16)
- rspec (2.7.0)
- rspec-core (~> 2.7.0)
- rspec-expectations (~> 2.7.0)
- rspec-mocks (~> 2.7.0)
- rspec-core (2.7.1)
- rspec-expectations (2.7.0)
+ rspec (2.8.0)
+ rspec-core (~> 2.8.0)
+ rspec-expectations (~> 2.8.0)
+ rspec-mocks (~> 2.8.0)
+ rspec-core (2.8.0)
+ rspec-expectations (2.8.0)
diff-lcs (~> 1.1.2)
- rspec-mocks (2.7.0)
+ rspec-mocks (2.8.0)
simplecov (0.5.4)
multi_json (~> 1.0.3)
simplecov-html (~> 0.5.3)
simplecov-html (0.5.3)
- sinatra (1.2.0)
- rack (~> 1.1)
- tilt (>= 1.2.2, < 2.0)
+ sinatra (1.3.2)
+ rack (~> 1.3, >= 1.3.6)
+ rack-protection (~> 1.2)
+ tilt (~> 1.3, >= 1.3.3)
sqlite3 (1.3.5)
state_machine (0.9.4)
- text (1.0.1)
+ text (1.0.3)
tilt (1.3.3)
tzinfo (0.3.31)
url_escape (2009.06.24)
View
2 server/lib/picky/results.rb
@@ -49,7 +49,7 @@ def prepare! extra_allocations = nil
# a reference to the result.
#
def ids only = nil
- allocations.ids only ? only : amount
+ allocations.ids only || amount
end
# The total results. Delegates to the allocations.
View
1 server/spec/integration/sinatra_index_actions_spec.rb
@@ -14,6 +14,7 @@ class MyPickyServer < Sinatra::Base
category :name
category :surname
end
+
people = Picky::Search.new data
get '/people' do
View
2 version.rb
@@ -1,3 +1,3 @@
module Picky
- VERSION = '4.0.9'
+ VERSION = '4.1.0'
end

0 comments on commit 8b8296f

Please sign in to comment.