active-fedora 6.0.0.pre2 → 6.0.0.pre3

data/.gitmodules

@@ -1,4 +1,4 @@
 [submodule "jetty"]
 	path = jetty
 	url = git://github.com/projecthydra/hydra-jetty.git
-  ignore = all
+  ignore = dirty

data/History.txt

@@ -1,3 +1,6 @@
+5.5.1
+#34 Allow passing RDF::URI to rdf_type
+
 5.5.0
 Added support for complex rdf structures.
 Changed RdfDatastream to_solr so that it uses the dsid as the solr prefix, not the datastream class name

data/lib/active_fedora/rdf_node.rb

@@ -188,7 +188,7 @@ module ActiveFedora
 
       def rdf_type(uri_or_string=nil)
         if uri_or_string
-          uri = RDF::URI.new(uri_or_string) unless uri_or_string.kind_of? RDF::URI
+          uri = uri_or_string.kind_of?(RDF::URI) ? uri_or_string : RDF::URI.new(uri_or_string) 
           self.config[:type] = {predicate: RDF.type}
           @rdf_type = uri
         end

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "6.0.0.pre2"
+  VERSION = "6.0.0.pre3"
 end

data/spec/integration/complex_rdf_datastream_spec.rb

@@ -89,7 +89,7 @@ END
 
         class MediatorUser
           include ActiveFedora::RdfObject
-          rdf_type "http://purl.org/dc/terms/AgentClass"
+          rdf_type RDF::DC.AgentClass
           map_predicates do |map|
             map.title(:in=> RDF::DC)
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 6.0.0.pre2
+  version: 6.0.0.pre3
   prerelease: 6
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-24 00:00:00.000000000 Z
+date: 2013-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr