json_structure 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7743f55d019b53d39543aede96c77ab327a2fe4a
-  data.tar.gz: 91f6d05f464028a7f8b3183db2b236b15033968b
+  metadata.gz: ddd50a60ceb48fde2376452cd100867cfc839f40
+  data.tar.gz: 12aedfb98c64758d0b69905111fd730b0811649a
 SHA512:
-  metadata.gz: 622248b21a9759681fae67b8d6000bd28c77140e93a0ac2d83a1c9b717dc8b1fd2c93b465d74bb51fbd138002b8a1c5ebaae6c037185430b70966695db6aa515
-  data.tar.gz: 570fbf46a0c804daf3603ad4b322b231764020157e86a8d12fadeecd9e4ad758e63015966d87fd6ae0456bbfe27f77ababafe160d17a170afeab734aa5bc15eb
+  metadata.gz: ee77013efd9d01e9bf5e42c9a10ee78ba79ae2b3678872cc7ea3d3e26f6c2e71ad9e6d49a977150e56e796165c72e2b4a8898ba8495ea9441a7c2c412cedc9f6
+  data.tar.gz: 1694e8b09ce760d8625315ed96526491ca3c6ba779e11311ef4c70cf19a5565fc7b7db16c5848eee97c987fcc86b9734b8c5fb2e83dc7d0900a8a6287de46daf

data/Rakefile

@@ -1,2 +1,8 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
+require 'rake/testtask'
 
+Rake::TestTask.new('test') do |test|
+  test.libs << 'test'
+  test.pattern = 'test/**/test_*.rb'
+  test.verbose = true
+end

data/lib/json_structure.rb

@@ -6,6 +6,10 @@ require 'json_structure/string'
 require 'json_structure/null'
 require 'json_structure/any_of'
 require 'json_structure/value'
+require 'json_structure/any'
+require 'json_structure/boolean'
+
+require 'json_structure/version'
 
 module JsonStructure
   def self.build(&block)
@@ -13,18 +17,22 @@ module JsonStructure
   end
 
   class Builder
-    [
-      Type,
-      Object_,
-      Array,
-      Number,
-      Integer,
-      Float,
-      String,
-      Null,
-      AnyOf,
-    ].each do |klass|
-      method = klass.name
+    %w[
+      Type
+      Object_
+      Array
+      Number
+      Integer
+      String
+      Null
+      AnyOf
+      Value
+      Any
+      Boolean
+    ].each do |name|
+      klass = JsonStructure.const_get(name)
+
+      method = name
         .gsub(/([a-z])([A-Z])/, '\1_\2')
         .gsub(/_+$/, '')
         .downcase

data/lib/json_structure/any.rb

@@ -0,0 +1,7 @@
+module JsonStructure
+  class Any < Type
+    def ===(_value)
+      true
+    end
+  end
+end

data/lib/json_structure/boolean.rb

@@ -0,0 +1,7 @@
+module JsonStructure
+  class Boolean
+    def ===(value)
+      value == true || value == false
+    end
+  end
+end

data/lib/json_structure/number.rb

@@ -20,11 +20,4 @@ module JsonStructure
       super
     end
   end
-
-  class Float < Number
-    def ===(value)
-      return false unless value.is_a?(::Float)
-      super
-    end
-  end
 end

data/lib/json_structure/object.rb

@@ -1,7 +1,7 @@
 module JsonStructure
   class Object_ < Type
     def initialize(hash = nil)
-      @hash = hash.each_with_object({}) do |(key, value), new_hash|
+      @hash = hash && hash.each_with_object({}) do |(key, value), new_hash|
         new_hash[key.to_s] = value
       end
     end

data/lib/json_structure/string.rb

@@ -9,9 +9,9 @@ module JsonStructure
     def ===(value)
       return false unless value.is_a?(::String)
 
-      return false unless @min_length && value.size < @min_length
-      return false unless @max_length && value.size > @max_length
-      return false unless @pattern && pattern =~ value
+      return false if @min_length && value.size < @min_length
+      return false if @max_length && value.size > @max_length
+      return false if @pattern && @pattern !~ value
       true
     end
   end

data/lib/json_structure/type.rb

@@ -1,11 +1,7 @@
 module JsonStructure
   class Type
-    def initialize(cond)
-      @cond = cond
-    end
-
-    def ===(value)
-      !!(@cond && @cond.call(value))
+    def ===(*)
+      false
     end
 
     def |(type)

data/lib/json_structure/version.rb

@@ -1,3 +1,3 @@
 module JsonStructure
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json_structure
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Kaido Iwamoto
@@ -55,8 +55,10 @@ files:
 - bin/setup
 - json_structure.gemspec
 - lib/json_structure.rb
+- lib/json_structure/any.rb
 - lib/json_structure/any_of.rb
 - lib/json_structure/array.rb
+- lib/json_structure/boolean.rb
 - lib/json_structure/null.rb
 - lib/json_structure/number.rb
 - lib/json_structure/object.rb