acts_as_rdf 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/acts_as_rdf.rb

@@ -40,26 +40,26 @@ module ActsAsRdf
   module InstanceMethods
 
     # current tested formats are rdfxml, turtle, ntriples
-    def to_rdf(host = "http://localhost", format = :rdfxml)
-      graph = to_graph(host)
-      return to_output(graph, host, format)
+    def to_rdf(request = nil, format = :rdfxml)
+      graph = to_graph(request)
+      return to_output(graph, request, format)
     end
 
     protected
 
-    def to_graph(host, graph = RDF::Graph.new)
+    def to_graph(request, graph = RDF::Graph.new)
 
       if 'Array'.eql?(self.class.name) then
         self.each do |element|
-          graph = self.to_graph(host, graph)
+          graph = self.to_graph(request, graph)
         end
       else
-        graph << [to_uri(self, host), RDF.type, to_uri(self.class, host)]
+        graph << [to_uri(self, request), RDF.type, to_uri(self.class, request)]
 
         self.attributes.each do |attr, value|
-          graph << [to_uri(self, host), to_uri(attr, host), RDF::Literal.new(value)]
+          graph << [to_uri(self, request), to_uri(attr, request), RDF::Literal.new(value)]
           if ('name'.eql?(attr)) then
-            graph << [to_uri(self, host), RDF::RDFS.label, RDF::Literal.new(value)]
+            graph << [to_uri(self, request), RDF::RDFS.label, RDF::Literal.new(value)]
           end
         end
 
@@ -71,10 +71,10 @@ module ActsAsRdf
               if association_objects != nil then
                 if 'Array'.eql?(association_objects.class.name) then
                   association_objects.each do |obj|
-                    graph << [to_uri(self, host), to_uri(soc.class_name, host), to_uri(obj, host)]
+                    graph << [to_uri(self, request), to_uri(soc.class_name, request), to_uri(obj, request)]
                   end
                 else
-                  graph << [to_uri(self, host), to_uri(soc.class_name, host), to_uri(association_objects, host)]
+                  graph << [to_uri(self, request), to_uri(soc.class_name, request), to_uri(association_objects, request)]
                 end
               end
             end
@@ -85,8 +85,8 @@ module ActsAsRdf
       return graph
     end
 
-    def to_output(graph, host, format)
-      base_uri = RDF::URI.new(host)
+    def to_output(graph, request, format)
+      base_uri = RDF::URI.new(get_base_uri(request))
 
       return RDF::Writer.for(format).buffer(:base_uri => base_uri, :default_namespace => base_uri, :prefixes => get_prefixes()) { |writer|
         graph.each_statement do |statement|
@@ -95,17 +95,20 @@ module ActsAsRdf
       }
     end
 
-    def to_uri(thing, host)
+    def to_uri(thing, request)
       if (thing.class.name != nil)
         if ('String'.eql?(thing.class.name) || 'Class'.eql?(thing.class.name)) then
-          return RDF::URI.new("#{host}/#{thing.to_s}")
+          return RDF::URI.new("#{get_base_uri(request)}/#{thing.to_s}")
         end
-        return RDF::URI.new("#{host}/#{thing.class.name.tableize}/#{thing.id}")
+        return RDF::URI.new("#{get_base_uri(request)}/#{thing.class.name.tableize}/#{thing.id}")
       end
 
-      return RDF::URI.new("#{host}##{thing.to_s}")
+      return RDF::URI.new("#{get_base_uri(request)}##{thing.to_s}")
     end
 
+    def get_base_uri(request)
+      request.nil? ? "http://locahost" : "#{request.protocol}://#{request.host}:#{request.port}"
+    end
   end
 end
 

data/test/test_to_rdf.rb

@@ -13,14 +13,13 @@ class RdfTest < Test::Unit::TestCase
   end
 
   def test_to_rdf
-    host = 'http://localhost'
     formats = [:rdfxml, :turtle, :ntriples]
     formats.each do |format|
       Mixin.find(:all).each do |o|
-        puts o.to_rdf(host, format)
+        puts o.to_rdf(nil, format)
       end
       MixinRelation.find(:all).each do |o|
-        puts o.to_rdf(host, format)
+        puts o.to_rdf(nil, format)
       end
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_rdf
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Andrew Sodt
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-26 00:00:00 -07:00
+date: 2010-10-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency