iq_rdf 0.1.7 → 0.1.8

data/lib/iq_rdf/document.rb

@@ -85,7 +85,7 @@ module IqRdf
 
       render_resource = lambda do |res, lang| # XXX: does not belong here
         if res.is_a?(IqRdf::Literal)
-          return res.to_s(lang)
+          return res.to_ntriples(lang)
         elsif res.is_a?(IqRdf::BlankNode)
           return render_blank_node.call(res)
         elsif res.is_a?(IqRdf::Collection)

data/lib/iq_rdf/literal/uri.rb

@@ -11,6 +11,10 @@ module IqRdf
         "<#{@obj.to_s}>"
       end
 
+      def to_ntriples(parent_lang = nil)
+        "<#{@obj.to_s}>"
+      end
+
       def build_xml(xml, &block)
         block.call("rdf:resource" => @obj.to_s)
       end

data/lib/iq_rdf/literal.rb

@@ -49,6 +49,20 @@ module IqRdf
       "#{quote}#{@obj.to_s.gsub("\\", "\\\\\\\\").gsub(/"/, "\\\"")}#{quote}#{lang}#{datatype}"
     end
 
+    def to_ntriples(parent_lang = nil)
+      quote = @obj.to_s.include?("\n") ? '"""' : '"'
+      suffix = if @datatype.is_a?(::URI)
+        "^^<#{@datatype.to_s}>"
+      elsif @datatype.is_a?(IqRdf::Uri)
+        "^^<#{@datatype.full_uri}>"
+      else
+        lang = @lang || parent_lang # Use the Literals lang when given
+        (lang && lang != :none) ? "@#{lang}" : ""
+      end
+
+      "#{quote}#{@obj.to_s.gsub("\\", "\\\\\\\\").gsub(/"/, "\\\"")}#{quote}#{suffix}"
+    end
+
     def build_xml(xml, &block)
       opts = {}
       if @datatype.is_a?(::URI)

data/lib/iq_rdf/version.rb

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

data/lib/iq_rdf.rb

@@ -22,7 +22,6 @@ 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'
 require 'iq_rdf/predicate_namespace'

data/test/ntriples_test.rb

@@ -52,7 +52,7 @@ class NTriplesTest < Test::Unit::TestCase
     document = IqRdf::Document.new('http://www.test.de/')
 
     document << IqRdf::build_full_uri_subject(URI.parse('http://www.xyz.de/#test'),
-        IqRdf::build_uri('SomeType')) do |t|
+      IqRdf::build_uri('SomeType')) do |t|
       t.sometest("testvalue")
     end
 
@@ -69,7 +69,7 @@ class NTriplesTest < Test::Unit::TestCase
         build_full_uri_predicate(URI.parse("http://www.test.org/hoho"), 42)
 
     assert_equal(<<-rdf.strip, document.to_ntriples.strip)
-<http://www.test.de/testemann> <http://www.test.org/hoho> 42 .
+<http://www.test.de/testemann> <http://www.test.org/hoho> "42"^^<http://www.w3.org/2001/XMLSchema#integer> .
     rdf
   end
 
@@ -171,16 +171,50 @@ _:b2 <http://www.umweltprobenbank.de/title> "blubb"@de .
     rdf
   end
 
-  def test_supress_if_empty_option
-    document = IqRdf::Document.new('http://www.test.de/')
+  def test_literals
+    document = IqRdf::Document.new('http://www.test.de/', :lang => :de)
     document.namespaces :foaf => 'http://xmlns.com/foaf/0.1/'
 
-    document << IqRdf::testemann.Foaf::knows(:suppress_if_empty => true)
-    document << IqRdf::testemann.Foaf::knows(nil, :suppress_if_empty => true)
-    document << IqRdf::testemann.Foaf::knows("", :suppress_if_empty => true)
-    document << IqRdf::testemann.Foaf::knows([], :suppress_if_empty => true)
+    document << IqRdf::testemann do |t|
+      t.Foaf::knows(:testefrau)
+      t.Foaf.nick("Testy")
+      t.Foaf.lastname("Testemann", :lang => :none)
+      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.complex2(IqRdf::Literal.new("Shorter form", :none, IqRdf::myDatatype))
+      t.quotes("\"I'm \\quoted\"")
+      t.line_breaks("I'm written\nover two lines")
+      t.some_literal(IqRdf::Literal.new("text", :de))
+    end
 
-    assert_equal("", document.to_ntriples.strip)
-  end
+    assert_equal(<<rdf.strip, document.to_ntriples.strip)
+<http://www.test.de/testemann> <http://xmlns.com/foaf/0.1/knows> <http://www.test.de/testefrau> .
+<http://www.test.de/testemann> <http://xmlns.com/foaf/0.1/nick> "Testy"@de .
+<http://www.test.de/testemann> <http://xmlns.com/foaf/0.1/lastname> "Testemann" .
+<http://www.test.de/testemann> <http://www.test.de/age> "32"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<http://www.test.de/testemann> <http://www.test.de/married> "false"^^<http://www.w3.org/2001/XMLSchema#boolean> .
+<http://www.test.de/testemann> <http://www.test.de/weight> "65.8"^^<http://www.w3.org/2001/XMLSchema#decimal> .
+<http://www.test.de/testemann> <http://www.test.de/complex> "A very complex type"^^<http://this.com/is#complex> .
+<http://www.test.de/testemann> <http://www.test.de/complex2> "Shorter form"^^<http://www.test.de/myDatatype> .
+<http://www.test.de/testemann> <http://www.test.de/quotes> "\\"I'm \\\\quoted\\""@de .
+<http://www.test.de/testemann> <http://www.test.de/line_breaks> """I'm written
+over two lines"""@de .
+<http://www.test.de/testemann> <http://www.test.de/some_literal> "text"@de .
+rdf
+    end
+
+    def test_supress_if_empty_option
+      document = IqRdf::Document.new('http://www.test.de/')
+      document.namespaces :foaf => 'http://xmlns.com/foaf/0.1/'
 
-end
+      document << IqRdf::testemann.Foaf::knows(:suppress_if_empty => true)
+      document << IqRdf::testemann.Foaf::knows(nil, :suppress_if_empty => true)
+      document << IqRdf::testemann.Foaf::knows("", :suppress_if_empty => true)
+      document << IqRdf::testemann.Foaf::knows([], :suppress_if_empty => true)
+
+      assert_equal("", document.to_ntriples.strip)
+    end
+
+  end

data/test/turtle_test.rb

@@ -141,7 +141,6 @@ rdf
       t.quotes("\"I'm \\quoted\"")
       t.line_breaks("I'm written\nover two lines")
       t.some_literal(IqRdf::Literal.new("text", :de))
-      t.messy(IqRdf::PlainTurtleLiteral.new('"this_already_is_in_turtle_format"@en'))
     end
 
     assert_equal(<<rdf, document.to_turtle)
@@ -160,8 +159,7 @@ rdf
            :quotes "\\"I'm \\\\quoted\\""@de;
            :line_breaks """I'm written
 over two lines"""@de;
-           :some_literal "text"@de;
-           :messy "this_already_is_in_turtle_format"@en.
+           :some_literal "text"@de.
 rdf
   end
 

metadata

@@ -1,61 +1,47 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: iq_rdf
-version: !ruby/object:Gem::Version 
-  hash: 21
+version: !ruby/object:Gem::Version
+  version: 0.1.8
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 7
-  version: 0.1.7
 platform: ruby
-authors: 
+authors:
 - Till Schulte-Coerne
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-10-17 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+date: 2012-10-18 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &2161452060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id001
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  name: bundler
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2161452060
+- !ruby/object:Gem::Dependency
+  name: builder
+  requirement: &2161451340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id002
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  name: builder
   prerelease: false
+  version_requirements: *2161451340
 description: IqRdf - A builder like rdf library for ruby and rails
-email: 
+email:
 - till.schulte-coerne@innoq.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
 - LICENSE
-files: 
+files:
 - LICENSE
 - README.md
 - Rakefile
@@ -70,7 +56,6 @@ files:
 - lib/iq_rdf/literal.rb
 - lib/iq_rdf/namespace.rb
 - lib/iq_rdf/node.rb
-- lib/iq_rdf/plain_turtle_literal.rb
 - lib/iq_rdf/predicate.rb
 - lib/iq_rdf/predicate_namespace.rb
 - lib/iq_rdf/rails/iq_rdf.rb
@@ -85,38 +70,35 @@ files:
 - test/xml_test.rb
 homepage: http://github.com/innoq/iq_rdf
 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: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 3133402933398086512
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 3133402933398086512
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: IqRdf - A builder like rdf library for ruby and rails
-test_files: 
+test_files:
 - test/iq_rdf_test.rb
 - test/ntriples_test.rb
 - test/test_helper.rb

data/lib/iq_rdf/plain_turtle_literal.rb

@@ -1,30 +0,0 @@
-#   Copyright 2011 innoQ Deutschland GmbH
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-
-module IqRdf
-  # This is a dummy class for some needs where
-  class PlainTurtleLiteral < Literal
-
-    def initialize(obj)
-      @obj = obj
-    end
-
-    def to_s(lang = nil)
-      @obj.to_s
-    end
-
-    alias_method :full_uri, :to_s
-
-  end
-end