ladder 0.3.2 → 0.4.0

data/lib/ladder/resource/dynamic.rb

@@ -58,14 +58,13 @@ module Ladder
         return unless self._context
 
         self._context.each do |field_name, uri|
-          next if fields.keys.include? field_name
+          next if fields[field_name]
+          next unless RDF::Vocabulary.find_term(uri)
 
-          if RDF::Vocabulary.find_term(uri)
-            create_accessors field_name
+          create_accessors field_name
 
-            # Update resource properties
-            resource_class.property(field_name.to_sym, predicate: RDF::Vocabulary.find_term(uri))
-          end
+          # Apply instance properties to resource
+          resource_class.property(field_name.to_sym, predicate: RDF::Vocabulary.find_term(uri))
         end
       end
 
@@ -113,13 +112,15 @@ module Ladder
         # @see Ladder::Resource#<<
         #
         # @param [RDF::Statement, Hash, Array] statement @see RDF::Statement#from
-        # @return [void]
+        # @return [Object, nil] the value inserted into the object
         def <<(statement)
           # ActiveTriples::Resource expects: RDF::Statement, Hash, or Array
           statement = RDF::Statement.from(statement) unless statement.is_a? RDF::Statement
 
-          # Don't store statically-defined types
-          return if resource_class.type == statement.object
+          case statement.object
+          when resource_class.type then return # Don't store statically-defined types
+          when RDF::Node then return super # Delegate nodes (relations) to parent
+          end
 
           if RDF.type == statement.predicate
             # Store type information
@@ -131,9 +132,12 @@ module Ladder
           end
 
           # If we have an undefined predicate, then dynamically define it
-          return unless statement.predicate.qname
           property statement.predicate.qname.last, predicate: statement.predicate unless field_from_predicate statement.predicate
 
+          if self._context && self._context.values.include?(statement.predicate.to_s)
+            send("#{self._context.key(statement.predicate.to_s)}=", statement.object.to_s)
+          end
+
           super
         end
 

data/lib/ladder/resource/serializable.rb

@@ -1,17 +1,30 @@
 require 'json/ld'
+require 'rdf/turtle'
 
 module Ladder
   module Resource
     module Serializable
+      ##
+      # Return a Turtle representation for the resource
+      #
+      # @see ActiveTriples::Resource#dump
+      #
+      # @param [Hash] opts options to pass to ActiveTriples
+      # @option opts [Boolean] :related whether to include related resources (default: false)
+      # @return [String] a serialized Turtle version of the resource
+      def as_turtle(opts = { related: false })
+        update_resource(opts.slice :related).dump(:ttl, { standard_prefixes: true }.merge(opts))
+      end
+
       ##
       # Return a JSON-LD representation for the resource
       #
       # @see ActiveTriples::Resource#dump
       #
       # @param [Hash] opts options to pass to ActiveTriples
-      # @option opts [Boolean] :related whether to include related resources
+      # @option opts [Boolean] :related whether to include related resources (default: false)
       # @return [Hash] a serialized JSON-LD version of the resource
-      def as_jsonld(opts = {})
+      def as_jsonld(opts = { related: false })
         JSON.parse update_resource(opts.slice :related).dump(:jsonld, { standard_prefixes: true }.merge(opts))
       end
 
@@ -46,13 +59,11 @@ module Ladder
           ns, name = property.predicate.qname
           qname_hash[ns] ||= {}
 
-          if relations.keys.include? field_name
-            if opts[:related]
-              qname_hash[ns][name] = send(field_name).to_a.map(&:as_qname)
-            else
-              qname_hash[ns][name] = send(field_name).to_a.map { |obj| "#{obj.class.name.underscore.pluralize}:#{obj.id}" }
-            end
-          elsif fields.keys.include? field_name
+          if relations[field_name]
+            qname_hash[ns][name] = opts[:related] ? send(field_name).to_a.map(&:as_qname) : send(field_name).to_a.map { |obj| "#{obj.class.name.underscore.pluralize}:#{obj.id}" }
+          end
+
+          if fields[field_name]
             qname_hash[ns][name] = read_attribute(field_name)
           end
 
@@ -60,7 +71,8 @@ module Ladder
           qname_hash[ns].delete_if { |_k, v| v.blank? }
         end
 
