active-triples 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6d723c23c6bfda1e8e8973f5554f318b6c4a2d1
-  data.tar.gz: 3faf28d1c82dbfdcb9d5ff72c661d134cba267c5
+  metadata.gz: a31ce4cccede2e3befa05a4b20dc4894547b219a
+  data.tar.gz: 8c47c1b2ad7a9514298dbae6f290c09313590c6d
 SHA512:
-  metadata.gz: f7c7a4d9511deb10aeaa171954f676471ac04ecba82e40cf903bc57173407738deead4fd2d04ee8fb313f44cb4b40b53fb41a6a4e6d8d3a34f374b2af40b4f04
-  data.tar.gz: b5ee0bab4f7a6c215d43ed7d904a0387bbeddd43c3a0285e7cd6ff82d20c7e0152fd0fb651af465ba52adda7221408a52a24f1472ea3884745d389f87747c56b
+  metadata.gz: dea13110704ca324e2cce448cd413450e21c0a6837ea269f7be8aa783b5540f85d9a11df04a2a891c1986ed40eb551347b06119547518c7e43c093cc715504c8
+  data.tar.gz: 82fbe1c1025d727d396eb8e3c612b56b209d40bac4bec074cef008afa91c052a58e7b344a38a47b29943d725f273776c83b04070a403abcf53adbdf3a6682372

data/README.md

@@ -132,6 +132,44 @@ puts my_thing.dump :ntriples
 Repositories and Persistence
 -----------------------------
 
