sufia-models 4.0.0.beta4 → 4.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26e357f1f6b832085b27631a3f0b27a6965e5e5d
-  data.tar.gz: 1848e22539c05d4fc6e65c4caf95dbb5bae3853d
+  metadata.gz: ee13e1774ba0de53ce7735b6bb93176a2e27e882
+  data.tar.gz: 0760211d652447c4c47680af22c5cb29afb215c0
 SHA512:
-  metadata.gz: 46eef68b1e122d8a97d163b8af48276506129800d77713866097738d1f41930f93f1ca9d01f098ffc295bc2d964ca9c3f373edfb8983089d1507907637609b1d
-  data.tar.gz: 692a11e6afe0f3fe8545eb12600f50233dc72b7de3fbee2e5bde078ed200e8d03497be4beb12354aaf666e36e651fd35243c3276870476566a9bb60cb51c679d
+  metadata.gz: dca80059d96ab1b9f09c53af4e76374fc0d8644ba44f1faf4fcc2d94365e75e49e1321dd2542390a1ee14459f098c8e64b16caf30bc1c104194c6a7562ac4b23
+  data.tar.gz: da74a7e90d7d9cd3f6a3da5bb67e7e2c0288b366322cb6d1431d0089b43845346188313c3cdca0bcbcf89bfdc22d654006a7133f273c08aab9e442c683b2fcca

data/app/models/concerns/sufia/generic_file/mime_types.rb

@@ -32,7 +32,7 @@ module Sufia
 
       module ClassMethods
         def image_mime_types
-          ['image/png', 'image/jpeg', 'image/jpg', 'image/jp2', 'image/bmp', 'image/gif']
+          ['image/png', 'image/jpeg', 'image/jpg', 'image/jp2', 'image/bmp', 'image/gif', 'image/tiff']
         end
 
         def pdf_mime_types

data/app/services/sufia/noid.rb

@@ -16,11 +16,8 @@ module Sufia
       end
 
       def namespaceize(identifier)
-        if identifier.start_with?(namespace)
-          identifier
-        else
-          "#{namespace}:#{identifier}"
-        end
+        return identifier if identifier.include?(':')
+        "#{namespace}:#{identifier}"
       end
 
       protected

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

@@ -0,0 +1,78 @@
+# -*- encoding : utf-8 -*-
+require 'rails/generators'
+require 'rails/generators/migration'
+
+class Sufia::Models::Upgrade400Generator < Rails::Generators::Base
+  include Rails::Generators::Migration
+
+  source_root File.expand_path('../templates', __FILE__)
+
+  argument     :model_name, type: :string , default: "user"
+  desc """
+This generator for upgrading sufia-models from 3.7.2 to 4.0 makes the following changes to your application:
+ 1. Creates several database migrations if they do not exist in /db/migrate
+ 2. Runs the mailboxer upgrade generator
+ 3. Adds analytics to the sufia.rb configuration file
+       """
+
+  # Implement the required interface for Rails::Generators::Migration.
+  # taken from http://github.com/rails/rails/blob/master/activerecord/lib/generators/active_record.rb
+  def self.next_migration_number(path)
+    if @prev_migration_nr
+      @prev_migration_nr += 1
+    else
+      if last_migration = Dir[File.join(path, '*.rb')].sort.last
+        @prev_migration_nr = last_migration.sub(File.join(path, '/'), '').to_i + 1
+      else
+        @prev_migration_nr = Time.now.utc.strftime("%Y%m%d%H%M%S").to_i
+      end
+    end
+    @prev_migration_nr.to_s
+  end
+
+  def banner
+    say_status("warning", "UPGRADING SUFIA MODELS", :yellow)
+  end
+
+  # Setup the database migrations
+  def copy_migrations
+    # Can't get this any more DRY, because we need this order.
+    [
+      'create_tinymce_assets.rb',
+      'create_content_blocks.rb',
+      'create_featured_works.rb'
+    ].each do |file|
+      better_migration_template file
+    end
+  end
+
+  # Upgrade mailboxer
+  def install_mailboxer
+    generate "mailboxer:namespacing_compatibility"
+  end
+
+  # Add config file for Google Analytics
+  def add_analytics_config
+    copy_file 'config/analytics.yml', 'config/analytics.yml'
+  end
+
+  # Add Google Analytics option to Sufia config
+  def inject_analytics_initializer
+    inject_into_file 'config/initializers/sufia.rb', after: /^Sufia\.config do.*$/ do
+      "\n  # Enable displaying usage statistics in the UI\n" +
+        "  # Defaults to FALSE\n" +
+        "  # Requires a Google Analytics id and OAuth2 keyfile.  See README for more info\n" +
+        "  #config.analytics = false\n"
+      end
+  end
+
+  private
+
+  def better_migration_template(file)
+    begin
+      migration_template "migrations/#{file}", "db/migrate/#{file}"
+    rescue Rails::Generators::Error => e
+      say_status("warning", e.message, :yellow)
+    end
+  end
+end

data/lib/sufia/models/engine.rb

@@ -23,7 +23,7 @@ module Sufia
       config.enable_contact_form_delivery = false
       config.browse_everything = nil
       config.enable_local_ingest = nil
-      config.usage_statistics = nil
+      config.analytics = false
       config.queue = Sufia::Resque::Queue
 
       config.autoload_paths += %W(

data/lib/sufia/models/version.rb

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

data/sufia-models.gemspec

@@ -29,12 +29,12 @@ Gem::Specification.new do |spec|
   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 "hydra-head", "~> 7.0.1"
+  spec.add_dependency "hydra-head", "~> 7.0"
   spec.add_dependency 'nest', '~> 1.1.1'
   spec.add_dependency 'resque', '~> 1.23'
-  spec.add_dependency 'resque-pool', '0.3.0'
+  spec.add_dependency 'resque-pool', '~> 0.3.0'
   spec.add_dependency 'noid', '~> 0.6.6'
-  spec.add_dependency 'mailboxer', '~> 0.12.0.rc2'
+  spec.add_dependency 'mailboxer', '~> 0.12.0'
   spec.add_dependency 'acts_as_follower', '>= 0.1.1', '< 0.3'
   spec.add_dependency 'carrierwave', '~> 0.9.0'
   spec.add_dependency 'hydra-derivatives', '~> 0.1'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sufia-models
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta4
+  version: 4.0.0.rc1
 platform: ruby
 authors:
 - Jeremy Friesen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-27 00:00:00.000000000 Z
+date: 2014-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.0.1
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.0.1
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: nest
   requirement: !ruby/object:Gem::Requirement
@@ -118,14 +118,14 @@ dependencies:
   name: resque-pool
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.0
 - !ruby/object:Gem::Dependency
@@ -148,14 +148,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0.rc2
+        version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0.rc2
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: acts_as_follower
   requirement: !ruby/object:Gem::Requirement
@@ -345,6 +345,7 @@ files:
 - lib/generators/sufia/models/templates/migrations/create_tinymce_assets.rb
 - lib/generators/sufia/models/templates/migrations/create_trophies.rb
 - 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/models.rb