active-fedora 6.8.0 → 7.0.0.pre1

data/spec/samples/hydra-rights_metadata_datastream.rb

@@ -12,81 +12,81 @@ module Hydra
   #
   # Another interesting thing in this Class: it extends to_solr, first calling "super" (the default to_solr behavior) and then inserting an additional embargo_release_date_dt field
   # It uses Solrizer::Extractor.insert_solr_field_value to do this.  That method handles inserting new values into a Hash while ensuring that you don't destroy or overwrite any existing values in the hash.
-  class RightsMetadataDatastream < ActiveFedora::OmDatastream
-
+  class RightsMetadataDatastream < ActiveFedora::OmDatastream       
+  
     set_terminology do |t|
-      t.root(:path => 'rightsMetadata', :xmlns => 'http://hydra-collab.stanford.edu/schemas/rightsMetadata/v1', :schema => 'http://github.com/projecthydra/schemas/tree/v1/rightsMetadata.xsd')
+      t.root(:path=>"rightsMetadata", :xmlns=>"http://hydra-collab.stanford.edu/schemas/rightsMetadata/v1", :schema=>"http://github.com/projecthydra/schemas/tree/v1/rightsMetadata.xsd") 
       t.copyright {
         t.machine {
-          t.cclicense
+          t.cclicense        
         }
-        t.human_readable(:path => 'human')
-        t.cclicense(:proxy => [:machine, :cclicense ])
+        t.human_readable(:path=>"human")
+        t.cclicense(:proxy=>[:machine, :cclicense ])                  
       }
       t.access {
-        t.human_readable(:path => 'human')
+        t.human_readable(:path=>"human")
         t.machine {
           t.group
           t.person
         }
-        t.person(:proxy => [:machine, :person])
-        t.group(:proxy => [:machine, :group])
+        t.person(:proxy=>[:machine, :person])
+        t.group(:proxy=>[:machine, :group])
         # accessor :access_person, :term=>[:access, :machine, :person]
       }
-      t.discover_access(:ref => [:access], :attributes => {:type => 'discover'})
-      t.read_access(:ref => [:access], :attributes => {:type => 'read'})
-      t.edit_access(:ref => [:access], :attributes => {:type => 'edit'})
+      t.discover_access(:ref=>[:access], :attributes=>{:type=>"discover"})
+      t.read_access(:ref=>[:access], :attributes=>{:type=>"read"})
+      t.edit_access(:ref=>[:access], :attributes=>{:type=>"edit"})
       # A bug in OM prevnts us from declaring proxy terms at the root of a Terminology
       # t.access_person(:proxy=>[:access,:machine,:person])
       # t.access_group(:proxy=>[:access,:machine,:group])
-
+    
       t.embargo {
-        t.human_readable(:path => 'human')
+        t.human_readable(:path=>"human")
         t.machine{
-          t.date(:type => 'release')
+          t.date(:type =>"release")
         }
         t.embargo_release_date(:proxy => [:machine, :date])
-      }
+      }    
     end
-
+    
     # Generates an empty Mods Article (used when you call ModsArticle.new without passing in existing xml)
     def self.xml_template
       builder = Nokogiri::XML::Builder.new do |xml|
