dm-parse 0.3.14 → 0.3.15

data/VERSION

@@ -1 +1 @@
-0.3.14
+0.3.15

data/dm-parse.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "dm-parse"
-  s.version = "0.3.14"
+  s.version = "0.3.15"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Zhi-Qiang Lei"]
-  s.date = "2012-07-14"
+  s.date = "2012-07-25"
   s.description = "An extension to make DataMapper working on Parse.com"
   s.email = "zhiqiang.lei@gmail.com"
   s.extra_rdoc_files = [

data/lib/adapters/parse_adapter.rb

@@ -207,6 +207,7 @@ module DataMapper
             translate c, r
             r
           end
+        when ["0 = 1"] # workaround for cancan
         else
           raise NotImplementedError
         end
@@ -272,9 +273,10 @@ module DataMapper
         equals = groups[true]
         others = groups[false]
 
-        if equals.present? && others.present?
-          raise "Parse Query: cannot combine Eql with others"
-        elsif equals.present?
+        # It's such a pity that js query cannot combine equal comparison
+        # with other comparisons, but DataMapper will construct query
+        # in that way.
+        if equals.present?
           raise "can only use one EqualToComparison for a field" unless equals.size == 1
           equals.first.as_json
         elsif others.present?

data/spec/parse_adapter_spec.rb

@@ -102,6 +102,16 @@ describe DataMapper::Adapters::ParseAdapter do
       end
     end
 
+    context "when query has :eql and others of one field" do
+      let(:query) { model.all(:rank => 5, :rank.gt => 3).query }
+      it { should eq("rank" => 5) }
+    end
+
+    context "when query has [\"0 = 1\"]" do
+      let(:query) { model.all(conditions: ["0 = 1"]).query }
+      it { should eq({}) }
+    end
+
     describe "exceptions" do
       subject { -> { adapter.send :parse_conditions_for, query } }
 
@@ -109,11 +119,6 @@ describe DataMapper::Adapters::ParseAdapter do
         let(:query) { (model.all("rank" => 5) & model.all("rank" => 3)).query }
         it { should raise_error("can only use one EqualToComparison for a field") }
       end
-
-      context "when query has :eql and others of one field" do
-        let(:query) { model.all(:rank => 5, :rank.gt => 3).query }
-        it { should raise_error }
-      end
     end # exceptions
   end # #parse_conditions_for
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dm-parse
 version: !ruby/object:Gem::Version
-  version: 0.3.14
+  version: 0.3.15
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-14 00:00:00.000000000 Z
+date: 2012-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dm-core
@@ -258,7 +258,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1932617468942195095
+      hash: -4398516798532427400
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: