spira 0.0.4 → 0.0.5

data/AUTHORS

@@ -1 +1,2 @@
 * Ben Lavender <blavender@gmail.com>
+* Nicholas J Humfrey <njh@aelius.com>

data/CHANGES.md

@@ -1,6 +1,15 @@
 # Changelog for Spira <http://github.com/datagraph/spira>
 
-## untagged
+## 0.0.5
+ * Relations can now find related classes in modules, either by absolute
+   reference, or by class name if they are in the same namespace.  
+ * Fix a bug with default_vocabulary in which a '/' was appended to
+   vocabularies ending in '#' 
+ * Fix a bug with the Decimal type where round-tripping was incorrect
+ * Fix some error messages that were missing closing parentheses
+
+## 0.0.4
+ * Added a Decimal type
  * Small updates for RDF.rb 0.2.0 compatibility
  * Add a Spira::Base class that can be inherited from for users who prefer to
    inherit rather than include.

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/lib/spira/resource/dsl.rb

@@ -139,13 +139,7 @@ module Spira
           when type.is_a?(Class) && type.ancestors.include?(Spira::Type)
             type.unserialize(statement.object)
           when type.is_a?(Symbol) || type.is_a?(String)
-            klass = begin 
-              Kernel.const_get(type.to_s)
-            rescue NameError
-              unless klass.is_a?(Class) && klass.ancestors.include?(Spira::Resource)
-                raise TypeError, "#{type} is not a Spira Resource (referenced as #{type} by #{self}"
-              end
-            end
+            klass = classize_resource(type)
             promise { klass.for(statement.object) }
           else
             raise TypeError, "Unable to unserialize #{statement.object} as #{type}"
@@ -159,7 +153,13 @@ module Spira
           when type.is_a?(Class) && type.ancestors.include?(Spira::Type)
             type.serialize(value)
           when value && value.class.ancestors.include?(Spira::Resource)
+            klass = classize_resource(type)
+            unless klass.ancestors.include?(value.class)
+              raise TypeError, "#{value} is an instance of #{value.class}, expected #{klass}"
+            end
             value.subject
+          when type.is_a?(Symbol) || type.is_a?(String)
+            klass = classize_resource(type)
           else
             raise TypeError, "Unable to serialize #{value} as #{type}"
         end
@@ -167,6 +167,52 @@ module Spira
 
       private
 
+      # Return the appropriate class object for a string or symbol
+      # representation.  Throws errors correctly if the given class cannot be
+      # located, or if it is not a Spira::Resource
+      # 
+      def classize_resource(type)
+        klass = nil
+        begin 
+          klass = qualified_const_get(type.to_s)
+        rescue NameError
+          raise NameError, "Could not find relation class #{type} (referenced as #{type} by #{self})"
+            klass.is_a?(Class) && klass.ancestors.include?(Spira::Resource)
+        end
+        unless klass.is_a?(Class) && klass.ancestors.include?(Spira::Resource)
+          raise TypeError, "#{type} is not a Spira Resource (referenced as #{type} by #{self})"
+        end
+        klass
+      end
+
+      # Resolve a constant from a string, relative to this class' namespace, if
+      # available, and from root, otherwise.
+      #
+      # FIXME: this is not really 'qualified', but it's one of those
+      # impossible-to-name functions.  Open to suggestions.
+      #
+      # @author njh
+      # @private
+      def qualified_const_get(str)
+        path = str.to_s.split('::')
+        from_root = path[0].empty?
+        if from_root
+          from_root = []
+          path = path[1..-1]
+        else
+          start_ns = ((Class === self)||(Module === self)) ? self : self.class
+          from_root = start_ns.to_s.split('::')
+        end
+        until from_root.empty?
+          begin
+            return (from_root+path).inject(Object) { |ns,name| ns.const_get(name) }
+          rescue NameError
+            from_root.delete_at(-1)
+          end
+        end
+        path.inject(Object) { |ns,name| ns.const_get(name) }
+      end
+
       ##
       # Add getters and setters for a property or list.
       # @private
@@ -177,7 +223,7 @@ module Spira
           when @default_vocabulary.nil?
             raise TypeError, "A :predicate option is required for types without a default vocabulary"
           else @default_vocabulary
-            separator = @default_vocabulary.to_s[-1,1] == "/" ? '' : '/'
+            separator = @default_vocabulary.to_s[-1,1] =~ /(\/|#)/ ? '' : '/'
             RDF::URI.new(@default_vocabulary.to_s + separator + name.to_s)
         end
         type = case

data/lib/spira/resource/instance_methods.rb

@@ -301,7 +301,7 @@ module Spira
       # @return [RDF::URI]
       # @raise [NoMethodError]
       def to_uri
-        uri || (raise NoMethodError, "No such method: :to_uri (this instance's subject is not a URI")
+        uri || (raise NoMethodError, "No such method: :to_uri (this instance's subject is not a URI)")
       end
 
       ##
@@ -319,7 +319,7 @@ module Spira
       # @return [RDF::Node]
       # @raise [NoMethodError]
       def to_node
-        @subject.node? ? @subject : (raise NoMethodError, "No such method: :to_uri (this instance's subject is not a URI")
+        @subject.node? ? @subject : (raise NoMethodError, "No such method: :to_uri (this instance's subject is not a URI)")
       end
 
       ##

data/lib/spira/types/decimal.rb

@@ -1,3 +1,5 @@
+require 'bigdecimal'
+
 module Spira::Types
 
   ##
@@ -13,14 +15,12 @@ module Spira::Types
     include Spira::Type
 
     def self.unserialize(value)
-      require 'bigdecimal' unless defined?(BigDecimal)
       object = value.object
       object.is_a?(BigDecimal) ? object : BigDecimal.new(object.to_s)
     end
 
     def self.serialize(value)
-      require 'bigdecimal' unless defined?(BigDecimal)
-      RDF::Literal.new(value, :datatype => XSD.decimal)
+      RDF::Literal.new(value.is_a?(BigDecimal) ? value.to_s('F') : value.to_s, :datatype => XSD.decimal)
     end
 
     register_alias XSD.decimal

data/lib/spira/version.rb

@@ -2,7 +2,7 @@ module Spira
   module VERSION
     MAJOR = 0
     MINOR = 0
-    TINY  = 4
+    TINY  = 5
     EXTRA = nil
 
     STRING = [MAJOR, MINOR, TINY].join('.')

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Ben Lavender
@@ -15,7 +15,7 @@ bindir:
 - bin
 cert_chain: []
 
-date: 2010-06-21 00:00:00 -05:00
+date: 2010-06-28 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -83,9 +83,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 1
         - 2
-        version: 0.1.2
+        - 0
+        version: 0.2.0
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -97,9 +97,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 1
-        - 1
-        version: 0.1.1
+        - 2
+        - 0
+        version: 0.2.0
   type: :runtime
   version_requirements: *id006
 description: Spira is a framework for using the information in RDF.rb repositories as model objects.