-        xml.rightsMetadata(:version => '0.1', 'xmlns' => 'http://hydra-collab.stanford.edu/schemas/rightsMetadata/v1') {
+        xml.rightsMetadata(:version=>"0.1", "xmlns"=>"http://hydra-collab.stanford.edu/schemas/rightsMetadata/v1") {
           xml.copyright {
             xml.human
             xml.machine {
-              xml.uvalicense 'no'
+              xml.uvalicense "no"
             }
           }
-          xml.access(:type => 'discover') {
+          xml.access(:type=>"discover") {
             xml.human
             xml.machine
           }
-          xml.access(:type => 'read') {
-            xml.human
+          xml.access(:type=>"read") {
+            xml.human 
             xml.machine
           }
-          xml.access(:type => 'edit') {
+          xml.access(:type=>"edit") {
             xml.human
             xml.machine
           }
           xml.embargo{
             xml.human
             xml.machine
-          }
+          }        
         }
       end
       return builder.doc
     end
-
+    
     # Returns the permissions for the selected person/group
-    # If new_access_level is provided, updates the selected person/group access_level to the one specified
+    # If new_access_level is provided, updates the selected person/group access_level to the one specified 
     # A new_access_level of "none" will remove all access_levels for the selected person/group
     # @param [Hash] selector
     # @param [String] new_access_level (default nil)
-    # @return [Hash]
-    #
+    # @return [Hash] 
+    # 
     # @example Query permissions for person123, Set the permissions to "read", then query again to see that they have changed.
     #   permissions({:person=>"person123"})
     #   => {"person123"=>"edit"}
@@ -94,32 +94,32 @@ module Hydra
     #   => {"person123"=>"read"}
     #   permissions({:person=>"person123"})
     #   => {"person123"=>"read"}
-    def permissions(selector, new_access_level = nil)
-
+    def permissions(selector, new_access_level=nil)
+    
       type = selector.keys.first.to_sym
       actor = selector.values.first
       if new_access_level.nil?
         xpath = self.class.terminology.xpath_for(:access, type, actor)
         nodeset = self.find_by_terms(xpath)
         if nodeset.empty?
-          return 'none'
+          return "none"
         else
-          return nodeset.first.ancestors('access').first.attributes['type'].text
+          return nodeset.first.ancestors("access").first.attributes["type"].text
         end
       else
         remove_all_permissions(selector)
-        unless new_access_level == 'none'
+        unless new_access_level == "none" 
           access_type_symbol = "#{new_access_level}_access".to_sym
-          result = self.update_values([access_type_symbol, type] => {'-1' => actor})
+          result = self.update_values([access_type_symbol, type] => {"-1"=>actor})
         end
         self.dirty = true
         return new_access_level
       end
-
+      
     end
-
+  
     # Reports on which groups have which permissions
-    # @return [Hash]
+    # @return [Hash] 
     # @example
     #   sample_ds.permissions({"group"=>"group_zzz"}, "edit")
     #   sample_ds.permissions({"group"=>"public"}, "discover")
@@ -127,9 +127,9 @@ module Hydra
     def groups
       return quick_search_by_type(:group)
     end
-
+  
     # Reports on which groups have which permissions
-    # @return [Hash]
+    # @return [Hash] 
     # @example
     #   sample_ds.permissions({"person"=>"person_123"}, "read")
     #   sample_ds.permissions({""person"=>"person_456"}, "edit")
@@ -137,21 +137,21 @@ module Hydra
     def individuals
       return quick_search_by_type(:person)
     end
-
+  
     # Updates permissions for all of the persons and groups in a hash
     # @param [Hash] params example: {"group"=>{"group1"=>"discover","group2"=>"edit"}, "person"=>{"person1"=>"read","person2"=>"discover"}}
     # Currently restricts actor type to group or person.  Any others will be ignored
     def update_permissions(params)
-      params.fetch('group', {}).each_pair {|group_id, access_level| self.permissions({'group' => group_id}, access_level)}
-      params.fetch('person', {}).each_pair {|group_id, access_level| self.permissions({'person' => group_id}, access_level)}
+      params.fetch("group", {}).each_pair {|group_id, access_level| self.permissions({"group"=>group_id}, access_level)}
+      params.fetch("person", {}).each_pair {|group_id, access_level| self.permissions({"person"=>group_id}, access_level)}
     end
-
+  
     # This method limits the response to known access levels (:discover, :read, :edit).  Probably runs a bit faster than {#permissions}.
-    # @param [:group,:person] type
-    # @return [Hash]
+    # @param [:group,:person] type 
+    # @return [Hash] 
     def quick_search_by_type(type)
       result = {}
-      [{:discover_access => 'discover'}, {:read_access => 'read'}, {:edit_access => 'edit'}].each do |access_levels_hash|
+      [{:discover_access=>"discover"},{:read_access=>"read"},{:edit_access=>"edit"}].each do |access_levels_hash|
         access_level = access_levels_hash.keys.first
         access_level_name = access_levels_hash.values.first
         self.find_by_terms(*[access_level, type]).each do |entry|
@@ -166,15 +166,15 @@ module Hydra
       release_date = release_date.to_s if release_date.is_a? Date
       begin
         Date.parse(release_date)
-      rescue
-        return 'INVALID DATE'
+      rescue 
+        return "INVALID DATE"
       end
-      self.update_values({[:embargo, :machine, :date] => release_date})
+      self.update_values({[:embargo,:machine,:date]=>release_date})
     end
-    def embargo_release_date(opts = {})
-      embargo_release_date = self.find_by_terms(*[:embargo, :machine, :date]).first ? self.find_by_terms(*[:embargo, :machine, :date]).first.text : nil
+    def embargo_release_date(opts={})
+      embargo_release_date = self.find_by_terms(*[:embargo,:machine,:date]).first ? self.find_by_terms(*[:embargo,:machine,:date]).first.text : nil
       if opts[:format] && opts[:format] == :solr_date
-        embargo_release_date << 'T23:59:59Z'
+        embargo_release_date << "T23:59:59Z"
       end
       embargo_release_date
     end
@@ -182,18 +182,18 @@ module Hydra
       (embargo_release_date && Date.today < embargo_release_date.to_date) ? true : false
     end
 
-    def to_solr(solr_doc = {})
+    def to_solr(solr_doc=Hash.new)
       super(solr_doc)
-      ::Solrizer::Extractor.insert_solr_field_value(solr_doc, 'embargo_release_date_dt', embargo_release_date(:format => :solr_date)) if embargo_release_date
+      ::Solrizer::Extractor.insert_solr_field_value(solr_doc, "embargo_release_date_dt", embargo_release_date(:format=>:solr_date)) if embargo_release_date
       solr_doc
     end
 
 
 
 
-
+  
     private
-    # Purge all access given group/person
+    # Purge all access given group/person 
     def remove_all_permissions(selector)
       type = selector.keys.first.to_sym
       actor = selector.values.first
@@ -201,6 +201,6 @@ module Hydra
       nodes_to_purge = self.find_by_terms(xpath)
       nodes_to_purge.each {|node| node.remove}
     end
-
+  
   end
 end

data/spec/samples/marpa-dc_datastream.rb

@@ -1,4 +1,4 @@
-require 'active-fedora'
+require "active-fedora"
 module Marpa
 
   # This is an example of a OmDatastream that defines a terminology for Dublin Core xml
@@ -11,18 +11,18 @@ module Marpa
   # * Does not override or extend to_solr, so the default solrization approach will be used (Solrizer::XML::TerminologyBasedSolrizer)
   #
   class DcDatastream < ActiveFedora::OmDatastream
-
+  
     set_terminology do |t|
-      t.root(:path => 'dc', :xmlns => 'http://purl.org/dc/terms/')
-      t.tibetan_title(:path => 'title', :attributes => {:language => 'tibetan'})
-      t.english_title(:path => 'title', :attributes => {:language => :none})
-      t.contributor(:index_as => [:facetable])
+      t.root(:path=>"dc", :xmlns=>'http://purl.org/dc/terms/')
+      t.tibetan_title(:path=>"title", :attributes=>{:language=>"tibetan"})
+      t.english_title(:path=>"title", :attributes=>{:language=>:none})
+      t.contributor(:index_as=>[:facetable])
       t.coverage
       t.creator
       t.description
       t.format
       t.identifier
-      t.language(:index_as => [:facetable])
+      t.language(:index_as=>[:facetable])
       t.publisher
       t.relation
       t.source
@@ -41,7 +41,7 @@ module Marpa
       t.coverage
       t.created
       t.creator
-      t.date(:index_as => [:facetable])
+      t.date(:index_as=>[:facetable])
       t.dateAccepted
       t.dateCopyrighted
       t.dateSubmitted
@@ -61,7 +61,7 @@ module Marpa
       t.isRequiredBy
       t.issued
       t.isVersionOf
-      t.language(:index_as => [:facetable])
+      t.language(:index_as=>[:facetable])
       t.license
       t.mediator
       t.medium
@@ -75,23 +75,23 @@ module Marpa
       t.rights
       t.rightsHolder
       t.source
-      t.spatial(:index_as => [:facetable])
-      t.subject(:index_as => [:facetable])
+      t.spatial(:index_as=>[:facetable])
+      t.subject(:index_as=>[:facetable])
       t.tableOfContents
       t.temporal
       t.type
       t.valid
     end
-
+  
     def self.xml_template
       builder = Nokogiri::XML::Builder.new do |xml|
-        xml.dc('xmlns' => 'http://purl.org/dc/terms/',
-          'xmlns:dcterms' => 'http://purl.org/dc/terms/',
-          'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance') {
+        xml.dc("xmlns"=>'http://purl.org/dc/terms/',
+          "xmlns:dcterms"=>'http://purl.org/dc/terms/', 
+          "xmlns:xsi"=>'http://www.w3.org/2001/XMLSchema-instance') {
         }
       end
       return builder.doc
     end
-
+  
   end
-end
+end

data/spec/samples/models/audio_record.rb

@@ -1,29 +1,29 @@
 require 'active-fedora'
 
 class AudioRecord
-
+  
     include ActiveFedora::Model
-
-    # This seems a bit strange, since this Class might be used outside of Oral Histories.
+      
+    # This seems a bit strange, since this Class might be used outside of Oral Histories.  
     # From this perspective, it makes more sense to put triples on the containing object, not on the children...
-
-    relationship 'parents', :is_part_of, [nil, :oral_history]
+    
+    relationship "parents", :is_part_of, [nil, :oral_history]
     #has n, :parents, {:predicate => :is_part_of, :likely_types => [nil, :oral_history]}
     # OR
     # is_part_of [:oral_history]
-
-    property 'date_recorded',   :date
-    property 'file_name', :string
-    property 'duration',  :string
-    property 'notes', :text
+    
+    property "date_recorded",   :date
+    property "file_name", :string
+    property "duration",  :string
+    property "notes", :text
 
     # This doesn't make sense when you have both compressed and uncompressed in the same object!
-    # Probably better to rely on the file size in datastreamVersion "SIZE" attribute from Fedora anyway
+    # Probably better to rely on the file size in datastreamVersion "SIZE" attribute from Fedora anyway    
     #property "file_size", :integer
 
     #property "restriction", :text
-
-    datastream 'compressed', ['audio/mpeg'], :multiple => true
-    datastream 'uncompressed', ['audio/wav', 'audio/aiff'], :multiple => true
-
-end
+    
+    datastream "compressed", ["audio/mpeg"], :multiple => true
+    datastream "uncompressed", ["audio/wav", "audio/aiff"], :multiple => true
+      
+end

data/spec/samples/models/image.rb

@@ -1,5 +1,5 @@
 require 'active-fedora'
 
-class Image
+class Image 
   include ActiveFedora::Model
-end
+end

data/spec/samples/models/mods_article.rb

@@ -1,4 +1,4 @@
-require 'active-fedora'
+require "active-fedora"
 require_relative '../hydra-mods_article_datastream.rb'
 require_relative '../hydra-rights_metadata_datastream.rb'
 
@@ -6,9 +6,9 @@ require_relative '../hydra-rights_metadata_datastream.rb'
 #
 # See lib/samples/sample_thing.rb for a fuller, annotated example of an ActiveFedora Model
 class ModsArticle < ActiveFedora::Base
-
-  has_metadata :name => 'descMetadata', :type => Hydra::ModsArticleDatastream
-  has_metadata :name => 'rightsMetadata', :type => Hydra::RightsMetadataDatastream
-  has_metadata :name => 'properties', :type => ActiveFedora::SimpleDatastream
+  
+  has_metadata :name => "descMetadata", :type=> Hydra::ModsArticleDatastream  
+  has_metadata :name => "rightsMetadata", :type => Hydra::RightsMetadataDatastream
+  has_metadata :name => "properties", :type => ActiveFedora::SimpleDatastream
 
 end

data/spec/samples/models/oral_history.rb

@@ -2,25 +2,25 @@ require 'active-fedora'
 
 class OralHistory < ActiveFedora::Base
     # Imitating DataMapper ...
-
-    has_many :parts, :property => :is_part_of
-
+    
+    has_many :parts, :property=>:is_part_of
+    
     # These are all the properties that don't quite fit into Qualified DC
     # Put them on the object itself (in the properties datastream) for now.
-    has_metadata :name => 'properties', :type => ActiveFedora::SimpleDatastream do |m|
-      field 'alt_title', :string
-      field 'narrator',  :string
-      field 'interviewer', :integer
-      field 'transcript_editor', :text
-      field 'bio', :string
-      field 'notes', :text
-      field 'hard_copy_availability', :text
-      field 'hard_copy_location', :text
-      field 'other_contributors', :string
-      field 'restrictions', :text
+    has_metadata :name => "properties", :type => ActiveFedora::SimpleDatastream do |m|
+      field "alt_title", :string
+      field "narrator",  :string
+      field "interviewer", :integer
+      field "transcript_editor", :text
+      field "bio", :string
+      field "notes", :text
+      field "hard_copy_availability", :text
+      field "hard_copy_location", :text
+      field "other_contributors", :string
+      field "restrictions", :text
     end
-
-    has_metadata :name => 'dublin_core', :type => ActiveFedora::QualifiedDublinCoreDatastream do |m|
+        
+    has_metadata :name => "dublin_core", :type => ActiveFedora::QualifiedDublinCoreDatastream do |m|
       # Default :multiple => true
       #
       # on retrieval, these will be pluralized and returned as arrays
@@ -28,9 +28,9 @@ class OralHistory < ActiveFedora::Base
       #
       # aimint to use method-missing to support calling methods like
       # my_oral_history.subjects  OR   my_oral_history.titles  OR EVEN my_oral_history.title whenever possible
-
+      
       #field :name => "subject_heading", :string, {:xml_node => "subject", :encoding => "LCSH"}
     end
 
-
+  
 end