+Resources can persist to various databases and triplestores though integration with [RDF::Repository](http://rubydoc.info/github/ruby-rdf/rdf/RDF/Repository).
+
+```ruby
+# Registers in-memory repositories. Other implementations of
+# RDF::Repository support persistence to (e.g.) triplestores & NoSQL
+# databases.
+ActiveTriples::Repositories.add_repository :default, RDF::Repository.new
+ActiveTriples::Repositories.add_repository :people, RDF::Repository.new
+
+class Person < ActiveTriples::Resource
+  configure :type => RDF::FOAF.Person, :base_uri => 'http://example.org/people#', :repository => :people
+  property :name, :predicate => RDF::FOAF.name
+end
+
+class Thing < ActiveTriples::Resource
+  configure :type => RDF::OWL.Thing, :base_uri => 'http://example.org/things#', :repository => :default
+  property :title, :predicate => RDF::DC.title
+  property :description, :predicate => RDF::DC.description
+  property :creator, :predicate => RDF::DC.creator, :class_name => 'Person'
+end
+
+t = Thing.new('1')
+t.title = 'A Thing'
+t.creator = Person.new('1')
+t.persisted? # => false
+t.creator.first.name = 'Tove'
+t.persist!
+
+ActiveTriples::Repositories.repositories[:default].dump :ntriples
+# => "<http://example.org/things#1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#Thing> .\n<http://example.org/things#1> <http://purl.org/dc/terms/title> \"A Thing\" .\n<http://example.org/things#1> <http://purl.org/dc/terms/creator> <http://example.org/people#1> .\n"
+
+t.creator.first.persisted? # => false
+t.creator.first.persist!
+
+ActiveTriples::Repositories.repositories[:people].dump :ntriples
+# => "<http://example.org/people#1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .\n<http://example.org/people#1> <http://xmlns.com/foaf/0.1/name> \"Tove\" .\n"
+```
+
 Contributing
 -------------
 

data/lib/active/triples.rb

@@ -0,0 +1 @@
+require 'active_triples'

data/lib/active_triples/resource.rb

@@ -39,14 +39,14 @@ module ActiveTriples
       end
 
       ##
-      # Adapter for a consistent interface for creating a new Resource 
-      # from a URI. Similar functionality should exist in all objects 
+      # Adapter for a consistent interface for creating a new Resource
+      # from a URI. Similar functionality should exist in all objects
       # which can become a Resource.
       #
       # @param uri [#to_uri, String]
       # @param vals values to pass as arguments to ::new
       #
-      # @return [ActiveTriples::Resource] a Resource with  
+      # @return [ActiveTriples::Resource] a Resource with
       def from_uri(uri,vals=nil)
         new(uri, vals)
       end
@@ -55,7 +55,7 @@ module ActiveTriples
     ##
     # Specifies whether the object is currently writable.
     #
-    # @return [true, false] 
+    # @return [true, false]
     def writable?
       !frozen?
     end
@@ -83,8 +83,8 @@ module ActiveTriples
     ##
     # Returns the current object.
     #
-    # @deprecated redundant, simply returns self. 
-    # 
+    # @deprecated redundant, simply returns self.
+    #
     # @return [self]
     def graph
       Deprecation.warn Resource, "graph is redundant & deprecated. It will be removed in ActiveTriples 0.2.0.", caller
@@ -130,16 +130,16 @@ module ActiveTriples
         end
       end
     end
-    
+
     ##
     # Returns a serialized string representation of self.
     # Extends the base implementation builds a JSON-LD context if the
-    # specified format is :jsonld and a context is provided by 
+    # specified format is :jsonld and a context is provided by
     # #jsonld_context
-    # 
+    #
     # @see RDF::Enumerable#dump
     #
-    # @param args [Array<Object>] 
+    # @param args [Array<Object>]
     # @return [String]
     def dump(*args)
       if args.first == :jsonld and respond_to?(:jsonld_context)
@@ -156,13 +156,13 @@ module ActiveTriples
       @rdf_subject ||= RDF::Node.new
     end
     alias_method :to_term, :rdf_subject
-    
+
     ##
     # A string identifier for the resource
     def id
       node? ? nil : rdf_subject.to_s
     end
-    
+
     def node?
       return true if rdf_subject.kind_of? RDF::Node
       false
@@ -174,7 +174,7 @@ module ActiveTriples
     def base_uri
       self.class.base_uri
     end
-    
+
     def type
       self.get_values(:type).to_a.map{|x| x.rdf_subject}
     end
@@ -270,12 +270,20 @@ module ActiveTriples
     def set_value(*args)
       # Add support for legacy 3-parameter syntax
       if args.length > 3 || args.length < 2
-        raise ArgumentError("wrong number of arguments (#{args.length} for 2-3)")
+        raise ArgumentError, "wrong number of arguments (#{args.length} for 2-3)"
       end
       values = args.pop
       get_term(args).set(values)
     end
 
+    ##
+    # Adds or updates a property with supplied values.
+    #
+    # @note This method will delete existing statements with the correct subject and predicate from the graph
+    def []=(uri_or_term_property, value)
+      self[uri_or_term_property].set(value)
+    end
+
     ##
     # Returns an array of values belonging to the property
     # requested. Elements in the array may RdfResource objects or a
@@ -291,6 +299,15 @@ module ActiveTriples
       get_term(args)
     end
 
+    ##
+    # Returns an array of values belonging to the property
+    # requested. Elements in the array may RdfResource objects or a
+    # valid datatype.
+    def [](uri_or_term_property)
+      get_term([uri_or_term_property])
+    end
+
+
     def get_term(args)
       @term_cache ||= {}
       term = Term.new(self, args)
@@ -311,9 +328,9 @@ module ActiveTriples
     #
     # @param [#to_uri, #to_s] uri_or_str the uri or string to use
     def set_subject!(uri_or_str)
-      raise "Refusing update URI when one is already assigned!" unless node?
+      raise "Refusing update URI when one is already assigned!" unless node? or rdf_subject == RDF::URI(nil)
       # Refusing set uri to an empty string.
-      return false if uri_or_str.nil? or uri_or_str.to_s.empty?
+      return false if uri_or_str.nil? or (uri_or_str.to_s.empty? and not uri_or_str.kind_of? RDF::URI)
       # raise "Refusing update URI! This object is persisted to a datastream." if persisted?
       old_subject = rdf_subject
       @rdf_subject = get_uri(uri_or_str)

data/lib/active_triples/term.rb

@@ -1,7 +1,12 @@
+require 'active_support/core_ext/module/delegation'
+
 module ActiveTriples
   class Term
+
     attr_accessor :parent, :value_arguments, :node_cache
-    delegate *(Array.public_instance_methods - [:__send__, :__id__, :class, :object_id] + [:as_json]), :to => :result
+
+    delegate *(Array.public_instance_methods - [:send, :__send__, :__id__, :class, :object_id] + [:as_json]), :to => :result
+
     def initialize(parent, value_arguments)
       self.parent = parent
       self.value_arguments = value_arguments
@@ -84,7 +89,7 @@ module ActiveTriples
     end
 
     def rdf_subject
-      raise ArgumentError("wrong number of arguments (#{value_arguments.length} for 1-2)") if value_arguments.length < 1 || value_arguments.length > 2
+      raise ArgumentError, "wrong number of arguments (#{value_arguments.length} for 1-2)" if value_arguments.length < 1 || value_arguments.length > 2
       if value_arguments.length > 1
         value_arguments.first
       else
@@ -129,7 +134,10 @@ module ActiveTriples
       end
 
       def valid_datatype?(val)
-        val.is_a? String or val.is_a? Date or val.is_a? Time or val.is_a? Numeric or val.is_a? Symbol or val == !!val
+        case val
+        when String, Date, Time, Numeric, Symbol, TrueClass, FalseClass then true
+        else false
+        end
       end
 
       # Converts an object to the appropriate class.

data/lib/active_triples/version.rb

@@ -1,3 +1,3 @@
 module ActiveTriples
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/spec/active_triples/resource_spec.rb

@@ -64,6 +64,21 @@ describe ActiveTriples::Resource do
         expect{ subject.set_subject! RDF::URI('http://example.org/moomin2') }.to raise_error
       end
     end
+
+    context 'with null relative URI subject' do
+      before do
+        subject.set_subject! RDF::URI(nil)
+      end
+      
+      it 'should have a subject of <>' do
+        expect(subject.rdf_subject).to eq RDF::URI(nil)
+      end
+
+      it 'should be settable' do
+        subject.set_subject! RDF::URI('http://example.org/moomin')
+        expect(subject.rdf_subject).to eq RDF::URI('http://example.org/moomin')
+      end
+    end
   end
 
   describe "#persisted?" do
@@ -305,6 +320,24 @@ describe ActiveTriples::Resource do
       expect(subject.query(:subject => RDF::URI("http://opaquenamespace.org/jokes"), :predicate => RDF::DC.title).statements.to_a.length).to eq 1
     end
   end
+  describe '#[]=' do
+    it 'should set a value in the graph' do
+      subject[RDF::DC.title] = 'Comet in Moominland'
+      subject.query(:subject => subject.rdf_subject, :predicate => RDF::DC.title).each_statement do |s|
+        expect(s.object.to_s).to eq 'Comet in Moominland'
+      end
+    end
+
+    it 'should set a value in the when given a registered property symbol' do
+      subject[:title] = 'Comet in Moominland'
+      expect(subject.title).to eq ['Comet in Moominland']
+    end
+
+    it "raise an error if the value is not a URI, Node, Literal, RdfResource, or string" do
+      expect { subject[RDF::DC.title] = Object.new }.to raise_error
+    end
+  end
+
   describe '#get_values' do
     before do
       subject.title = ['Comet in Moominland', "Finn Family Moomintroll"]
@@ -325,6 +358,26 @@ describe ActiveTriples::Resource do
     end
   end
 
+  describe '#[]' do
+    before do
+      subject.title = ['Comet in Moominland', "Finn Family Moomintroll"]
+    end
+
+    it 'should return values for a predicate uri' do
+      expect(subject[RDF::DC.title]).to eq ['Comet in Moominland', 'Finn Family Moomintroll']
+    end
+
+    it 'should return values for a registered predicate symbol' do
+      expect(subject[:title]).to eq ['Comet in Moominland', 'Finn Family Moomintroll']
+    end
+
+    it "should return values for other subjects if asked" do
+      expect(subject.get_values(RDF::URI("http://opaquenamespace.org/jokes"),:title)).to eq []
+      subject.set_value(RDF::URI("http://opaquenamespace.org/jokes"), RDF::DC.title, 'Comet in Moominland')
+      expect(subject.get_values(RDF::URI("http://opaquenamespace.org/jokes"),:title)).to eq ["Comet in Moominland"]
+    end
+  end
+
   describe '#type' do
     it 'should return the type configured on the parent class' do
       expect(subject.type).to eq [DummyResource.type]

data/spec/active_triples/term_spec.rb

@@ -0,0 +1,95 @@
+require 'spec_helper'
+require 'rdf/isomorphic'
+
+describe ActiveTriples::Term do
+
+  describe "#rdf_subject" do
+    subject { described_class.new( double("parent"), double("value args") ) }
+    context "when term has 0 value arguments" do
+      before { subject.value_arguments = double(length: 0) }
+      it "should raise an error" do
+        expect { subject.rdf_subject }.to raise_error
+      end
+    end
+    context "when term has 1 value argument" do
+      before do
+        allow(subject.parent).to receive(:rdf_subject) { "parent subject" }
+        subject.value_arguments = double(length: 1)
+      end
+      it "should call `rdf_subject' on the parent" do
+        expect(subject.rdf_subject).to eq "parent subject"
+      end
+    end
+    context "when term has 2 value arguments" do
+      before { subject.value_arguments = double(length: 2, first: "first") }
+      it "should return the first value argument" do
+        expect(subject.rdf_subject).to eq "first"
+      end
+    end
+    context "when term has 3 value arguments" do
+      before { subject.value_arguments = double(length: 3) }
+      it "should raise an error" do
+        expect { subject.rdf_subject }.to raise_error
+      end
+    end
+  end
+
+  describe "#valid_datatype?" do
+    subject { described_class.new( double("parent"), "value" ) }
+    before { allow(subject.parent).to receive(:rdf_subject) { "parent subject" } }
+    context "the value is not a Resource" do
+      it "should be true if value is a String" do
+        expect(subject.send(:valid_datatype?, "foo")).to be true
+      end
+      it "should be true if value is a Symbol" do
+        expect(subject.send(:valid_datatype?, :foo)).to be true
+      end
+      it "should be true if the value is a Numeric" do
+        expect(subject.send(:valid_datatype?, 1)).to be true
+        expect(subject.send(:valid_datatype?, 0.1)).to be true
+      end
+      it "should be true if the value is a Date" do
+        expect(subject.send(:valid_datatype?, Date.today)).to be true
+      end
+      it "should be true if the value is a Time" do
+        expect(subject.send(:valid_datatype?, Time.now)).to be true
+      end
+      it "should be true if the value is a boolean" do
+        expect(subject.send(:valid_datatype?, false)).to be true
+        expect(subject.send(:valid_datatype?, true)).to be true
+      end
+    end
+    context "the value is a Resource" do
+      after { Object.send(:remove_const, :DummyResource) }
+      let(:resource) { DummyResource.new }
+      context "and the resource class does not include RDF::Isomorphic" do
+        before { class DummyResource < ActiveTriples::Resource; end }
+        it "should be false" do
+          expect(subject.send(:valid_datatype?, resource)).to be false
+        end
+      end
+      context "and the resource class includes RDF:Isomorphic" do
+        before do
+          class DummyResource < ActiveTriples::Resource
+            include RDF::Isomorphic
+          end
+        end
+        it "should be false" do
+          expect(subject.send(:valid_datatype?, resource)).to be false
+        end
+      end
+      context "and the resource class includes RDF::Isomorphic and aliases :== to :isomorphic_with?" do
+        before do
+          class DummyResource < ActiveTriples::Resource
+            include RDF::Isomorphic
+            alias_method :==, :isomorphic_with?
+          end
+        end
+        it "should be false" do
+          expect(subject.send(:valid_datatype?, resource)).to be false
+        end
+      end
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-triples
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Tom Johnson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-17 00:00:00.000000000 Z
+date: 2014-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -181,6 +181,7 @@ files:
 - LICENSE
 - README.md
 - active-triples.gemspec
+- lib/active/triples.rb
 - lib/active_triples.rb
 - lib/active_triples/configurable.rb
 - lib/active_triples/indexing.rb
@@ -198,6 +199,7 @@ files:
 - spec/active_triples/properties_spec.rb
 - spec/active_triples/repositories_spec.rb
 - spec/active_triples/resource_spec.rb
+- spec/active_triples/term_spec.rb
 - spec/pragmatic_context_spec.rb
 - spec/spec_helper.rb
 - spec/support/active_model_lint.rb