saneitized 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d06c3288205ec366ffb099b4b1eef0ca7f84536
-  data.tar.gz: 61c1bf281121da5af7f2bf7a8cd8015fb947eeee
+  metadata.gz: d2bc38bc070f2a0476dadc2416ef30c8d6485fce
+  data.tar.gz: eacec70fdcdfe47a810a227c1021fbca70893c4f
 SHA512:
-  metadata.gz: 7053a36f0eac4e2605359870a3992266875fcc8cd585cbfe8ac82465f10ef73d1ade5d5be654d33185f01abec5ead944b035ea7467c67335f0e9b5ef65ceab05
-  data.tar.gz: 439e5e13f787845305b76f8367298672d744a961923bafe03e60a1903e8f4c68ea618e7ccce11a42e7399999478a2c103aa9b62e45bd9a66f50453109ad2cc3e
+  metadata.gz: a1b2413ea4aea85bd134a487f06a33c557649f21282f620318947e1c7b9235251eb2151d6a9ff8ca5e7c150e1ad46c1259bf4a1e963c2872db0e174c8c01fd23
+  data.tar.gz: 00ae7b55e0b4802082a55c58d7b69182c924acfc77c617353fe4ff9b5a967625550ee581cf44e200decb2c55906a9a82a2466632fac906dc0a0e08d6003ce0b9

data/.travis.yml

@@ -2,5 +2,6 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.2
-  #- jruby-19mode
+  - 2.1.3
+  - rbx-2
+  - jruby-19mode

data/README.md

@@ -33,6 +33,7 @@ It tries to convert strings in the following order, trying the next thing if it
 the new value if it succeeds
 
     Boolean: Saneitized.convert('true') #=> true ('false' works the same way)
+    nil:     Saneitized.convert('null') #=> nil  (also converts 'nil' and 'NULL')
     Integer: Saneitized.convert('42') #=> 42
     Float:   Saneitized.convert('22.2') #=> 22.2
     JSON:    Saneitized.convert("{\"hello\":\"goodbye\"}") #=> {"hello"=>"goodbye"}

data/lib/saneitized/converter.rb

@@ -6,13 +6,17 @@ module Saneitized
     return Saneitized::Hash.new(unknown) if unknown.is_a? ::Hash
     return Saneitized::Array.new(unknown) if unknown.is_a? ::Array
     return unknown unless unknown.is_a? String #Only attempt to convert string
-    return true  if unknown == 'true'
-    return false if unknown == 'false'
 
-    if value = Converter.integer?(unknown) then return value end
-    if value = Converter.float?(unknown)   then return value end
-    if value = Converter.json?(unknown)    then return convert(value) end
-    if value = Converter.time?(unknown)    then return value end
+    %w(true false nil integer float json time).each do |type|
+      value = Converter.send(type + '?', unknown)
+      next if value == :nope
+      return (type == 'json') ? convert(value) : value
+    end
+
+    #if value = Converter.integer?(unknown) then return value end
+    #if value = Converter.float?(unknown)   then return value end
+    #if (value = Converter.json?(unknown)) != :nope then return convert(value) end
+    #if value = Converter.time?(unknown)    then return value end
 
     unknown
   end
@@ -20,28 +24,39 @@ module Saneitized
   module Converter
     extend self
 
+    def true?(unknown)
+      (unknown == 'true') ? true : :nope
+    end
+
+    def false?(unknown)
+      (unknown == 'false') ? false : :nope
+    end
+
+    def nil?(unknown)
+      (%w(nil null NULL).include? unknown) ? nil : :nope
+    end
+
     def json?(unknown)
       JSON.parse(unknown)
     rescue JSON::ParserError, TypeError
-      false
+      :nope
     end
 
     def integer?(unknown)
       Integer(unknown)
     rescue ArgumentError, TypeError
-      false
+      :nope
     end
 
     def float?(unknown)
       Float(unknown)
     rescue ArgumentError, TypeError
-      false
+      :nope
     end
 
     def time?(unknown)
-      Chronic.parse(unknown)
-    rescue ArgumentError, TypeError
-      false
+      value = Chronic.parse(unknown)
+      value.nil? ? :nope : value
     end
   end
 

data/lib/saneitized/version.rb

@@ -1,3 +1,3 @@
 module Saneitized
-  VERSION = '1.1.1'
+  VERSION = '1.2.0'
 end

data/saneitized.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'chronic', '~> 0.10.2'
 
   spec.add_development_dependency 'bundler',   '~>1.5'
-  spec.add_development_dependency 'rspec',     '~>2.14'
+  spec.add_development_dependency 'rspec',     '~>3.0'
   spec.add_development_dependency 'rake',      '~>10.1'
   spec.add_development_dependency 'simplecov', '~>0.8'
   spec.add_development_dependency 'coveralls', '~>0.7'

data/spec/saneitized/array_spec.rb

@@ -4,7 +4,7 @@ describe Saneitized::Array do
 
   describe '#new' do
     it 'should convert array of numbers' do
-      Saneitized::Array.new(['1','2','3']).should == [1,2,3]
+      expect(Saneitized::Array.new(['1','2','3'])).to eql [1,2,3]
     end
   end
 
@@ -12,7 +12,7 @@ describe Saneitized::Array do
     it 'should convert object at index' do
       a = Saneitized::Array.new
       a[0] = 'true'
-      a[0].should == true
+      expect(a[0]).to eql true
     end
   end
 
@@ -20,7 +20,7 @@ describe Saneitized::Array do
     it 'should converted added object' do
       a = Saneitized::Array.new
       a << '11'
-      a.should == [11]
+      expect(a).to eql [11]
     end
   end
 end

data/spec/saneitized/converter_spec.rb

@@ -5,59 +5,65 @@ describe Saneitized do
     it 'should convert hash' do
       unsullied = {:kick_ass => 'true', :cities_sacked => '3'}
       sanitized = {:kick_ass => true, :cities_sacked => 3}
-      Saneitized.convert(unsullied).should == sanitized
+      expect(Saneitized.convert(unsullied)).to eql sanitized
     end
 
     it 'should convert array' do
       insane = ['1', '3', '2014-05-29 19:19:44 -0400']
       sane = [1, 3, Time.new(2014,5,29,19,19,44,'-04:00')]
-      Saneitized.convert(insane).should == sane
+      expect(Saneitized.convert(insane)).to eql sane
     end
 
     it 'should convert json' do
       insane = {'all' => '34.2', 'base' => ['are', 'true', '10'] }.to_json
       sane = {'all' => 34.2, 'base' => ['are', true, 10]}
-      Saneitized.convert(insane).should == sane
+      expect(Saneitized.convert(insane)).to eql sane
+    end
+
+    %w(nil null NULL).each do | nnil |
+      it "should change #{nnil} to nil" do
+        expect(Saneitized.convert(nnil)).to be nil
+      end
     end
 
     it "should change 'true' to true" do
-      Saneitized.convert('true').should == true
+      expect(Saneitized.convert('true')).to be true
     end
 
     it "should change 'false' to false" do
-      Saneitized.convert('false').should == false
+      expect(Saneitized.convert('false')).to be false
     end
 
     it "should change '12.34' to 12.34" do
-      Saneitized.convert('12.34').should == 12.34
+      expect(Saneitized.convert('12.34')).to eql 12.34
     end
 
     it 'should not change 0.5 to 0.0' do
-      Saneitized.convert(0.5).should == 0.5
+      expect(Saneitized.convert(0.5)).to eql 0.5
     end
 
     it 'should change integer string to integer' do
-      Saneitized.convert('12').kind_of?(Fixnum).should be true
+      expect(Saneitized.convert('12').kind_of?(Fixnum)).to eql true
     end
 
     it "should changer '12' to 12" do
-      Saneitized.convert('12').should == 12
+      expect(Saneitized.convert('12')).to be 12
     end
 
     it 'should do nothing to strings' do
-      Saneitized.convert('blah').should == 'blah'
+      expect(Saneitized.convert('blah')).to eql 'blah'
     end
 
     it 'should do nothing to nil' do
-      Saneitized.convert(nil).should be_nil
+      expect(Saneitized.convert(nil)).to be nil
     end
 
     it 'should convert datetime string' do
-      Saneitized.convert("2001-02-03 10:11:12 -0400").should == Time.new(2001,2,3,10,11,12,'-04:00')
+      expect(Saneitized.convert("2001-02-03 10:11:12 -0400")).to eql Time.new(2001,2,3,10,11,12,'-04:00')
     end
 
     it 'should leave marketplaces alone' do
-      Saneitized.convert('marketplaces').should == 'marketplaces'
+      expect(Saneitized.convert('marketplaces')).to eq 'marketplaces'
     end
   end
 end

data/spec/saneitized/hash_spec.rb

@@ -4,35 +4,35 @@ describe Saneitized::Hash do
 
   describe '#new' do
     it "should change 'true' to true" do
-      Saneitized::Hash.new({:true => 'true'})[:true].should == true
+      expect(Saneitized::Hash.new({:true => 'true'})[:true]).to eql true
     end
 
     it "should change 'false' to false" do
-      Saneitized::Hash.new({:false => 'false'})[:false].should == false
+      expect(Saneitized::Hash.new({:false => 'false'})[:false]).to eql false
     end
 
     it "should change '12.34' to 12.34" do
-      Saneitized::Hash.new({value: '12.34'})[:value].should == 12.34
+      expect(Saneitized::Hash.new({value: '12.34'})[:value]).to eql 12.34
     end
 
     it 'should not change 0.5 to 0.0' do
-      Saneitized::Hash.new({value: 0.5})[:value].should == 0.5
+      expect(Saneitized::Hash.new({value: 0.5})[:value]).to eql 0.5
     end
 
     it 'should change integer string to integer' do
-      Saneitized::Hash.new({int: '12'})[:int].kind_of?(Fixnum).should be true
+      expect(Saneitized::Hash.new({int: '12'})[:int].kind_of?(Fixnum)).to be true
     end
 
     it "should changer '12' to 12" do
-      Saneitized::Hash.new({int: '12'})[:int].should == 12
+      expect(Saneitized::Hash.new({int: '12'})[:int]).to be 12
     end
 
     it 'should do nothing to strings' do
-      Saneitized::Hash.new({string: 'blah'})[:string].should == 'blah'
+      expect(Saneitized::Hash.new({string: 'blah'})[:string]).to eql 'blah'
     end
 
     it 'should do nothing to nil' do
-      Saneitized::Hash.new({nill: nil})[:nill].should be_nil
+      expect(Saneitized::Hash.new({nill: nil})[:nill]).to be nil
     end
   end
 
@@ -40,7 +40,7 @@ describe Saneitized::Hash do
     it 'should sanitized assigned keys' do
       hash = Saneitized::Hash.new
       hash['key']= '10'
-      hash['key'].should == 10
+      expect(hash['key']).to eql 10
     end
   end
 

data/spec/spec_helper.rb

@@ -12,7 +12,6 @@ require 'pry'
 #
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: saneitized
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Benjamin Guest
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-02 00:00:00.000000000 Z
+date: 2014-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement