spira 0.0.3 → 0.0.4

data/CHANGES.md

@@ -1,6 +1,13 @@
 # Changelog for Spira <http://github.com/datagraph/spira>
- 
+
 ## untagged
+ * 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.
+ * Resource#new returns to the public API as a way to create a resource with a
+   new blank node subject.
+
+## 0.0.3
  * Bumped promise dependency to 0.1.1 to fix a Ruby 1.9 warning
  * Rework error handling when a repository is not configured; this should
    always now raise a Spira::NoRepositoryError regardless of what operation 

data/README

@@ -94,9 +94,12 @@ Then use your model classes, in a way more or less similar to any number of ORMs
     hits = CD.for 'queens-greatest-hits'
     hits.artist == artist == queen
 
-### Absolute and Relative URIs
+### URIs and Blank Nodes
 
-A class with a base URI can reference objects by a short name:
+Spira instances have a subject, which is either a URI or a blank node.
+
+A class with a base URI can instantiate with a string (or anything, via to_s),
+and it will have a URI representation:
 
     Artist.for('queen')
 
@@ -108,12 +111,25 @@ can always access classes with a full URI:
 If you have a URI that you would like to look at as a Spira resource, you can instantiate it from the URI:
 
     RDF::URI.new('http://example.org/my-hidden-cds/new-kids').as(Artist)
-    # => <Artist @uri=http://example.org/my-hidden-cds/new-kids>
+    # => <Artist @subject=http://example.org/my-hidden-cds/new-kids>
 
 Any call to 'for' with a valid identifier will always return an object with nil
 fields.  It's a way of looking at a given resource, not a closed-world mapping
 to one.
 
+You can use also use blank nodes more or less as you would a URI:
+
+    remix_artist = Artist.for(RDF::Node.new)
+    # => <Artist @subject=#<RDF::Node:0xd1d314(_:g13751060)>>
+    RDF::Node.new.as(Artist)
+    # => <Artist @subject=#<RDF::Node:0xd1d314(_:g13751040)>>
+
+Finally, you can create an instance of a Spira projection with #new, and you'll
+get an instance with a shiny new blank node subject:
+
+    formerly_known_as_prince = Artist.new
+    # => <Artist @subject=#<RDF::Node:0xd1d314(_:g13747140)>>
+
 ### Class Options
 
 A number of options are available for Spira classes.

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/lib/spira.rb

@@ -110,6 +110,7 @@ module Spira
   module_function :type_alias
 
   autoload :Resource,         'spira/resource'
+  autoload :Base,             'spira/base'
   autoload :Type,             'spira/type'
   autoload :Types,            'spira/types'
   autoload :Errors,           'spira/errors'

data/lib/spira/base.rb

@@ -0,0 +1,11 @@
+module Spira
+
+  ##
+  # Spira::Base does nothing but include Spira::Resource, if it's more your
+  # style to do inheritance than module inclusion.
+  #
+  # @see Spira::Resource
+  class Base
+    include Spira::Resource
+  end
+end

data/lib/spira/resource/class_methods.rb

@@ -67,8 +67,8 @@ module Spira
         if !self.type.nil? && attributes[:type]
           raise TypeError, "#{self} has an RDF type, #{self.type}, and cannot accept one as an argument."
         end
-        uri = id_for(identifier)
-        self.new(uri, attributes)
+        subject = id_for(identifier)
+        self.new(attributes.merge(:_subject => subject))
       end
 
       ##

data/lib/spira/resource/instance_methods.rb

@@ -20,15 +20,17 @@ module Spira
       attr_reader :subject
 
       ## 
-      # Initialize a new Spira::Resource instance of this resource class.  This
-      # method should not be called directly, use
+      # Initialize a new Spira::Resource instance of this resource class using
+      # a new blank node subject.  Accepts a hash of arguments for initial
+      # attributes.  To use a URI or existing blank node as a subject, use
       # {Spira::Resource::ClassMethods#for} instead.
       #
-      # @param [RDF::URI, RDF::Node] identifier The URI or URI fragment for this instance
       # @param [Hash] opts Default attributes for this instance
       # @see Spira::Resource::ClassMethods#for
-      def initialize(identifier, opts = {})
-        @subject = identifier
+      # @see RDF::URI#as
+      # @see RDF::Node#as
+      def initialize(opts = {})
+        @subject = opts[:_subject] || RDF::Node.new
         reload(opts)
       end
   
@@ -184,7 +186,7 @@ module Spira
       #
       # @private
       def inspect
-        "<#{self.class}:#{self.object_id} uri: #{@subject}>"
+        "<#{self.class}:#{self.object_id} @subject: #{@subject}>"
       end
  
       ##

data/lib/spira/types.rb

@@ -20,6 +20,7 @@ module Spira
     require 'spira/types/string'
     require 'spira/types/float'
     require 'spira/types/uri'
+    require 'spira/types/decimal'
 
 
   end

data/lib/spira/types/decimal.rb

@@ -0,0 +1,29 @@
+module Spira::Types
+
+  ##
+  # A {Spira::Type} for integer values.  Values will be associated with the
+  # `XSD.integer` type.
+  #
+  # A {Spira::Resource} property can reference this type as
+  # `Spira::Types::Integer`, `Integer`, or `XSD.integer`.
+  #
+  # @see Spira::Type
+  # @see http://rdf.rubyforge.org/RDF/Literal.html
+  class Decimal
+    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)
+    end
+
+    register_alias XSD.decimal
+
+  end
+end

data/lib/spira/version.rb

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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Ben Lavender
@@ -15,7 +15,7 @@ bindir:
 - bin
 cert_chain: []
 
-date: 2010-06-07 00:00:00 +02:00
+date: 2010-06-21 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,13 +23,13 @@ dependencies:
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 1
-        - 10
-        version: 0.1.10
+        - 2
+        - 0
+        version: 0.2.0
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -65,13 +65,13 @@ dependencies:
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 1
-        - 10
-        version: 0.1.10
+        - 2
+        - 0
+        version: 0.2.0
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -116,6 +116,7 @@ files:
 - README
 - UNLICENSE
 - VERSION
+- lib/spira/base.rb
 - lib/spira/errors.rb
 - lib/spira/exceptions.rb
 - lib/spira/resource/class_methods.rb
@@ -126,6 +127,7 @@ files:
 - lib/spira/type.rb
 - lib/spira/types/any.rb
 - lib/spira/types/boolean.rb
+- lib/spira/types/decimal.rb
 - lib/spira/types/float.rb
 - lib/spira/types/integer.rb
 - lib/spira/types/string.rb