sufia-models 3.5.0 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7000540d10c6082fbe78b05a2043eb11f555635
-  data.tar.gz: 60e2c7dc3e31acd37648c671f5df9835f151b913
+  metadata.gz: 473c65f0756556119b1e9710330f297de48b7515
+  data.tar.gz: 12f4b8a3380a9f839afab703e225e0fafbc6fad1
 SHA512:
-  metadata.gz: 61cb90f5d5c5cbf94aca85a2e23a69f20b03b33105808febb2492c4cc55779c49177abbbcfcbdf65b276617281ccf86eadcb2b55674e2c94130cf4364225c2ed
-  data.tar.gz: d0226b74b4c91b7ee635afdf6f37baacd31e8025b53e079a1c123cfa97f1fbd2dfc7851c585f82053e498ab12857600041047d5fce3bbe7541ae69424e762caf
+  metadata.gz: 3b5892c1e42e9fefa5f9b64a75cae761c37ff06fba9a8a92b198f20c06982f79943af6f6020a76946b82f81c78f71fc479111da93aa24a850ae71adeb5fc163f
+  data.tar.gz: 534a0750f304ec5600b9eafabfec6fe527241b7e1780d6fe32b01299d186d9d5fce0941ef5aa64986f626318ab998d803d9833e47b47efbe6d07c24f1a2fb17b

data/app/models/concerns/sufia/user.rb

@@ -66,11 +66,11 @@ module Sufia::User
 
   # The basic groups method, override or will fallback to Sufia::Ldap::User
   def groups
-    return self.group_list ? self.group_list.split(";?;") : []
+    @groups ||= self.group_list ? self.group_list.split(";?;") : []
   end
 
   def ability
-    @ability ||= Ability.new(self)
+    @ability ||= ::Ability.new(self)
   end
 
   module ClassMethods

data/lib/generators/sufia/models/install_generator.rb

@@ -45,7 +45,8 @@ This generator makes the following changes to your application:
       "create_version_committers.rb",
       "add_groups_to_users.rb",
       "create_local_authorities.rb",
-      "create_trophies.rb"
+      "create_trophies.rb",
+      'add_linkedin_to_users.rb'
     ].each do |file|
       better_migration_template file
     end

data/lib/generators/sufia/models/templates/migrations/add_linkedin_to_users.rb

@@ -0,0 +1,5 @@
+class AddLinkedinToUsers < ActiveRecord::Migration
+  def change
+    add_column :users, :linkedin_handle, :string
+  end
+end

data/lib/sufia/models/generic_file/actions.rb

@@ -32,7 +32,6 @@ module Sufia::GenericFile
       end
 
       generic_file.record_version_committer(user)
-      Sufia.queue.push(UnzipJob.new(generic_file.pid)) if generic_file.content.mimeType == 'application/zip'
       if Sufia.config.respond_to?(:after_create_content)
         Sufia.config.after_create_content.call(generic_file, user)
       end

data/lib/sufia/models/version.rb

@@ -1,5 +1,5 @@
 module Sufia
   module Models
-    VERSION = "3.5.0"
+    VERSION = "3.6.0"
   end
 end

data/sufia-models.gemspec

@@ -1,10 +1,9 @@
 # coding: utf-8
 version = File.read(File.expand_path("../../SUFIA_VERSION", __FILE__)).strip
 
-
 Gem::Specification.new do |spec|
   spec.name          = "sufia-models"
-  spec.version       = version 
+  spec.version       = version
   spec.authors       = [
     "Jeremy Friesen",
   ]
@@ -27,11 +26,11 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
 
-  spec.add_dependency 'rails', '>= 3.2.13', '< 5.0'
+  spec.add_dependency 'rails', '> 4.0.0', '< 5.0'
   spec.add_dependency 'activeresource' # No longer a dependency of rails 4.0
 
   # spec.add_dependency "hydra", "6.1.0.rc2"
-  # Since hydra 6.1 isn't out yet, we'll just build it so that it's compatible 
+  # Since hydra 6.1 isn't out yet, we'll just build it so that it's compatible
   # without an explicit dependency
   spec.add_dependency "active-fedora", "~> 6.7.0"
   spec.add_dependency "blacklight", "~> 4.5.0"
@@ -44,7 +43,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'mailboxer', '~> 0.11.0'
   spec.add_dependency 'acts_as_follower', '>= 0.1.1', '< 0.3'
   spec.add_dependency 'paperclip', '~> 3.4.0'
-  spec.add_dependency 'zipruby', '0.3.6'
   spec.add_dependency 'hydra-derivatives', '~> 0.0.5'
   spec.add_dependency 'activerecord-import'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sufia-models
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.6.0
 platform: ruby
 authors:
 - Jeremy Friesen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-05 00:00:00.000000000 Z
+date: 2013-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,9 +42,9 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '>'
       - !ruby/object:Gem::Version
-        version: 3.2.13
+        version: 4.0.0
     - - <
       - !ruby/object:Gem::Version
         version: '5.0'
@@ -52,9 +52,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '>'
       - !ruby/object:Gem::Version
-        version: 3.2.13
+        version: 4.0.0
     - - <
       - !ruby/object:Gem::Version
         version: '5.0'
@@ -218,20 +218,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.4.0
-- !ruby/object:Gem::Dependency
-  name: zipruby
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.3.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.3.6
 - !ruby/object:Gem::Dependency
   name: hydra-derivatives
   requirement: !ruby/object:Gem::Requirement
@@ -306,6 +292,7 @@ files:
 - lib/generators/sufia/models/templates/migrations/add_avatars_to_users.rb
 - lib/generators/sufia/models/templates/migrations/add_groups_to_users.rb
 - lib/generators/sufia/models/templates/migrations/add_ldap_attrs_to_user.rb
+- lib/generators/sufia/models/templates/migrations/add_linkedin_to_users.rb
 - lib/generators/sufia/models/templates/migrations/add_social_to_users.rb
 - lib/generators/sufia/models/templates/migrations/create_checksum_audit_logs.rb
 - lib/generators/sufia/models/templates/migrations/create_local_authorities.rb
@@ -344,7 +331,6 @@ files:
 - lib/sufia/models/jobs/resolrize_job.rb
 - lib/sufia/models/jobs/transcode_audio_job.rb
 - lib/sufia/models/jobs/transcode_video_job.rb
-- lib/sufia/models/jobs/unzip_job.rb
 - lib/sufia/models/model_methods.rb
 - lib/sufia/models/noid.rb
 - lib/sufia/models/resque.rb
@@ -375,7 +361,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Models and services for sufia

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

@@ -1,38 +0,0 @@
-class UnzipJob < ActiveFedoraPidBasedJob
-  def queue_name
-    :unzip
-  end
-
-  def run
-    Zip::Archive.open_buffer(object.content.content) do |archive|
-      archive.each do |f|
-        if f.directory?
-          create_directory(f)
-        else
-          create_file(f)
-        end
-      end
-    end
-  end
-
-  protected
-
-  # Creates a GenericFile object based on +file+
-  # @param file [Zip::File]
-  def create_file(file)
-    @generic_file = GenericFile.new
-    @generic_file.batch_id = object.batch.pid
-    @generic_file.add_file(file.read, 'content', file.name)
-    @generic_file.apply_depositor_metadata(object.edit_users.first)
-    @generic_file.date_uploaded = Time.now.ctime
-    @generic_file.date_modified = Time.now.ctime
-    @generic_file.save
-  end
-  
-  # Creates representation of directory corresponding to +file+
-  # Default behavior: _do nothing_
-  # @param file [Zip::File]
-  def create_directory(file)
-  end
-
-end