xml_schema 0.0.3 → 0.1.0

data/ChangeLog

@@ -0,0 +1,5 @@
+xml_schema (0.1.0)
+
+  * XmlSchema.datatype_of returns URI, not String
+  * XmlSchema.to_s returns the URI string without trailing "#"
+  * XmlSchema.uri (and "[]" accessor, e.g. NS::OWL["hello"]) return an instance of URI

data/LICENSE

@@ -0,0 +1,7 @@
+Copyright (c) 2012 Slava Kravchenko
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.rdoc

@@ -6,18 +6,18 @@ XmlSchema gem is a simple convertor utility for XML Schema (literal) datatypes t
 
   $ require "xml_schema"
 
-  $ XmlSchema.datatype_of(true)  # => "http://www.w3.org/2001/XMLSchema#boolean"
-  $ XmlSchema.datatype_of(Time.now)  # => "http://www.w3.org/2001/XMLSchema#time"
+  $ XmlSchema.datatype_of(true)  # => #<URI::HTTP:0x00000000dcff78 URL:http://www.w3.org/2001/XMLSchema#boolean>
+  $ XmlSchema.datatype_of(Time.now)  # => #<URI::HTTP:0x00000000dcff78 URL:http://www.w3.org/2001/XMLSchema#time>
 
   $ XmlSchema.instantiate("55^^<http://www.w3.org/2001/XMLSchema#int>")  # => 55
 
 XmlSchema also provides means to access and work with frequently used namespaces:
 
-  $ NS::OWL.uri  # => "http://www.w3.org/2002/07/owl"
+  $ NS::OWL.uri  # => #<URI::HTTP:0x00000000dcff78 URL:http://www.w3.org/2002/07/owl>
   $ NS::RDFS["hello"]  # => #<URI::HTTP:0x00000000dcff78 URL:http://www.w3.org/2000/01/rdf-schema#hello>
 
 That's pretty much all there is to it.
 
 = Authors
 
-Slava Kravchenko <https://github.com/cordawyn/xml_schema>
+Slava Kravchenko <slava.kravchenko@gmail.com>

data/lib/xml_schema/ns.rb

@@ -13,15 +13,15 @@ module NS
     ns_module = self.const_set(name, Module.new)
     ns_module.module_eval <<-HERE
       def self.uri
