iq_rdf 0.1.2 → 0.1.3

data/LICENSE

@@ -174,4 +174,4 @@
       incurred by, or claims asserted against, such Contributor by reason
       of your accepting any such warranty or additional liability.
 
-   END OF TERMS AND CONDITIONS
+   END OF TERMS AND CONDITIONS

data/README.md

@@ -26,10 +26,10 @@ document = IqRdf::Document.new('http://www.test.de/')
 document.namespaces :skos => 'http://www.w3.org/2008/05/skos#',
   :foaf => 'http://xmlns.com/foaf/0.1/' # A :rdf namespace is added automatically
 
-document << IqRdf::john_doe.myCustomNote("This is an example", :lang => :en) 
+document << IqRdf::john_doe.myCustomNote("This is an example", :lang => :en)
 # Turtle: :john_doe :myCustomNote "This is an example"@en.
 
-document << IqRdf::john_doe(IqRdf::Foaf::build_uri("Person")).Foaf::name("John Doe") 
+document << IqRdf::john_doe(IqRdf::Foaf::build_uri("Person")).Foaf::name("John Doe")
 # Turtle: :john_doe a foaf:Person; foaf:name "John Doe".
 
 document << IqRdf::john_doe.Foaf::knows(IqRdf::jane_doe)
@@ -46,7 +46,7 @@ Gemfile (or with Rails 2.x in your config/environment.rb):
 ```ruby
 gem "iq_rdf"
 ```
-  
+
 Add the mime types you want to support to your config/initializers/mime_types.rb
 file:
 