-        qname_hash
+        # Insert labels for boosting search score
+        { rdfs: { label: update_resource(opts.slice :related).rdf_label } }.merge qname_hash
       end
     end
   end

data/lib/ladder/version.rb

@@ -1,3 +1,3 @@
 module Ladder
-  VERSION = '0.3.2'
+  VERSION = '0.4.0'
 end

data/spec/ladder/file_spec.rb

@@ -2,24 +2,18 @@ require 'spec_helper'
 
 describe Ladder::File do
   before do
-    Mongoid.load!('mongoid.yml', :development)
-    Mongoid.logger.level = Moped.logger.level = Logger::DEBUG
-    Mongoid.purge!
-
-    LADDER_BASE_URI ||= 'http://example.org'
-
     class Datastream
       include Ladder::File
     end
   end
 
   after do
-    Object.send(:remove_const, :LADDER_BASE_URI) if Object
+    Ladder::Config.models.delete Datastream
     Object.send(:remove_const, 'Datastream') if Object
   end
 
   shared_context 'with relations' do
-    let(:thing)    { Thing.new }
+    let(:thing) { Thing.new }
 
     before do
       class Thing
@@ -37,6 +31,7 @@ describe Ladder::File do
     end
 
     after do
+      Ladder::Config.models.delete Thing
       Object.send(:remove_const, 'Thing') if Object
     end
 

data/spec/ladder/resource/dynamic_spec.rb

@@ -2,37 +2,39 @@ require 'spec_helper'
 
 describe Ladder::Resource::Dynamic do
   before do
-    Mongoid.load!('mongoid.yml', :development)
-    Mongoid.logger.level = Moped.logger.level = Logger::DEBUG
-    Mongoid.purge!
-
-    LADDER_BASE_URI ||= 'http://example.org'
-
     class Thing
       include Ladder::Resource::Dynamic
+
+      # FIXME: DRY out this block
       configure type: RDF::DC.BibliographicResource
 
-      field :alt
-      property :alt, predicate: RDF::DC.alternative # non-localized literal
-      property :title, predicate: RDF::DC.title     # localized literal
+      property :title,      predicate: RDF::DC.title           # localized String
+      property :alt,        predicate: RDF::DC.alternative,    # non-localized String
+                            localize: false
+      property :references, predicate: RDF::DC.references      # URI
+      property :referenced, predicate: RDF::DC.isReferencedBy  # Array
+      property :is_valid,   predicate: RDF::DC.valid           # Boolean
+      property :date,       predicate: RDF::DC.date            # Date
+      property :issued,     predicate: RDF::DC.issued          # DateTime
+      property :spatial,    predicate: RDF::DC.spatial         # Float
+      # property :conformsTo, predicate: RDF::DC.conformsTo      # Hash
+      property :identifier, predicate: RDF::DC.identifier      # Integer
+      # property :license,    predicate: RDF::DC.license         # Range
+      property :source,     predicate: RDF::DC.source          # Symbol
+      property :created,    predicate: RDF::DC.created         # Time
+      ###
     end
   end
 
   after do
-    Object.send(:remove_const, :LADDER_BASE_URI) if Object
+    Ladder::Config.models.delete Thing
     Object.send(:remove_const, 'Thing') if Object
   end
 
   context 'with data' do
     let(:subject) { Thing.new }
 
-    before do
-      # non-localized literal
-      subject.alt = 'Mumintrollet pa kometjakt'
-
-      # localized literal
-      subject.title = 'Comet in Moominland'
-    end
+    include_context 'with data'
 
     it_behaves_like 'a Resource'
     it_behaves_like 'a Dynamic Resource'

data/spec/ladder/resource_spec.rb

@@ -2,25 +2,32 @@ require 'spec_helper'
 
 describe Ladder::Resource do
   before do
-    Mongoid.load!('mongoid.yml', :development)
-    Mongoid.logger.level = Moped.logger.level = Logger::DEBUG
-    Mongoid.purge!
-
-    LADDER_BASE_URI ||= 'http://example.org'
-
     class Thing
       include Ladder::Resource
+
+      # FIXME: DRY out this block
       configure type: RDF::DC.BibliographicResource
 
