hydra-head 4.0.0.rc3 → 4.0.0.rc4

data/Gemfile

@@ -6,8 +6,9 @@ gemspec
 # For rvm users:
 # bundle config build.ruby-debug-base19 --with-ruby-include=$rvm_path/src/ruby-1.9.3-p0
 group :test do
-  # gem 'linecache19',       '>= 0.5.13'
-  # gem 'ruby-debug-base19', '>= 0.11.26'
-  # gem 'ruby-debug19'
-end
+#  gem 'linecache19',       '>= 0.5.13'
+#  gem 'ruby-debug-base19', '>= 0.11.26'
+#  gem 'ruby-debug19'
+   gem 'cucumber-rails', '>=1.2.0', :require=>false
 
+end

data/Gemfile.lock

@@ -1,16 +1,15 @@
 PATH
   remote: .
   specs:
-    hydra-head (4.0.0.rc3)
+    hydra-head (4.0.0.rc4)
       RedCloth (= 4.2.9)
-      active-fedora (~> 4.0.0.rc18)
+      active-fedora (~> 4.0.0.rc19)
       blacklight (~> 3.3.1)
       block_helpers
       cancan
       devise
       rails (~> 3.2.1)
       sanitize
-      solrizer-fedora (>= 1.2.5)
 
 GEM
   remote: http://rubygems.org/
@@ -29,7 +28,7 @@ GEM
       rack-cache (~> 1.1)
       rack-test (~> 0.6.1)
       sprockets (~> 2.1.2)
-    active-fedora (4.0.0.rc18)
+    active-fedora (4.0.0.rc19)
       activeresource (>= 3.0.0)
       activesupport (>= 3.0.0)
       equivalent-xml
@@ -259,8 +258,6 @@ GEM
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.5)
-    sqlite3-ruby (1.3.3)
-      sqlite3 (>= 1.3.3)
     stomp (1.2.2)
     term-ansicolor (1.0.7)
     thor (0.14.6)
@@ -289,5 +286,6 @@ DEPENDENCIES
   jettywrapper (>= 1.0.4)
   mocha
   rspec-rails
-  sqlite3-ruby
+  solrizer-fedora (>= 1.2.5)
+  sqlite3
   yard

data/app/models/ability.rb

@@ -18,34 +18,38 @@ class Ability
     if @user.is_being_superuser?(session)
       can :manage, :all
     else
-      can :edit, String do |pid|
-        @response, @permissions_solr_document = get_permissions_solr_response_for_doc_id(pid)
-        test_edit
-      end 
+      hydra_default_permissions
+    end
+  end
+
+  def hydra_default_permissions
+    can :edit, String do |pid|
+      @response, @permissions_solr_document = get_permissions_solr_response_for_doc_id(pid)
+      test_edit
+    end 
 
-      can :edit, ActiveFedora::Base do |obj|
-        @response, @permissions_solr_document = get_permissions_solr_response_for_doc_id(obj.pid)
-        test_edit
-      end
- 
-      can :edit, SolrDocument do |obj|
-        test_edit
-      end       
+    can :edit, ActiveFedora::Base do |obj|
+      @response, @permissions_solr_document = get_permissions_solr_response_for_doc_id(obj.pid)
+      test_edit
+    end
 
-      can :read, String do |pid|
-        @response, @permissions_solr_document = get_permissions_solr_response_for_doc_id(pid)
-        test_read
-      end
+    can :edit, SolrDocument do |obj|
+      test_edit
+    end       
 
-      can :read, ActiveFedora::Base do |obj|
-        @response, @permissions_solr_document = get_permissions_solr_response_for_doc_id(obj.pid)
-        test_read
-      end 
-      
-      can :read, SolrDocument do |obj|
-        test_read
-      end 
+    can :read, String do |pid|
+      @response, @permissions_solr_document = get_permissions_solr_response_for_doc_id(pid)
+      test_read
     end
+
+    can :read, ActiveFedora::Base do |obj|
+      @response, @permissions_solr_document = get_permissions_solr_response_for_doc_id(obj.pid)
+      test_read
+    end 
+    
+    can :read, SolrDocument do |obj|
+      test_read
+    end 
   end
   
   private

data/app/models/generic_content.rb

@@ -7,10 +7,7 @@ class GenericContent < ActiveFedora::Base
   has_metadata :name => "descMetadata", :type => Hydra::Datastream::ModsGenericContent
 
   # A place to put extra metadata values
