ladder 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7375d4f5b507945381d998d3965f4cdcc8e585e
-  data.tar.gz: 01b3d742e5457614366c60d083715fea84b09cc4
+  metadata.gz: eae01f78a4a1a7f0b6a81fdae649c7b8afff280e
+  data.tar.gz: d5ea2050c1d1b9972b46c8edb5a0e37d1f9ec206
 SHA512:
-  metadata.gz: dbca5ae82c1668d8faa094d75b4a09f1c63bc882af0f057231ecf228d79044895f9b8a813b962a3f981ff974f9cf20855146fd0126c1a31c9abcc4872f9106db
-  data.tar.gz: 5981572185f3939e1f25843e50b9306d1bb3ec8937e16d11ad90d08e28027e5b755023294965ce8de7d9a8574cc395e7e5f4e2b6b4c7bff4e5a420624e169733
+  metadata.gz: 1715db5f2296eaf36139f553fefdbb5a3d071c578c7fc3ef132cf61023a8641740b4fff28bce5dbf85486067ff5e2e25e71fd8821360bc03834b4791df3812ff
+  data.tar.gz: 7aaf433f31b7edf78f752f374830e6b4dac9c7f54707c1ffba731fda7b4a918783e64b5d5269a0b163a5ac72c7ec35be397fea0df8c73759e6d2ef492eb6653e

data/.ruby-version

@@ -1 +1 @@
-2.1.2
+2.1.5

data/README.md

