spira 0.0.11 → 0.0.12

data/CHANGES.md

@@ -1,5 +1,10 @@
 # Changelog for Spira <http://github.com/datagraph/spira>
 
+## 0.0.12
+ * Implemented #validate, #validate! (refactored from #save!)
+ * Force to_a on query results when constructing to force the promise-like
+   semantics of SPARQL::Client
+
 ## 0.0.11
  * Bumped the version dependency on rdf-isomorphic to 0.3.0
  * Added support for before_create, after_create, before_save, after_save,

data/lib/spira/resource/dsl.rb

@@ -70,19 +70,25 @@ module Spira
       # @see Spira::Type
       # @return [Void]
       def property(name, opts = {} )
-        add_accessors(name,opts,:hash_accessors)
+        predicate = predicate_for(opts[:predicate], name)
+        type = type_for(opts[:type])
+        @properties[name] = { :predicate => predicate, :type => type }
+        add_accessors(name,opts)
       end
 
       ##
       # The plural form of `property`.  `Has_many` has the same options as
       # `property`, but instead of a single value, a Ruby Array of objects will
-      # be created instead.  Be warned that this should be a Set to match RDF
-      # semantics, but this is not currently implemented.  Duplicate values of
-      # an array will be lost on save.  
+      # be created instead.
+      #
+      # has_many corresponds to an RDF subject with several triples of the same
+      # predicate.  This corresponds to a Ruby Set, which will be returned when
+      # the property is accessed.  Arrays will be accepted for new values, but
+      # ordering and duplicate values will be lost on save.
       #
       # @see Spira::Resource::DSL#property
       def has_many(name, opts = {})
-        add_accessors(name,opts,:hash_accessors)
+        property(name, opts)
         @lists[name] = true
       end
 
@@ -215,34 +221,48 @@ module Spira
       end
 
       ##
-      # Add getters and setters for a property or list.
+      # Determine the type for a property based on the given type option
+      #
+      # @param [nil, Spira::Type, Constant] type
+      # @return Spira::Type
+      # @private
+      def type_for(type) 
+        case
+            when type.nil?
+              Spira::Types::Any
+            when type.is_a?(Symbol) || type.is_a?(String)
+              type
+            when !(Spira.types[type].nil?)
+              Spira.types[type]
+            else
+              raise TypeError, "Unrecognized type: #{type}"
+          end
+      end
+
+      ##
+      # Determine the predicate for a property based on the given predicate, name, and default vocabulary
+      #
+      # @param  [#to_s, #to_uri] predicate
+      # @param  [Symbol] name
+      # @return [RDF::URI]
       # @private
-      def add_accessors(name, opts, accessors_method)
-        predicate = case
-          when opts[:predicate]
-            opts[:predicate]
+      def predicate_for(predicate, name)
+        case
+          when predicate.respond_to?(:to_uri) && predicate.to_uri.absolute?
+            predicate
           when @default_vocabulary.nil?
             raise ResourceDeclarationError, "A :predicate option is required for types without a default vocabulary"
-          else @default_vocabulary
+          else
+            # FIXME: use rdf.rb smart separator after 0.3.0 release
             separator = @default_vocabulary.to_s[-1,1] =~ /(\/|#)/ ? '' : '/'
             RDF::URI.intern(@default_vocabulary.to_s + separator + name.to_s)
         end
-        if !(predicate.respond_to?(:to_uri))
-         raise ResourceDeclarationError, ":predicate options must be RDF::URIs or strings with a default vocabulary declared"
-        end
-        type = case
-            when opts[:type].nil?
-              Spira::Types::Any
-            when opts[:type].is_a?(Symbol) || opts[:type].is_a?(String)
-              opts[:type]
-            when !(Spira.types[opts[:type]].nil?)
-              Spira.types[opts[:type]]
-            else
-              raise TypeError, "Unrecognized type: #{opts[:type]}"
-          end
-        @properties[name] = {}
-        @properties[name][:predicate] = predicate
-        @properties[name][:type] = type
+      end
+
+      ##
+      # Add getters and setters for a property or list.
+      # @private
+      def add_accessors(name, opts)
         name_equals = (name.to_s + "=").to_sym
 
         self.send(:define_method,name_equals) do |arg|

data/lib/spira/resource/instance_methods.rb

@@ -78,14 +78,14 @@ module Spira
       # @return [Hash{Symbol => Any}] attributes
       # @private
       def reload_attributes()
-        statements = self.class.repository_or_fail.query(:subject => @subject)
+        statements = self.class.repository_or_fail.query(:subject => @subject).to_a
         attributes = {}
 
         # Set attributes for each statement corresponding to a predicate
         self.class.properties.each do |name, property|
           if self.class.is_list?(name)
             values = Set.new
-            collection = statements.query(:subject => @subject, :predicate => property[:predicate]) unless statements.empty?
+            collection = statements.select{|s| s.subject == @subject && s.predicate == property[:predicate]} unless statements.empty?
             unless collection.nil?
               collection.each do |statement|
                 values << self.class.build_value(statement,property[:type], @cache)
@@ -93,7 +93,7 @@ module Spira
             end
             attributes[name] = values
           else
-            statement = statements.query(:subject => @subject, :predicate => property[:predicate]).first unless statements.empty?
+            statement = statements.select{|s| s.subject == @subject && s.predicate == property[:predicate]}.first unless statements.empty?
             attributes[name] = self.class.build_value(statement, property[:type], @cache)
           end
         end
@@ -162,16 +162,12 @@ module Spira
         existed = (self.respond_to?(:before_create) || self.respond_to?(:after_create)) && !self.type.nil? && exists?
         before_create if self.respond_to?(:before_create) && !self.type.nil? && !existed
         before_save if self.respond_to?(:before_save)
-        unless self.class.validators.empty?
-          errors.clear
-          self.class.validators.each do | validator | self.send(validator) end
-          if errors.empty?
+        # we use the non-raising validate and check it to make a slightly different error message.  worth it?...
+        case validate
+          when true
             _update!
-          else
+          when false
             raise(ValidationError, "Could not save #{self.inspect} due to validation errors: " + errors.each.join(';'))
-          end
-        else
-          _update!
         end
         after_create if self.respond_to?(:after_create) && !self.type.nil? && !existed
         after_save if self.respond_to?(:after_save)
@@ -464,6 +460,28 @@ module Spira
         @errors ||= Spira::Errors.new
       end
 
+      ##
+      # Run any model validations and populate the errors object accordingly.  
+      # Returns true if the model is valid, false otherwise
+      #
+      # @return [True, False]
+      def validate
+        unless self.class.validators.empty?
+          errors.clear
+          self.class.validators.each do | validator | self.send(validator) end
+        end
+        errors.empty?
+      end
+
+      ## 
+      # Run validations on this model and raise a Spira::ValidationError if the validations fail.
+      #
+      # @see #validate
+      # @return true
+      def validate!
+        validate || raise(ValidationError, "Failed to validate #{self.inspect}: " + errors.each.join(';'))
+      end
+
       ##
       # Returns true if any data exists for this subject in the backing RDF store
       #

data/lib/spira/version.rb

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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 11
-  version: 0.0.11
+  - 12
+  version: 0.0.12
 platform: ruby
 authors: 
 - Ben Lavender
@@ -15,13 +15,14 @@ bindir:
 - bin
 cert_chain: []
 
-date: 2010-11-03 00:00:00 -05:00
+date: 2011-02-10 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rdf-spec
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -36,6 +37,7 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -50,6 +52,7 @@ dependencies:
   name: yard
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -64,6 +67,7 @@ dependencies:
   name: rdf
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -78,6 +82,7 @@ dependencies:
   name: rdf-isomorphic
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -92,6 +97,7 @@ dependencies:
   name: promise
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -115,7 +121,6 @@ files:
 - AUTHORS
 - README
 - UNLICENSE
-- VERSION
 - lib/spira/base.rb
 - lib/spira/errors.rb
 - lib/spira/exceptions.rb
@@ -148,6 +153,7 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -157,6 +163,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 2
       version: 1.8.2
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -166,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: spira
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A framework for using the information in RDF.rb repositories as model objects.

data/VERSION

@@ -1 +0,0 @@
-0.0.11