active-triples 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42a735382f3d5ad34bb75398f7dbe41bc4092ed0
-  data.tar.gz: 64e572f52e992165f32a84202a73b6266032ce81
+  metadata.gz: 18f7fdc54422676d984f7e33ae9867636610e4ce
+  data.tar.gz: 6961ae10dc7196fd88d6cff90d353f1605bafd04
 SHA512:
-  metadata.gz: 8e1c1c02dc97fddfb50dd818fd97087a9d8032d8e0552dc5d712da15c5f7363ed0a90eada66d2dfa28692049a6fb1ab6427ffe6167115565ca2cb66537a41d7f
-  data.tar.gz: 4fc879ad051dd585c8eb4b1570f4b1530002e7e2b91a15ee2511b1771d38c3edf4074ee550123598e74d591173483c79141b8d174cb255ae6a385c682fcb67cd
+  metadata.gz: d64fbb4b48e730f62905b1dda9091ea2f43135e7c3aff5b8a2397323d2c521f79b1bb54abb52cbac4a1d786b879e1860491537b65d424dac2b001de64b79047c
+  data.tar.gz: 58393069ffdabc2010f82eced08a5500fe1cac7b34f73a50448065a580b241250cac5ee3acf8f0f3dd3c798b19640ac9de35b914cdd65339d4f424188e5f6712

data/.coveralls.yml

@@ -0,0 +1 @@
+service_name: travis-ci

data/.gitignore

@@ -4,3 +4,7 @@ pkg/
 Gemfile.lock
 tmp/*
 .sass-cache
+.idea
+coverage
+.ruby-version
+.ruby-gemset

data/README.md

@@ -1,7 +1,9 @@
 Description
 -----------
 
-[![Build Status](https://travis-ci.org/no-reply/ActiveTriples.png?branch=master)](https://travis-ci.org/no-reply/ActiveTriples)
+[![Build Status](https://travis-ci.org/ActiveTriples/ActiveTriples.png?branch=master)](https://travis-ci.org/ActiveTriples/ActiveTriples)
+[![Coverage Status](https://coveralls.io/repos/ActiveTriples/ActiveTriples/badge.png?branch=master)](https://coveralls.io/r/ActiveTriples/ActiveTriples?branch=master)
+[![Gem Version](https://badge.fury.io/rb/active-triples.svg)](http://badge.fury.io/rb/active-triples)
 
 An ActiveModel-like interface for RDF data. Models graphs as Resources with property/attribute configuration, accessors, and other methods to support Linked Data in a Ruby/Rails enviornment.
 

data/Rakefile

@@ -0,0 +1,5 @@
+require 'rake/clean'
+require 'bundler'
+
+Bundler::GemHelper.install_tasks
+

data/active-triples.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency('rdoc')
   s.add_development_dependency('rspec')
+  s.add_development_dependency('coveralls')
   s.add_development_dependency('guard-rspec')
   s.add_development_dependency('webmock')
   s.add_development_dependency('nokogiri')

data/lib/active_triples.rb

@@ -8,7 +8,6 @@ module ActiveTriples
     autoload :Resource
     autoload :List
     autoload :Term
-    autoload :Indexing
     autoload :Configurable
     autoload :Properties
     autoload :PropertyBuilder
@@ -19,6 +18,10 @@ module ActiveTriples
     autoload :Identifiable
   end
 
+  # Raised when a declared repository doesn't have a definition
+  class RepositoryNotFoundError < StandardError
+  end
+
   def self.class_from_string(class_name, container_class=Kernel)
     container_class = container_class.name if container_class.is_a? Module
     container_parts = container_class.split('::')
@@ -33,4 +36,22 @@ module ActiveTriples
       end
     end
   end
+
+  def self.ActiveTripels
+    puts <<-eos
+
+        ###########
+        ******o****
+         **o******
+          *******
+           \\***/
+            | |
+            ( )
+            / \\
+        ,---------.
+
+eos
+"Yum"
+  end
+
 end

data/lib/active_triples/nested_attributes.rb

@@ -51,13 +51,12 @@ module ActiveTriples
       attributes_collection.each do |attributes|
         attributes = attributes.with_indifferent_access
 
-        if attributes['id'] && existing_record = association.detect { |record| record.rdf_subject.to_s == attributes['id'].to_s }
-          if !call_reject_if(association_name, attributes)
-            assign_to_or_mark_for_destruction(existing_record, attributes, options[:allow_destroy])
+        if !call_reject_if(association_name, attributes)
+          if attributes['id'] && existing_record = association.detect { |record| record.rdf_subject.to_s == attributes['id'].to_s }
+              assign_to_or_mark_for_destruction(existing_record, attributes, options[:allow_destroy])
+          else
+            association.build(attributes.except(*UNASSIGNABLE_KEYS))
           end
-        else
-          attributes = attributes.with_indifferent_access
-          association.build(attributes.except(*UNASSIGNABLE_KEYS))
         end
       end
     end

data/lib/active_triples/property_builder.rb

@@ -17,14 +17,15 @@ module ActiveTriples
     def self.build(model, name, options, &block)
       builder = create_builder name, options, &block
       reflection = builder.build(&block)
-      define_accessors model, reflection
+      define_accessors model, reflection, options
       reflection
     end
 
-    def self.define_accessors(model, reflection)
+    def self.define_accessors(model, reflection, options={})
       mixin = model.generated_property_methods
       name = reflection.term
       define_readers(mixin, name)
+      define_id_reader(model, name) unless options[:cast] == false
       define_writers(mixin, name)
     end
 
@@ -36,6 +37,14 @@ module ActiveTriples
       CODE
     end
 
+    def self.define_id_reader(mixin, name)
+      mixin.class_eval <<-CODE, __FILE__, __LINE__ + 1
+        def #{name}_ids(*args)
+          get_values(:#{name}, :cast => false)
+        end
+      CODE
+    end
+
     def self.define_writers(mixin, name)
       mixin.class_eval <<-CODE, __FILE__, __LINE__ + 1
         def #{name}=(value)

data/lib/active_triples/repositories.rb

@@ -7,7 +7,7 @@ module ActiveTriples
   # RDF::Repository implementation to be used for persistence of
   # resources that will be shared between ActiveFedora::Base objects.
   #
-  #    ActiveFedora::Rdf::Repositories.add_repository :blah, RDF::Repository.new
+  #    ActiveTriples::Repositories.add_repository :blah, RDF::Repository.new
   #
   # Multiple repositories can be registered to keep different kinds of
   # resources seperate. This is configurable on subclasses of Resource

data/lib/active_triples/resource.rb

@@ -20,12 +20,12 @@ module ActiveTriples
   #      end
   #    end
   class Resource < RDF::Graph
-    @@type_registry
     extend Configurable
     include Properties
     extend Deprecation
     extend  ActiveModel::Naming
     extend  ActiveModel::Translation
+    extend  ActiveModel::Callbacks
     include ActiveModel::Validations
     include ActiveModel::Conversion
     include ActiveModel::Serialization
@@ -33,6 +33,7 @@ module ActiveTriples
     include NestedAttributes
     include Reflection
     attr_accessor :parent
+    define_model_callbacks :persist
 
     class << self
       def type_registry
@@ -227,11 +228,18 @@ module ActiveTriples
       self
     end
 
-    def persist!
-      raise "failed when trying to persist to non-existant repository or parent resource" unless repository
-      erase_old_resource
-      repository << self
-      @persisted = true
+    def persist!(opts={})
+      return if @persisting
+      return false if opts[:validate] && !valid?
+      @persisting = true
+      run_callbacks :persist do
+        raise "failed when trying to persist to non-existant repository or parent resource" unless repository
+        erase_old_resource
+        repository << self
+        @persisted = true
+      end
+      @persisting = false
+      true
     end
 
     ##
@@ -251,9 +259,7 @@ module ActiveTriples
     # @return [true, false]
     def reload
       @term_cache ||= {}
-      if self.class.repository == :parent
-        return false if final_parent.nil?
-      end
+      return false unless repository
       self << repository.query(subject: rdf_subject)
       unless empty?
         @persisted = true
@@ -504,7 +510,9 @@ module ActiveTriples
           if self.class.repository == :parent
             final_parent
           else
-            Repositories.repositories[self.class.repository]
+            repo = Repositories.repositories[self.class.repository]
+            raise RepositoryNotFoundError, "The class #{self.class} expects a repository called #{self.class.repository}, but none was declared" unless repo
+            repo
           end
       end
 

data/lib/active_triples/term.rb

@@ -11,6 +11,7 @@ module ActiveTriples
     def initialize(parent_resource, value_arguments)
       self.parent = parent_resource
       @reflections = parent_resource.reflections
+      self.term_args ||= {}
       self.value_arguments = value_arguments
     end
 
@@ -177,7 +178,8 @@ module ActiveTriples
       end
 
       def cast?
-        return true unless property_config
+        return true unless property_config || (term_args && term_args[:cast])
+        return term_args[:cast] if term_args.has_key?(:cast)
         !!property_config[:cast]
       end
 

data/lib/active_triples/version.rb

@@ -1,3 +1,3 @@
 module ActiveTriples
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/spec/active_triples/nested_attributes_spec.rb

@@ -141,8 +141,8 @@ describe "nesting attribute behavior" do
       end
     end
 
-    describe "with an existing object" do
-      before(:each) do
+    context "a simple model" do
+      before do
         class SpecResource < ActiveTriples::Resource
           property :parts, predicate: RDF::DC.hasPart, :class_name=>'Component'
           accepts_nested_attributes_for :parts, allow_destroy: true
@@ -152,31 +152,57 @@ describe "nesting attribute behavior" do
           end
         end
 
+        SpecResource.accepts_nested_attributes_for *args
       end
+      after { Object.send(:remove_const, :SpecResource) }
 
-      after(:each) do
-        Object.send(:remove_const, :SpecResource)
-      end
+      let(:args) { [:parts] }
       subject { SpecResource.new }
-      before do
-        subject.attributes = { parts_attributes: [
-                                  {label: 'Alternator'},
-                                  {label: 'Distributor'},
-                                  {label: 'Transmission'},
-                                  {label: 'Fuel Filter'}]}
-      end
-      let (:replace_object_id) { subject.parts[1].rdf_subject.to_s }
-      let (:remove_object_id) { subject.parts[3].rdf_subject.to_s }
 
-      it "should update nested objects" do
-        subject.parts_attributes= [{id: replace_object_id, label: "Universal Joint"}, {label:"Oil Pump"}, {id: remove_object_id, _destroy: '1', label: "bar1 uno"}]
+      context "for an existing object" do
+        before do
+          subject.attributes = { parts_attributes: [
+                                    {label: 'Alternator'},
+                                    {label: 'Distributor'},
+                                    {label: 'Transmission'},
+                                    {label: 'Fuel Filter'}]}
+          subject.parts_attributes = new_attributes
+        end
+
+        context "that allows destroy" do
+          let(:args) { [:parts, allow_destroy: true] }
+          let (:replace_object_id) { subject.parts[1].rdf_subject.to_s }
+          let (:remove_object_id) { subject.parts[3].rdf_subject.to_s }
 
-        expect(subject.parts.map{|p| p.label.first}).to eq ['Alternator', 'Universal Joint', 'Transmission', 'Oil Pump']
+          let(:new_attributes) { [{ id: replace_object_id, label: "Universal Joint" },
+                                  { label:"Oil Pump" },
+                                  { id: remove_object_id, _destroy: '1', label: "bar1 uno" }] }
 
+          it "should update nested objects" do
+            expect(subject.parts.map{|p| p.label.first}).to eq ['Alternator', 'Universal Joint', 'Transmission', 'Oil Pump']
+          end
+        end
+
+        context "when an id is provided" do
+          let(:new_attributes) { [{ id: 'http://example.com/part#1', label: "Universal Joint" }] }
+
+          it "creates a new statement" do
+            expect(subject.parts.last.rdf_subject).to eq RDF::URI('http://example.com/part#1')
+          end
+        end
       end
-      it "create a new object when the id is provided" do
-       subject.parts_attributes= [{id: 'http://example.com/part#1', label: "Universal Joint"}]
-       expect(subject.parts.last.rdf_subject).to eq RDF::URI('http://example.com/part#1')
+
+      context "for a new B-node" do
+        context "when called with reject_if" do
+          let(:args) { [:parts, reject_if: reject_proc] }
+          let(:reject_proc) { lambda { |attributes| attributes[:label] == 'Bar' } }
+          let(:new_attributes) { [{ label: "Universal Joint" }, { label: 'Bar'} ] }
+          before { subject.parts_attributes = new_attributes }
+
+          it "should call the reject if proc" do
+            expect(subject.parts.map(&:label)).to eq [['Universal Joint']]
+          end
+        end
       end
     end
   end

data/spec/active_triples/resource_spec.rb

@@ -135,13 +135,18 @@ describe ActiveTriples::Resource do
       context "and the item is not a blank node" do
 
         subject {DummyResource.new("info:fedora/example:pid")}
+        let(:result) { subject.persist! }
 
         before do
           @repo = RDF::Repository.new
           allow(subject.class).to receive(:repository).and_return(nil)
           allow(subject).to receive(:repository).and_return(@repo)
           subject.title = "bla"
-          subject.persist!
+          result
+        end
+        
+        it "should return true" do
+          expect(result).to eq true
         end
 
         it "should persist to the repository" do
@@ -158,6 +163,28 @@ describe ActiveTriples::Resource do
           expect(subject.title).to eq []
           expect(@repo.statements.to_a.length).to eq 1 # Only the type statement
         end
+
+        context "and validations are checked" do
+          let(:result) { subject.persist!(:validate => true) }
+          context "and it's valid" do
+            it "should return true" do
+              expect(result).to eq true
+            end
+          end
+          context "and it's invalid" do
+            subject do
+              a = DummyResource.new("info:fedora/example:pid")
+              allow(a).to receive(:valid?).and_return(false)
+              a
+            end
+            it "should return false" do
+              expect(result).to eq false
+            end
+            it "should not be persisted" do
+              expect(subject).not_to be_persisted
+            end
+          end
+        end
       end
     end
   end
@@ -254,6 +281,15 @@ describe ActiveTriples::Resource do
     end
   end
 
+  describe '#repository' do
+    subject { DummyLicense.new('http://example.org/cc')}
+
+    it "should warn when the repo doesn't exist" do
+      allow(DummyLicense).to receive(:repository).and_return('repo2')
+      expect { subject }.to raise_error ActiveTriples::RepositoryNotFoundError, 'The class DummyLicense expects a repository called repo2, but none was declared'
+    end
+  end
+
   describe '#destroy!' do
     before do
       subject.title = 'Creative Commons'
@@ -266,7 +302,7 @@ describe ActiveTriples::Resource do
       expect(subject.destroy!).to be true
       expect(subject.destroy).to be true
     end
-    
+
     it 'should delete the graph' do
       subject.destroy
       expect(subject).to be_empty
@@ -400,10 +436,18 @@ describe ActiveTriples::Resource do
     it "should be empty array if we haven't set it" do
       expect(subject.aggregates).to match_array([])
     end
-    
-    it "should be set to a URI producing an ActiveTriple::Resource" do
-      subject.aggregates = RDF::URI("http://example.org/b1")
-      expect(subject.aggregates.first).to be_a ActiveTriples::Resource
+
+    context "when set to a URI" do
+      let(:aggregates_uri) { RDF::URI("http://example.org/b1") }
+      before do
+        subject.aggregates = aggregates_uri
+      end
+      it "produce an ActiveTriple::Resource" do
+        expect(subject.aggregates.first).to be_a ActiveTriples::Resource
+      end
+      it "should have an ID accessor" do
+        expect(subject.aggregates_ids).to eq [aggregates_uri]
+      end
     end
     
     it "should be settable" do
@@ -729,4 +773,24 @@ END
       expect(subject.item.first.creator.first.knows.first.foaf_name).to eq ['Bob']
     end
   end
+
+  describe "callbacks" do
+    describe ".before_persist" do
+      before do
+        class DummyResource < ActiveTriples::Resource
+          def bla
+            self.title = "test"
+          end
+        end
+        DummyResource.before_persist :bla
+        repository = RDF::Repository.new
+        allow(subject).to receive(:repository).and_return(repository)
+      end
+      it "should call prior to persisting" do
+        expect(subject.title).to be_blank
+        subject.persist!
+        expect(subject.title).to eq ["test"]
+      end
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -1,3 +1,6 @@
+require 'coveralls'
+Coveralls.wear!
+
 require 'bundler/setup'
 Bundler.setup
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-triples
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Tom Johnson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-08 00:00:00.000000000 Z
+date: 2015-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -109,6 +109,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -173,6 +187,7 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files:
+- ".coveralls.yml"
 - ".gitignore"
 - ".travis.yml"
 - AUTHORS
@@ -180,12 +195,12 @@ files:
 - Guardfile
 - LICENSE
 - README.md
+- Rakefile
 - active-triples.gemspec
 - lib/active/triples.rb
 - lib/active_triples.rb
 - lib/active_triples/configurable.rb
 - lib/active_triples/identifiable.rb
-- lib/active_triples/indexing.rb
 - lib/active_triples/list.rb
 - lib/active_triples/nested_attributes.rb
 - lib/active_triples/node_config.rb

data/lib/active_triples/indexing.rb

@@ -1,76 +0,0 @@
-module ActiveFedora
-  module Rdf
-    module Indexing
-      extend Deprecation
-      extend ActiveSupport::Concern
-
-      # In active_fedora 8, we can get the prefix part from Datastream.prefix
-      def apply_prefix(name)
-        "#{dsid.underscore}__#{name}"
-      end
-
-      def prefix(name)
-        Deprecation.warn Indexing, "prefix is deprecated. Use apply_prefix instead. In active-fedora 8, the prefix method will just return the prefix to be applied, and will not do the applying.  This will enable conformity between OmDatastream and RdfDatastream"
-        apply_prefix(name)
-      end
-
-      def to_solr(solr_doc = Hash.new) # :nodoc:
-        fields.each do |field_key, field_info|
-          values = resource.get_values(field_key)
-          Array(values).each do |val|
-            if val.kind_of? RDF::URI
-              val = val.to_s 
-            elsif val.kind_of? Rdf::Resource
-              val = val.solrize
-            end
-            self.class.create_and_insert_terms(apply_prefix(field_key), val, field_info[:behaviors], solr_doc)
-          end
-        end
-        solr_doc
-      end
-
-      # Gives the primary solr name for a column. If there is more than one indexer on the field definition, it gives the first 
-      def primary_solr_name(field)
-        config = self.class.config_for_term_or_uri(field)
-        return nil unless config # punt on index names for deep nodes!
-        if behaviors = config.behaviors
-          behaviors.each do |behavior|
-            result = ActiveFedora::SolrService.solr_name(apply_prefix(field), behavior, type: config.type)
-            return result if Solrizer::DefaultDescriptors.send(behavior).evaluate_suffix(:text).stored?
-          end
-          raise RuntimeError "no stored fields were found"
-        end
-      end
-
-      module ClassMethods
-        def prefix(dsid, name)
-          Deprecation.warn Indexing, "prefix is deprecated and will be removed in active-fedora 8.0.0.", caller
-          "#{dsid.underscore}__#{name}".to_sym
-        end
-
-        # Gives the datatype for a column.
-        def type(field)
-          config_for_term_or_uri(field).type
-        end
-      end
-      
-      private
-        # returns a Hash, e.g.: {field => {:values => [], :type => :something, :behaviors => []}, ...}
-        def fields
-          field_map = {}.with_indifferent_access
-
-          self.class.properties.each do |name, config|
-            type = config[:type]
-            behaviors = config[:behaviors]
-            next unless type and behaviors
-            next if config[:class_name] && config[:class_name] < ActiveFedora::Base
-            resource.query(:subject => rdf_subject, :predicate => config[:predicate]).each_statement do |statement|
-              field_map[name] ||= {:values => [], :type => type, :behaviors => behaviors}
-              field_map[name][:values] << statement.object.to_s
-            end
-          end
-          field_map
-        end
-    end
-  end
-end