sufia-models 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3f270df659dfb48b395c515f70e0447c94504f7
-  data.tar.gz: d7db33a427da9b43b84e51e25ffc6fa2c3dbdd4a
+  metadata.gz: ddd7181cafb3b120aefffbbde8d170b1e2149ec5
+  data.tar.gz: 3f255cafe12f0e78f81fad2f8651adfb10f49404
 SHA512:
-  metadata.gz: b76383a5af4b49c6bfd22e158233d0d51088cb3b1545b5dfafbde77827dcf6c662889fdf34bf01bfe46fc1406ef147009b2791d64c523fcee507cd8a5f910b67
-  data.tar.gz: d800eba8c79b73b29da94a8ab1928dee3bf883e1c07115ddec34b85186cc41dc77a22075e51fac85f4141daffa03013ccf1f1e6c716a5ebaa0fa59ddd22172ff
+  metadata.gz: 9bb4039d4dd6ce49c74193559605ca2fccee547861654f4963ca664238656ae8fa78b03efefa09fddcab81da0d1f21780a6b775de95bb048c948f9fcf2acb928
+  data.tar.gz: bb7584fe3c1bb62f8f17390665df49f55c71e3dd2bd1c82dfef199435d5cf3f541c8c68e9d968204e98ceee05a027d0264337498ee2b5ad034a8c920e832c46a

data/app/models/batch.rb

@@ -32,9 +32,9 @@ class Batch < ActiveFedora::Base
 
   def self.find_or_create(pid)
     begin
-      @batch = Batch.find(pid)
+      Batch.find(pid)
     rescue ActiveFedora::ObjectNotFoundError
-      @batch = Batch.create({pid: pid})
+      Batch.create({pid: pid})
     end
   end
 

data/app/models/checksum_audit_log.rb

@@ -16,10 +16,9 @@ class ChecksumAuditLog < ActiveRecord::Base
   attr_accessible :pass, :pid, :dsid, :version, :created_at
 
   def ChecksumAuditLog.get_audit_log(version)
-    log = ChecksumAuditLog.find_or_create_by_pid_and_dsid_and_version(:pid => version.pid,
-                                                                      :dsid => version.dsid,
-                                                                      :version => version.versionID)
-    log
+    ChecksumAuditLog.find_or_create_by_pid_and_dsid_and_version(:pid => version.pid,
+                                                                :dsid => version.dsid,
+                                                                :version => version.versionID)
   end
 
   def ChecksumAuditLog.prune_history(version)

data/lib/sufia/models.rb

@@ -22,6 +22,7 @@ module Sufia
   end
 
   autoload :Resque, 'sufia/models/resque'
+  autoload :Utils, 'sufia/models/utils'
 
   attr_writer :queue
 

data/lib/sufia/models/engine.rb

@@ -12,6 +12,11 @@ module Sufia
       config.autoload_paths += %W(
         #{config.root}/lib/sufia/models/jobs
       )
+
+      rake_tasks do
+        load File.expand_path('../../../tasks/sufia-models_tasks.rake', __FILE__)
+      end
+
       initializer "patches" do
         require 'sufia/models/active_fedora/redis'
         require 'sufia/models/active_record/redis'

data/lib/sufia/models/generic_file.rb

@@ -6,6 +6,13 @@ module Sufia
   module GenericFile
     extend ActiveSupport::Concern
     extend ActiveSupport::Autoload
+    autoload :Export
+    autoload :Thumbnail
+    autoload :Characterization
+    autoload :Audit
+    autoload :Actions
+    autoload :Permissions
+    autoload :WebForm
     include Sufia::ModelMethods
     include Sufia::Noid
     include Sufia::GenericFile::Thumbnail
@@ -13,6 +20,7 @@ module Sufia
     include Sufia::GenericFile::Characterization
     include Sufia::GenericFile::Audit
     include Sufia::GenericFile::Permissions
+    include Sufia::GenericFile::WebForm
 
     included do
       has_metadata :name => "descMetadata", :type => GenericFileRdfDatastream

data/lib/sufia/models/id_service.rb

@@ -16,8 +16,12 @@ require 'noid'
 
 module Sufia
   module IdService
-    @template = Sufia.config.noid_template rescue '.reeddeeddk'
-    @minter = ::Noid::Minter.new(:template => @template)
+
+    def self.noid_template
+      Sufia.config.noid_template
+    end
+
+    @minter = ::Noid::Minter.new(:template => noid_template)
     @pid = $$
     @namespace = Sufia.config.id_namespace
     @semaphore = Mutex.new
@@ -39,20 +43,19 @@ module Sufia
 
     def self.next_id
       pid = ''
-      File.open("tmp/minter-state", File::RDWR|File::CREAT, 0644) {|f|
+      File.open(Sufia::Engine.config.minter_statefile, File::RDWR|File::CREAT, 0644) do |f|
         f.flock(File::LOCK_EX)
         yaml = YAML::load(f.read)
-        yaml = {:template => @template} unless yaml
+        yaml = {:template => noid_template} unless yaml
         minter = ::Noid::Minter.new(yaml)
-        pid =  "#{@namespace}:#{minter.mint}"
+        pid = "#{@namespace}:#{minter.mint}"
         f.rewind
         yaml = YAML::dump(minter.dump)
         f.write yaml
         f.flush
         f.truncate(f.pos)
-      }
+      end
       return pid
     end
-    
   end
 end

data/lib/sufia/models/jobs/batch_update_job.rb

@@ -14,7 +14,6 @@
 
 class BatchUpdateJob
   include Hydra::PermissionsQuery
-  include GenericFileHelper
   include Rails.application.routes.url_helpers 
 
   def queue_name
@@ -79,7 +78,7 @@ class BatchUpdateJob
   end
   
   def file_list ( files)
-    return files.map {|gf| '<a href="'+Sufia::Engine.routes.url_helpers.generic_files_path+'/'+gf.noid+'">'+display_title(gf)+'</a>'}.join(', ')
+    return files.map {|gf| '<a href="'+Sufia::Engine.routes.url_helpers.generic_files_path+'/'+gf.noid+'">'+gf.to_s+'</a>'}.join(', ')
     
   end
   

data/lib/sufia/models/jobs/transcode_audio_job.rb

@@ -28,10 +28,9 @@ class TranscodeAudioJob < FfmpegTranscodeJob
       opts = ""
       if generic_file.mime_type == 'audio/mpeg'
         # Don't re-encode, just copy
-        generic_file.add_file_datastream(generic_file.content.read, :dsid=>'mp3', :mimeType=>'audio/mp3')
-        #generic_file.content.rewind
+        generic_file.add_file_datastream(generic_file.content.read, :dsid=>'mp3', :mimeType=>'audio/mpeg')
       else
-        encode_datastream('mp3', 'audio/mp3', opts)
+        encode_datastream('mp3', 'audio/mpeg', opts)
       end
     end
 

data/lib/sufia/models/model_methods.rb

@@ -35,5 +35,11 @@ module Sufia
 
       return true
     end
+
+    def to_s
+      return Array(title).join(" | ") if title.present?
+      label || "No Title"
+    end
+
   end
 end

data/lib/sufia/models/version.rb

@@ -1,5 +1,5 @@
 module Sufia
   module Models
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/lib/tasks/sufia-models_tasks.rake

@@ -1,4 +1,7 @@
-# desc "Explaining what the task does"
-# task :sufia-models do
-#   # Task goes here
-# end
+namespace :solr do
+
+  desc "Enqueue a job to resolrize the repository objects"
+  task :reindex => :environment do
+    Sufia.queue.push(ResolrizeJob.new)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sufia-models
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Jeremy Friesen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-20 00:00:00.000000000 Z
+date: 2013-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler