sufia-models 3.4.0.rc3 → 3.4.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a99a0369bfcbc1664a14c452be1b8974636a0634
-  data.tar.gz: a6f097543986bec5f9d858f52c2dc920c655c01b
+  metadata.gz: 8a30a239851c784305a00e71642b899ab777e14c
+  data.tar.gz: 78c31e0c6733c9720e34cae450a3fdbef07191af
 SHA512:
-  metadata.gz: 028422dbcd056c63af547d8f7a2750db76f9116a9f5026fe81a331a630690a2f410259eaf3b22ee82713fe55669d95b406a43494c7c1dea994d8f8cb269776a8
-  data.tar.gz: a5bb30b936796faf04f70ece3f66ad8ebfe3707f566cef41f792dd614fdcf3fced413cd7dea8d4cbc9a677b76810c6fe2976aa05f23597dcc540bc6698eb59be
+  metadata.gz: 110a1c7b4aa2c6eb57bcc35fec1a35e361c0906e85d9d27b7917874ae3a6f3815a88da83a174bf2bb55cf657632015b9180ffa57c94e4b7a894ca606b96bbd56
+  data.tar.gz: ffbc2564c22b91b09bfbdae7623c2b1190e87e270f23eb824dbb90b20a57a0c2a1f8c43b1bf45d7d9750a4819b740613510270eae6d5ee86d64e7290ad32b795

data/app/models/batch.rb

@@ -8,10 +8,7 @@ class Batch < ActiveFedora::Base
   belongs_to :user, :property => "creator"
   has_many :generic_files, :property => :is_part_of
 
-  delegate :title, :to => :descMetadata, multiple: true
-  delegate :creator, :to => :descMetadata, multiple: true
-  delegate :part, :to => :descMetadata, multiple: true
-  delegate :status, :to => :descMetadata, multiple: true
+  has_attributes :title, :creator, :part, :status, datastream: :descMetadata, multiple: true
 
   def self.find_or_create(pid)
     begin

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

@@ -3,9 +3,9 @@ module Sufia
     module Characterization
       extend ActiveSupport::Concern
       included do
-        has_metadata :name => "characterization", :type => FitsDatastream
-        delegate :mime_type, :to => :characterization, multiple: false
-        delegate_to :characterization, [:format_label, :file_size, :last_modified,
+        has_metadata "characterization", :type => FitsDatastream
+        has_attributes :mime_type, datastream: :characterization, multiple: false
+        has_attributes :format_label, :file_size, :last_modified,
                                         :filename, :original_checksum, :rights_basis,
                                         :copyright_basis, :copyright_note,
                                         :well_formed, :valid, :status_message,
@@ -20,7 +20,7 @@ module Sufia
                                         :gps_timestamp, :latitude, :longitude,
                                         :character_set, :markup_basis,
                                         :markup_language, :duration, :bit_depth,
-                                        :sample_rate, :channels, :data_format, :offset], multiple: true
+                                        :sample_rate, :channels, :data_format, :offset, datastream: :characterization, multiple: true
 
       end
 

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

@@ -10,12 +10,12 @@ module Sufia
         has_file_datastream "thumbnail"
 
 
-        delegate_to :properties, [:relative_path, :depositor, :import_url], multiple: false
-        delegate_to :descMetadata, [:date_uploaded, :date_modified], multiple: false 
-        delegate_to :descMetadata, [:related_url, :based_near, :part_of, :creator,
+        has_attributes :relative_path, :depositor, :import_url, datastream: :properties, multiple: false
+        has_attributes :date_uploaded, :date_modified, datastream: :descMetadata, multiple: false 
+        has_attributes :related_url, :based_near, :part_of, :creator,
                                     :contributor, :title, :tag, :description, :rights,
                                     :publisher, :date_created, :subject,
-                                    :resource_type, :identifier, :language], multiple: true
+                                    :resource_type, :identifier, :language, datastream: :descMetadata, multiple: true
       end
     end
   end

data/lib/sufia/models/version.rb

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

data/sufia-models.gemspec

@@ -33,10 +33,12 @@ 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 "active-fedora", "~> 6.7.0"
+  spec.add_dependency "blacklight", "~> 4.5.0"
   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'
+  spec.add_dependency 'resque', '~> 1.23'
   spec.add_dependency 'resque-pool', '0.3.0'
   spec.add_dependency 'noid', '~> 0.6.6'
   spec.add_dependency 'mailboxer', '~> 0.11.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sufia-models
 version: !ruby/object:Gem::Version
-  version: 3.4.0.rc3
+  version: 3.4.0.rc4
 platform: ruby
 authors:
 - Jeremy Friesen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-18 00:00:00.000000000 Z
+date: 2013-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,6 +72,34 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: active-fedora
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 6.7.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 6.7.0
+- !ruby/object:Gem::Dependency
+  name: blacklight
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.5.0
 - !ruby/object:Gem::Dependency
   name: hydra-head
   requirement: !ruby/object:Gem::Requirement
@@ -106,14 +134,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.23.0
+        version: '1.23'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.23.0
+        version: '1.23'
 - !ruby/object:Gem::Dependency
   name: resque-pool
   requirement: !ruby/object:Gem::Requirement
@@ -346,7 +374,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.7
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Models and services for sufia