sufia-models 3.4.0.rc2 → 3.4.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b7a4b3cdaff9deeb0daf9a3187c248a84187e43
-  data.tar.gz: fb13bbf2f95b343425790369e7fe7274cd00aa5d
+  metadata.gz: a99a0369bfcbc1664a14c452be1b8974636a0634
+  data.tar.gz: a6f097543986bec5f9d858f52c2dc920c655c01b
 SHA512:
-  metadata.gz: 156794daad36670ca931d967e88351953a152654517ad278b006cbff3603b68cbb0d11d6f91684f74edf641df1a0e46397dd48b59ea4d67e8f62c2cffb73403b
-  data.tar.gz: fc3ed4678add11ee8f51c55c8d691b4984b835acf29d362ac7ec86d6adc7e23c4be2e8a5e22ad18b655a190b792a2eec49f85c9e335bfd6a423a062340e9f961
+  metadata.gz: 028422dbcd056c63af547d8f7a2750db76f9116a9f5026fe81a331a630690a2f410259eaf3b22ee82713fe55669d95b406a43494c7c1dea994d8f8cb269776a8
+  data.tar.gz: a5bb30b936796faf04f70ece3f66ad8ebfe3707f566cef41f792dd614fdcf3fced413cd7dea8d4cbc9a677b76810c6fe2976aa05f23597dcc540bc6698eb59be

data/lib/sufia/models.rb

@@ -6,12 +6,6 @@ require 'mailboxer'
 require 'acts_as_follower'
 require 'paperclip'
 require "active_resource" # used by GenericFile to catch errors & by GeoNamesResource
-begin
-  # activerecord-import 0.3.1 does not support rails 4, so we don't require it.
-  require 'activerecord-import'
-rescue LoadError
-  $stderr.puts "Sufia-models is unable to load activerecord-import"
-end
 require 'resque/server'
 
 module Sufia

data/lib/sufia/models/engine.rb

@@ -28,6 +28,7 @@ module Sufia
       config.autoload_paths += %W(
         #{config.root}/lib/sufia/models/jobs
         #{config.root}/app/models/datastreams
+        #{config.root}/app/models/concerns
       )
 
       rake_tasks do
@@ -42,6 +43,7 @@ module Sufia
       end
 
       initializer 'requires' do
+        require 'activerecord-import'
         require 'hydra/derivatives'
         require 'sufia/models/model_methods'
         require 'sufia/models/noid'
@@ -54,7 +56,6 @@ module Sufia
         require 'sufia/models/generic_file/mime_types'
         require 'sufia/models/generic_file/thumbnail'
         require 'sufia/models/generic_file'
-        require 'sufia/models/user'
         require 'sufia/models/user_local_directory_behavior'
         require 'sufia/models/id_service'
         require 'sufia/models/solr_document_behavior'

data/lib/sufia/models/noid.rb

@@ -1,7 +1,7 @@
 module Sufia
   module Noid
     def Noid.noidify(identifier)
-      identifier.split(":").last
+      String(identifier).split(":").last
     end
 
     def Noid.namespaceize(identifier)

data/lib/sufia/models/version.rb

@@ -1,5 +1,5 @@
 module Sufia
   module Models
-    VERSION = "3.4.0.rc2"
+    VERSION = "3.4.0.rc3"
   end
 end

data/sufia-models.gemspec

@@ -33,8 +33,7 @@ Gem::Specification.new do |spec|
   # 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 
   # without an explicit dependency
-  spec.add_dependency "hydra-head", "~> 6.4.0.rc2"
-  spec.add_dependency 'active-fedora', "~> 6.6.0.rc1"
+  spec.add_dependency "hydra-head", "~> 6.4.0"
 
   spec.add_dependency 'nest', '~> 1.1.1'
   spec.add_dependency 'resque', '~> 1.23.0'#, :require => 'resque/server'
@@ -45,6 +44,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'paperclip', '~> 3.4.0'
   spec.add_dependency 'zipruby', '0.3.6'
   spec.add_dependency 'hydra-derivatives', '~> 0.0.5'
-  # https://github.com/zdennis/activerecord-import/pull/79
-  #spec.add_dependency 'activerecord-import', '0.3.0' # 0.3.1 caused a bug in testing: "SQLite3::SQLException: near ",": syntax error: INSERT INTO..."
+  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.4.0.rc2
+  version: 3.4.0.rc3
 platform: ruby
 authors:
 - Jeremy Friesen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-03 00:00:00.000000000 Z
+date: 2013-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -78,28 +78,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 6.4.0.rc2
+        version: 6.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 6.4.0.rc2
-- !ruby/object:Gem::Dependency
-  name: active-fedora
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 6.6.0.rc1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 6.6.0.rc1
+        version: 6.4.0
 - !ruby/object:Gem::Dependency
   name: nest
   requirement: !ruby/object:Gem::Requirement
@@ -232,6 +218,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.5
+- !ruby/object:Gem::Dependency
+  name: activerecord-import
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Models and services for sufia
 email:
 - jeremy.n.friesen@gmail.com
@@ -246,6 +246,7 @@ files:
 - Rakefile
 - app/models/batch.rb
 - app/models/checksum_audit_log.rb
+- app/models/concerns/sufia/user.rb
 - app/models/datastreams/batch_rdf_datastream.rb
 - app/models/datastreams/file_content_datastream.rb
 - app/models/datastreams/fits_datastream.rb
@@ -319,7 +320,6 @@ files:
 - lib/sufia/models/noid.rb
 - lib/sufia/models/resque.rb
 - lib/sufia/models/solr_document_behavior.rb
-- lib/sufia/models/user.rb
 - lib/sufia/models/user_local_directory_behavior.rb
 - lib/sufia/models/utils.rb
 - lib/sufia/models/version.rb
@@ -346,7 +346,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.1.7
 signing_key: 
 specification_version: 4
 summary: Models and services for sufia