spira 1.1.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67941fa34ff100d0330f499f459a24c8e9d5c1be
-  data.tar.gz: 45a7cecd46dfde2605ab969a2955654414c35b2c
+  metadata.gz: dbed11be22b47543853764d62b1930a8b113c67f
+  data.tar.gz: 2090996379c9642b5d52b5ec820ea380e87a5641
 SHA512:
-  metadata.gz: 9c5ec796da4d9d60541bfc20d526b73155b7c46acb1fd1dfff32468eb69579b65fa178b2bcfd2b19e803269097b3f2c1867d3ac8254d232ac68013caf60576f1
-  data.tar.gz: eafe04bca18c94e973944716784d96e9804aa3846b87e881853b037f43d93824b470da7e7bd08db14bc1524c912f2e8a7bede7ca6ebdf2041c2829a6383ebed9
+  metadata.gz: b8c274d445a9d0c7ab289521653e2906b7e7ed390ea981e93114bcb8f0324841627b6f5f670c92fff9d077d1a53776082b5d3c04d2e8c32fb539a5c9bb47eb69
+  data.tar.gz: 8aa1a2b9e3b452f2dfa17e9238839b2ba6a6e7be497ba8aae000244bc735edc42a092cb4539ffcd00d5d5a87cdcf68d6f29f8441a3ecffbe0d7d83bd2e4ac8f7

data/README.md

@@ -24,8 +24,8 @@ class Person < Spira::Base
 
   configure :base_uri => "http://example.org/example/people"
 
-  property :name, :predicate => FOAF.name, :type => String
-  property :age,  :predicate => FOAF.age,  :type => Integer
+  property :name, :predicate => RDF::Vocab::FOAF.name, :type => String
+  property :age,  :predicate => RDF::Vocab::FOAF.age,  :type => Integer
 
 end
 
@@ -113,13 +113,13 @@ require 'spira'
     
 class CD < Spira::Base
   configure :base_uri => 'http://example.org/cds'
-  property :name,   :predicate => DC.title,   :type => XSD.string
+  property :name,   :predicate => RDF::Vocab::DC.title,   :type => XSD.string
   property :artist, :predicate => URI.new('http://example.org/vocab/artist'), :type => :artist
 end
 
 class Artist < Spira::Base
   configure :base_uri => 'http://example.org/artists'
-  property :name, :predicate => DC.title, :type => XSD.string
+  property :name, :predicate => RDF::Vocab::DC.title, :type => XSD.string
   has_many :cds,  :predicate => URI.new('http://example.org/vocab/published_cd'), :type => XSD.string
 end
 ```
@@ -212,7 +212,7 @@ A class with a `type` set is assigned an `RDF.type` on creation and saving.
 ```ruby
 class Album < Spira::Base
   type URI.new('http://example.org/types/album')
-  property :name,   :predicate => DC.title
+  property :name,   :predicate => RDF::Vocab::DC.title
 end
 
 Spira.repository = RDF::Repository.new

data/VERSION

@@ -1 +1 @@
-1.1.1
+2.0.0

data/lib/spira/base.rb

@@ -20,8 +20,9 @@ module Spira
     extend ActiveModel::Naming
     include ActiveModel::Conversion
     include ActiveModel::Dirty
+    include ActiveModel::Serialization
 
-    include ::RDF, ::RDF::Enumerable, ::RDF::Queryable
+    include ::RDF, ::RDF::Enumerable, ::RDF::Queryable, Utils
 
     define_model_callbacks :save, :destroy, :create, :update
 

data/lib/spira/persistence.rb

@@ -460,7 +460,7 @@ module Spira
     # Destroy all model data
     # AND non-model data, where this resource is referred to as object.
     def destroy_model_data(*args)
-      if self.class.repository.delete(*statements) && self.class.repository.delete([nil, nil, subject])
+      if self.class.repository.delete(statements) && self.class.repository.delete([nil, nil, subject])
         @destroyed = true
         freeze
       end

data/lib/spira/resource.rb

@@ -61,11 +61,11 @@ module Spira
     # represents an RDF predicate.
     #
     # @example A simple string property