@@ -55,7 +55,7 @@ Mime::Type.register "application/rdf+xml", :rdf
 Mime::Type.register "text/turtle", :ttl
 Mime::Type.register "application/n-triples", :nt
 ```
-  
+
 Now you can define views in you application. Use the extension *.iqrdf*
 for the view files. You can use the extensions *.ttl* or
 *.rdf* in the URL of your request, to force the output to be

data/iq_rdf.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.summary     = "IqRdf - A builder like rdf library for ruby and rails"
   s.description = s.summary
   s.extra_rdoc_files = ['README.md', 'LICENSE']
-  
+
   s.add_dependency "bundler"
   s.add_dependency "builder"
 

data/lib/iq_rdf/blank_node.rb

@@ -23,7 +23,7 @@ module IqRdf
     end
 
     def to_turtle(parent_lang = nil)
-      
+
     end
 
     def to_s(parent_lang = nil)

data/lib/iq_rdf/collection.rb

@@ -20,7 +20,7 @@ module IqRdf
     def initialize(collection)
       @elements = []
       collection.each do |element|
-        element = Literal.new(element) unless element.is_a?(IqRdf::Uri)
+        element = Literal.new(element) unless element.is_a?(IqRdf::Uri) || element.is_a?(IqRdf::Literal)
         @elements << element
       end
     end

data/lib/iq_rdf/document.rb

@@ -90,4 +90,4 @@ module IqRdf
     end
 
   end
-end
+end

data/lib/iq_rdf/literal/boolean.rb

@@ -0,0 +1,15 @@
+module IqRdf
+  class Literal
+    class Boolean < Literal
+
+      def initialize(b)
+        super(!!b, nil, ::URI.parse("http://www.w3.org/2001/XMLSchema#boolean"))
+      end
+
+      def to_s(parent_lang = nil)
+        @obj.to_s
+      end
+
+    end
+  end
+end

data/lib/iq_rdf/literal/numeric.rb

@@ -0,0 +1,16 @@
+module IqRdf
+  class Literal
+    class Numeric < Literal
+
+      def initialize(num)
+        raise "#{num.inspect} is not a Numeric!" unless num.is_a?(::Numeric)
+        super(num, nil, ::URI.parse(num.is_a?(Integer) ? "http://www.w3.org/2001/XMLSchema#integer" : "http://www.w3.org/2001/XMLSchema#decimal"))
+      end
+
+      def to_s(parent_lang = nil)
+        @obj.to_s
+      end
+
+    end
+  end
+end

data/lib/iq_rdf/literal/string.rb

@@ -0,0 +1,12 @@
+module IqRdf
+  class Literal
+    class String < Literal
+
+      def initialize(s, lang = nil)
+        raise "#{s.inspect} is not a String" unless s.is_a?(::String)
+        super(s, lang)
+      end
+
+    end
+  end
+end

data/lib/iq_rdf/literal/uri.rb

@@ -0,0 +1,20 @@
+module IqRdf
+  class Literal
+    class URI < Literal
+
+      def initialize(uri)
+        raise "#{uri.inspect} is not an URI" unless uri.is_a?(::URI)
+        super(uri)
+      end
+
+      def to_s(parent_lang = nil)
+        "<#{@obj.to_s}>"
+      end
+
+      def build_xml(xml, &block)
+        block.call("rdf:resource" => @obj.to_s)
+      end
+
+    end
+  end
+end

data/lib/iq_rdf/literal.rb

@@ -15,42 +15,38 @@
 module IqRdf
   class Literal
 
-    def initialize(obj, lang = nil)
+    def initialize(obj, lang = nil, datatype = nil)
+      raise "#{datatype.inspect} is not an URI" if datatype && !datatype.is_a?(::URI)
       @obj = obj
+      @datatype = datatype
       @lang = lang
     end
 
-    def to_s(lang = nil)
-      lang = @lang || lang # Use the Literals lang when given
-      if @obj.is_a?(URI)
-        "<#{@obj.to_s}>"
-      elsif @obj === true
-        "true"
-      elsif @obj === false
-        "false"
-      elsif @obj.is_a?(Numeric)
-        @obj.to_s
+    def self.build(o)
+      if o.is_a?(::URI)
+        IqRdf::Literal::URI.new(o)
+      elsif o === true || o === false
+        IqRdf::Literal::Boolean.new(o)
+      elsif o.is_a?(::Numeric)
+        IqRdf::Literal::Numeric.new(o)
       else
-        quote = @obj.to_s.include?("\n") ? '"""' : '"'
-        "#{quote}#{@obj.to_s.gsub("\\", "\\\\\\\\").gsub(/"/, "\\\"")}#{quote}#{(lang && lang != :none) ? "@#{lang}" : ""}"
+        IqRdf::Literal::String.new(o)
       end
     end
 
+    def to_s(parent_lang = nil)
+      lang = @lang || parent_lang # Use the Literals lang when given
+      quote = @obj.to_s.include?("\n") ? '"""' : '"'
+      "#{quote}#{@obj.to_s.gsub("\\", "\\\\\\\\").gsub(/"/, "\\\"")}#{quote}" <<
+          ((lang && lang != :none) ? "@#{lang}" : "") <<
+          (@datatype ? "^^<#{@datatype.to_s}>" : "")
+    end
+
     def build_xml(xml, &block)
-      if @obj.is_a?(URI)
-        block.call("rdf:resource" => @obj.to_s)
-      else
-        opts = {}
-        { Integer => "http://www.w3.org/2001/XMLSchema#integer",
-          Float => "http://www.w3.org/2001/XMLSchema#decimal",
-          TrueClass => "http://www.w3.org/2001/XMLSchema#boolean",
-          FalseClass => "http://www.w3.org/2001/XMLSchema#boolean",
-        }.each do |klass, s|
-          opts["rdf:datatype"] = s if @obj.is_a?(klass)
-        end
-        opts["xml:lang"] = @lang if @lang
-        block.call(@obj.to_s, opts)
-      end
+      opts = {}
+      opts["rdf:datatype"] = @datatype.to_s if @datatype
+      opts["xml:lang"] = @lang if @lang
+      block.call(@obj.to_s, opts)
     end
 
     alias_method :full_uri, :to_s

data/lib/iq_rdf/namespace.rb

@@ -38,7 +38,7 @@ module IqRdf
     end
 
     # Namespace only methods
-    
+
     def self.create(token, uri_prefix)
       klass_name = self.class_name(token)
       klass = IqRdf.const_defined?(klass_name) ? IqRdf.const_get(klass_name) : IqRdf.const_set(klass_name, Class.new(self))
@@ -66,6 +66,6 @@ module IqRdf
     def self.class_name(name)
       name.to_s.gsub(/(^|_)(.)/) { $2.upcase }
     end
-  
+
   end
-end
+end

data/lib/iq_rdf/plain_turtle_literal.rb

@@ -27,4 +27,4 @@ module IqRdf
     alias_method :full_uri, :to_s
 
   end
-end
+end

data/lib/iq_rdf/predicate_namespace.rb

@@ -44,7 +44,7 @@ module IqRdf
             o = IqRdf::Default.build_uri(o)
           else
             return nil if options[:suppress_if_empty] === true && (o.nil? || o === "")
-            o = Literal.new(o)
+            o = Literal.build(o)
           end
           predicate << o
         end

data/lib/iq_rdf/rails/iq_rdf.rb

@@ -38,6 +38,6 @@ module ActionView
         EOV
       end
     end
-    
+
   end
 end

data/lib/iq_rdf/uri.rb

@@ -66,4 +66,4 @@ module IqRdf
     end
 
   end
-end
+end

data/lib/iq_rdf/version.rb

@@ -13,5 +13,5 @@
 #   limitations under the License.
 
 module IqRdf
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/iq_rdf.rb

@@ -18,6 +18,10 @@ require 'iq_rdf/blank_node'
 require 'iq_rdf/predicate'
 
 require 'iq_rdf/literal'
+require 'iq_rdf/literal/boolean'
+require 'iq_rdf/literal/string'
+require 'iq_rdf/literal/uri'
+require 'iq_rdf/literal/numeric'
 require 'iq_rdf/plain_turtle_literal'
 require 'iq_rdf/namespace'
 require 'iq_rdf/collection'
@@ -75,4 +79,4 @@ module IqRdf
     Namespace.dummy_empty_namespace.build_uri(uri, type, &block)
   end
 
-end
+end

data/test/turtle_test.rb

@@ -17,7 +17,7 @@ $LOAD_PATH << File.dirname(__FILE__)
 require 'test_helper'
 
 class TurtleTest < Test::Unit::TestCase
-  
+
   def test_basic_turtle_output
     document = IqRdf::Document.new('http://www.test.de/', :lang => :de)
     document.namespaces :foaf => 'http://xmlns.com/foaf/0.1/'
@@ -136,6 +136,7 @@ rdf
       t.age(32)
       t.married(false)
       t.weight(65.8)
+      t.complex(IqRdf::Literal.new("A very complex type", :none, URI.parse("http://this.com/is#complex")))
       t.quotes("\"I'm \\quoted\"")
       t.line_breaks("I'm written\nover two lines")
       t.some_literal(IqRdf::Literal.new("text", :de))
@@ -153,6 +154,7 @@ rdf
            :age 32;
            :married false;
            :weight 65.8;
+           :complex "A very complex type"^^<http://this.com/is#complex>;
            :quotes "\\"I'm \\\\quoted\\""@de;
            :line_breaks """I'm written
 over two lines"""@de;
@@ -213,5 +215,5 @@ rdf
 ].
 rdf
   end
-  
-end
+
+end

data/test/xml_test.rb

@@ -17,7 +17,7 @@ $LOAD_PATH << File.dirname(__FILE__)
 require 'test_helper'
 
 class XmlTest < Test::Unit::TestCase
-  
+
   def test_basic_xml_output
     document = IqRdf::Document.new('http://www.test.de/', :lang => :de)
     document.namespaces :foaf => 'http://xmlns.com/foaf/0.1/'
@@ -68,7 +68,7 @@ rdf
       document.namespaces :skos => 'http://www.w3.org/2008/05/skos#', :foaf => 'http://xmlns.com/foaf/0.1/', :upb => 'http://www.upb.de/'
 
       document << IqRdf::testemann.myCustomNote("This is an example", :lang => :en) # :testemann :myCustomNote "This is an example"@en.
-     
+
       document << IqRdf::testemann(IqRdf::Foaf::build_uri("Person")).Foaf::name("Heinz Peter Testemann", :lang => :none) # :testemann a foaf:Person; foaf:name "Heinz Peter Testemann" .
       document << IqRdf::testemann.Foaf::knows(IqRdf::testefrau) # :testemann foaf:knows :testefrau .
       document << IqRdf::testemann.Foaf::nick("Crash test dummy") # :testemann foaf:nick "Crash test dummy"@de .
@@ -178,6 +178,7 @@ skos:testnode :test32 [
         t.age(32)
         t.married(false)
         t.weight(65.8)
+        t.complex(IqRdf::Literal.new("A very complex type", :none, URI.parse("http://this.com/is#complex")))
         t.quotes("\"I'm \\quoted\"")
         t.line_breaks("I'm written\nover two lines")
         t.some_literal(IqRdf::Literal.new("text", :de))
@@ -193,6 +194,7 @@ skos:testnode :test32 [
     <age rdf:datatype="http://www.w3.org/2001/XMLSchema#integer">32</age>
     <married rdf:datatype="http://www.w3.org/2001/XMLSchema#boolean">false</married>
     <weight rdf:datatype="http://www.w3.org/2001/XMLSchema#decimal">65.8</weight>
+    <complex rdf:datatype="http://this.com/is#complex" xml:lang="none">A very complex type</complex>
     <quotes>"I'm \\quoted"</quotes>
     <line_breaks>I'm written
 over two lines</line_breaks>
@@ -232,4 +234,4 @@ rdf
 rdf
   end
 
-  end
+  end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: iq_rdf
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Till Schulte-Coerne
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-25 00:00:00 Z
+date: 2012-02-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false
@@ -63,6 +63,10 @@ files:
 - lib/iq_rdf/blank_node.rb
 - lib/iq_rdf/collection.rb
 - lib/iq_rdf/document.rb
+- lib/iq_rdf/literal/boolean.rb
+- lib/iq_rdf/literal/numeric.rb
+- lib/iq_rdf/literal/string.rb
+- lib/iq_rdf/literal/uri.rb
 - lib/iq_rdf/literal.rb
 - lib/iq_rdf/namespace.rb
 - lib/iq_rdf/node.rb