tes-request 0.3 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2801298fca82cc8a1001b03f767bc40762bb584
-  data.tar.gz: d03c89d8663d1e995ba8874a6f5a47decb86e7b9
+  metadata.gz: 3d0275c362a3e421084ffed8f81836519569ca20
+  data.tar.gz: 4c0361fb7ce849ee3bab2980e0530fd50ea1025e
 SHA512:
-  metadata.gz: 5a804cb2eec661e57d60fb074ee95e7d4d070b1f4aa8df3992e6497fa5fa7b4f101cef785ce195d9e9e54b6de1bd9304231068f9ec968e542fca84fe7c356e20
-  data.tar.gz: af30855c4cc23fd18318eb78bd3dab35b171bd216cb08cfe5cba2937180fef4aa927e2b977d59a0f39764b6df96f91786cb00c99467f8858af835534e54cf0ba
+  metadata.gz: ae5cce1cfdac34fa69937fdc6b7e4af2580593173b83e34bc92b7ca05b85e223824d7368e52d5508440c9a959c9cba0193a5e3cbb0ffe8c715602dc20360bd39
+  data.tar.gz: 156bc1b8568c7c7bd76ba4daee49256142309b17da9104e181a527337f61477cc8d9713d46d5190e880c534523ce081b6be42e9d9a2caf1bef00d2447cfdd0ce

data/README.md

@@ -1,6 +1,6 @@
 # Tes::Request
 
-[![Build Status](https://travis-ci.org/wuhuizuo/tes-request.svg)](https://travis-ci.org/wuhuizuo/tes-request)
+[![Build Status](https://travis-ci.org/sangfor-vtt/tes-request.svg)](https://travis-ci.org/sangfor-vtt/tes-request)
 [![Gem Version](https://badge.fury.io/rb/tes-request.svg)](https://rubygems.org/gems/tes-request)
 
 TES(Test Env Service) request profile struct, manager lib and request tools
@@ -86,7 +86,7 @@ $ tes-client
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/wuhuizuo/tes-request. 
+Bug reports and pull requests are welcome on GitHub at https://github.com/sangfor-vtt/tes-request. 
 This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 ## License

data/lib/tes/request/expression.rb

@@ -3,7 +3,7 @@ module Tes
     class Expression
       include Comparable
 
-      REG_EXP_CHAIN = /^(!)?([0-9A-Za-z_.]+)(\?|=|>=|<=|<|>)?(-?[\w]+(\.[\d]+)?)?/
+      REG_EXP_CHAIN = /^(!)?([0-9A-Za-z_.]+)(\?|=|>=|<=|<|>|!=)?(-?[\w]+(\.[\d]+)?)?/
 
       # @param [String] exp_str 表达式字符串
       def initialize(exp_str)
@@ -13,6 +13,7 @@ module Tes
         @data = {}
         @data[:revert] = true if mt[1]
         @data[:left_exp] = mt[2]
+
         if mt[3]
           @data[:op] = mt[3]
           if mt[4]
@@ -20,6 +21,12 @@ module Tes
             if @data[:expect_val] =~ /^-?\d+(\.[\d]+)?/
               @data[:expect_val] = mt[5] ? @data[:expect_val].to_f : @data[:expect_val].to_i
             end
+
+            # 处理前置 逻辑非 与表达式中的不等比较符
+            if @data[:op] == '!='
+              @data[:revert] = (@data[:revert] ? false : true)
+              @data[:op] = '='
+            end
           end
         end
       end

data/lib/tes/request/version.rb

@@ -1,5 +1,5 @@
 module Tes
   module Request
-    VERSION = '0.3'
+    VERSION = '0.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tes-request
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '0.4'
 platform: ruby
 authors:
 - wuhuizuo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-26 00:00:00.000000000 Z
+date: 2017-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: java-properties