-        \"#{url}\"
+        URI(\"#{url}\")
       end
 
       def self.to_s
-        \"\#{uri}#\"
+        \"#{url}\"
       end
 
       def self.[](value)
-        URI.parse(\"\#{self}\#{value}\")
+        URI(\"\#{self}#\#{value}\")
       end
 HERE
   end

data/lib/xml_schema/version.rb

@@ -1,3 +1,3 @@
 module XmlSchema
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

data/lib/xml_schema.rb

@@ -2,7 +2,6 @@ require 'time'
 require 'xml_schema/ns'
 
 module XmlSchema
-
   TYPES = %w(int boolean float dateTime time date string decimal double duration gYearMonth gYear gMonthDay gDay gMonth hexBinary base64Binary anyURI QName NOTATION)
 
 
@@ -14,19 +13,19 @@ module XmlSchema
     #++
     case object.class.name
     when "Fixnum", "Integer"
-      NS::XMLSchema['int'].to_s
+      NS::XMLSchema['int']
     when "TrueClass", "FalseClass"
-      NS::XMLSchema['boolean'].to_s
+      NS::XMLSchema['boolean']
     when "Float"
-      NS::XMLSchema['float'].to_s
+      NS::XMLSchema['float']
     when "DateTime"
-      NS::XMLSchema['dateTime'].to_s
+      NS::XMLSchema['dateTime']
     when "Time"
-      NS::XMLSchema['time'].to_s
+      NS::XMLSchema['time']
     when "Date"
-      NS::XMLSchema['date'].to_s
+      NS::XMLSchema['date']
     when "String"
-      NS::XMLSchema['string'].to_s
+      NS::XMLSchema['string']
     else
       raise "#{object.class} cannot be coerced into any XMLSchema datatype"
     end
@@ -39,16 +38,17 @@ module XmlSchema
     # NOTE: removing language tag (e.g. "@en")
     full_literal = datatype_uri ? literal.sub(/@\w+$/, '') + "^^<#{datatype_uri}>" : literal.sub(/@\w+$/, '')
     literal_value, literal_type = full_literal.split('^^')
-    datatype = if literal_type
-      ns, l_type = literal_type.delete("<>").split('#')
-      if ns == NS::XMLSchema.uri && TYPES.include?(l_type)
-        l_type
+    datatype =
+      if literal_type
+        ns, l_type = literal_type.delete("<>").split('#')
+        if URI(ns) == NS::XMLSchema.uri && TYPES.include?(l_type)
+          l_type
+        else
+          raise "Incompatible datatype URI! (#{ns})"
+        end
       else
-        raise "Incompatible datatype URI! (#{ns})"
+        'string'
       end
-    else
-      'string'
-    end
 
     # clean-up the literal_value
     literal_value.sub!(/^["']/, '')
@@ -72,5 +72,4 @@ module XmlSchema
       literal_value
     end
   end
-
 end

data/test/xml_schema_test.rb

@@ -53,31 +53,31 @@ class XmlSchemaTest < Test::Unit::TestCase
   end
 
   def test_should_return_datatype_for_integer
-    assert_equal "http://www.w3.org/2001/XMLSchema#int", XmlSchema.datatype_of(42)
+    assert_equal URI("http://www.w3.org/2001/XMLSchema#int"), XmlSchema.datatype_of(42)
   end
 
   def test_should_return_datatype_for_boolean
-    assert_equal "http://www.w3.org/2001/XMLSchema#boolean", XmlSchema.datatype_of(true)
+    assert_equal URI("http://www.w3.org/2001/XMLSchema#boolean"), XmlSchema.datatype_of(true)
   end
 
   def test_should_return_datatype_for_float
-    assert_equal "http://www.w3.org/2001/XMLSchema#float", XmlSchema.datatype_of(11.11)
+    assert_equal URI("http://www.w3.org/2001/XMLSchema#float"), XmlSchema.datatype_of(11.11)
   end
 
   def test_should_return_datatype_for_datetime
-    assert_equal "http://www.w3.org/2001/XMLSchema#dateTime", XmlSchema.datatype_of(DateTime.new)
+    assert_equal URI("http://www.w3.org/2001/XMLSchema#dateTime"), XmlSchema.datatype_of(DateTime.new)
   end
 
   def test_should_return_datatype_for_time
-    assert_equal "http://www.w3.org/2001/XMLSchema#time", XmlSchema.datatype_of(Time.now)
+    assert_equal URI("http://www.w3.org/2001/XMLSchema#time"), XmlSchema.datatype_of(Time.now)
   end
 
   def test_should_return_datatype_for_date
-    assert_equal "http://www.w3.org/2001/XMLSchema#date", XmlSchema.datatype_of(Date.today)
+    assert_equal URI("http://www.w3.org/2001/XMLSchema#date"), XmlSchema.datatype_of(Date.today)
   end
 
   def test_should_return_datatype_for_string
-    assert_equal "http://www.w3.org/2001/XMLSchema#string", XmlSchema.datatype_of("test")
+    assert_equal URI("http://www.w3.org/2001/XMLSchema#string"), XmlSchema.datatype_of("test")
   end
 
   def test_should_raise_exception_on_unknown_class

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xml_schema
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-13 00:00:00.000000000 Z
+date: 2012-07-23 00:00:00.000000000 Z
 dependencies: []
 description: Helper methods and constants to handle XmlSchema
 email:
@@ -19,8 +19,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- ChangeLog
 - Gemfile
 - Gemfile.lock
+- LICENSE
 - README.rdoc
 - Rakefile
 - lib/xml_schema.rb
@@ -49,7 +51,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: xml_schema
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Helper methods and constants to handle XmlSchema