rdf-mapper 0.0.2 → 0.0.3

data/README.rdoc

@@ -25,10 +25,10 @@ The latest version of RDFMapper can be found at
 
 == Contribute
 
-Please note that RDFMapper in under heavy development right now, it's not yet
-production safe. Any contribution (bug tickets, code patches) is more than
-welcome. Email us at team@42cities.com or submit a ticket on
-GitHub[http://github.com/42cities/rdf-mapper/issues]
+Please note that RDFMapper in under *heavy* *development* right now, it's *not*
+*yet* suitable for production environment. Any contribution (bug tickets,
+code patches) is more than welcome. Email us at team@42cities.com or submit
+a ticket on GitHub[http://github.com/42cities/rdf-mapper/issues].
 
 
 = 5-minute crash course
@@ -186,3 +186,17 @@ That's pretty much all you need to know. Go try and let us know what you think!
 
 RDFMapper is free and unencumbered public domain software. For more information,
 see http://unlicense.org or the accompanying UNLICENSE file.
+
+
+== Roadmap
+
+Several important features are not yet implemented. Here's a rough list of what is still
+to be done:
+
+* Test coverage is extremely low (~10%)
+* Documentation coverage is mediocre 
+* REST adapter is missing
+* SPARQL adapter supports only simple `DESCRIBE` queries. At later stages it will most
+  likely use {sparql-client}[http://github.com/bendiken/sparql-client] library.
+* JSON support is missing. Will use {rdf-json}[http://github.com/bendiken/rdf-json] library.
+* `has_one` and `has_and_belongs_to_many` are missing

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/lib/adapters/rails.rb

@@ -38,7 +38,7 @@ module RDFMapper
       def save(instance)
         if instance[:rails_id].nil?
           obj = instance.class.find(instance.id.to_s).from(:rails)
-          instance[:rails_id] = obj.rails_id unless obj.nil?
+          instance[:rails_id] = obj[:rails_id] unless obj.nil?
         end
         if instance[:rails_id].nil?
           create(instance)
@@ -59,24 +59,27 @@ module RDFMapper
       # [-]
       ##
       def update(instance)
-        query = RDFMapper::Scope::Query.new(instance.class, :conditions => instance.attributes)
-        Query.new(query, @options).update
+        Query.new(default_query(instance), @options).update
       end
       
       ##
       # [-]
       ##
       def create(instance)
-        query = RDFMapper::Scope::Query.new(instance.class, :conditions => instance.attributes)
-        Query.new(query, @options).create
+        Query.new(default_query(instance), @options).create
       end
       
       
       private
       
-      def check_for_rails_id(instance)
+      ##
+      # [-]
+      ##
+      def default_query(instance) #nodoc
+        conditions = {}.merge(instance.properties).merge(instance.foreign_keys)
+        RDFMapper::Scope::Query.new(instance.class, :conditions => conditions)
       end
-
+      
       class Query
         
         include RDFMapper::Logger
@@ -109,8 +112,8 @@ module RDFMapper
         def find
           @query.check(:rails_id)
           #
-          debug 'Searching for %s with %s' % [@rails, @query.inspect]
-          debug 'Query: %s' % find_options.inspect
+          #debug 'Searching for %s with %s' % [@rails, @query.inspect]
+          #debug 'Query: %s' % find_options.inspect
           #
           @rails.find(:all, find_options).map do |record|
             record_attributes(record)
@@ -138,7 +141,12 @@ module RDFMapper
         def save_options
           Hash[@query.to_a.map do |condition|
             name = @replace[condition.name]
-            [name, validate(condition.value)]
+            if condition.value.kind_of? RDFMapper::Model
+              value = condition.value[:rails_id]
+            else
+              value = condition.value
+            end
+            [name, value]
           end.reject do |name, value|
             name.nil? or value.nil?
           end]

data/lib/lib/associations/base.rb

@@ -20,7 +20,7 @@ module RDFMapper
       end
       
       ##
-      # [-]
+      # Association should override this method
       ##
       def replace(value)
         raise NotImplementedError, 'Expected association to override `replace`'

data/lib/lib/associations/belongs_to.rb

@@ -43,6 +43,12 @@ module RDFMapper
         end
       end
 
+      ##
+      # Returns the 'foreign key' (i.e. association URI).
+      ##
+      def keys
+        @key || value.id
+      end
 
       private
 

data/lib/lib/associations/has_many.rb

@@ -10,8 +10,12 @@ module RDFMapper
       # objects as appropriate.
       ##
       def replace(objects)
-        new_objects = filter(objects.to_a)
-        return @value if new_objects.empty?
+        unless objects.kind_of? Array
+          objects = [objects]
+        end
+
+        new_objects = filter(objects)
+        return self if new_objects.empty?
         
         new_objects.each do |child|
           self << child
@@ -22,7 +26,7 @@ module RDFMapper
           delete(child) unless new_objects.include?(child)
         end
         
-        @value
+        self
       end
       
       ##
@@ -68,17 +72,18 @@ module RDFMapper
       # Finds an associated object according to the same rules as
       # RDFMapper::Model.find.
       ##
-      def find
-        raise NotImplementedError, '`find` not yet implemented' # TODO
+      def find(*args)
+        @association.find(*args).from(value)
       end
       
       ##
-      # Returns one or more new objects of the collection type that
-      # have been instantiated with attributes and linked to this object
-      # through a foreign key, but have not yet been saved.
+      # Returns a new object of the collection type that has been
+      # instantiated with attributes and linked to this object,
+      # but not yet saved.
       ##
-      def build
-        raise NotImplementedError, '`build` not yet implemented' # TODO
+      def build(attributes)
+        obj = @association.new(attributes)
+        (self << obj).last
       end
       
       ##
@@ -86,16 +91,24 @@ module RDFMapper
       # instantiated with attributes, linked to this object through
       # a foreign key, and that has already been saved.
       ##
-      def create
-        raise NotImplementedError, '`create` not yet implemented' # TODO
+      def create(attributes = {})
+        obj = @association.create(attributes.merge({ reverse => @instance }))
+        (self << obj).last
+      end
+      
+      ##
+      # Either finds or creates a new object in the collection. 
+      ##
+      def find_or_create(attributes = {})
+        obj = attributes[:id].nil? ? nil : find(attributes[:id])
+        obj.nil? ? create(attributes) : obj
       end
 
       ##
       # Returns true if a given object is present in the collection
       ##
       def include?(object)
-        @value ||= []
-        @value.include?(object)
+        value.include?(object)
       end
             
       ##
@@ -105,6 +118,13 @@ module RDFMapper
         value
       end
       
+      ##
+      # [-]
+      ##
+      def kind_of?(cls)
+        cls == self.class || cls == Enumerable || cls == Array
+      end
+      
       
       private
       
@@ -124,10 +144,12 @@ module RDFMapper
         if @instance.id.nil?
           return []
         end
+        @value = []
         replace @association.find(:all, {
           :conditions => { reverse => @instance },
           :skip => [reverse]
         })
+        @value
       end
       
       ##

data/lib/lib/model/base.rb

@@ -56,8 +56,20 @@ module RDFMapper
         end
       end
       
+      ##
+      # Returns the short name for model's namespace. Defaults to `myrdf`
+      #
+      #   class Person < RDFMapper::Model
+      #     namespace 'http://example.org/schema#', :name => 'my'
+      #   end
+      #
+      #   Person.ns        #=> 'example'
+      #   Person.to_xml    #=> '<my:Person></my:Person>'
+      #
+      # @return [String]
+      ##
       def ns
-        @ns || 'myrdf'
+        @ns.to_s || 'myrdf'
       end
       
       ##
@@ -267,13 +279,11 @@ module RDFMapper
       # successfully to the database or not.
       #
       # @param [Hash] attributes attributes of the new object
-      # @param [RDF::URI, String] id object's ID
-      #
       # @return [Object] instance of RDFMapper::Model
       # @return [nil] if save was unsuccessful
       ##
-      def create(attributes, id)
-        new(attributes).save(id)
+      def create(attributes)
+        new(attributes).save(attributes[:id])
       end
       
       ##
@@ -310,15 +320,13 @@ module RDFMapper
       ##
       # Either finds or creates an object with the specified ID.
       #
-      # @param [RDF::URI, String] id object's ID
       # @param [Hash] attributes attributes of the new object
-      #
       # @return [Object] instance of RDFMapper::Model
       # @return [nil] if save was unsuccessful
       ##
-      def find_or_create(id, attributes = {})
-        instance = find(id)
-        instance.nil? ? create(id, attributes) : instance
+      def find_or_create(atts = {})
+        instance = atts[:id].nil? ? nil : find(atts[:id])
+        instance.nil? ? create(atts) : instance
       end
       
       ##
@@ -440,7 +448,7 @@ module RDFMapper
     ##
     # Returns objects's unique ID.
     #
-    # @return [RDF::URI] object's ID
+    # @return [String] object's ID (URI)
     ##
     def id(*args)
       @id.nil? ? nil : @id.dup
@@ -452,6 +460,7 @@ module RDFMapper
     # @return [Boolean]
     ##
     def ==(other)
+      return false unless other.kind_of? self.class
       (other.nil? or other.id.nil?) ? false : (id == other.id)
     end
     
@@ -491,6 +500,32 @@ module RDFMapper
       name.nil? ? nil : set_attribute(name, value)
     end
     
+    ##
+    # Returns a hash of all the properties (i.e. attributes without
+    # associations).
+    #
+    # @return [Hash] all properties of an instance (name => value)
+    ##
+    def properties(*args)
+      Hash[self.class.properties.keys.map do |name|
+        [ name, self[name] ]
+      end].merge(@arbitrary).merge({ :id => id })
+    end
+    
+    ##
+    # Returns a hash of all foreign keys (i.e. URIs) for belongs_to
+    # type of associations.
+    #
+    # @return [Hash] all foreign keys of an instance (name => uri)
+    ##
+    def foreign_keys
+      Hash[self.class.associations.select do |name, assoc|
+        assoc.belongs_to?
+      end.map do |name, assoc|
+        [ name, @attributes[name].keys ]
+      end]
+    end
+    
     ##
     # Returns a hash of all the attributes with their names as keys and
     # the attributes' values as values.
@@ -498,7 +533,9 @@ module RDFMapper
     # @return [Hash] all attributes of an instance (name => value)
     ##
     def attributes(*args)
-      @attributes.merge(@arbitrary)
+      Hash[@attributes.keys.map do |name|
+        [ name, self[name] ]
+      end].merge(@arbitrary).merge({ :id => id })
     end
     
     ##
@@ -537,7 +574,7 @@ module RDFMapper
     def save(id = nil)
       # Raise error if adapter is unspecified
       check_for_adapter
-      
+            
       if new? and id.nil?
         raise RuntimeError, 'Save failed. ID must be specified'
       end
@@ -588,7 +625,7 @@ module RDFMapper
     # Sets ID of this object (must be RDF::URI or a String).
     ##
     def id=(value) #nodoc
-      @id = RDF::URI.new(value.to_s)
+      @id = value.to_s
     end
     
     ##

data/lib/lib/model/property.rb

@@ -12,7 +12,7 @@ module RDFMapper
       ##
       # Checks if property has default (nil) value.
       #
-      # @params [Boolean]
+      # @param [Boolean]
       ##
       def new?
         @new

data/lib/lib/scope/collection.rb

@@ -127,6 +127,18 @@ module RDFMapper
         items.include?(object)
       end
       
+      ##
+      # Invokes the block passing in successive elements from array,
+      # returning an array containing those elements for which the
+      # block returns a true value.
+      #
+      # @yield [Object]
+      # @return [Array]
+      ##
+      def select(&block)
+        items.select { |x| block.call(x) }
+      end
+      
       ##
       # Converts collection into Array.
       #
@@ -141,6 +153,13 @@ module RDFMapper
       alias_method :slice, :[]
       alias_method :include?, :exists?
 
+      ##
+      # [-]
+      ##
+      def kind_of?(cls)
+        cls == self.class || cls == Enumerable || cls == Array
+      end
+
       ##
       # Developer-friendly representation of the instance
       #

data/lib/lib/scope/condition.rb

@@ -18,10 +18,10 @@ module RDFMapper
         if @att == :id
           return @att
         end
-        unless att = @cls.has?(@att)
-          raise RuntimeError, 'Undefined attribute %s for %s' % [@att, @cls]
-        else
+        if att = @cls.has?(@att)
           att.name
+        else
+          @att
         end
       end
       
@@ -34,6 +34,15 @@ module RDFMapper
       
       alias_method :check, :value
       
+      ##
+      # Checks whether specified object passes all conditions of the query.
+      #
+      # @param [RDFMapper::Model] object 
+      ##
+      def matches?(object)
+        object.send(name) == value
+      end
+      
       ##
       # [-]
       ##

data/lib/lib/scope/loader.rb

@@ -24,14 +24,29 @@ module RDFMapper
       end
       
       ##
-      # Sets data adapter for this loader. This will override default model adapter.
+      # Sets data adapter or collection.
       #
-      # @param [Symbol] adapter (:rails, :sparql, :rest)
-      # @param [Hash] options options to pass on to the adapter constructor
-      # @return [Object] adapter instance 
-      ##
-      def from(adapter, options = {})
-        @adapter = RDFMapper::Adapters.register(adapter, @cls, options)
+      # @overload type(adapter, options = {})
+      #   Sets data adapter, this will override default model adapter
+      #   @param [Symbol] adapter (:rails, :sparql, :rest)
+      #   @param [Hash] options options to pass on to the adapter constructor
+      #   @return [Object] adapter instance
+      #
+      # @overload type(collection)
+      #   Sets collection of instances that should be queried.
+      #   @param [Array] collection
+      ##
+      def from(adapter_or_collection, options = {})
+        if adapter_or_collection.kind_of? Array
+          @loaded = true
+          adapter_or_collection.select do |instance|
+            @conditions.matches?(instance)
+          end.each do |instance|
+            @objects << instance.properties
+          end
+          return 
+        end
+        @adapter = RDFMapper::Adapters.register(adapter_or_collection, @cls, options)
       end
 
       ##

data/lib/lib/scope/model.rb

@@ -46,13 +46,21 @@ module RDFMapper
       # In addition to the original method, preloads the model.
       ##
       def [](name)
-        super || (@loaded ? nil : load[name])
+        @arbitrary[name] || (@loaded ? super(name) : load[name])
       end
       
       ##
-      # Returns a hash of all the attributes with their names as keys and
-      # the attributes' values as values. If model is unloaded, it will
-      # preload it before returning its attributes.
+      # In addition to the original method, preloads the model.
+      # 
+      # @return [Hash] all attributes of an instance (name => value)
+      ##
+      def properties
+        check_for_nil_error
+        @loaded ? super : load.properties
+      end
+      
+      ##
+      # In addition to the original method, preloads the model.
       # 
       # @return [Hash] all attributes of an instance (name => value)
       ##
@@ -104,7 +112,7 @@ module RDFMapper
       # In addition to the original method, preloads the model.
       ##
       def get_attribute(name, *args)
-        @loaded ? super : load.send(name, *args)
+        @loaded ? super(name, *args) : load.send(name, *args)
       end
       
       ##

data/lib/lib/scope/query.rb

@@ -74,6 +74,23 @@ module RDFMapper
         nil
       end
       
+      ##
+      # Checks whether specified object passes all conditions of the query.
+      #
+      # @param [RDFMapper::Model] object 
+      ##
+      def matches?(object)
+        unless object.kind_of? RDFMapper::Model
+          return false
+        end
+        unless object.class == @cls
+          return false
+        end
+        to_a.reject do |condition|
+          condition.matches?(object)
+        end.empty?
+      end
+      
       ##
       # [-]
       ##
@@ -141,12 +158,9 @@ module RDFMapper
         else
           RDF::URI.new(self[:id].to_s)
         end
-        [{ :subject => target,
-           :predicate => RDF.type,
-           :object => @cls.type
-        }] + to_a(:id).map do |condition|
+        to_a(:id).map do |condition|
           condition.to_statements(target)
-        end.flatten.compact
+        end.flatten.compact + @cls.to_statements(:short => true)
       end
       
       ##

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Alex Serebryakov
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-26 00:00:00 +01:00
+date: 2010-05-28 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency