common_repository_model 0.0.9 → 0.1.0

data/lib/common_repository_model.rb

@@ -1,4 +1,5 @@
 require "common_repository_model/version"
+require "common_repository_model/exceptions"
 
 module CommonRepositoryModel
   # Your code goes here...

data/lib/common_repository_model/exceptions.rb

@@ -0,0 +1,10 @@
+require 'active_fedora'
+module CommonRepositoryModel
+  class ObjectNotFoundError < ActiveFedora::ObjectNotFoundError
+    attr_reader :original_exception
+    def initialize(message, original_exception = nil)
+      super(message)
+      @original_exception = original_exception || self
+    end
+  end
+end

data/lib/common_repository_model/persistence_base.rb

@@ -1,24 +1,22 @@
 require 'active_fedora'
 require 'active_model_serializers'
 require_relative './persistence_base_serializer'
+require_relative './exceptions'
 module CommonRepositoryModel
-  class ObjectNotFoundError < ActiveFedora::ObjectNotFoundError
-  end
-
   class PersistenceBase < ActiveFedora::Base
     include ActiveModel::SerializerSupport
     def active_model_serializer
       "#{self.class}Serializer".constantize
     end
 
-    class_attribute :attributes_for_json
-    self.attributes_for_json = []
-
-    def self.register_attribute(attribute_name, options = {})
-      delegate(attribute_name, options)
-      self.attributes_for_json ||= []
-      self.attributes_for_json += [attribute_name]
+    def self.find(*args,&block)
+      super
+    rescue RSolr::Error::Http => e
+      raise CommonRepositoryModel::ObjectNotFoundError.new(
+        "#{self}.find(#{args.inspect}) had a SOLR error.", e
+      )
+    rescue ActiveFedora::ObjectNotFoundError => e
+      raise CommonRepositoryModel::ObjectNotFoundError.new(e.message, e)
     end
-
   end
 end

data/lib/common_repository_model/version.rb

@@ -1,3 +1,3 @@
 module CommonRepositoryModel
-  VERSION = "0.0.9"
+  VERSION = "0.1.0"
 end

data/lib/generators/common_repository_model/collection/collection_generator.rb

@@ -1,8 +1,8 @@
 require 'rails/generators'
 
 class CommonRepositoryModel::CollectionGenerator < Rails::Generators::NamedBase
+  check_class_collision
   source_root File.expand_path('../templates', __FILE__)
-  argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
   class_option :test_dir, :type => :string, :default => "spec/factories", :desc => "The directory where the factories should go"
 
   def create_collection

data/lib/tasks/common_repository_model.tasks

@@ -1,4 +1,19 @@
 namespace :common_repository_model do
+  task :configure_hydra_jetty do
+    require 'fileutils'
+    path_to_hydra_jetty_project = "../hydra-jetty"
+
+    ['solr/test-core','solr/development-core'].each do |subdir|
+      FileUtils.cp(
+        'config/schema.xml',
+        File.join(path_to_hydra_jetty_project, subdir, 'conf/schema.xml')
+      )
+      FileUtils.cp(
+        'config/solrconfig.xml',
+        File.join(path_to_hydra_jetty_project, subdir, 'conf/solrconfig.xml')
+      )
+    end
+  end
   task :prompt_for_area => :environment do
     require 'highline'
     highline = HighLine.new

data/spec/common_respository_model/data_spec.rb

@@ -24,6 +24,7 @@ describe CommonRepositoryModel::Data do
     it 'should have content versions' do
       subject.content = file_1
       subject.save
+      file_1.reopen(file_1.path,'r')
       subject.content.content.must_equal file_1.read
       subject.content = file_2
       subject.save
@@ -31,21 +32,21 @@ describe CommonRepositoryModel::Data do
       subject.content.versions.count.must_equal 2
     end
 
-    it 'should save' do
-      with_persisted_area(collection.name_of_area_to_assign) do |area|
+    # it 'should save' do
+    #   with_persisted_area(collection.name_of_area_to_assign) do |area|
 
-        # Before we can add a collection, the containing object
-        # must be saved
-        collection.save!
-        subject.collection = collection
-        subject.save!
+    #     # Before we can add a collection, the containing object
+    #     # must be saved
+    #     collection.save!
+    #     subject.collection = collection
+    #     subject.save!
 
-        @subject = subject.class.find(subject.pid)
+    #     @subject = subject.class.find(subject.pid)
 
-        assert_rels_ext(@subject, :is_part_of, [collection])
-        assert_active_fedora_belongs_to(@subject, :collection, collection)
+    #     assert_rels_ext(@subject, :is_part_of, [collection])
+    #     assert_active_fedora_belongs_to(@subject, :collection, collection)
 
-      end
-    end
+    #   end
+    # end
   end
 end

data/spec/common_respository_model/persistence_base_spec.rb

@@ -5,4 +5,17 @@ describe CommonRepositoryModel::PersistenceBase do
 
   subject { CommonRepositoryModel::PersistenceBase.new }
 
+  describe '.find' do
+    it 'should handle find with missing parameter' do
+      lambda {
+        subject.class.find(nil)
+      }.must_raise(CommonRepositoryModel::ObjectNotFoundError)
+    end
+
+    it 'should handle find with invalid PID' do
+      lambda {
+        subject.class.find('-1')
+      }.must_raise(CommonRepositoryModel::ObjectNotFoundError)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: common_repository_model
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-29 00:00:00.000000000 Z
+date: 2012-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -76,30 +76,30 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: active-fedora
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.2.0
 - !ruby/object:Gem::Dependency
-  name: minitest-matchers
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -108,21 +108,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: active-fedora
+  name: minitest-matchers
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 5.0.0.rc3
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 5.0.0.rc3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
@@ -131,7 +131,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -154,6 +154,7 @@ files:
 - Rakefile
 - common_repository_model.gemspec
 - config/README.md
+- config/schema.xml
 - config/solrconfig.xml
 - lib/common_repository_model.rb
 - lib/common_repository_model/area.rb
@@ -162,6 +163,7 @@ files:
 - lib/common_repository_model/collection_serializer.rb
 - lib/common_repository_model/data.rb
 - lib/common_repository_model/data_serializer.rb
+- lib/common_repository_model/exceptions.rb
 - lib/common_repository_model/file_datastream.rb
 - lib/common_repository_model/persistence_base.rb
 - lib/common_repository_model/persistence_base_serializer.rb