Predicate filter proposal

calabash-cucumber/lib/calabash-cucumber/map.rb

@@ -77,28 +77,29 @@ def self.map(query, method_name, *method_args)
       #
       # @see map for examples.
       def self.raw_map(query, method_name, *method_args)
-        operation_map = {
-            :method_name => method_name,
-            :arguments => method_args
-        }
+        if correct_predicate?(query) || correct_format?(query)
+          operation_map = {
+              :method_name => method_name,
+              :arguments => method_args
+          }
 
-        route = {:method => :post, :path => "map"}
-        parameters = {:query => query,
-                      :operation => operation_map}
-        body = self.map_factory.http(route, parameters)
+          route = {:method => :post, :path => "map"}
+          parameters = {:query => query,
+                        :operation => operation_map}
+          body = self.map_factory.http(route, parameters)
 
-        hash = JSON.parse(body)
-        if hash["outcome"] != "SUCCESS"
-          message = %Q[
-map #{query}, #{method_name} failed for:
+          hash = JSON.parse(body)
+          if hash["outcome"] != "SUCCESS"
+            message = %Q[
+              map #{query}, #{method_name} failed for:
+              reason: #{hash["reason"]}
+              details: #{hash["details"]}
+            ]
+            self.map_factory.screenshot_and_raise(message)
+          end
 
- reason: #{hash["reason"]}
-details: #{hash["details"]}
-]
-          self.map_factory.screenshot_and_raise(message)
+          hash
         end
-
-        hash
       end
 
       # Asserts the result of a calabash `map` call and raises an error with
@@ -143,6 +144,40 @@ def self.assert_map_results(map_results, msg)
         end
       end
 
+      # Evaluating whether a query contain correct predicate selector
+      # returns true if query include correct predicate selector
+      def self.correct_predicate?(query)
+        if !query.match(/{.*}/).nil?
+          str = query.match(/{.*}/)[0]
+          correct = false
+          predicate = %w(BEGINSWITH CONTAINS ENDSWITH LIKE MATCHES)
+          predicate.each do |value|
+            if str.include?(value)
+              correct = true
+              return correct
+            end
+          end
+          if !correct
+            fail "Incorrect predicate used, valid selectors are: #{predicate}"
+          end
+        end
+      end
+
+      # Evaluating whether a query contain two ' characters
+      # returns true if query include : character and two ' characters
+      # returns true if query does not include : character, like query("label")
+      # TODO: We can add additional verification in future
+      def self.correct_format?(query)
+        if !query.match(/:'/).nil?
+          if !query.match(/:'.*'/).nil?
+            true
+          else
+            fail 'Incorrect query format please check query string'
+          end
+        else
+          true
+        end
+      end
       private
 
       def self.map_factory

calabash-cucumber/spec/lib/map_spec.rb

@@ -40,5 +40,36 @@
                          /map view marked:'my mark', scrollToViewWithMark failed for:/)
     end
   end
+
+  describe ".raw_map.correct_predicate" do
+    let(:query) { "view marked:'my mark'" }
+    let(:incorrect_predicate) {%w(BEGINSWTH CONTAIN ENDWITH LKE MTCHES)}
+    let(:correct_predicate) {%w(BEGINSWITH CONTAINS ENDSWITH LIKE MATCHES)}
+
+    it "raw_map receive incorrect predicate and raise error" do
+
+      incorrect_predicate.each do |predicate|
+        merged_query = query + "{text #{predicate} 'sometext'}"
+        expect do
+          Calabash::Cucumber::Map.raw_map(merged_query, method_name, args)
+        end.to raise_error(RuntimeError,
+                           /Incorrect predicate used, valid selectors are:/)
+      end
+
+    end
+
+    it "raw_map receive correct predicate and not raise error" do
+
+      correct_predicate.each do |predicate|
+        merged_query = query + "{text #{predicate} 'sometext'}"
+        expect do
+          Calabash::Cucumber::Map.raw_map(merged_query, method_name, args)
+        end.not_to raise_error(RuntimeError,
+                           /Incorrect predicate used, valid selectors are:/)
+      end
+
+    end
+  end
+
 end