-      field :alt
-      property :alt, predicate: RDF::DC.alternative # non-localized literal
-      property :title, predicate: RDF::DC.title     # localized literal
-      property :identifier, predicate: RDF::DC.identifier
+      property :title,      predicate: RDF::DC.title           # localized String
+      property :alt,        predicate: RDF::DC.alternative,    # non-localized String
+                            localize: false
+      property :references, predicate: RDF::DC.references      # URI
+      property :referenced, predicate: RDF::DC.isReferencedBy  # Array
+      property :is_valid,   predicate: RDF::DC.valid           # Boolean
+      property :date,       predicate: RDF::DC.date            # Date
+      property :issued,     predicate: RDF::DC.issued          # DateTime
+      property :spatial,    predicate: RDF::DC.spatial         # Float
+      # property :conformsTo, predicate: RDF::DC.conformsTo      # Hash
+      property :identifier, predicate: RDF::DC.identifier      # Integer
+      # property :license,    predicate: RDF::DC.license         # Range
+      property :source,     predicate: RDF::DC.source          # Symbol
+      property :created,    predicate: RDF::DC.created         # Time
+      ###
     end
   end
 
   after do
-    Object.send(:remove_const, :LADDER_BASE_URI) if Object
+    Ladder::Config.models.delete Thing
     Object.send(:remove_const, 'Thing') if Object
   end
 
@@ -47,7 +54,7 @@ describe Ladder::Resource do
         configure type: RDF::DC.PhysicalResource
 
         embedded_in :thing
-        property :thing, predicate: RDF::DC.relation, class_name: 'Thing'
+        property :thing, predicate: RDF::DC.isPartOf, class_name: 'Thing'
       end
 
       # many-to-many
@@ -63,6 +70,10 @@ describe Ladder::Resource do
     end
 
     after do
+      Ladder::Config.models.delete Person
+      Ladder::Config.models.delete Concept
+      Ladder::Config.models.delete Part
+
       Object.send(:remove_const, 'Person') if Object
       Object.send(:remove_const, 'Concept') if Object
       Object.send(:remove_const, 'Part') if Object
@@ -77,6 +88,26 @@ describe Ladder::Resource do
     it_behaves_like 'a Resource'
   end
 
+  context 'with subclass' do
+    before do
+      class Subthing < Thing
+        # types are not inherited, so we must set it explicitly
+        configure type: RDF::DC.BibliographicResource
+      end
+    end
+
+    after do
+      Ladder::Config.models.delete Subthing
+      Object.send(:remove_const, 'Subthing') if Object
+    end
+
+    let(:subject) { Subthing.new }
+
+    include_context 'with data'
+
+    it_behaves_like 'a Resource'
+  end
+
   context 'with relations' do
     let(:subject) { Thing.new }
 

data/spec/ladder/searchable/background_spec.rb

@@ -2,23 +2,30 @@ require 'spec_helper'
 
 describe Ladder::Searchable::Background do
   before do
-    Mongoid.load!('mongoid.yml', :development)
-    Mongoid.logger.level = Moped.logger.level = Logger::DEBUG
-    Mongoid.purge!
-
-    Elasticsearch::Model.client = Elasticsearch::Client.new host: 'localhost:9200', log: true
-    Elasticsearch::Model.client.indices.delete index: '_all'
-
-    LADDER_BASE_URI ||= 'http://example.org'
+    Elasticsearch::Client.new(host: 'localhost:9200', log: true).indices.delete index: '_all'
 
     class Thing
       include Ladder::Resource
       include Ladder::Searchable::Background
+
+      # FIXME: DRY out this block
       configure type: RDF::DC.BibliographicResource
 
-      field :alt
-      property :alt, predicate: RDF::DC.alternative # non-localized literal
-      property :title, predicate: RDF::DC.title     # localized literal
+      property :title,      predicate: RDF::DC.title           # localized String
+      property :alt,        predicate: RDF::DC.alternative,    # non-localized String
+                            localize: false
+      property :references, predicate: RDF::DC.references      # URI
+      property :referenced, predicate: RDF::DC.isReferencedBy  # Array
+      property :is_valid,   predicate: RDF::DC.valid           # Boolean
+      property :date,       predicate: RDF::DC.date            # Date
+      property :issued,     predicate: RDF::DC.issued          # DateTime
+      property :spatial,    predicate: RDF::DC.spatial         # Float
+      # property :conformsTo, predicate: RDF::DC.conformsTo      # Hash
+      property :identifier, predicate: RDF::DC.identifier      # Integer
+      # property :license,    predicate: RDF::DC.license         # Range
+      property :source,     predicate: RDF::DC.source          # Symbol
+      property :created,    predicate: RDF::DC.created         # Time
+      ###
     end
 
     class Datastream
