lib/dm-mongo-adapter/conditions.rb @@ -7,6 +7,7 @@ require 'mongo' dir = Pathname(__FILE__).dirname.expand_path / 'dm-mongo-adapter' require dir / 'query' +require dir / 'conditions' require dir / 'adapter' require dir / 'types' require dir / 'resource' lib/dm-mongo-adapter.rb @@ -7,7 +7,7 @@ module DataMapper def initialize(collection, query) assert_kind_of 'collection', collection, ::Mongo::Collection assert_kind_of 'query', query, DataMapper::Query - @collection, @query, @statements = collection, query, {} + @collection, @query, @statements, @conditions = collection, query, {}, Conditions.new end def read @@ -17,78 +17,78 @@ module DataMapper conditions_statement(@query.conditions) - @collection.find(@statements, options).to_a + @statements.merge!(@conditions.to_statement) unless @conditions.empty? + + @conditions.filter_collection!(@collection.find(@statements, options).to_a) end private - def conditions_statement(conditions, affirmative = true) - case conditions - when AbstractOperation then operation_statement(conditions, affirmative) - when AbstractComparison then comparison_statement(conditions, affirmative) - end + + def conditions_statement(conditions, affirmative = true) + case conditions + when AbstractOperation then operation_statement(conditions, affirmative) + when AbstractComparison then comparison_statement(conditions, affirmative) end + end - def operation_statement(operation, affirmative = true) - case operation - when NotOperation then conditions_statement(operation.first, !affirmative) - when AndOperation then operation.each{|op| conditions_statement(op, affirmative)} - when OrOperation then raise NotImplementedError - end + def operation_statement(operation, affirmative = true) + case operation + when NotOperation then conditions_statement(operation.first, !affirmative) + when AndOperation then operation.each{|op| conditions_statement(op, affirmative)} + when OrOperation then operation.each{|op| @conditions.add(op, affirmative)} end + end - #-- - # TODO: Rather than raise an error do what we can in a $where operation or in memory. - def comparison_statement(comparison, affirmative = true) - if comparison.relationship? - return conditions_statement(comparison.foreign_key_mapping, affirmative) - end - - field = comparison.subject.field - value = comparison.value - - operator = if affirmative - case comparison - when EqualToComparison then value - when GreaterThanComparison then {'$gt' => value} - when LessThanComparison then {'$lt' => value} - when GreaterThanOrEqualToComparison then {'$gte' => value} - when LessThanOrEqualToComparison then {'$lte' => value} - when InclusionComparison then value.kind_of?(Range) ? range_comparison(field, value) : {'$in' => value} - when RegexpComparison then value - when LikeComparison then like_comparison_regexp(value) - else raise NotImplementedError - end - else - case comparison - when EqualToComparison then {'$ne' => value} - when InclusionComparison then value.kind_of?(Range) ? range_comparison(field, value, false) : {'$nin' => value} - else raise NotImplementedError - end - end + def comparison_statement(comparison, affirmative = true) + if comparison.relationship? + return conditions_statement(comparison.foreign_key_mapping, affirmative) + end - statement = operator.is_a?(Hash) && operator.has_key?('$where') ? operator : {field.to_sym => operator} + field = comparison.subject.field + value = comparison.value - @statements.update(statement) + # these comparisons should be handled by the conditions object, because: + # + # * $nin with range requires $where clause + # * negated regexp comparison is currently not supported by mongo, see: http://jira.mongodb.org/browse/SERVER-251 + if (comparison.kind_of?(InclusionComparison) && value.kind_of?(Range) && !affirmative) || + (comparison.kind_of?(RegexpComparison) && !affirmative) + @conditions.add(comparison, affirmative) + return end - def sort_statement(conditions) - conditions.inject([]) do |sort_arr, condition| - sort_arr << [condition.target.field, condition.operator == :asc ? 'ascending' : 'descending'] + operator = if affirmative + case comparison + when EqualToComparison then value + when GreaterThanComparison then {'$gt' => value} + when LessThanComparison then {'$lt' => value} + when GreaterThanOrEqualToComparison then {'$gte' => value} + when LessThanOrEqualToComparison then {'$lte' => value} + when InclusionComparison then value.kind_of?(Range) ? + {'$gte' => value.first, value.exclude_end? ? '$lt' : '$lte' => value.last} : {'$in' => value} + when RegexpComparison then value + when LikeComparison then comparison.send(:expected_value) + else + raise NotImplementedError + end + else + case comparison + when EqualToComparison then {'$ne' => value} + when InclusionComparison then {'$nin' => value} + else + raise NotImplementedError end end - def like_comparison_regexp(value) - # TODO: %% isn't supported. It isn't in LikeComparison's matches? fyi. - Regexp.new(value.to_s.gsub(/^([^%])/, '^\\1').gsub(/([^%])$/, '\\1$').gsub(/%/, '.*').gsub('_', '.')) - end + operator.is_a?(Hash) ? + (@statements[field.to_sym] ||= {}).merge!(operator) : @statements[field.to_sym] = operator + end - def range_comparison(field, range, affirmative=true) - if affirmative - {'$gte' => range.first, range.exclude_end? ? '$lt' : '$lte' => range.last} - else - {'$where' => "this.#{field} < #{range.first} || this.#{field} #{range.exclude_end? ? '>=' : '>'} #{range.last}"} - end + def sort_statement(conditions) + conditions.inject([]) do |sort_arr, condition| + sort_arr << [condition.target.field, condition.operator == :asc ? 'ascending' : 'descending'] end + end end # Query end # Mongo end # DataMapper lib/dm-mongo-adapter/query.rb @@ -23,6 +23,21 @@ describe DataMapper::Adapters::MongoAdapter do it_should_behave_like 'An Adapter' + describe "queries" do + before :all do + @red = Heffalump.create(:color => 'red', :num_spots => 2) + @green = Heffalump.create(:color => 'green', :num_spots => 3) + @blue = Heffalump.create(:color => 'blue', :num_spots => 5) + end + + it "should be able to search for objects matching conditions for the same property" do + col = Heffalump.all(:num_spots.gt => 2, :num_spots.not => 3) + + col.size.should == 1 + col.first.should eql(@blue) + end + end + describe "embedded objects as properties" do before :all do class Zoo spec/adapter_spec.rb 565c48efd0af8dff66d1f18bd750b90251517eb1 Piotr Solnica piotr@zenbe.com http://github.com/solnic/dm-mongo-adapter/commit/0bf728d48b99e7c0256415c2f9b368eaf7680923 0bf728d48b99e7c0256415c2f9b368eaf7680923 2009-11-07T06:37:20-08:00 2009-11-07T06:37:20-08:00 Added Conditions object which can construct $where clause required for OR statements, negated range (:things.not => 1..2) and negated regexp comparisons (:field.not => /blak/) In the worst case fetched collection is filtered out using Comparison objects that don't have a corresponding mongodb query syntax (like mentioned negated regexp comparison) This change makes the adapter to pass shared adapter specs from dm-core, w00t! d37733947cd939b3bd02612f13f72815f15be01b Piotr Solnica piotr@zenbe.com