jsonrpc2 0.0.5 → 0.0.6

data/lib/jsonrpc2/html.rb

@@ -1,4 +1,5 @@
 require 'cgi'
+require 'time'
 module JSONRPC2
   # HTML output helpers for browseable API interface
   module HTML
@@ -100,6 +101,12 @@ HTML5
           0
         when /^Array/
           []
+        when 'Time'
+          "00:00"
+        when 'DateTime'
+          Time.at(0).iso8601
+        when 'Date'
+          '1970-01-01'
         else
           {}
         end

data/lib/jsonrpc2/types.rb

@@ -1,3 +1,5 @@
+require 'date'
+
 module JSONRPC2
   # Types are checked against textual descriptions of the contents:
   #
@@ -15,6 +17,9 @@ module JSONRPC2
   # * CustomType - A defined custom object type
 	module Types
 		module_function
+    DateTimeRegex = %r"([0-9]{4})(-([0-9]{2})(-([0-9]{2})(T([0-9]{2}):([0-9]{2})(:([0-9]{2})(\.([0-9]+))?)?(Z|(([-+])([0-9]{2}):([0-9]{2})))?)?)?)?"
+    DateRegex     = %r'\A\d{4}-\d{2}-\d{2}\z'
+    TimeRegex     = %r'\A\d{2}:\d{2}(?:\.\d{1,4})?\z'
 
     # Checks that object is of given type (and that any custom types
     # comply with interface)
@@ -45,6 +50,12 @@ module JSONRPC2
             object.is_a?(Hash)
           when 'Array'
             object.is_a?(Array)
+          when 'Date'
+            object.is_a?(String) && DateRegex.match(object) || object.is_a?(Date)
+          when 'Time'
+            object.is_a?(String) && TimeRegex.match(object) || object.is_a?(Time)
+          when 'DateTime'
+            object.is_a?(String) && DateTimeRegex.match(object) || object.is_a?(Time)
           when /\AArray\[(.*)\]\z/
             object.is_a?(Array) && object.all? { |value| valid?(interface, $1, value) }
           when 'Value', 'Any', 'void'

data/lib/jsonrpc2/version.rb

@@ -1,5 +1,5 @@
 # JSONRPC2 namespace module
 module JSONRPC2
   # Version
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/test/test_types.rb

@@ -0,0 +1,28 @@
+require 'test/unit'
+$: << File.join(File.dirname(__FILE__),'../lib')
+require 'jsonrpc2/types'
+
+InterfaceTestContainer = Struct.new("InterfaceTestContainer", :types)
+
+class TestTypes < Test::Unit::TestCase
+  def setup
+    complex = JSONRPC2::JsonObjectType.new('Complex1',[])
+    complex.string('field1', 'Field 1')
+
+    container = JSONRPC2::JsonObjectType.new('Container', [])
+    container.field('complex', 'Complex', 'Complex field')
+
+    container2 = JSONRPC2::JsonObjectType.new('Container2', [])
+    container2.field('complex', 'Array[Complex]', 'Complex fields')
+    @interface = InterfaceTestContainer.new('Complex' => complex, 'Container' => container, 'Container2' => container2)
+  end
+  def test_complex_types
+    assert(JSONRPC2::Types.valid?(@interface, 'Complex', {'field1' => "Foo"}))
+    assert(! JSONRPC2::Types.valid?(@interface, 'Complex', {'field1' => 3}))
+
+    assert(JSONRPC2::Types.valid?(@interface, 'Container', { 'complex' => { 'field1' => 'Foo' } }))
+
+    assert(JSONRPC2::Types.valid?(@interface, 'Container2', { 'complex' => [{ 'field1' => 'Foo' }] }))
+    assert(!JSONRPC2::Types.valid?(@interface, 'Container2', { 'complex' => [{ 'field1' => false }] }))
+  end
+end

metadata

@@ -1,124 +1,101 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: jsonrpc2
-version: !ruby/object:Gem::Version 
-  hash: 21
+version: !ruby/object:Gem::Version
+  version: 0.0.6
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 5
-  version: 0.0.5
 platform: ruby
-authors: 
+authors:
 - Geoff Youngs
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-07-19 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-08-24 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: httpclient
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: RedCloth
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: RedCloth
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: thor
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-description: |+
-  == Description
-  
-  A Rack compatible JSON-RPC2 server domain specific language (DSL) - allows JSONRPC APIs to be 
-  defined as mountable Rack applications with inline documentation, authentication and type checking.
-  
-  e.g.
-  
-    class Calculator < JSONRPC2::Interface
-      title "JSON-RPC2 Calculator"
-      introduction "This interface allows basic maths calculations via JSON-RPC2"
-      auth_with JSONRPC2::BasicAuth.new({'user' => 'secretword'})
-  
-      section 'Simple Ops' do
-          desc 'Multiply two numbers'
-          param 'a', 'Number', 'a'
-          param 'b', 'Number', 'b'
-          result 'Number', 'a * b'
-          def mul args
-            args['a'] * args['b']
-          end
-  
-          desc 'Add numbers'
-          example "Calculate 1 + 1 = 2", :params => { 'a' => 1, 'b' => 1}, :result => 2
-  
-          param 'a', 'Number', 'First number'
-          param 'b', 'Number', 'Second number'
-          optional 'c', 'Number', 'Third number'
-          result 'Number', 'a + b + c'
-          def sum args
-            val = args['a'] + args['b']
-            val += args['c'] if args['c']
-            val
-          end
-      end
-    end
-  
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: ! "== Description\n\nA Rack compatible JSON-RPC2 server domain specific
+  language (DSL) - allows JSONRPC APIs to be \ndefined as mountable Rack applications
+  with inline documentation, authentication and type checking.\n\ne.g.\n\n  class
+  Calculator < JSONRPC2::Interface\n    title \"JSON-RPC2 Calculator\"\n    introduction
+  \"This interface allows basic maths calculations via JSON-RPC2\"\n    auth_with
+  JSONRPC2::BasicAuth.new({'user' => 'secretword'})\n\n    section 'Simple Ops' do\n
+  \       desc 'Multiply two numbers'\n        param 'a', 'Number', 'a'\n        param
+  'b', 'Number', 'b'\n        result 'Number', 'a * b'\n        def mul args\n          args['a']
+  * args['b']\n        end\n\n        desc 'Add numbers'\n        example \"Calculate
+  1 + 1 = 2\", :params => { 'a' => 1, 'b' => 1}, :result => 2\n\n        param 'a',
+  'Number', 'First number'\n        param 'b', 'Number', 'Second number'\n        optional
+  'c', 'Number', 'Third number'\n        result 'Number', 'a + b + c'\n        def
+  sum args\n          val = args['a'] + args['b']\n          val += args['c'] if args['c']\n
+  \         val\n        end\n    end\n  end\n\n"
+email:
 - git@intersect-uk.co.uk
-executables: 
+executables:
 - jsonrpc2
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - README.markdown
@@ -135,39 +112,30 @@ files:
 - lib/jsonrpc2/textile.rb
 - lib/jsonrpc2/types.rb
 - lib/jsonrpc2/version.rb
+- test/test_types.rb
 homepage: http://github.com/geoffyoungs/jsonrpc2
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: JSON-RPC2 server DSL
 test_files: []
-
 has_rdoc: