linked_vocabs 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8afd0f6c1a9ef5c1b998260ea65516f997d8450e
-  data.tar.gz: 16715bdd289fed07c8a13b0ad1c0efeef41167d0
+  metadata.gz: 5078355060b71f3b05b1d72b0d2cf66d5851ec7b
+  data.tar.gz: 424415eb503470073eed8d1120e9120438ac7516
 SHA512:
-  metadata.gz: 7be672326fb2ee98c5d39407f26d461b008c798e8ba6a6f5aa8318cc3132341f7fb7b4002f476c1113158587ede9a283ef1fb1909fa974c0e3f91ec3b376debc
-  data.tar.gz: 8c26071cf7e3bfbe01bcfd5168c4d6706d32a18c4e3ead87e882f1c69bc631676c210c3d47b13d573a07c7061c9be6e4f627d8d2f169b931f5199d894c1e9979
+  metadata.gz: 88ebf20502f9385e0b56149e802d4481442c56c26d558213159b9082813b214fa694ac2caf30dfc74dd32f39ba7fd131a75c3afbb5e19673463da4e50bdd34f5
+  data.tar.gz: 282e714d4e05d4a557b61244b167d2fbb0e87f73041146d71b9256fbea2c97e2def28db3b24c39bb241e68101e56a2f3013e039c39a93e8233cc84aeb96f83c9

data/lib/linked_vocabs/controlled.rb

@@ -8,7 +8,7 @@ module LinkedVocabs
   # QuestioningAuthority to RdfResource classes.
   # @TODO: introduce graph context for provenance
   module Controlled
-    
+
     def self.included(klass)
       klass.extend ClassMethods
       klass.property :hiddenLabel, :predicate => RDF::SKOS.hiddenLabel
@@ -20,7 +20,7 @@ module LinkedVocabs
     end
     delegate :search, :get_full_record, :response, :results, :to => :qa_interface
 
-    
+
     # Override set_subject! to find terms when (and only when) they
     # exist in the vocabulary
     def set_subject!(uri_or_str)
@@ -31,6 +31,8 @@ module LinkedVocabs
       rescue RuntimeError, NoMethodError
       end
 
+      return false if uri_or_str.is_a? RDF::Node
+
       self.class.vocabularies.each do |vocab, config|
         if uri_or_str.start_with? config[:prefix]
           # @TODO: is it good to need a full URI for a non-strict vocab?
@@ -50,7 +52,7 @@ module LinkedVocabs
       uri_or_str = vocab_matches.first
       return super if self.class.uses_vocab_prefix?(uri_or_str) and not uri_or_str.kind_of? RDF::Node
     end
-    
+
     def in_vocab?
       return false unless self.class.uses_vocab_prefix?(rdf_subject.to_s)
       self.class.vocabularies.each do |vocab, config|
@@ -161,7 +163,7 @@ module LinkedVocabs
 
         def get_full_record(id, sub_authority)
         end
-        
+
         private
 
           def sparql_starts_search(q)
@@ -173,10 +175,10 @@ module LinkedVocabs
             query = @sparql.query("SELECT DISTINCT ?s ?p ?o WHERE { ?s ?p ?o. FILTER(contains(lcase(?o), '#{q.downcase}'))}")
             solutions_from_sparql_query(query)
           end
-          
+
           def solutions_from_sparql_query(query)
             # @TODO: labels should be taken from ActiveTriples::Resource.
-            # However, the default labels there are hidden behind a private method. 
+            # However, the default labels there are hidden behind a private method.
             labels = [RDF::SKOS.prefLabel,
                       RDF::DC.title,
                       RDF::RDFS.label]
@@ -187,7 +189,7 @@ module LinkedVocabs
             return label_solutions.uniq unless label_solutions.empty?
             solutions.map { |solution| build_hit(solution) }.compact.uniq
           end
-           
+
           def build_hit(solution)
             { :id => solution[:s].to_s, :label => solution[:o].to_s }
           end

data/lib/linked_vocabs/validators/property_validator.rb

@@ -6,7 +6,7 @@ module LinkedVocabs::Validators
       values.each do |v|
         unless v.try(:in_vocab?)
           term = v.try(:rdf_subject) || v