@@ -1,5 +1,6 @@
-![Ladder logo](https://github.com/mjsuhonos/ladder/blob/master/logo.png)
-[![Gem Version](http://img.shields.io/gem/v/ladder.svg)](https://rubygems.org/gems/ladder) [![Build Status](https://travis-ci.org/mjsuhonos/ladder.svg)](https://travis-ci.org/mjsuhonos/ladder)
+![Ladder logo](https://github.com/ladder/ladder/blob/master/logo.png)
+
+[![Gem Version](http://img.shields.io/gem/v/ladder.svg)](https://rubygems.org/gems/ladder) [![Build Status](https://travis-ci.org/ladder/ladder.svg)](https://travis-ci.org/ladder/ladder)
 
 # Ladder
 
@@ -13,9 +14,9 @@ Ladder is a dynamic, scalable metadata framework written in Ruby using well-know
 
 Ladder was loosely conceived over the course of several years prior to 2011.  In early 2012, Ladder began existence as an opportunity to escape from a decade of LAMP development and become familiar with Ruby.  From 2012 to late 2013, a closed prototype was built under the auspices of [Deliberate Data](http://deliberatedata.com) as a proof-of-concept to test the feasibility of the design.
 
-From mid-2014, Ladder is being re-architected as a series of Ruby modules that can be used individually and incorporated within existing Ruby frameworks (eg. [Project Hydra](http://projecthydra.org)), or used together as a comprehensive stack.  Ladder is intended to encourage the LAM community to think less dogmatically about our established (often monolithic and/or niche) toolsets and instead embrace a broader vision of using non-LAM specific technologies.
+From mid-2014, Ladder is being re-architected as a series of Ruby modules that can be used individually and incorporated within existing Ruby frameworks (eg. [Project Hydra](http://projecthydra.org)), or used together as a comprehensive stack.  Ladder is intended to encourage the [LAM](http://en.wikipedia.org/wiki/GLAM_(industry_sector)) community to think less dogmatically about our established (often monolithic and/or niche) toolsets and instead embrace a broader vision of adopting more widely-used technologies.
 
-For those interested in the historical code, the original [prototype](https://github.com/mjsuhonos/ladder/tree/prototype) branch is available, as is an [experimental](https://github.com/mjsuhonos/ladder/tree/l2) branch.
+For those interested in the historical code, the original [prototype](https://github.com/ladder/ladder/tree/prototype) branch is available, as is an [experimental](https://github.com/ladder/ladder/tree/l2) branch.
 
 ## Installation
 
@@ -581,7 +582,7 @@ es.as_indexed_json
 
 Anyone and everyone is welcome to contribute.  Go crazy.
 
-1. Fork it ( https://github.com/mjsuhonos/ladder/fork )
+1. Fork it ( https://github.com/ladder/ladder/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
@@ -598,4 +599,4 @@ Many thanks to Christopher Knight [@NomadicKnight](https://twitter.com/Nomadic_K
 ## License
 
 Apache License Version 2.0
-http://apache.org/licenses/LICENSE-2.0.txt
+http://apache.org/licenses/LICENSE-2.0.txt

data/ladder.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.email         = "mj@suhonos.ca"
   spec.summary       = %q{Opinionated ActiveModel framework.}
   spec.description   = %q{Ladder is a metadata framework for RDF modelling, persistence, and full-text indexing.}
-  spec.homepage      = "https://github.com/mjsuhonos/ladder"
+  spec.homepage      = "https://github.com/ladder/ladder"
   spec.license       = "APACHE2"
   spec.required_ruby_version     = '>= 1.9.3'
 
@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "mongoid", "~> 4.0"
-  spec.add_dependency "active-triples", "~> 0.3"
+  spec.add_dependency "active-triples", "~> 0.4"
   spec.add_dependency "elasticsearch-model", "~> 0.1"
   
   spec.add_development_dependency "bundler", "~> 1.7"
@@ -30,4 +30,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.1"
   spec.add_development_dependency "rake", "~> 10.3"
   spec.add_development_dependency "yard", "~> 0.8"
+  spec.add_development_dependency "simplecov", "~> 0.9"
 end

data/lib/ladder/resource.rb

@@ -32,16 +32,14 @@ module Ladder::Resource
   end
 
   ##
-  # Overload ActiveTriples #update_resource
-  #
-  # @see ActiveTriples::Identifiable
+  # Populate resource properties from ActiveModel
   def update_resource(opts = {})
-    super() do |name, prop|
-      value = update_from_field(name) if fields[name] # this is a literal property
-      value = update_from_relation(name, opts) if relations[name] # this is a relation property
+    resource_class.properties.each do |name, property|
+      value = update_from_field(name) if fields[name]
+      value = update_from_relation(name, opts) if relations[name]
 
       cast_uri = RDF::URI.new(value)
-      resource.set_value(prop.predicate, cast_uri.valid? ? cast_uri : value) if value
+      resource.set_value(property.predicate, cast_uri.valid? ? cast_uri : value) if value
     end
 
     resource

data/lib/ladder/resource/dynamic.rb

@@ -26,49 +26,6 @@ module Ladder::Resource::Dynamic
 
       resource
     end
-    
-    def <<(data)
-      # ActiveTriples::Resource expects: RDF::Statement, Hash, or Array
-      data = RDF::Statement.from(data) unless data.is_a? RDF::Statement
-
-      # Define predicate on object unless it's defined on the class
-      if resource_class.properties.values.map(&:predicate).include? data.predicate
-        field_name = resource_class.properties.select { |name, term| term.predicate == data.predicate }.keys.first.to_sym
-      else
-        qname = data.predicate.qname
-
-        if respond_to? qname.last or :name == qname.last
-          field_name = qname.join('_').to_sym
-        else
-          field_name = qname.last
-        end
-
-        property field_name, predicate: data.predicate
-      end
-
-      # Set the value in Mongoid
-      value = case data.object
-        when RDF::Literal
-          data.object.object
-        when RDF::URI
-          data.object.to_s
-        else
-          data.object
-      end
-
-      self.send("#{field_name}=", value)
-    end
-
-    private
-    
-      ##
-      # Overload ActiveTriples #resource_class
-      #
-      # @see ActiveTriples::Identifiable
-      def resource_class
-        @modified_resource_class ||= self.class.resource_class.clone
-      end
-
   end
 
   ##
@@ -76,11 +33,45 @@ module Ladder::Resource::Dynamic
   def property(field_name, *opts)
     # Store context information
     self._context ||= Hash.new(nil)
+
+    # Ensure new field name is unique
+    field_name = opts.first[:predicate].qname.join('_').to_sym if respond_to? field_name or :name == field_name
+
     self._context[field_name] = opts.first[:predicate].to_s
 
     apply_context
   end
 
+  def <<(data)
+    # ActiveTriples::Resource expects: RDF::Statement, Hash, or Array
+    data = RDF::Statement.from(data) unless data.is_a? RDF::Statement
+
+    # Define predicate on object unless it's defined on the class
+    if resource_class.properties.values.map(&:predicate).include? data.predicate
+      field_name = resource_class.properties.select { |name, term| term.predicate == data.predicate }.keys.first.to_sym
+    else
+      qname = data.predicate.qname
+
+      if respond_to? qname.last or :name == qname.last
+        field_name = qname.join('_').to_sym
+      else
+        field_name = qname.last
+      end
+
+      property field_name, predicate: data.predicate
+    end
+
+    # Set the value in Mongoid
+    value = case data.object
+      when RDF::Literal
+        data.object.object
+      else
+        data.object.to_s
+    end
+
+    self.send("#{field_name}=", value)
+  end
+
   private
 
     ##
@@ -112,4 +103,19 @@ module Ladder::Resource::Dynamic
       end
     end
 
+  public
+  
+  module ClassMethods
+    
+    private
+
+      ##
+      # Overload ActiveTriples #resource_class
+      #
+      # @see ActiveTriples::Identifiable
+      def resource_class
+        @modified_resource_class ||= self.class.resource_class.clone
+      end
+  end
+
 end

data/lib/ladder/version.rb

@@ -1,3 +1,3 @@
 module Ladder
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/ladder/dynamic_spec.rb

@@ -18,8 +18,154 @@ describe Ladder::Resource::Dynamic do
   end
 
   it_behaves_like 'a Resource'
+
+  shared_context 'with data' do
+    let(:subject) { Thing.new }
+
+    before do
+      # non-localized literal
+      subject.class.field :alt
+      subject.class.property :alt, :predicate => RDF::DC.alternative
+      subject.alt = 'Mumintrollet pa kometjakt'
+
+      # localized literal
+      subject.class.property :title, :predicate => RDF::DC.title
+      subject.title = 'Comet in Moominland'
+    end
+  end
+
+  describe '#property' do
+    include_context 'with data'
+
+    context 'with undefined property' do
+      before do
+        subject.property :description, :predicate => RDF::DC.description
+        subject.description = "Second in Tove Jansson's series of Moomin books"
+      end
+
+      it 'should create a context' do
+        expect(subject._context).to eq({:description => RDF::DC.description.to_uri.to_s})
+      end
+      
+      it 'should build an accessor' do
+        expect(subject.description).to eq "Second in Tove Jansson's series of Moomin books"
+      end
+    end
+
+    context 'with conflicting property' do
+      before do
+        subject.property :title, :predicate => RDF::DC11.title
+        subject.dc11_title = "Kometjakten"
+      end
+
+      it 'should create a context' do
+        expect(subject._context).to eq({:dc11_title => RDF::DC11.title.to_uri.to_s})
+      end
+      
+      it 'should build an accessor' do
+        expect(subject.dc11_title).to eq "Kometjakten"
+      end
+    end
+  end
+
+  describe '#<<' do
+    include_context 'with data'
+
+    context 'with defined field' do
+      before do
+        subject << RDF::Statement(nil, RDF::DC.title, 'Kometen kommer')
+      end
+      
+      it 'should not create a context' do
+        expect(subject._context).to be nil
+      end
+      
+      it 'should update existing values' do
+        expect(subject.title).to eq 'Kometen kommer'
+      end
+    end
+
+    context 'with undefined field' do
+      before do
+        subject << RDF::Statement(nil, RDF::DC.description, "Second in Tove Jansson's series of Moomin books")
+      end
+
+      it 'should create a context' do
+        expect(subject._context).to eq({:description => RDF::DC.description.to_uri.to_s})
+      end
+      
+      it 'should build an accessor' do
+        expect(subject.description).to eq "Second in Tove Jansson's series of Moomin books"
+      end
+    end
+
+    context 'with conflicting field' do
+      before do
+        subject << RDF::Statement(nil, RDF::DC11.title, "Kometjakten")
+      end
+
+      it 'should create a context' do
+        expect(subject._context).to eq({:dc11_title => RDF::DC11.title.to_uri.to_s})
+      end
+      
+      it 'should build an accessor' do
+        expect(subject.dc11_title).to eq "Kometjakten"
+      end
+    end
+
+
+    context 'with a URI value' do
+      before do
+        subject << RDF::Statement(nil, RDF::DC.identifier, RDF::URI('http://some.uri'))
+        subject.update_resource
+      end
+      
+      it 'should store the URI as a string' do
+        expect(subject.identifier).to eq 'http://some.uri'
+      end
+      
+      it 'should cast a URI into the resource' do
+        query = subject.resource.query(:subject => subject.rdf_subject, :predicate => RDF::DC.identifier)
+        expect(query.count).to eq 1
+        expect(query.first_object).to be_a_kind_of RDF::URI
+      end
+    end
+
+  end
   
-  # TODO: Add specs
+  describe '#update_resource' do
+    include_context 'with data'
+
+    before do
+      # undefined property
+      subject.property :description, :predicate => RDF::DC.description
+      subject.description = "Second in Tove Jansson's series of Moomin books"
+
+      # conflicting property
+      subject.property :title, :predicate => RDF::DC11.title
+      subject.dc11_title = "Kometjakten"
+
+      # defined field
+      subject << RDF::Statement(nil, RDF::DC.title, 'Kometen kommer')
+
+      # conflicting field
+      subject << RDF::Statement(nil, RDF::DC.alternative, "Kometjakten")
+
+      # URI value
+      subject << RDF::Statement(nil, RDF::DC.identifier, RDF::URI('http://some.uri'))
+
+      subject.update_resource
+    end
+    
+    it 'should have updated values' do
+      expect(subject.resource.statements.count).to eq 5
+      expect(subject.resource.query(:predicate => RDF::DC.description, :object => "Second in Tove Jansson's series of Moomin books").count).to eq 1
+      expect(subject.resource.query(:predicate => RDF::DC11.title, :object => "Kometjakten").count).to eq 1
+      expect(subject.resource.query(:predicate => RDF::DC.title, :object => RDF::Literal.new('Kometen kommer', :language => :en)).count).to eq 1
+      expect(subject.resource.query(:predicate => RDF::DC.alternative, :object => "Kometjakten").count).to eq 1
+      expect(subject.resource.query(:predicate => RDF::DC.identifier, :object => RDF::URI('http://some.uri')).count).to eq 1
+    end
+  end
 
   after do
     Object.send(:remove_const, :LADDER_BASE_URI) if Object

data/spec/shared/resource.rb

@@ -3,8 +3,23 @@ shared_examples 'a Resource' do
   let(:person) { Person.new }
 
   shared_context 'with data' do
+    before do
+      # non-localized literal
+      subject.class.field :alt
+      subject.class.property :alt, :predicate => RDF::DC.alternative
+      subject.alt = 'Mumintrollet pa kometjakt'
+
+      # localized literal
+      subject.class.property :title, :predicate => RDF::DC.title
+      subject.title = 'Comet in Moominland'
+    end
+  end
+
+  shared_context 'with relations' do
     let(:concept) { Concept.new }
     let(:part)    { Part.new }
+
+    include_context 'with data'
     
     before do
       class Concept
@@ -15,15 +30,6 @@ shared_examples 'a Resource' do
         include Ladder::Resource
       end
 
-      # non-localized literal
-      subject.class.field :alt
-      subject.class.property :alt, :predicate => RDF::DC.alternative
-      subject.alt = 'Mumintrollet pa kometjakt'
-
-      # localized literal
-      subject.class.property :title, :predicate => RDF::DC.title
-      subject.title = 'Comet in Moominland'
-
       # many-to-many
       person.class.property :things, :predicate => RDF::DC.relation, :class_name => 'Thing'
       subject.class.property :people, :predicate => RDF::DC.creator, :class_name => 'Person'
@@ -70,11 +76,7 @@ shared_examples 'a Resource' do
 
   describe '#property' do
     context 'with non-localized literal' do
-      before do
-        subject.class.field :alt
-        subject.class.property :alt, :predicate => RDF::DC.alternative
-        subject.alt = 'Mumintrollet pa kometjakt'
-      end
+      include_context 'with data'
 
       it 'should return non-localized value' do
         expect(subject.alt).to eq 'Mumintrollet pa kometjakt'
@@ -95,10 +97,7 @@ shared_examples 'a Resource' do
     end
     
     context 'with localized literal' do
-      before do
-        subject.class.property :title, :predicate => RDF::DC.title
-        subject.title = 'Comet in Moominland'
-      end
+      include_context 'with data'
       
       it 'should return localized value' do
         expect(subject.title).to eq 'Comet in Moominland'
@@ -119,12 +118,7 @@ shared_examples 'a Resource' do
     end
 
     context 'with many-to-many' do
-      before do
-        subject.class.property :people, :predicate => RDF::DC.creator, :class_name => 'Person'
-        person.class.property :things, :predicate => RDF::DC.relation, :class_name => 'Thing'
-        subject.people << person
-        subject.save
-      end
+      include_context 'with relations'
 
       it 'should have a relation' do
         expect(subject.relations['people'].relation).to eq (Mongoid::Relations::Referenced::ManyToMany)
@@ -146,28 +140,24 @@ shared_examples 'a Resource' do
     end
 
     context 'with one-sided has-many' do
-      before do
-        subject.class.has_and_belongs_to_many :people, inverse_of: nil
-        subject.class.property :people, :predicate => RDF::DC.creator, :class_name => 'Person'
-        subject.people << person
-      end
+      include_context 'with relations'
 
       it 'should have a relation' do
-        expect(subject.relations['people'].relation).to eq (Mongoid::Relations::Referenced::ManyToMany)
-        expect(subject.people.to_a).to include person
+        expect(subject.relations['concepts'].relation).to eq (Mongoid::Relations::Referenced::ManyToMany)
+        expect(subject.concepts.to_a).to include concept
       end
 
       it 'should not have an inverse relation' do
-        expect(subject.relations['people'].inverse_of).to be nil
-        expect(person.relations).to be_empty
+        expect(subject.relations['concepts'].inverse_of).to be nil
+        expect(concept.relations).to be_empty
       end
 
       it 'should have a valid predicate' do
-        expect(subject.class.properties['people'].predicate).to eq RDF::DC.creator
+        expect(subject.class.properties['concepts'].predicate).to eq RDF::DC.subject
       end
 
       it 'should not have an inverse predicate' do
-        expect(person.class.properties).to be_empty
+        expect(concept.class.properties).to be_empty
       end
     end
 
@@ -203,9 +193,8 @@ shared_examples 'a Resource' do
   end
 
   describe '#update_resource' do
-
     context 'without related: true' do
-      include_context 'with data'
+      include_context 'with relations'
       
       before do
         subject.update_resource
@@ -248,7 +237,7 @@ shared_examples 'a Resource' do
     end
 
     context 'with related: true' do
-      include_context 'with data'
+      include_context 'with relations'
       
       before do
         subject.update_resource(:related => true)
@@ -314,7 +303,7 @@ shared_examples 'a Resource' do
     end
 
     context 'with related and then without related' do
-      include_context 'with data'
+      include_context 'with relations'
       
       before do
         subject.update_resource(:related => true)
@@ -344,11 +333,20 @@ shared_examples 'a Resource' do
   end
   
   describe '#as_jsonld' do
-    include_context 'with data'
+    include_context 'with relations'
     
     it 'should output a valid jsonld representation of itself' do
       g = RDF::Graph.new << JSON::LD::API.toRdf(subject.as_jsonld)
       expect(subject.resource.to_hash == g.to_hash).to be true
     end
   end
+  
+  describe '#rdf_label' do
+    include_context 'with data'
+
+    it 'should return the default label' do
+      expect(subject.rdf_label.to_a).to eq ['Comet in Moominland']
+    end
+  end
+
 end

data/spec/spec_helper.rb

@@ -3,6 +3,8 @@ Bundler.setup
 
 require 'ladder'
 require 'pry'
+require 'simplecov'
+SimpleCov.start
 
 Dir['./spec/shared/**/*.rb'].each { |f| require f }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ladder
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - MJ Suhonos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-19 00:00:00.000000000 Z
+date: 2014-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: elasticsearch-model
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +136,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
 description: Ladder is a metadata framework for RDF modelling, persistence, and full-text
   indexing.
 email: mj@suhonos.ca
@@ -165,7 +179,7 @@ files:
 - spec/shared/resource.rb
 - spec/shared/searchable.rb
 - spec/spec_helper.rb
-homepage: https://github.com/mjsuhonos/ladder
+homepage: https://github.com/ladder/ladder
 licenses:
 - APACHE2
 metadata: {}