@@ -8,4 +8,4 @@ development: development_db_name production: production_db_name = Required Gems = -* validatable, json, couchrest, activesupport \ No newline at end of file +* validatable, json, couchrest >= 0.9.12, activesupport \ No newline at end of file INSTALL @@ -78,8 +78,11 @@ h4. Finding stuff For running basic finds (e.g. creating/querying views) you can either use the CouchPotato::Persistence::Finder class: - user = User.create! :first_name => 'joe' - Finder.new.find User, :first_name => 'joe' # => [user] + joe = User.create! :first_name => 'joe', :position => 1 + jane = User.create! :first_name => 'jane', :position => 2 + Finder.new.find User, :first_name => 'joe' # => [joe] + Finder.new.find User, :first_name => ['joe', 'jane'] # => [joe, jane] + Finder.new.find User, :position => 1..2 # => [joe, jane] You can also count: README.textile @@ -166,6 +166,12 @@ module CouchPotato instance end + def create(attributes = {}) + instance = self.new attributes + instance.save + instance + end + def get(id) begin self.json_create db.get(id) lib/couch_potato/persistence.rb @@ -72,11 +72,23 @@ module CouchPotato def search_keys(params) if params[:search_values].select{|v| v.is_a?(Range)}.any? {:startkey => params[:search_values].map{|v| v.is_a?(Range) ? v.first : v}, :endkey => params[:search_values].map{|v| v.is_a?(Range) ? v.last : v}} + elsif params[:search_values].select{|v| v.is_a?(Array)}.any? + {:keys => prepare_multi_key_search(params[:search_values])} else {:key => params[:search_values]} end end + def prepare_multi_key_search(values) + array = values.select{|v| v.is_a?(Array)}.first + index = values.index array + array.map do |item| + copy = values.dup + copy[index] = item + copy + end + end + def view_parameters(clazz, options) { :class => clazz, @@ -89,7 +101,7 @@ module CouchPotato end def view_name(options) - options.to_a.map(&:first).join('_and_') + options.to_a.sort_by{|f| f.first.to_s}.map(&:first).join('_and_') end end end lib/couch_potato/persistence/finder.rb @@ -11,6 +11,24 @@ describe CouchPotato::Persistence::Finder, 'find' do CouchPotato::Persistence.Db.delete! end + describe "couchdb 0.9+" do + it "should find items by an array of values" do + c1 = Comment.create! :title => 'test', :commenter_id => '1' + c2 = Comment.create! :title => 'test', :commenter_id => '2' + c3 = Comment.create! :title => 'test', :commenter_id => '3' + comments = CouchPotato::Persistence::Finder.new.find Comment, :commenter_id => ['2', '3'] + comments.should == [c2, c3] + end + + it "should find items by an array of values combined with other attributes" do + c1 = Comment.create! :title => 'test', :commenter_id => '1' + c2 = Comment.create! :title => 'test', :commenter_id => '2' + c3 = Comment.create! :title => 'test2', :commenter_id => '3' + comments = CouchPotato::Persistence::Finder.new.find Comment, :commenter_id => ['2', '3'], :title => 'test' + comments.should == [c2] + end + end + it "should find objects with a given attribute value pair" do c1 = Comment.create! :title => 'test', :commenter_id => '1' c2 = Comment.create! :title => 'test', :commenter_id => '2' spec/finder_spec.rb b0b8b363c8bf747a83f8a92cf1155b8c88e93805 Alexander Lang alex@skywalker.lan http://github.com/langalex/couch_potato/commit/8a76caa0340ba5998a92d4a41be3b0a76c8666b4 8a76caa0340ba5998a92d4a41be3b0a76c8666b4 2008-10-26T08:13:16-07:00 2008-10-26T08:13:16-07:00 added find by array of values (couchdb 0.9 only) 385287ac787a9ebfb5640dba0b924df5aa4ad4aa Alexander Lang alex@skywalker.lan