active-triples 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8509c08a01f7e74117e8ea5791aaf2728360c80
-  data.tar.gz: f1941f479ed0e56364c957497e8d8f39403b6efa
+  metadata.gz: 024aea8eb521fecc89a76d764bb1dd856febbf9c
+  data.tar.gz: e0fc3915d0fe0faba66b65df1adc31233a976433
 SHA512:
-  metadata.gz: faff9891e25d5962d178cf88baceaaaf0b40b8f0d0bca6538d15421834f6529d00cdbe5e5995e1cfef868a8f593a1a2e84aa3309b3cb933ee7e5192333fcfc4c
-  data.tar.gz: 76ef886b46c6cafb1f24a64df413a7d2f8d08aff2e97e2821cbca91e827bd03089eb337ace703aacf774d774b764c5320de891dd88320468608c408c079b214f
+  metadata.gz: 20b0ff10a9833b835c4eae9957baa1712ced77bceebb362eff685a508475d2dc05ca587b2cfe30959ddcc31385696136f8d714c57997e30c4e1ffc809a4c967e
+  data.tar.gz: b61e998c602a8d860fef2614158ecebeb3acec51c83b4e8e1b264554a2dced2beb10c9a1cc20cc3b746f4029df2318ab3ae8dcc50a07802b1742a4f096854e42

data/CHANGES.md

@@ -1,3 +1,10 @@
+0.7.2
+----
+
+  - Allows interoperability between `ActiveModel::Validations` and
+    `RDF::Graph#valid?`. This fixes a bug with validation callbacks. See:
+    [#167](https://github.com/ActiveTriples/ActiveTriples/pull/167).
+    
 0.7.1
 ----
 

data/lib/active_triples/rdf_source.rb

@@ -47,10 +47,10 @@ module ActiveTriples
     include RDF::Enumerable
     include RDF::Queryable
     include RDF::Mutable
-    include ActiveModel::Validations
     include ActiveModel::Conversion
     include ActiveModel::Serialization
     include ActiveModel::Serializers::JSON
+    include ActiveModel::Validations
 
     attr_accessor :parent
 
@@ -66,6 +66,13 @@ module ActiveTriples
       extend ActiveModel::Translation
       extend ActiveModel::Callbacks
 
+      validate do
+        errors.add(:rdf_subject, 'The #rdf_subject Term must be valid') unless
+          rdf_subject.valid?
+        errors.add(:base, 'The underlying graph must be valid') unless
+          graph.valid?
+      end
+
       delegate :each, :load!, :count, :has_statement?, :to => :@graph
 
       define_model_callbacks :persist
@@ -436,6 +443,10 @@ module ActiveTriples
 
     private
 
+      def graph
+        @graph
+      end
+
       ##
       # Returns the properties registered and their configurations.
       #

data/lib/active_triples/version.rb

@@ -1,3 +1,3 @@
 module ActiveTriples
-  VERSION = "0.7.1".freeze
+  VERSION = '0.7.2'.freeze
 end

data/spec/active_triples/validations_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe ActiveTriples::Resource do
+
+  subject { MyResource.new }
+
+  before(:all) do
+    class MyResource < ActiveTriples::Resource
+      property :title, predicate: ::RDF::DC.title
+
+      validates_presence_of :title
+    end
+  end
+
+  after(:all) do
+    Object.send(:remove_const, :MyResource)
+  end
+
+  describe "validation" do
+    it "should have a presence validator on the class" do
+      expect(MyResource.validators.first).to be_a(ActiveModel::Validations::PresenceValidator)
+    end
+    it "should have validation callbacks" do
+      expect(MyResource._validate_callbacks).to be_present
+    end
+    it "should run the validations" do
+      expect(subject).to receive(:run_validations!)
+      subject.valid?
+    end
+    it { is_expected.to be_invalid }
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-triples
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Tom Johnson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-11 00:00:00.000000000 Z
+date: 2015-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -233,6 +233,7 @@ files:
 - spec/active_triples/repositories_spec.rb
 - spec/active_triples/resource_spec.rb
 - spec/active_triples/schema_spec.rb
+- spec/active_triples/validations_spec.rb
 - spec/active_triples_spec.rb
 - spec/pragmatic_context_spec.rb
 - spec/spec_helper.rb
@@ -257,7 +258,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: RDF graphs in ActiveModel wrappers.