influxdb 0.0.15 → 0.0.16

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MTM1OTVmZjljMTBkM2NjMjM3YTg2MTA5Yjk0MDRlZTdhNzNiODU4OQ==
-  data.tar.gz: !binary |-
-    ZDJlMGNhZDFhODg2NzEyZmFhODk5MTk4YjIxMzZjMjU3MTIwMzY0OA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    YjlhYmZmMTk0MTEwYzc4MjVmNjJiN2E4MjE0OWI5YjU2ZGFlMDc0YTY3ZDBm
-    YjJkNWM3OGRiODU5NzMxMTdmYmJiMmZjZTdlOTIyNzA3OWZiZWJmMjNjZDU2
-    ZDVjYzNmOWUxOWMyNDcyZjZhMjIzMDVmZjY4MTFjNDkwZjIxM2M=
-  data.tar.gz: !binary |-
-    Njc1OTllNjhmYmQwYjM3ZGU0NjliZmRhZjJiMGZiZGExZmYzMzc0NWY0Zjcx
-    Yjc3Y2MyZjRjZDQxOGE5YmE0YmRjZWY3NzBlMmQ0NzJkMWFlZTY4M2I5NGZk
-    MDkzY2Y1OGRkYjBjNjkxYjljNmUyODUxNWMyNDhkODcxZTdhNjM=
+SHA1:
+  metadata.gz: 922d7fb8e14dbf9ed19a5be9309589f17ca56772
+  data.tar.gz: e13dbb25d5cc539b31751a8e6fc28f1561c6f5db
+SHA512:
+  metadata.gz: 8770fa30c86622dc5da0cc973bb7642ec1840be9fddd68280c810c2be3313fab4803db4067f5c88c271a71def0b27a6208aa16af539e2d62f245d8cc3d15c446
+  data.tar.gz: c32e3f4298a9b67af57695db14459eface58346a56ba7da079ad4764d5a7891b572d13bff04dd75afb4efa125d273cb4f2e53dea3671c952e53fdb2e5ec19aee

data/lib/influxdb/point_value.rb

@@ -18,32 +18,19 @@ module InfluxDB
     end
 
     def load
-      if json?
+      if maybe_json?
         begin
           JSON.parse(value)
         rescue JSON::ParserError => e
-          raise InfluxDB::JSONParserError, e.message
+          value
         end
       else
         value
       end
     end
 
-    def json?
-      value =~ /(
-        # define subtypes and build up the json syntax, BNF-grammar-style
-        # The {0} is a hack to simply define them as named groups here but not match on them yet
-        # I added some atomic grouping to prevent catastrophic backtracking on invalid inputs
-        (?<number>  -?(?=[1-9]|0(?!\d))\d+(\.\d+)?([eE][+-]?\d+)?){0}
-        (?<boolean> true | false | null ){0}
-        (?<string>  " (?>[^"\\\\]* | \\\\ ["\\\\bfnrt\/] | \\\\ u [0-9a-f]{4} )* " ){0}
-        (?<array>   \[ (?> \g<json> (?: , \g<json> )* )? \s* \] ){0}
-        (?<pair>    \s* \g<string> \s* : \g<json> ){0}
-        (?<object>  \{ (?> \g<pair> (?: , \g<pair> )* )? \s* \} ){0}
-        (?<json>    \s* (?> \g<number> | \g<boolean> | \g<string> | \g<array> | \g<object> ) \s* ){0}
-        )
-      \A \g<json> \Z
-      /uix
+    def maybe_json?
+      value.is_a?(String) && value =~ /\A(\{|\[).*(\}|\])$/
     end
   end
 end

data/lib/influxdb/version.rb

@@ -1,3 +1,3 @@
 module InfluxDB
-  VERSION = "0.0.15"
+  VERSION = "0.0.16"
 end

data/spec/influxdb/point_value_spec.rb

@@ -4,10 +4,24 @@ describe InfluxDB::PointValue do
 
   describe 'load' do
 
-    it 'should raise error if json parsing fails' do
-      val = InfluxDB::PointValue.new('{invalid_json')
-      val.should_receive(:json?).and_return(true)
-      expect { val.load }.to raise_error(InfluxDB::JSONParserError)
+    it 'should parse json as array' do
+      val = InfluxDB::PointValue.new('["foo", "bar"]')
+      val.load.should == %w(foo bar)
+    end
+
+    it 'should parse json as hash' do
+      val = InfluxDB::PointValue.new('{"foo":"bar"}')
+      val.load.should == {"foo" => "bar"}
+    end
+
+    it 'should return string value if invalid json array' do
+      val = InfluxDB::PointValue.new('[foo,bar]')
+      val.load.should == '[foo,bar]'
+    end
+
+    it 'should return string value if invalid json hash' do
+      val = InfluxDB::PointValue.new('{foo:"bar"}')
+      val.load.should == '{foo:"bar"}'
     end
   end
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: influxdb
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - Todd Persen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-04 00:00:00.000000000 Z
+date: 2014-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -42,42 +42,42 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: This is the official Ruby library for InfluxDB.
@@ -118,17 +118,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Ruby library for InfluxDB.