-          vocabularies = record.class.properties[attribute].class_name.vocabularies.keys
+          vocabularies = record.class.properties[attribute.to_s].class_name.vocabularies.keys
           record.errors.add :base, "value `#{term} for `#{attribute}` property is not a term in a controlled vocabulary #{vocabularies.join(', ')}"
         end
       end

data/lib/linked_vocabs/version.rb

@@ -1,3 +1,3 @@
 module LinkedVocabs
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/linked_vocabs.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "guard-rspec"
 
   spec.add_dependency 'rake'
-  spec.add_dependency 'active-triples', '>=0.1.0'
+  spec.add_dependency 'active-triples', '>=0.6.0'
   spec.add_dependency 'rdf', '>=1.1.2.1'
   spec.add_dependency 'sparql'
   spec.add_dependency 'sparql-client'

data/spec/controlled_spec.rb

@@ -18,6 +18,12 @@ describe LinkedVocabs::Controlled do
 
   subject { DummyAuthority }
 
+  describe '#set_subject' do
+    it 'handles bnodes' do
+      expect(subject.new.set_subject!(RDF::Node.new)).to eq false
+    end
+  end
+
   describe 'vocabulary registration' do
     it 'should add vocabulary' do
       expect(subject.vocabularies).to include :dcmitype
@@ -82,7 +88,7 @@ describe LinkedVocabs::Controlled do
   describe '#load_vocabularies' do
     it 'should load data' do
       subject.load_vocabularies
-      expect(subject.new('Image').has_subject?(RDF::URI('http://purl.org/dc/dcmitype/Image'))).to be_true
+      expect(subject.new('Image').has_subject?(RDF::URI('http://purl.org/dc/dcmitype/Image'))).to eq true
     end
   end
 

data/spec/property_validator_spec.rb

@@ -6,13 +6,13 @@ describe LinkedVocabs::Validators::PropertyValidator do
       include LinkedVocabs::Controlled
       use_vocabulary :dcmitype
 
-      property :type, :predicate => RDF::DC.type, :class_name => DummyAuthority
+      property :dctype, :predicate => RDF::DC.type, :class_name => DummyAuthority
     end
 
     class DummyResource < ActiveTriples::Resource
-      validates_vocabulary_of :type
+      validates_vocabulary_of :dctype
 
-      property :type, :predicate => RDF::DC.type, :class_name => DummyAuthority
+      property :dctype, :predicate => RDF::DC.type, :class_name => DummyAuthority
     end
   end
 
@@ -20,27 +20,27 @@ describe LinkedVocabs::Validators::PropertyValidator do
     Object.send(:remove_const, 'DummyAuthority') if Object
     Object.send(:remove_const, 'DummyResource') if Object
   end
-  
+
   subject { DummyResource.new }
   let(:authority) { DummyAuthority }
-  
+
   context 'with value in vocabulary' do
     before do
-      subject.type = authority.list_terms.first
+      subject.dctype = authority.list_terms.first
     end
     it 'is valid' do
       expect(subject).to be_valid
     end
 
     it 'is invalid with other invalid values' do
-      subject.type << 'freetext value'
+      subject.dctype << 'freetext value'
       expect(subject).not_to be_valid
     end
   end
 
   context 'with value out of vocabulary' do
     before do
-      subject.type = authority.new
+      subject.dctype = authority.new
     end
     it 'is invalid' do
       expect(subject).not_to be_valid
@@ -50,7 +50,7 @@ describe LinkedVocabs::Validators::PropertyValidator do
   context 'with value of wrong class' do
     before do
       class NotAuthority < ActiveTriples::Resource; end
-      subject.type = NotAuthority.new
+      subject.dctype = NotAuthority.new
     end
 
     after do
@@ -64,7 +64,7 @@ describe LinkedVocabs::Validators::PropertyValidator do
 
   context 'with literal value' do
     before do
-      subject.type = 'freetext value'
+      subject.dctype = 'freetext value'
     end
     it 'is invalid' do
       expect(subject).not_to be_valid

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: linked_vocabs
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Tom Johnson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-15 00:00:00.000000000 Z
+date: 2015-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: rdf
   requirement: !ruby/object:Gem::Requirement