-  has_metadata :name => "properties", :type => ActiveFedora::MetadataDatastream do |m|
-    m.field 'collection', :string
-    m.field 'depositor', :string
-  end
+  has_metadata :name => "properties", :type => Hydra::Datastream::Properties
   
   # adds helpful methods for basic hydra objects.  
   # FIXME:  redundate with  GenericContent include above??

data/app/models/generic_image.rb

@@ -51,11 +51,7 @@ class GenericImage < ActiveFedora::Base
   has_metadata :name => "descMetadata", :type => Hydra::Datastream::ModsImage
   
   # A place to put extra metadata values
-  has_metadata :name => "properties", :type => ActiveFedora::MetadataDatastream do |m|
-    m.field 'collection', :string
-    m.field 'depositor', :string
-    m.field 'title', :string
-  end
+  has_metadata :name => "properties", :type => Hydra::Datastream::Properties
   
   def initialize( attrs={} )
     super

data/app/models/hydra/datastream/properties.rb

@@ -0,0 +1,19 @@
+module Hydra::Datastream
+  class Properties < ActiveFedora::NokogiriDatastream
+    set_terminology do |t|
+      t.root(:path=>"fields", :xmlns => '', :namespace_prefix => nil) 
+
+      t.collection :xmlns => '', :namespace_prefix => nil
+      t.depositor :xmlns => '', :namespace_prefix => nil
+      t.title :xmlns => '', :namespace_prefix => nil
+    end
+
+    def self.xml_template
+      builder = Nokogiri::XML::Builder.new do |xml|
+        xml.fields
+      end
+
+      builder.doc
+    end
+  end
+end

data/hydra-head.gemspec

@@ -15,14 +15,14 @@ Gem::Specification.new do |s|
   s.add_dependency "rails", '~> 3.2.1'
   s.add_dependency "blacklight", '~>3.3.1'  
   s.add_dependency "devise"
-  s.add_dependency "active-fedora", '~>4.0.0.rc18'
+  s.add_dependency "active-fedora", '~>4.0.0.rc19'
   s.add_dependency 'RedCloth', '=4.2.9'
-  s.add_dependency 'solrizer-fedora', '>=1.2.5'
+  s.add_development_dependency 'solrizer-fedora', '>=1.2.5'
   s.add_dependency 'block_helpers'
   s.add_dependency 'sanitize'
   s.add_dependency 'cancan'
   
-  s.add_development_dependency 'sqlite3-ruby'
+  s.add_development_dependency 'sqlite3'
 
   s.add_development_dependency 'yard'
   s.add_development_dependency 'jettywrapper', ">=1.0.4"

data/lib/hydra-head/version.rb

@@ -1,4 +1,4 @@
 module HydraHead
-  VERSION = "4.0.0.rc3"
+  VERSION = "4.0.0.rc4"
 end
 

data/test_support/etc/Gemfile

@@ -5,9 +5,7 @@ source 'http://rubygems.org'
 
 gem "rails", '~> 3.2.2'
 
-#gem 'sqlite3-ruby', '~>1.2.5', :require => 'sqlite3'
-gem 'sqlite3-ruby', :require => 'sqlite3'
-#gem 'sqlite3'
+gem 'sqlite3'
 
 gem 'blacklight', '~>3.3.0'
 
@@ -21,10 +19,11 @@ gem 'cancan'
 group :development, :test do 
        gem 'rspec-rails'
        gem 'mocha'
-       gem 'cucumber-rails'
+       gem 'cucumber-rails', :require => false
        gem 'capybara'
        gem 'factory_girl'
        gem 'rest-client'
+       gem 'solrizer-fedora', '>=1.2.5'
 end
 
 # Gems used only for assets and not required

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-head
 version: !ruby/object:Gem::Version
-  version: 4.0.0.rc3
+  version: 4.0.0.rc4
   prerelease: 6
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-29 00:00:00.000000000 Z
+date: 2012-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70261450818920 !ruby/object:Gem::Requirement
+  requirement: &70283600038780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 3.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70261450818920
+  version_requirements: *70283600038780
 - !ruby/object:Gem::Dependency
   name: blacklight
-  requirement: &70261450817940 !ruby/object:Gem::Requirement
+  requirement: &70283600038160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 3.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *70261450817940
+  version_requirements: *70283600038160
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &70261450817260 !ruby/object:Gem::Requirement
+  requirement: &70283600037660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,21 +44,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70261450817260
+  version_requirements: *70283600037660
 - !ruby/object:Gem::Dependency
   name: active-fedora
-  requirement: &70261450816280 !ruby/object:Gem::Requirement
+  requirement: &70283600037020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.0.rc18
+        version: 4.0.0.rc19
   type: :runtime
   prerelease: false
-  version_requirements: *70261450816280
+  version_requirements: *70283600037020
 - !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: &70261450815340 !ruby/object:Gem::Requirement
+  requirement: &70283600036420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -66,21 +66,21 @@ dependencies:
         version: 4.2.9
   type: :runtime
   prerelease: false
-  version_requirements: *70261450815340
+  version_requirements: *70283600036420
 - !ruby/object:Gem::Dependency
   name: solrizer-fedora
-  requirement: &70261450814520 !ruby/object:Gem::Requirement
+  requirement: &70283600035840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.2.5
-  type: :runtime
+  type: :development
   prerelease: false
-  version_requirements: *70261450814520
+  version_requirements: *70283600035840
 - !ruby/object:Gem::Dependency
   name: block_helpers
-  requirement: &70261450813780 !ruby/object:Gem::Requirement
+  requirement: &70283600035380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70261450813780
+  version_requirements: *70283600035380
 - !ruby/object:Gem::Dependency
   name: sanitize
-  requirement: &70261450812920 !ruby/object:Gem::Requirement
+  requirement: &70283600034820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70261450812920
+  version_requirements: *70283600034820
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &70261450812300 !ruby/object:Gem::Requirement
+  requirement: &70283600034300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70261450812300
+  version_requirements: *70283600034300
 - !ruby/object:Gem::Dependency
-  name: sqlite3-ruby
-  requirement: &70261450811800 !ruby/object:Gem::Requirement
+  name: sqlite3
+  requirement: &70283600062900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70261450811800
+  version_requirements: *70283600062900
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70261450827640 !ruby/object:Gem::Requirement
+  requirement: &70283600062380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70261450827640
+  version_requirements: *70283600062380
 - !ruby/object:Gem::Dependency
   name: jettywrapper
-  requirement: &70261450826800 !ruby/object:Gem::Requirement
+  requirement: &70283600061760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: 1.0.4
   type: :development
   prerelease: false
-  version_requirements: *70261450826800
+  version_requirements: *70283600061760
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70261450826060 !ruby/object:Gem::Requirement
+  requirement: &70283600061260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +154,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70261450826060
+  version_requirements: *70283600061260
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70261450825200 !ruby/object:Gem::Requirement
+  requirement: &70283600060660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,10 +165,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70261450825200
+  version_requirements: *70283600060660
 - !ruby/object:Gem::Dependency
   name: cucumber-rails
-  requirement: &70261450824560 !ruby/object:Gem::Requirement
+  requirement: &70283600059920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -176,10 +176,10 @@ dependencies:
         version: 1.2.0
   type: :development
   prerelease: false
-  version_requirements: *70261450824560
+  version_requirements: *70283600059920
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70261450824020 !ruby/object:Gem::Requirement
+  requirement: &70283600059280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -187,7 +187,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70261450824020
+  version_requirements: *70283600059280
 description: ! 'Hydra-Head is a Rails Engine containing the core code for a Hydra
   application. The full hydra stack includes: Blacklight, Fedora, Solr, active-fedora,
   solrizer, and om'
@@ -339,6 +339,7 @@ files:
 - app/models/hydra/datastream/mods_dataset.rb
 - app/models/hydra/datastream/mods_generic_content.rb
 - app/models/hydra/datastream/mods_image.rb
+- app/models/hydra/datastream/properties.rb
 - app/models/hydra/datastream/rights_metadata.rb
 - app/models/image_asset.rb
 - app/models/mods_asset.rb
@@ -651,7 +652,7 @@ files:
 - vendor/cache/RedCloth-4.2.9.gem
 - vendor/cache/actionmailer-3.2.2.gem
 - vendor/cache/actionpack-3.2.2.gem
-- vendor/cache/active-fedora-4.0.0.rc18.gem
+- vendor/cache/active-fedora-4.0.0.rc19.gem
 - vendor/cache/activemodel-3.2.2.gem
 - vendor/cache/activerecord-3.2.2.gem
 - vendor/cache/activeresource-3.2.2.gem
@@ -734,7 +735,6 @@ files:
 - vendor/cache/solrizer-fedora-1.2.5.gem
 - vendor/cache/sprockets-2.1.2.gem
 - vendor/cache/sqlite3-1.3.5.gem
-- vendor/cache/sqlite3-ruby-1.3.3.gem
 - vendor/cache/stomp-1.2.2.gem
 - vendor/cache/term-ansicolor-1.0.7.gem
 - vendor/cache/thor-0.14.6.gem