sparkql 1.0.0 → 1.0.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDMyYjhlMDJkY2ZkZjJmN2VlYzVmNTdkODNjNTRjZjFkMjEwZDJiMA==
+    ZDQ2MjhlNzA5NWY1ZGM5YmM4ODEzMGE2Y2Y5ZWQ0YzkzZWYwODMxYQ==
   data.tar.gz: !binary |-
-    N2YwNzMyMTJjMGFjZmQ5MDM0OWYyZDYyM2Y2MmQwMWEyMWZhZTg0MA==
+    OTNiMjFjMjA2ODZmMmRmYWNkM2JiNjA4NDA5NjcwZDBhNTVlY2Q5NA==
 SHA512:
   metadata.gz: !binary |-
-    MWQxYWQwZmZjZTRlNGMwYzBkNGJkYWRjZTQxZTRhMTA1ZTZmYzVkNDQ0OTI0
-    OGY5ZmRlMjRlNTUzMGIwOWJlNGY4ODcxZjEyMDg3YTRkMDVhMzNkNDUwYTYy
-    NTFmYThlMGRkMzE2YjcwNzkxZDgwOGQ3MDBkMDMwNjU4ZGYwZTM=
+    MWFhMTU2MDQ1ZjBkZDFhOTAyNGMyNDM4MjZmZDI0ODg0ZTg3NmI1MWRkYWMz
+    ZTI4ZDgxNTg1YWFhY2ZkOTUxOTM5ZGQ1NWEwMGMzNWVlNDc3NDYyOTMzODEx
+    YmEwNDNmMGMwZWFkOTk1MzNkZjVkMGVmOGJjYzE0MzViYTczZGY=
   data.tar.gz: !binary |-
-    YjM1YWE1MGJlNTlhNWZiZmY5YjZkN2ZhMGIyYTUxMDQ5NzY3N2U4N2RmMTFj
-    YmFmODY2ZTEwNzA2NTFlMzkxNzJhM2RiYTM2Mjc1YTJhMzhjZTFmNWYxMDUy
-    YzZlMmQ0N2RkMWQ2ZGE2M2Y5MjZjMDBjYWRkNzc4NzM2NWVlNzA=
+    Y2ZlNWFkYThlN2UwMjFiNzI5ZjE5NTJkNmY3OTNlODRhMzY1YjNhNjJmYTRl
+    ODg5ZTQ4ZDJlMjU0NWRiYmNmYzViNzdjZDY0NmNmYTAxYjc3YTAxOTg0YmEy
+    YmVjYThkZTg0ZGZiOTdlM2Y0YWYyNzY0YTE4ZTU1Y2QzN2NhMzU=

data/CHANGELOG.md

@@ -1,4 +1,8 @@
-v1.0.0, 2016-02-11 ([changes](https://github.com/sparkapi/sparkql/compare/v0.3.20...v1.0.0))
+v1.0.1, 2016-02-24 ([changes](https://github.com/sparkapi/sparkql/compare/v1.0.0...v1.0.1))
+-------------------
+  * [IMPROVEMENT] Support scientific notation for floating point numbers
+
+v1.0.0, 2016-02-11 ([changes](https://github.com/sparkapi/sparkql/compare/v0.3.23...v1.0.0))
 -------------------
   * [IMPROVEMENT] function support for fields (delayed resolution). Backing systems must
     implement necessary function behaviour.

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

data/lib/sparkql/token.rb

@@ -7,7 +7,7 @@ module Sparkql::Token
   STANDARD_FIELD = /[A-Z]+[A-Za-z0-9]*/
   CUSTOM_FIELD = /^(\"([^$."][^."]+)\".\"([^$."][^."]*)\")/
   INTEGER = /^\-?[0-9]+/
-  DECIMAL = /^\-?[0-9]+\.[0-9]+/
+  DECIMAL = /^\-?[0-9]+\.[0-9]+([Ee]-?[0-9]{1,2})?/
   CHARACTER = /^'([^'\\]*(\\.[^'\\]*)*)'/
   DATE = /^[0-9]{4}\-[0-9]{2}\-[0-9]{2}/
   TIME = /^[0-9]{2}\:[0-9]{2}((\:[0-9]{2})(\.[0-9]{1,50})?)?/

data/test/unit/lexer_test.rb

@@ -100,4 +100,13 @@ class LexerTest < Test::Unit::TestCase
       assert_equal :DATETIME, token.first, op
     end
   end
+
+  def test_decimal_matches
+    ['-15.42', '1.0', '0.22', '9.0E-6', '-9.0E-3'].each do |op|
+      @lexer = Lexer.new(op)
+      token = @lexer.shift
+      assert_equal :DECIMAL, token.first, op
+    end
+  end
+
 end

data/test/unit/parser_compatability_test.rb

@@ -67,6 +67,21 @@ class ParserCompatabilityTest < Test::Unit::TestCase
         :type => :decimal,
         :operator => "Eq"
       },
+      {
+        :string => "FloatField Eq 9.1E-6",
+        :type => :decimal,
+        :operator => "Eq"
+      },
+      {
+        :string => "FloatField Eq -9.1E-6",
+        :type => :decimal,
+        :operator => "Eq"
+      },
+      {
+        :string => "FloatField Eq 1.0E8",
+        :type => :decimal,
+        :operator => "Eq"
+      },
       {
         :string => "FloatField Eq -2001.120,-2002.0",
         :type => :decimal,
@@ -468,6 +483,13 @@ class ParserCompatabilityTest < Test::Unit::TestCase
     assert_equal true, parser.escape_value(expressions.first)
   end
 
+  test "escape decimal values" do
+    parser = Parser.new
+    expressions = parser.tokenize( "DecimalField Eq 0.00005 And DecimalField Eq 5.0E-5" )
+    assert_equal 5.0E-5, parser.escape_value(expressions.first)
+    assert_equal parser.escape_value(expressions.first), parser.escape_value(expressions.last)
+  end
+
   test "Between" do
     ["BathsFull Bt 10,20", "DateField Bt 2012-12-31,2013-01-31"].each do |f|
       parser = Parser.new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sparkql
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Wade McEwen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-12 00:00:00.000000000 Z
+date: 2016-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: georuby