@@ -28,13 +35,15 @@ describe Ladder::Searchable::Background do
   end
 
   after do
-    Object.send(:remove_const, :LADDER_BASE_URI) if Object
+    Ladder::Config.models.delete Thing
+    Ladder::Config.models.delete Datastream
+
     Object.send(:remove_const, 'Thing') if Object
     Object.send(:remove_const, 'Datastream') if Object
   end
 
   shared_context 'with relations' do
-    let(:person)  { Person.new }
+    let(:person) { Person.new }
 
     before do
       class Person
@@ -48,6 +57,7 @@ describe Ladder::Searchable::Background do
     end
 
     after do
+      Ladder::Config.models.delete Person
       Object.send(:remove_const, 'Person') if Object
     end
   end

data/spec/ladder/searchable/file_spec.rb

@@ -2,14 +2,7 @@ require 'spec_helper'
 
 describe Ladder::Searchable::File do
   before do
-    Mongoid.load!('mongoid.yml', :development)
-    Mongoid.logger.level = Moped.logger.level = Logger::DEBUG
-    Mongoid.purge!
-
-    Elasticsearch::Model.client = Elasticsearch::Client.new host: 'localhost:9200', log: true
-    Elasticsearch::Model.client.indices.delete index: '_all'
-
-    LADDER_BASE_URI ||= 'http://example.org'
+    Elasticsearch::Client.new(host: 'localhost:9200', log: true).indices.delete index: '_all'
 
     class Datastream
       include Ladder::File
@@ -18,6 +11,7 @@ describe Ladder::Searchable::File do
   end
 
   after do
+    Ladder::Config.models.delete Datastream
     Object.send(:remove_const, 'Datastream') if Object
   end
 

data/spec/ladder/searchable/resource_spec.rb

@@ -2,28 +2,35 @@ require 'spec_helper'
 
 describe Ladder::Searchable::Resource do
   before do
-    Mongoid.load!('mongoid.yml', :development)
-    Mongoid.logger.level = Moped.logger.level = Logger::DEBUG
-    Mongoid.purge!
-
-    Elasticsearch::Model.client = Elasticsearch::Client.new host: 'localhost:9200', log: true
-    Elasticsearch::Model.client.indices.delete index: '_all'
-
-    LADDER_BASE_URI ||= 'http://example.org'
+    Elasticsearch::Client.new(host: 'localhost:9200', log: true).indices.delete index: '_all'
 
     class Thing
       include Ladder::Resource
       include Ladder::Searchable
+
+      # FIXME: DRY out this block
       configure type: RDF::DC.BibliographicResource
 
-      field :alt
-      property :alt, predicate: RDF::DC.alternative # non-localized literal
-      property :title, predicate: RDF::DC.title     # localized literal
+      property :title,      predicate: RDF::DC.title           # localized String
+      property :alt,        predicate: RDF::DC.alternative,    # non-localized String
+                            localize: false
+      property :references, predicate: RDF::DC.references      # URI
+      property :referenced, predicate: RDF::DC.isReferencedBy  # Array
+      property :is_valid,   predicate: RDF::DC.valid           # Boolean
+      property :date,       predicate: RDF::DC.date            # Date
+      property :issued,     predicate: RDF::DC.issued          # DateTime
+      property :spatial,    predicate: RDF::DC.spatial         # Float
+      # property :conformsTo, predicate: RDF::DC.conformsTo      # Hash
+      property :identifier, predicate: RDF::DC.identifier      # Integer
+      # property :license,    predicate: RDF::DC.license         # Range
+      property :source,     predicate: RDF::DC.source          # Symbol
+      property :created,    predicate: RDF::DC.created         # Time
+      ###
     end
   end
 
   after do
-    Object.send(:remove_const, :LADDER_BASE_URI) if Object
+    Ladder::Config.models.delete Thing
     Object.send(:remove_const, 'Thing') if Object
   end
 
@@ -42,6 +49,7 @@ describe Ladder::Searchable::Resource do
     end
 
     after do
+      Ladder::Config.models.delete Person
       Object.send(:remove_const, 'Person') if Object
     end
   end