hydra-head 3.0.0.rc1 → 3.0.0.rc2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hydra-head (3.0.0.rc1)
+    hydra-head (3.0.0.rc2)
       RedCloth (= 4.2.3)
       active-fedora (~> 3.0.7)
       blacklight (= 3.0.0)
@@ -37,7 +37,6 @@ PATH
       trollop
       will_paginate
       xml-simple
-      yard
 
 GEM
   remote: http://rubygems.org/
@@ -270,3 +269,4 @@ DEPENDENCIES
   rspec-rails (>= 2.0.0)
   ruby-debug
   ruby-debug-base
+  yard

data/HOW_TO_GET_STARTED.textile

@@ -6,13 +6,6 @@ h2. Before You Begin
 
 This tutorial is a work in progress.  We are actively seeking feedback.  If you run into _anything_ that is incorrect or confusing, please email the "hydra-tech":http://groups.google.com/group/hydra-tech mailing list and let us know.
 
-*Apologies for the dust*
-
-The HTML and CSS for hydra-head are currently being overhauled in anticipation of the 3.0.0 release.  The Hydra UI group is working hard on brand new information architecture with corresponding brand-new HTML and CSS.  This work is being carried out in another branch of the hydra-head code on Github and will be merged into the prereleases of the gem as the work approaches completion.  In the meantime, if you use the pre-release versions of hydra-head, you will encounter odd HTML with broken styling.  We are aware of this.   You might think of it as a tour through a construction site where the electricity, plumbing, walls and windows are finished but the drywall, carpet, and furnishings are still being worked on.
-
-This means that the server-side code in hydra-head (Models, Controllers, Modules, and underlying libraries) is stable and ready for you to explore, but the View-level code is still in flux.
-
-If you want to use the UI infrastructure that the hydra-head gem provides, you should wait for the official 3.0.0 release before putting a lot of work into customizing and styling the HTML in your views.  In contrast, if you plan to write all of the UI for your Hydra Head from scratch and simply use the underlying infrastructure to interact with Fedora & Solr, then it's safe to proceed with development.  
 
 h2. What you will learn from this document
 

data/README.textile

@@ -71,10 +71,10 @@ First, add them to the "Gemfile":http://gembundler.com/gemfile.html of your appl
 <pre>
   source 'http://rubygems.org'
 
-  gem 'rails', '~>3.0.4'
+  gem 'rails', '~>3.0.10'
 
   gem 'blacklight', '~> 3.0.0'
-  gem 'hydra-head', '3.0.0pre3'
+  gem 'hydra-head', '3.0.0.rc1'
 
   # We will assume that you're using sqlite3 for testing/demo, 
   # but in a production setup you probably want to use a real sql database like mysql or postgres
@@ -110,7 +110,7 @@ Even if all of the dependencies are satisfied, this will take a _very_ long time
 
 <pre>
   gem install blacklight
-  gem install hydra-head -v 3.0.0pre3
+  gem install hydra-head -v 3.0.0.rc1
 </pre>
 
 Then re-run bundle install and it will run slightly faster.
@@ -147,7 +147,7 @@ Run the database migrations
 
 <pre>
 rake db:migrate
-rake db:migrate RAILS_ENV=test
+rake db:test:prepare
 </pre>
 
 h3. Add all the generated code to the Git repository

data/hydra-head.gemspec

@@ -45,10 +45,10 @@ Gem::Specification.new do |s|
   s.add_dependency 'trollop'
   s.add_dependency 'will_paginate'
   s.add_dependency 'xml-simple'
-  s.add_dependency 'yard'
   s.add_dependency 'block_helpers'
   s.add_dependency 'sanitize'
   
+  s.add_development_dependency 'yard'
   s.add_development_dependency 'jettywrapper', "~> 0.0.10"
   s.add_development_dependency 'ruby-debug'
   s.add_development_dependency 'ruby-debug-base'

data/lib/hydra-head/version.rb

@@ -1,4 +1,4 @@
 module HydraHead
-  VERSION = "3.0.0.rc1"
+  VERSION = "3.0.0.rc2"
 end
 

data/tasks/hydra-head.rake

@@ -67,7 +67,7 @@ namespace :hyhead do
     end
 
     YARD::Rake::YardocTask.new(:doc) do |yt|
-      readme_filename = 'README.textile'
+      readme_filename = File.join(project_root,'README.textile')
       textile_docs = []
       Dir[File.join(project_root, "*.textile")].each_with_index do |f, index| 
         unless f.include?("/#{readme_filename}") # Skip readme, which is already built by the --readme option

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: hydra-head
 version: !ruby/object:Gem::Version 
-  hash: 15424119
+  hash: 15424113
   prerelease: 6
   segments: 
   - 3
   - 0
   - 0
   - rc
-  - 1
-  version: 3.0.0.rc1
+  - 2
+  version: 3.0.0.rc2
 platform: ruby
 authors: 
 - Matt Zumwalt, Bess Sadler, Julie Meloni, Naomi Dushay, Jessie Keck, John Scofield, Justin Coyne & many more.  See https://github.com/projecthydra/hydra-head/contributors
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-20 00:00:00 -05:00
+date: 2011-10-21 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -505,7 +505,7 @@ dependencies:
   type: :runtime
   version_requirements: *id033
 - !ruby/object:Gem::Dependency 
-  name: yard
+  name: block_helpers
   prerelease: false
   requirement: &id034 !ruby/object:Gem::Requirement 
     none: false
@@ -519,7 +519,7 @@ dependencies:
   type: :runtime
   version_requirements: *id034
 - !ruby/object:Gem::Dependency 
-  name: block_helpers
+  name: sanitize
   prerelease: false
   requirement: &id035 !ruby/object:Gem::Requirement 
     none: false
@@ -533,7 +533,7 @@ dependencies:
   type: :runtime
   version_requirements: *id035
 - !ruby/object:Gem::Dependency 
-  name: sanitize
+  name: yard
   prerelease: false
   requirement: &id036 !ruby/object:Gem::Requirement 
     none: false
@@ -544,7 +544,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  type: :development
   version_requirements: *id036
 - !ruby/object:Gem::Dependency 
   name: jettywrapper
@@ -972,7 +972,6 @@ files:
 - install.rb
 - lib/application_controller.rb
 - lib/application_helper.rb
-- lib/blacklight.rb
 - lib/blacklight/catalog_helper.rb
 - lib/block_mapper.rb
 - lib/djatoka.rb

data/lib/blacklight.rb

@@ -1,40 +0,0 @@
-require "hydra-head" # This is a hacky way of ensuring that require_plugin_dependency is defined.
-module Blacklight
-
-  require_plugin_dependency "vendor/plugins/blacklight/lib/blacklight.rb"
-  
- # This method overrides the default Blacklight self.init in order to support the opention of dual default/fulltext indexing
- # that's supported in hydrangea. This also supports the traditional one index structure of Blacklight.  
-
- def self.init
-    
-    solr_config = YAML::load(File.open("#{RAILS_ROOT}/config/solr.yml"))
-    raise "The #{RAILS_ENV} environment settings were not found in the solr.yml config" unless solr_config[RAILS_ENV]
-    
-    if solr_config[RAILS_ENV].has_key?("default")
-      Blacklight.solr_config[:url] = solr_config[RAILS_ENV]['default']['url']
-    elsif solr_config[RAILS_ENV].has_key?('url') 
-      Blacklight.solr_config[:url] = solr_config[RAILS_ENV]['url']
-    else
-      raise "BLACKLIGHT: Unable to configure solr -- #{solr_config.inspect}"
-    end
-    
-    if Gem.available? 'curb'
-      require 'curb'
-      Blacklight.solr = RSolr::Ext.connect(Blacklight.solr_config.merge(:adapter=>:curb))
-    else
-      Blacklight.solr = RSolr::Ext.connect(Blacklight.solr_config)
-    end
-    
-    # set the SolrDocument.connection to Blacklight.solr
-    SolrDocument.connection = Blacklight.solr
-    logger.info("BLACKLIGHT: running version #{Blacklight.version}")
-    logger.info("BLACKLIGHT: initialized with Blacklight.solr_config: #{Blacklight.solr_config.inspect}")
-    logger.info("BLACKLIGHT: initialized with Blacklight.solr: #{Blacklight.solr.inspect}")
-    logger.info("BLACKLIGHT: initialized with Blacklight.config: #{Blacklight.config.inspect}")
-    
-  end
-  
-  
-  
-end