sufia-models 4.0.0.rc1 → 4.0.0.rc2

data/lib/sufia/models/engine.rb

@@ -25,11 +25,10 @@ module Sufia
       config.enable_local_ingest = nil
       config.analytics = false
       config.queue = Sufia::Resque::Queue
+      config.max_notifications_for_dashboard = 5
 
       config.autoload_paths += %W(
-        #{config.root}/lib/sufia/models/jobs
         #{config.root}/app/models/datastreams
-        #{config.root}/app/models/concerns
       )
 
       rake_tasks do
@@ -44,7 +43,6 @@ module Sufia
       initializer 'requires' do
         require 'activerecord-import'
         require 'hydra/derivatives'
-        require 'sufia/models/model_methods'
         require 'sufia/models/file_content'
         require 'sufia/models/file_content/versions'
         require 'sufia/models/user_local_directory_behavior'

data/lib/sufia/models/resque.rb

@@ -14,7 +14,7 @@ module Sufia
         begin
           ::Resque.enqueue_to queue, MarshaledJob, Base64.encode64(Marshal.dump(job))
         rescue Redis::CannotConnectError
-          logger.error "Redis is down!"
+          ActiveFedora::Base.logger.error "Redis is down!"
         end
       end
     end

data/lib/sufia/models/version.rb

@@ -1,5 +1,5 @@
 module Sufia
   module Models
-    VERSION = "4.0.0.rc1"
+    VERSION = "4.0.0.rc2"
   end
 end

data/lib/sufia/permissions.rb

@@ -0,0 +1,9 @@
+module Sufia
+  module Permissions
+    extend ActiveSupport::Autoload
+
+    autoload :Writable
+    autoload :Readable
+
+  end
+end

data/lib/sufia/permissions/readable.rb

@@ -0,0 +1,20 @@
+module Sufia
+  module Permissions
+    module Readable
+      extend ActiveSupport::Concern
+
+      def public?
+        read_groups.include?('public')
+      end
+
+      def registered?
+        read_groups.include?('registered')
+      end
+
+      def private?
+        !(public? || registered?)
+      end
+
+    end
+  end
+end

data/lib/sufia/permissions/writable.rb

@@ -0,0 +1,56 @@
+module Sufia
+  module Permissions
+    module Writable
+      extend ActiveSupport::Concern
+
+      #we're overriding the permissions= method which is in Hydra::AccessControls::Permissions
+      include Hydra::AccessControls::Permissions
+      include Hydra::AccessControls::Visibility
+
+      included do
+        has_metadata "rightsMetadata", type: ParanoidRightsDatastream
+        validate :paranoid_permissions
+      end
+
+      def paranoid_permissions
+        # let the rightsMetadata ds make this determination
+        # - the object instance is passed in for easier access to the props ds
+        rightsMetadata.validate(self)
+      end
+
+      ## Updates those permissions that are provided to it. Does not replace any permissions unless they are provided
+      def permissions=(params)
+        perm_hash = permission_hash
+        params[:new_user_name].each { |name, access| perm_hash['person'][name] = access } if params[:new_user_name].present?
+        params[:new_group_name].each { |name, access| perm_hash['group'][name] = access } if params[:new_group_name].present?
+
+        params[:user].each { |name, access| perm_hash['person'][name] = access} if params[:user]
+        params[:group].each { |name, access| perm_hash['group'][name] = access if ['read', 'edit'].include?(access)} if params[:group]
+
+        rightsMetadata.update_permissions(perm_hash)
+      end
+
+      def permissions
+        perms = super
+        perms.map {|p| { name: p.name, access: p.access, type:p.type } }
+      end
+
+      private
+
+      def permission_hash
+        old_perms = self.permissions
+        user_perms =  {}
+        old_perms.select{|r| r[:type] == 'user'}.each do |r|
+          user_perms[r[:name]] = r[:access]
+        end
+        user_perms
+        group_perms =  {}
+        old_perms.select{|r| r[:type] == 'group'}.each do |r|
+          group_perms[r[:name]] = r[:access]
+        end
+        {'person'=>user_perms, 'group'=>group_perms}
+      end
+
+    end
+  end
+end

data/lib/tasks/sufia-models_tasks.rake

@@ -1,7 +1,63 @@
 namespace :solr do
-
   desc "Enqueue a job to resolrize the repository objects"
   task reindex: :environment do
     Sufia.queue.push(ResolrizeJob.new)
   end
-end
+end
+
+namespace :sufia do
+  namespace :jetty do
+    desc 'Configure jetty with full-text indexing'
+    task config: :download_jars do
+      Rake::Task['jetty:config'].invoke
+    end
+
+    desc 'Download Solr full-text extraction jars'
+    task :download_jars do
+      puts "Downloading full-text jars from maven.org ..."
+      url_prefix = 'http://search.maven.org/remotecontent?filepath='
+      fulltext_dir = 'jetty/solr/lib/contrib/extraction/lib'
+      jars = %w(
+          org/apache/james/apache-mime4j-core/0.7.2/apache-mime4j-core-0.7.2.jar
+          org/apache/james/apache-mime4j-dom/0.7.2/apache-mime4j-dom-0.7.2.jar
+          org/apache/solr/solr-cell/4.0.0/solr-cell-4.0.0.jar
+          org/bouncycastle/bcmail-jdk15/1.45/bcmail-jdk15-1.45.jar
+          org/bouncycastle/bcprov-jdk15/1.45/bcprov-jdk15-1.45.jar
+          de/l3s/boilerpipe/boilerpipe/1.1.0/boilerpipe-1.1.0.jar
+          org/apache/commons/commons-compress/1.4.1/commons-compress-1.4.1.jar
+          dom4j/dom4j/1.6.1/dom4j-1.6.1.jar
+          org/apache/pdfbox/fontbox/1.7.0/fontbox-1.7.0.jar
+          com/ibm/icu/icu4j/49.1/icu4j-49.1.jar
+          com/googlecode/mp4parser/isoparser/1.0-RC-1/isoparser-1.0-RC-1.jar
+          jdom/jdom/1.0/jdom-1.0.jar
+          org/apache/pdfbox/jempbox/1.7.0/jempbox-1.7.0.jar
+          com/googlecode/juniversalchardet/juniversalchardet/1.0.3/juniversalchardet-1.0.3.jar
+          com/drewnoakes/metadata-extractor/2.4.0-beta-1/metadata-extractor-2.4.0-beta-1.jar
+          edu/ucar/netcdf/4.2-min/netcdf-4.2-min.jar
+          org/apache/pdfbox/pdfbox/1.7.0/pdfbox-1.7.0.jar
+          org/apache/poi/poi/3.8/poi-3.8.jar
+          org/apache/poi/poi-ooxml/3.8/poi-ooxml-3.8.jar
+          org/apache/poi/poi-ooxml-schemas/3.8/poi-ooxml-schemas-3.8.jar
+          org/apache/poi/poi-scratchpad/3.8/poi-scratchpad-3.8.jar
+          rome/rome/0.9/rome-0.9.jar
+          org/ccil/cowan/tagsoup/tagsoup/1.2.1/tagsoup-1.2.1.jar
+          org/apache/tika/tika-core/1.2/tika-core-1.2.jar
+          org/apache/tika/tika-parsers/1.2/tika-parsers-1.2.jar
+          org/gagravarr/vorbis-java-core/0.1/vorbis-java-core-0.1.jar
+          org/gagravarr/vorbis-java-tika/0.1/vorbis-java-tika-0.1.jar
+          xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar
+          org/apache/xmlbeans/xmlbeans/2.3.0/xmlbeans-2.3.0.jar
+          org/tukaani/xz/1.0/xz-1.0.jar
+        )
+      FileUtils.mkdir_p(fulltext_dir) unless File.directory?(fulltext_dir)
+      Dir.chdir(fulltext_dir) do
+        jars.each do |jar|
+          url = url_prefix + jar
+          jarfile = jar.split('/').last
+          puts "Fetching #{url}" unless File.exists?(jarfile)
+          system "wget --quiet --no-clobber #{url} -O #{jarfile}"
+        end
+      end
+    end
+  end
+end

data/sufia-models.gemspec

@@ -24,22 +24,22 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rake", "~> 10.3"
 
   spec.add_dependency 'rails', '~> 4.0', '< 5.0.0'
-  spec.add_dependency 'activeresource', "~>4.0.0" # No longer a dependency of rails 4.0
+  spec.add_dependency 'activeresource', "~> 4.0" # No longer a dependency of rails 4.0
 
   spec.add_dependency "hydra-head", "~> 7.0"
-  spec.add_dependency 'nest', '~> 1.1.1'
+  spec.add_dependency 'nest', '~> 1.1'
   spec.add_dependency 'resque', '~> 1.23'
-  spec.add_dependency 'resque-pool', '~> 0.3.0'
-  spec.add_dependency 'noid', '~> 0.6.6'
-  spec.add_dependency 'mailboxer', '~> 0.12.0'
+  spec.add_dependency 'resque-pool', '~> 0.3'
+  spec.add_dependency 'noid', '~> 0.6'
+  spec.add_dependency 'mailboxer', '~> 0.12'
   spec.add_dependency 'acts_as_follower', '>= 0.1.1', '< 0.3'
-  spec.add_dependency 'carrierwave', '~> 0.9.0'
+  spec.add_dependency 'carrierwave', '~> 0.9'
   spec.add_dependency 'hydra-derivatives', '~> 0.1'
-  spec.add_dependency 'oauth2', '~> 0.9.3'
-  spec.add_dependency 'google-api-client', '~> 0.7.1'
-  spec.add_dependency 'legato', '~> 0.3.0'
-  spec.add_dependency 'activerecord-import'
+  spec.add_dependency 'oauth2', '~> 0.9'
+  spec.add_dependency 'google-api-client', '~> 0.7'
+  spec.add_dependency 'legato', '~> 0.3'
+  spec.add_dependency 'activerecord-import', '~> 0.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sufia-models
 version: !ruby/object:Gem::Version
-  version: 4.0.0.rc1
+  version: 4.0.0.rc2
 platform: ruby
 authors:
 - Jeremy Friesen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-06 00:00:00.000000000 Z
+date: 2014-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,16 +28,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.3'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: hydra-head
   requirement: !ruby/object:Gem::Requirement
@@ -92,14 +92,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: resque
   requirement: !ruby/object:Gem::Requirement
@@ -120,42 +120,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: noid
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.6
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.6
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: mailboxer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: '0.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: acts_as_follower
   requirement: !ruby/object:Gem::Requirement
@@ -182,14 +182,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: hydra-derivatives
   requirement: !ruby/object:Gem::Requirement
@@ -210,56 +210,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: google-api-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: legato
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: activerecord-import
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
 description: Models and services for sufia
 email:
 - jeremy.n.friesen@gmail.com
@@ -273,9 +273,18 @@ files:
 - README.md
 - Rakefile
 - app/actors/sufia/generic_file/actor.rb
+- app/jobs/active_fedora_pid_based_job.rb
+- app/jobs/audit_job.rb
+- app/jobs/batch_update_job.rb
+- app/jobs/characterize_job.rb
+- app/jobs/create_derivatives_job.rb
+- app/jobs/import_url_job.rb
+- app/jobs/resolrize_job.rb
 - app/models/batch.rb
 - app/models/checksum_audit_log.rb
 - app/models/collection.rb
+- app/models/concerns/sufia/ability.rb
+- app/models/concerns/sufia/collection.rb
 - app/models/concerns/sufia/generic_file.rb
 - app/models/concerns/sufia/generic_file/accessible_attributes.rb
 - app/models/concerns/sufia/generic_file/audit.rb
@@ -283,6 +292,7 @@ files:
 - app/models/concerns/sufia/generic_file/derivatives.rb
 - app/models/concerns/sufia/generic_file/export.rb
 - app/models/concerns/sufia/generic_file/featured.rb
+- app/models/concerns/sufia/generic_file/full_text_indexing.rb
 - app/models/concerns/sufia/generic_file/metadata.rb
 - app/models/concerns/sufia/generic_file/mime_types.rb
 - app/models/concerns/sufia/generic_file/permissions.rb
@@ -291,6 +301,7 @@ files:
 - app/models/concerns/sufia/generic_file/versions.rb
 - app/models/concerns/sufia/generic_file/virus_check.rb
 - app/models/concerns/sufia/generic_file/web_form.rb
+- app/models/concerns/sufia/model_methods.rb
 - app/models/concerns/sufia/properties_datastream_behavior.rb
 - app/models/concerns/sufia/user.rb
 - app/models/datastreams/batch_rdf_datastream.rb
@@ -320,6 +331,7 @@ files:
 - app/services/sufia/id_service.rb
 - app/services/sufia/noid.rb
 - config/locales/sufia.en.yml
+- lib/generators/sufia/models/fulltext_generator.rb
 - lib/generators/sufia/models/install_generator.rb
 - lib/generators/sufia/models/templates/config/analytics.yml
 - lib/generators/sufia/models/templates/config/clamav.rb
@@ -330,6 +342,7 @@ files:
 - lib/generators/sufia/models/templates/config/resque_admin.rb
 - lib/generators/sufia/models/templates/config/resque_config.rb
 - lib/generators/sufia/models/templates/config/setup_mail.rb
+- lib/generators/sufia/models/templates/config/solrconfig.xml
 - lib/generators/sufia/models/templates/config/sufia.rb
 - lib/generators/sufia/models/templates/migrations/acts_as_follower_migration.rb
 - lib/generators/sufia/models/templates/migrations/add_avatars_to_users.rb
@@ -347,26 +360,21 @@ files:
 - lib/generators/sufia/models/templates/migrations/create_version_committers.rb
 - lib/generators/sufia/models/upgrade400_generator.rb
 - lib/generators/sufia/models/usagestats_generator.rb
-- lib/sufia/ability.rb
+- lib/sufia/messages.rb
 - lib/sufia/models.rb
 - lib/sufia/models/active_fedora/redis.rb
 - lib/sufia/models/active_record/redis.rb
 - lib/sufia/models/engine.rb
 - lib/sufia/models/file_content.rb
 - lib/sufia/models/file_content/versions.rb
-- lib/sufia/models/jobs/active_fedora_pid_based_job.rb
-- lib/sufia/models/jobs/audit_job.rb
-- lib/sufia/models/jobs/batch_update_job.rb
-- lib/sufia/models/jobs/characterize_job.rb
-- lib/sufia/models/jobs/create_derivatives_job.rb
-- lib/sufia/models/jobs/import_url_job.rb
-- lib/sufia/models/jobs/resolrize_job.rb
-- lib/sufia/models/model_methods.rb
 - lib/sufia/models/resque.rb
 - lib/sufia/models/user_local_directory_behavior.rb
 - lib/sufia/models/utils.rb
 - lib/sufia/models/version.rb
 - lib/sufia/models/virus_found_error.rb
+- lib/sufia/permissions.rb
+- lib/sufia/permissions/readable.rb
+- lib/sufia/permissions/writable.rb
 - lib/tasks/resque.rake
 - lib/tasks/sufia-models_tasks.rake
 - sufia-models.gemspec
@@ -395,4 +403,3 @@ signing_key:
 specification_version: 4
 summary: Models and services for sufia
 test_files: []
-has_rdoc: