jsexp 1.0.0 → 1.0.1

data/README.md

@@ -13,7 +13,7 @@ Example
     schema = { 
       'name' => String, # case expression
       'email' => /@/, # case expression
-      'p' => (0.0..1.0), # case expression
+      'p' => (0.0..1.0), # definite range
       'id' => [:range, [0, :inf]], # indefinite range
       'color' => [:enum, ['red', 'green', 'blue']], # enum
       'offset' => [:tuple, [Float, Float]], # exact-size array
@@ -46,3 +46,16 @@ Non-features
  -  nested schemas: This is a source of arbitrary complexity.
  -  specific error messages: Refer to the schema to see what's wrong.
  -  lambdas: Do more complex validation yourself.
+
+Float Promotion
+---------------
+
+Javascript does not distinguish between integer and float. To accomodate, we accept integers or floats for type Float.
+
+Numeric Ranges
+--------------
+
+ -  (0..10): integers 0, 1, ..., 10 # to_a
+ -  (0.0..10.0): floats [0.0, 10.0]
+ -  [:range, [0, :inf]]: integers 0, 1, ...
+ -  [:range, [0.0, :inf]]: floats [0.0, inf)

data/lib/jsexp.rb

@@ -1,35 +1,49 @@
 module JSExp
-
-def JSExp.valid?(schema, obj)
-  if schema.is_a?(Hash)
-    obj.is_a?(Hash) && schema.map {|key, schema_| 
-      if schema_.is_a?(Array) && schema_[0] == :optional
-        !obj.key?(key) || valid?(schema_[1], obj[key])
+  def JSExp.valid?(schema, obj)
+    if schema.is_a?(Hash)
+      obj.is_a?(Hash) && schema.map {|key, schema_| 
+        if schema_.is_a?(Array) && schema_[0] == :optional
+          !obj.key?(key) || valid?(schema_[1], obj[key])
+        else
+          obj.key?(key) && valid?(schema_, obj[key])
+        end
+      }.all?
+    elsif schema.is_a?(Array)
+      case schema[0]
+      when :array
+        obj.is_a?(Array) && obj.map {|x| valid?(schema[1], x)}.all?
+      when :enum
+        schema[1].include?(obj)
+      when :range
+        min, max = schema[1]
+        bound = (min == :inf ? max : min)
+        same_domain?(bound, obj) && 
+        (min == :inf ? true : obj >= min) && 
+        (max == :inf ? true : obj <= max)
+      when :tuple
+        obj.is_a?(Array) && obj.size == schema[1].size && schema[1].each_index.map {|i| valid?(schema[1][i], obj[i])}.all?
+      end
+    elsif schema.is_a?(Range)
+      same_domain?(schema.min, obj) && schema.include?(obj)
+    elsif schema == Float
+      obj.is_a?(Integer) || obj.is_a?(Float)
+    else
+      case obj
+      when schema
+        true
       else
-        obj.key?(key) && valid?(schema_, obj[key])
+        false
       end
-    }.all?
-  elsif schema.is_a?(Array)
-    case schema[0]
-    when :array
-      obj.is_a?(Array) && obj.map {|x| valid?(schema[1], x)}.all?
-    when :enum
-      schema[1].include?(obj)
-    when :range
-      min, max = schema[1]
-      (min == :inf ? true : obj.class == min.class && obj >= min) && 
-      (max == :inf ? true : obj.class == max.class && obj <= max)
-    when :tuple
-      obj.is_a?(Array) && obj.size == schema[1].size && schema[1].each_index.map {|i| valid?(schema[1][i], obj[i])}.all?
     end
-  else
-    case obj
-    when schema
-      true
-    else
-      false
+  end
+private
+  def JSExp.same_domain?(schema, obj)
+    # y.is_a?(x.class) fails when y.class == Bignum and x.class == Fixnum
+    case schema
+    when Integer
+      JSExp.valid?(Integer, obj)
+    when Float
+      JSExp.valid?(Float, obj)
     end
   end
 end
-
-end

data/test/jsexp_test.rb

@@ -8,25 +8,20 @@ describe JSExp do
     JSExp.valid?(String, 0).must_equal false
 
     JSExp.valid?(Integer, 0).must_equal true
-    JSExp.valid?(Integer, 0.0).must_equal false
+    JSExp.valid?(Integer, '').must_equal false
 
     JSExp.valid?(Float, 0.0).must_equal true
-    JSExp.valid?(Float, 0).must_equal false
+    JSExp.valid?(Float, '').must_equal false
 
     JSExp.valid?(/@/, 'user@example.com').must_equal true
     JSExp.valid?(/@/, '').must_equal false
-
-    JSExp.valid?((0..10), 5).must_equal true
-    JSExp.valid?((0..10), 11).must_equal false
-
-    JSExp.valid?((0.0..1.0), 0.5).must_equal true
-    JSExp.valid?((0.0..1.0), 1.1).must_equal false
   end
 
   it 'validates indefinite arrays' do
     JSExp.valid?([:array, Integer], []).must_equal true
     JSExp.valid?([:array, Integer], [0]).must_equal true
     JSExp.valid?([:array, Integer], [0, 0]).must_equal true
+
     JSExp.valid?([:array, Integer], [0.0]).must_equal false
     JSExp.valid?([:array, Integer], [0, 0.0]).must_equal false
   end
@@ -44,15 +39,19 @@ describe JSExp do
     JSExp.valid?(schema, {'id' => 0}).must_equal false
   end
 
+  it 'validates definite ranges' do
+    JSExp.valid?((0..10), 5).must_equal true
+    JSExp.valid?((0..10), 11).must_equal false
+
+    JSExp.valid?((0.0..1.0), 0.5).must_equal true
+    JSExp.valid?((0.0..1.0), 1.1).must_equal false
+  end
+
   it 'validates indefinite ranges' do
     JSExp.valid?([:range, [0, :inf]], 0).must_equal true
     JSExp.valid?([:range, [0, :inf]], -1).must_equal false
-    JSExp.valid?([:range, [0, :inf]], 0.0).must_equal false
 
     JSExp.valid?([:range, [:inf, 0]], 0).must_equal true
-    JSExp.valid?([:range, [:inf, 0]], 1).must_equal false
-
-    JSExp.valid?([:range, [:inf, :inf]], 0).must_equal true
   end
 
   it 'validates tuples' do
@@ -61,4 +60,15 @@ describe JSExp do
     JSExp.valid?([:tuple, [Integer, Float]], [0]).must_equal false
     JSExp.valid?([:tuple, [Integer, Float]], [0, 0.0, 0]).must_equal false
   end
+
+  it 'handles float promotion' do
+    JSExp.valid?(Float, 0).must_equal true
+    JSExp.valid?(Integer, 0.0).must_equal false
+
+    JSExp.valid?((0.0..10.0), 5).must_equal true
+    JSExp.valid?((0..10), 5.0).must_equal false
+
+    JSExp.valid?([:range, [0.0, :inf]], 5).must_equal true
+    JSExp.valid?([:range, [0, :inf]], 5.0).must_equal false
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsexp
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -41,7 +41,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: json schemas