Measure name matching (#37)

* fixes broken query helper tests

* adds tests for new VALID_FILTER_RE regex

* makes VALID_FILTER_RE tests pass

* remove coverage files, ignore dir

Author: MarcioPorto

Diff for: .gitignore

@@ -2,3 +2,5 @@
 *.log
 spec/fixtures/foodmart/
 spec/fixtures/webshop.sqlite
+coverage
+

Diff for: Gemfile.lock

@@ -0,0 +1,112 @@
+PATH
+  remote: .
+  specs:
+    mondrian-rest (1.0.0-java)
+      activesupport (~> 5.1, >= 5.1.5)
+      grape (~> 1.0, >= 1.0.0)
+      mondrian-olap (~> 0.8.0)
+      writeexcel (~> 1.0, >= 1.0.5)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activesupport (5.2.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    axiom-types (0.1.1)
+      descendants_tracker (~> 0.0.4)
+      ice_nine (~> 0.11.0)
+      thread_safe (~> 0.3, >= 0.3.1)
+    builder (3.2.3)
+    coercible (1.0.0)
+      descendants_tracker (~> 0.0.1)
+    concurrent-ruby (1.0.5-java)
+    coveralls (0.8.22)
+      json (>= 1.8, < 3)
+      simplecov (~> 0.16.1)
+      term-ansicolor (~> 1.3)
+      thor (~> 0.19.4)
+      tins (~> 1.6)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    diff-lcs (1.3)
+    docile (1.3.1)
+    equalizer (0.0.11)
+    grape (1.1.0)
+      activesupport
+      builder
+      mustermann-grape (~> 1.0.0)
+      rack (>= 1.3.0)
+      rack-accept
+      virtus (>= 1.0.0)
+    i18n (1.1.0)
+      concurrent-ruby (~> 1.0)
+    ice_nine (0.11.2)
+    jar-dependencies (0.3.12)
+    jdbc-derby (10.12.1.1)
+    jdbc-sqlite3 (3.20.1)
+    json (2.1.0-java)
+    minitest (5.11.3)
+    mondrian-olap (0.8.0)
+      nokogiri
+    mustermann (1.0.3)
+    mustermann-grape (1.0.0)
+      mustermann (~> 1.0.0)
+    nokogiri (1.8.4-java)
+    rack (2.0.5)
+    rack-accept (0.4.5)
+      rack (>= 0.4)
+    rack-test (0.7.0)
+      rack (>= 1.0, < 3)
+    rake (12.3.1)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
+    rubyzip (1.2.2)
+    simplecov (0.16.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    term-ansicolor (1.6.0)
+      tins (~> 1.0)
+    thor (0.19.4)
+    thread_safe (0.3.6-java)
+    tins (1.16.3)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    virtus (1.0.5)
+      axiom-types (~> 0.1)
+      coercible (~> 1.0)
+      descendants_tracker (~> 0.0, >= 0.0.3)
+      equalizer (~> 0.0, >= 0.0.9)
+    writeexcel (1.0.5)
+
+PLATFORMS
+  java
+
+DEPENDENCIES
+  coveralls
+  jar-dependencies (~> 0.3.2)
+  jdbc-derby (~> 10.12, >= 10.12.1.1)
+  jdbc-sqlite3 (~> 3.15, >= 3.15.1)
+  mondrian-rest!
+  rack-test (~> 0.7.0)
+  rake (~> 12.1, >= 12.1.0)
+  rspec (~> 3.6, >= 3.6.0)
+  rubyzip (~> 1.2, >= 1.2.1)
+
+BUNDLED WITH
+   1.16.3

Diff for: lib/mondrian_rest/query_helper.rb

@@ -4,7 +4,7 @@ module QueryHelper
     VALID_FILTER_OPS = [
       '>', '<', '>=', '<=', '=', '<>'
     ].freeze
-    VALID_FILTER_RE = /(?<measure>[a-zA-Z0-9\s]+)\s*(?<operand>#{VALID_FILTER_OPS.join("|")})\s*(?<value>-?\d+\.?\d*)/
+    VALID_FILTER_RE = /(?<measure>[a-zA-Z0-9-!$%^&*()_+|@#~`{}\[\]:";'?,.\/\s]+)\s*(?<operand>#{VALID_FILTER_OPS.join("|")})\s*(?<value>-?\d+\.?\d*)/
     MEMBER_METHODS = %w[Caption Key Name UniqueName].freeze
 
     def unparse_node(node)
@@ -269,7 +269,7 @@ def build_query(cube, options = {})
 
         # Apply filters
         unless filters.empty?
-          filter_exp = filters.map { |f| "[Measures].[#{org.olap4j.mdx.MdxUtil.mdxEncodeString(f[:measure])}] #{f[:operand]} #{f[:value]}" }.join(' AND ')
+          filter_exp = filters.map { |f| "[Measures].[#{f[:measure]}] #{f[:operand]} #{f[:value]}" }.join(' AND ')
           axis_exp = "FILTER(#{axis_exp}, #{filter_exp})"
         end
 

Diff for: spec/query_builder_spec.rb

@@ -158,4 +158,14 @@ def error!(*args)
       expect(q.to_mdx).to eq("SELECT {[Measures].[Store Invoice]} ON COLUMNS,\n{[Top Sellers]} ON ROWS\nFROM [Warehouse]")
     end
   end
+
+  describe "VALID_FILTER_RE" do
+    it "should match measures with special characters (except '<', '>' and '=')" do
+      m = QueryHelper::VALID_FILTER_RE.match(" \"#$%&'()*+,-./:;?@[\]^_`{|}~ > 100")
+      expect(m["measure"]).to eq(" \"#$%&'()*+,-./:;?@[\]^_`{|}~ ")
+
+      m = QueryHelper::VALID_FILTER_RE.match("#<=># > 100")
+      expect(m["measure"]).not_to eq("#<=># ")
+    end
+  end
 end