-    #     property :name, :predicate => FOAF.name, :type => String
+    #     property :name, :predicate => RDF::Vocab::FOAF.name, :type => String
     # @example A property which defaults to {Spira::Types::Any}
-    #     property :name, :predicate => FOAF.name
+    #     property :name, :predicate => RDF::Vocab::FOAF.name
     # @example An integer property
-    #     property :age,  :predicate => FOAF.age, :type => Integer
+    #     property :age,  :predicate => RDF::Vocab::FOAF.age, :type => Integer
     # @param  [Symbol] name The name of this property
     # @param  [Hash{Symbol => Any}] opts property options
     # @option opts [RDF::URI]            :predicate The RDF predicate which will refer to this property

data/lib/spira/type.rb

@@ -26,8 +26,8 @@ module Spira
   # Spira by default.  It allows either of the following forms to declare an
   # integer property on a Spira resource:
   #
-  #     property :age, :predicate => FOAF.age, :type => Integer
-  #     property :age, :predicate => FOAF.age, :type => RDF::XSD.integer
+  #     property :age, :predicate => RDF::Vocab::FOAF.age, :type => Integer
+  #     property :age, :predicate => RDF::Vocab::FOAF.age, :type => RDF::XSD.integer
   #
   # `Spira::Type`s include the RDF namespace and thus have all of the base RDF
   # vocabularies available to them without the `RDF::` prefix.

data/lib/spira/utils.rb

@@ -1,29 +1,37 @@
 module Spira
   module Utils
     ##
-    # Rename a resource in the repository to the new given subject.
-    # Changes are immediately saved to the repository.
-    #
-    # @param [RDF::Resource] old_subject
+    # Rename the subject of a Spira object to something else
     # @param [RDF::Resource] new_subject
     # @param [RDF::Repository] repository
-    def rename!(old_subject, new_subject, repository = nil)
-      repository ||= Spira.repository(:default)
-      update_repository = RDF::Repository.new
-
-      old_subject_statements = repository.query(:subject => old_subject)
-      old_subject_statements.each do |statement|
-        update_repository << RDF::Statement.new(new_subject, statement.predicate, statement.object)
-      end
+    # @return [Spira::Base] A new instance using this subject
+    def rename!(new_subject, repository = nil)
+      repository ||= Spira.repository
+      repository.rename!(subject, new_subject)
+      self.class.for(new_subject)
+    end
+  end
+end
 
-      old_object_statements = repository.query(:object => old_subject)
-      old_object_statements.each do |statement|
-        update_repository << RDF::Statement.new(statement.subject, statement.predicate, new_subject)
+module RDF
+  class Repository
+    ##
+    # Rename a resource in the Repository to the new given subject.
+    #
+    # @param [RDF::Resource] old_subject
+    # @param [RDF::Resource] new_subject
+    # @return [self]
+    def rename!(old_subject, new_subject)
+      transaction(mutable: true) do |tx|
+        query(subject: old_subject) do |statement|
+          tx.insert RDF::Statement.new(new_subject, statement.predicate, statement.object)
+          tx.delete(statement)
+        end
+        query(object: old_subject) do |statement|
+          tx.insert RDF::Statement.new(statement.subject, statement.predicate, new_subject)
+          tx.delete(statement)
+        end
       end
-
-      repository.insert *update_repository
-      repository.delete *(old_subject_statements + old_object_statements)
     end
-    module_function :rename!
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spira
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Ben Lavender
@@ -9,7 +9,7 @@ autorequire:
 bindir:
 - bin
 cert_chain: []
-date: 2015-09-26 00:00:00.000000000 Z
+date: 2016-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -17,34 +17,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.16.1
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.16.1
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rdf-isomorphic
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: promise
   requirement: !ruby/object:Gem::Requirement
@@ -65,70 +59,98 @@ dependencies:
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: rdf-spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: rdf-turtle
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: rdf-vocab
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -199,7 +221,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -207,7 +229,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: spira
-rubygems_version: 2.4.7
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A framework for using the information in RDF.rb repositories as model objects.