Skip to content

Commit 57639a1

Browse files
committed
Load all formats using glob
Previously we had to explicitly load attributes before formats, because the format classes weren't requiring their parent class. In effect there was a coupling between the load order in json-schema.rb and the individual format classes. I've changed this so that each format requires it's parent class.
1 parent 3c50306 commit 57639a1

File tree

7 files changed

+7
-8
lines changed

7 files changed

+7
-8
lines changed

lib/json-schema.rb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,5 @@
1414
require 'json-schema/schema/reader'
1515
require 'json-schema/validator'
1616

17-
Dir[File.join(File.dirname(__FILE__), "json-schema/attributes/*.rb")].each {|file| require file }
18-
Dir[File.join(File.dirname(__FILE__), "json-schema/attributes/formats/*.rb")].each {|file| require file }
17+
Dir[File.join(File.dirname(__FILE__), "json-schema/attributes/**/*.rb")].each {|file| require file }
1918
Dir[File.join(File.dirname(__FILE__), "json-schema/validators/*.rb")].sort!.each {|file| require file }

lib/json-schema/attributes/formats/custom.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
require 'json-schema/attribute'
1+
require 'json-schema/attributes/format'
22
require 'json-schema/errors/custom_format_error'
33

44
module JSON

lib/json-schema/attributes/formats/date.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
require 'json-schema/attribute'
1+
require 'json-schema/attributes/format'
22

33
module JSON
44
class Schema

lib/json-schema/attributes/formats/date_time.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
require 'json-schema/attribute'
1+
require 'json-schema/attributes/format'
22

33
module JSON
44
class Schema

lib/json-schema/attributes/formats/date_time_v4.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
require 'json-schema/attribute'
1+
require 'json-schema/attributes/format'
22

33
module JSON
44
class Schema

lib/json-schema/attributes/formats/time.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
require 'json-schema/attribute'
1+
require 'json-schema/attributes/format'
22

33
module JSON
44
class Schema

lib/json-schema/attributes/formats/uri.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
require 'json-schema/attribute'
1+
require 'json-schema/attributes/format'
22
require 'json-schema/errors/uri_error'
33

44
module JSON

0 commit comments

Comments
 (0)