sufia-models 3.7.1 → 3.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 902e7d4fb841924ee21200d49905afc2846cd5e2
-  data.tar.gz: db30fcb30777e501c49fb81bd532fe2661bf7c90
+  metadata.gz: 46955d1e4d943f5aa48af13600bf6315f7de2246
+  data.tar.gz: c024b0bc111898801fe776e72df994964ca34b93
 SHA512:
-  metadata.gz: 00e12777e02c48ed2a954735cda0772adcf64d39bced24a08857b780e35f59617a1976c1f59db4711684715ffe4181042933493a75b0438e95ef567fb16a574c
-  data.tar.gz: 4720cacea6669c8fb5ba407a06cd28051f91e1d08bc9475655152ffb1ce9d5fcb7b89d2b6de4b02978c035d6d154b74919d1cd0c68ab3825a56f312399f178e0
+  metadata.gz: 81d45bb938a76994c7f84fb30093d53421004930a809a3782932eb9bee52dd6a250f42de784ade74b3d70e806ce976df4a86af7d1f21a0876bd782d212346fcd
+  data.tar.gz: 0d69c56dc6ceab560b4d98642bfb7976c03cd4d06cd3455bb71a771cecf1d70d8a9b8b150963e3a55b5e0e9860bc51bb3ee66bcf9930206d6ed37090f232af93

data/app/models/geo_names_resource.rb

@@ -5,10 +5,10 @@ class GeoNamesResource < ActiveResource::Base
  
   def self.collection_path(prefix_options = {}, query_options = nil)
     super(prefix_options, query_options).gsub(/\.json|\.xml/, "") 
-  end 
- 
-  def self.instantiate_collection(collection, prefix_options = {})
-      col = super(collection["geonames"],prefix_options)
+  end
+
+  def self.instantiate_collection(collection, original_params = {}, prefix_options = {})
+      col = super(collection["geonames"], original_params, prefix_options)
       col.map! {|item|  { label: item.name+ (item.adminName1 ? ", " + item.adminName1 : "")+", " + item.countryName, value: item.name+ (item.adminName1 ? ", " + item.adminName1 : "")+", " + item.countryName} }
       return col      
   end

data/lib/sufia/models/generic_file.rb

@@ -11,6 +11,7 @@ module Sufia
     autoload :Metadata, 'sufia/models/generic_file/metadata'
     autoload :Versions, 'sufia/models/generic_file/versions'
     autoload :VirusCheck, 'sufia/models/generic_file/virus_check'
+    autoload :ReloadOnSave, 'sufia/models/generic_file/reload_on_save'
     include Sufia::ModelMethods
     include Sufia::Noid
     include Sufia::GenericFile::MimeTypes
@@ -25,6 +26,7 @@ module Sufia
     include Sufia::GenericFile::Metadata
     include Sufia::GenericFile::Versions
     include Sufia::GenericFile::VirusCheck
+    include Sufia::GenericFile::ReloadOnSave
 
     included do
       belongs_to :batch, :property => :is_part_of

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

@@ -0,0 +1,18 @@
+# add this in here until we can use a version of Active Fedora that contains this ability
+module Sufia
+  module GenericFile
+    module ReloadOnSave
+
+      attr_writer :reload_on_save
+
+      def reload_on_save?
+        !!@reload_on_save
+      end
+
+      def refresh
+        self.reload if reload_on_save?
+      end
+    end
+  end
+end
+

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

@@ -8,7 +8,7 @@ class ActiveFedoraPidBasedJob
     self.pid = pid
   end
   def object
-    @object ||= ActiveFedora::Base.find(pid, cast:true)
+    @object ||= ActiveFedora::Base.find(pid, cast:true).tap{|f| f.reload_on_save = true}
   end
   alias_method :generic_file, :object
   alias_method :generic_file_id, :pid

data/lib/sufia/models/version.rb

@@ -1,5 +1,5 @@
 module Sufia
   module Models
-    VERSION = "3.6.1"
+    VERSION = "3.7.2"
   end
 end

data/sufia-models.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
 
   spec.add_dependency 'rails', '> 4.0.0', '< 5.0'
-  spec.add_dependency 'activeresource' # No longer a dependency of rails 4.0
+  spec.add_dependency 'activeresource', "~>4.0.0" # No longer a dependency of rails 4.0
 
   spec.add_dependency "blacklight", "~> 4.7.0"
   spec.add_dependency "hydra-head", "~> 6.5.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sufia-models
 version: !ruby/object:Gem::Version
-  version: 3.7.1
+  version: 3.7.2
 platform: ruby
 authors:
 - Jeremy Friesen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-21 00:00:00.000000000 Z
+date: 2014-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -62,16 +62,16 @@ dependencies:
   name: activeresource
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: blacklight
   requirement: !ruby/object:Gem::Requirement
@@ -317,6 +317,7 @@ files:
 - lib/sufia/models/generic_file/metadata.rb
 - lib/sufia/models/generic_file/mime_types.rb
 - lib/sufia/models/generic_file/permissions.rb
+- lib/sufia/models/generic_file/reload_on_save.rb
 - lib/sufia/models/generic_file/thumbnail.rb
 - lib/sufia/models/generic_file/trophies.rb
 - lib/sufia/models/generic_file/versions.rb