hydra 7.0.0.rc1 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c68891c5ada06cc1a3c2a3fbb6a82fde59da0ea6
-  data.tar.gz: 7c0b8b9ea62a7efe231f3b65d97eea4551195771
+  metadata.gz: 57ba23f57ce7053f1ba3ba3b46c306ffb2cc12ad
+  data.tar.gz: 2e133722302297e19f5fbebd4a2780721395e7c6
 SHA512:
-  metadata.gz: 9baebc2136f07907f1d2672a363174a4bd3bb54909cea84d2bf56b489d780f0fb042a47721e5465fb5a78ecce0833139f6d0acda32cfa2ba7b0c5e114887a1ee
-  data.tar.gz: 97648dcf5b096a131426d104bab43fe44a20e4079e32fd0cf9c8c49b4d3695d78c3d9bbceeec6132efdf06069a4abbe04374dd511b6eff55ed67c8139f1a135c
+  metadata.gz: c2c93c5b5b2e8ac5a8328aceace75d5fc112bbde2cc1b532d3b36bc8eaf94f7c312c40c1f2095769684ec9ada0f4b882c83c82e1596bc147478f745fd6971cc4
+  data.tar.gz: 3ca2915c65fd0f0cab91ad9fe5534f6ec618ce5c926c5912dcb5fcccb7760d7c567e63e3cdf0bffff5d5c76357ca1057344381f10fd0fb08c845745605f8b035

data/RELEASE-POLICY.md

@@ -43,7 +43,7 @@ repositories, so you can treat them like any other.
 	git pull
 	```
 
-1. Copy the wiki pages to `docs/` directory of `hydra` project.
+1. Copy the wiki pages to `doc/` directory of `hydra` repository.
 
 	```
 	cp -a path/to/hydra.wiki/* path/to/hydra/doc/
@@ -60,4 +60,4 @@ repositories, so you can treat them like any other.
 This commit should then be included as part of the pull request for the new
 release. See ["Making Changes"](/CONTRIBUTING.md#making-changes) and
 ["Submitting Changes"](/CONTRIBUTING.md#submitting-changes) on the preferred
-way to submit pull requests.
+way to submit pull requests.

data/doc/Dive-into-Hydra.md

@@ -1,4 +1,4 @@
-This tutorial is known to work with [hydra](http://rubygems.org/gems/hydra) release version 6.1.0.   
+This tutorial is tested to work with [hydra](http://rubygems.org/gems/hydra) release version 7.0.0.   
 _Please update this wiki to reflect any other versions that have been tested._
 
 # Prerequisites
@@ -11,8 +11,8 @@ The tutorial also mentions using [Ruby Version Manager](http://rvm.io), a.k.a RV
 
 # System Requirements
 Your system should have the following installed before beginning the walkthrough
-+ [ruby](http://www.ruby-lang.org/en/) 1.9.3 or 2.0.0
-+ [rails](http://rubyonrails.org/)  ~>3.2.15 or ~>4.0.0
++ [ruby](http://www.ruby-lang.org/en/) 2.1.1 (also works with 2.0.0)
++ [rails](http://rubyonrails.org/)  ~>4.1.0  (also works with 3.2.x & 4.0.x)
 + [git](http://git-scm.com/)
 + [java](http://www.java.com/en/) runtime >= 6.0 
 
@@ -29,14 +29,10 @@ Your system should have the following installed before beginning the walkthrough
 
 # Steps/Lessons
 1. [[Lesson: Generate a Rails Application]]
-1. [[Lesson: Create a git Repository]]
 1. [[Lesson: Add the Hydra Dependencies]]
-1. [[Lesson: Run the Hydra generator]]
 1. [[Lesson: Install hydra-jetty]]
-1. [[Lesson: Start Jetty]]
 1. [[Lesson: Start the Application & Search for Results]]
 1. [[Lesson: Build a Book Model]]
-1. [[Lesson: Turn Off Access Controls]]
 1. [[Lesson: Make Blacklight Return Search Results]]
 
 ## Bonus
@@ -45,7 +41,6 @@ You've completed the main tutorial, the following lessons can be completed in an
 1. [[Lesson: Define Relationships Between Objects]]  
 1. [[Lesson: Adding Content Datastreams]]  
 1. [[Lesson: Generate Rails Scaffolding for Creating and Editing Books]]  
-1. [[Lesson: Set up your Rails Application to use RSpec]]  
 
 # Next Steps
 You've finished the initial Hydra tutorial and learned about setting up the basic hydra framework, building basic data models, establishing relationships between models, and modifying the basic user interface provided in a default hydra install.  There is still lots more to learn.  At this point, you can explore the ideas in this tutorial further by spending some time building out your models to support more complex metadata, further customizing your application views, and/or adding tests to make your applications more robust and easy to maintain.

data/doc/Lesson:-Define-Relationships-Between-Objects.md

@@ -1,6 +1,3 @@
-This lesson is known to work with hydra version 6.2.0.   
-_Please update this wiki to reflect any other versions that have been tested._
-
 # Goals
 * Set up Models to represent relationships between different types of objects
 * Create and modify relationships between objects
@@ -28,6 +25,11 @@ class Datastreams::PageMetadata < ActiveFedora::OmDatastream
   def self.xml_template
     Nokogiri::XML.parse("<fields/>")
   end
+
+  def prefix
+    '' # add a prefix for solr index terms if you need to namespace identical terms in multiple data streams 
+  end
+
 end
 
 ```
@@ -52,7 +54,7 @@ This is very similar to how our Book class looks, with the exception of the line
 
 ### Step 3: Make Books aware of their Pages
 
-Let's edit the Book class and add the other half of the relationship:
+Let's edit the Book class in ```app/models/book.rb``` and add the other half of the relationship:
 
 ```ruby
   # within app/models/book.rb
@@ -72,6 +74,8 @@ p.book = b
  => #<Book pid:"changeme:1", title:"Anna Karenina", author:"Tolstoy, Leo"> 
 p.save
  => true 
+b.reload
+ => #<Book pid:"changeme:1", title:"Anna Karenina", author:"Tolstoy, Leo"> 
 b.pages
  => [#<Page pid:"changeme:2", number:1, text:"Happy families are all alike; every unhappy family is unhappy in its own way.">] 
 ```
@@ -89,7 +93,7 @@ Alternatively, look at the datastream in your browser at [http://localhost:8983/
 
 Either way, you should see RDF that looks like this:
 
-```
+```text
 <?xml version="1.0" encoding="UTF-8"?>
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:ns0="info:fedora/fedora-system:def/model#" xmlns:ns1="info:fedora/fedora-system:def/relations-external#">
   <rdf:Description rdf:about="info:fedora/changeme:2">
@@ -123,5 +127,5 @@ $> git commit -m "Created a book page model with relationship to the book model"
 ```
 
 # Next Step
-Go on to [[Lesson: Adding Content Datastreams]] or 
+Go on to **BONUS** [[Lesson: Adding Content Datastreams]] or 
 explore other [Dive into Hydra](Dive into Hydra#Bonus) tutorial bonus lessons.

data/doc/Lesson:-Generate-Rails-Scaffolding-for-Creating-and-Editing-Books.md

@@ -1,6 +1,3 @@
-This Tutorial is known to work with hydra version 6.1.0, 6.2.0.  
-_Please update this wiki to reflect any other versions that have been tested._
-
 # Goals
 
 - Understand the difference between unique (single-value) and multi-valued metadata fields
@@ -44,22 +41,21 @@ Removing test/unit/helpers/
 
 Run the `rails server` and visit [[http://localhost:3000/books]]
 
-If you see 'uninitialized constant Book::BookMetadata' you'll need to edit `app/models/datastreams/book_metadata.rb`
-
-Replace the first line BookMetadata with Datastreams::BookMetadata:
-
-```ruby
-class Datastreams::BookMetadata < ActiveFedora::OmDatastream
-```
-
-You will also need to edit `app/models/book.rb`
-
-Again, replace BookMetadata with Datastreams::BookMetadata:
+Explore the pages for creating, editing and showing Books.
 
-```ruby
-  has_metadata 'descMetadata', type: Datastreams::BookMetadata
-```
-Explore the pages for creating, editing and showing Books.  
+> ####Rails 3-troubleshooting:
+> If you see 'uninitialized constant Book::BookMetadata' you'll need to edit two files.
+> Open `app/models/datastreams/book_metadata.rb` and replace `BookMetadata` in the class definition with `Datastreams::BookMetadata` i.e.
+> 
+> ```ruby
+> class Datastreams::BookMetadata < ActiveFedora::OmDatastream
+> ```
+>
+> You will also need to edit `app/models/book.rb` and replace `BookMetadata` with `Datastreams::BookMetadata`:
+>
+> ```ruby
+>  has_metadata 'descMetadata', type: Datastreams::BookMetadata
+> ```  
 
 ### Step 3: Commit your work
 
@@ -179,4 +175,4 @@ git commit -m "Handling multivalued author fields"
 Based on the concepts in steps 1-7, determine whether you want 'Title' to display as a single or multi-valued field and make appropriate edits to the 'show' view and '_form' partial on your own.
 
 # Next Step
-Proceed to [[Lesson: Set up your Rails Application to use RSpec]] or explore other [Dive into Hydra](Dive into Hydra#Bonus) tutorial bonus lessons.
+Proceed to additional hydra tutorials including [Tame Your XML With OM](https://github.com/projecthydra/om/wiki/Tame-your-XML-with-OM) and [Access Controls with Hydra](https://github.com/projecthydra/hydra-head/wiki/Access-Controls-with-Hydra) or go back to explore other [Dive into Hydra](Dive into Hydra#Bonus) tutorial bonus lessons.

data/doc/Lesson:-add-the-Hydra-dependencies.md

@@ -1,28 +1,70 @@
-This lesson is known to work with hydra (gem) version 6.1.0, 6.2.0.   
-_Please update this wiki to reflect any other versions that have been tested._
-
 # Goals
 * Add the Hydra software to your application's list of dependencies
-* Use bundler to install dependencies
+* Add Hydra (Hydra, Blacklight, and Devise) functionality to your Rails Application
 
 # Explanation 
 
 In order to take advantage of the Hydra code and features in your application, you need to tell the application where to find that code and which versions of that code to use.  Rails uses a tool called [bundler](http://bundler.io/) to track dependencies.  Bundler looks in the file called `Gemfile` to know what you want installed.
 
+Hydra builds on and extends the features provided by Blacklight, the hydra generator integrates core hydra and blacklight functionality into your application.  To do this, we run the custom [Rails generator](http://guides.rubyonrails.org/generators.html) provided by the hydra gem.  The generator creates a number of files in your application that will allow you to build a Hydra application and use and modify Blacklight's features in your application.  The default generator also installs [devise](https://github.com/plataformatec/devise) to provide simple user authentication and management.
+
 # Steps
 
-Open up ```Gemfile``` in your editor.   We're going to add the following lines:
+### Step 1: Add the *hydra* gem to your Gemfile
+
+Open up `Gemfile` in your editor.   We're going to add the following lines after the `source` line:
 
 ```ruby
 gem 'hydra'
 ```
 
-This declares our application to have a dependency on the hydra6 release version of the hydra-gem and ensures that the hydra-head gem gets included (required) correctly. This includes a dependency for the jettywrapper gem (installed automatically). The jettywrapper gem is used to install and configure a preconfigured instance of jetty that loads and runs local development instances of Fedora and Solr for you to run and test your application against.
+This includes the hydra-gem in our application.  Bundler will then ensure that the hydra-head, blacklight, active-fedora and other gems required by hydra get included (required) correctly. This includes a dependency for the jettywrapper gem (installed automatically). The jettywrapper gem is used to install and configure a preconfigured instance of jetty that loads and runs local development instances of Fedora and Solr for you to run and test your application against.
+
+Now save the change and install the dependencies by running bundler:
+```text
+bundle install
+```
+
+Check which files have been changed:
+```text
+git status
+```
+
+You should see changes to your `Gemfile` and `Gemfile.lock`.  Now, go ahead and commit the modified files to your local git repo:
+```text
+git add .
+git commit -m "Add hydra dependency to Gemfile"
+```
+
+### Step 2: Run the code generator provided by the *hydra* gem.
+
+>
+**Tip:** If you want to see clearly what changes that the generator makes, make sure that all of your current changes have been checked into git before running the generator. I.E. make sure that `git status` reports that there are no changes ("nothing to commit").  Then, after you run the generator, you can list all of the newly created and modified field by running `git status`.
+>
+
+Run the hydra generator
+
+```text
+rails generate hydra:install
+```
+
+The hydra generator invokes both the blacklight generator and the hydra-head generator.  Additionally, the blacklight generator installed the devise gem and the bootstrap gem.  It's created an important file in our application `app/controllers/catalog_controller.rb`.  This is the primary place where you configure the blacklight search.
+
+When they are done, the generators have created a few database migrations that support saving user data, searches and bookmarks. Normally you would have to run `rake db:migrate` to update your database tables, but the hydra installer does this for you as one of its last steps.
+
+### Step 3: Review and commit your changes
+
+See what the hydra generator has done
+```text
+git status
+```
+
+After you've viewed which files have been modified, commit the changes:
 
-Now we save the file and install the dependencies by running bundler:
 ```text
-$ bundle install
+git add .
+git commit -m "Ran hydra generator"
 ```
 
 # Next Step
-Go on to [[Lesson: Run the Hydra generator]] or return to the [[Dive into Hydra]] page.
+Go on to [[Lesson: Install hydra-jetty]] or return to the [[Dive into Hydra]] page.

data/doc/Lesson:-adding-content-datastreams.md

@@ -1,6 +1,3 @@
-This lesson is known to work with hydra version 6.1.0, 6.2.0.   
-_Please update this wiki to reflect any other versions that have been tested._
-
 # Goals
 * Add "file-bearing" Datastreams to models and objects
 * See where files are stored in Fedora objects and how to retrieve them
@@ -57,4 +54,4 @@ $> git commit -m "Created a content datastream"
 ```
 
 # Next Step
-Proceed to [[Lesson: Generate Rails Scaffolding for Creating and Editing Books]] or explore other [Dive into Hydra](Dive into Hydra#bonus) tutorial bonus lessons.
+Proceed to **BONUS** [[Lesson: Generate Rails Scaffolding for Creating and Editing Books]] or explore other [Dive into Hydra](Dive into Hydra#bonus) tutorial bonus lessons.

data/doc/Lesson:-build-a-book-model.md

@@ -1,6 +1,3 @@
-This lesson is known to work with hydra release version 6.1.0, 6.2.0.   
-_Please update this wiki to reflect any other versions that have been tested._
-
 # Goals
 * Define a simple OM (Opinionated Metadata) Terminology for Book Metadata that we will track as XML Datastreams
 * Start the Rails console and run code interactively in the console
@@ -44,6 +41,12 @@ class BookMetadata < ActiveFedora::OmDatastream
   def self.xml_template
     Nokogiri::XML.parse("<fields/>")
   end
+
+  def prefix
+    # set a datastream prefix if you need to namespace terms that might occur in multiple data streams 
+    ""
+  end
+
 end
 ```
 
@@ -216,7 +219,7 @@ Check and see that to_solr includes the title and author fields.
 
 ```text
 b.descMetadata.to_solr
- => {"title_tesim"=>["Anna Karenina"], "author_tesim"=>["Tolstoy, Leo"]}
+ => {"title_tesim"=>["Anna Karenina"], "author_tesim"=>["Tolstoy, Leo"]} 
 ```
 Now when you call `.to_solr` on a BookMetadata datastream it returns a solr document with fields named `title_tesim` and `author_tesim` that contain your title and author values.  Those are the field names that we will add to Blacklight's queries in [[Lesson: Make Blacklight Return Search Results]].
 
@@ -234,14 +237,14 @@ If you refresh the document result from solr ([[http://localhost:8983/solr/selec
 
 ```xml
 <arr name="title_tesim">
-  <str>Anna Karenina</str>
+    <str>Anna Karenina</str>
 </arr>
 <arr name="author_tesim">
-  <str>Tolstoy, Leo</str>
+    <str>Tolstoy, Leo</str>
 </arr>
 ```
 
-**Aside:** The strange suffixes on the field names are provided by [solrizer](http://github.com/projecthydra/solrizer). You can read about them in the solrizer documentaton. In short, the **_tesim** suffix tells Solr to treat the values as _**t**ext_ in the _**e**nglish_ language that should be _**s**tored_, _**i**ndexed_ and allowed to be _**m**ultivalued_. This _tesim suffix is a useful catch-all that gets your searches working predictably with minimal fuss. As you encounter cases where you need to index your content in more nuanced ways, there are ways to change these suffixes in order to achieve different results in Solr.
+**Aside:** The strange suffixes on the field names are provided by [solrizer](http://github.com/projecthydra/solrizer). You can read about them in the [solrizer documentaton](https://github.com/projecthydra/hydra-head/wiki/Solr-Schema). In short, the **_tesim** suffix tells Solr to treat the values as _**t**ext_ in the _**e**nglish_ language that should be _**s**tored_, _**i**ndexed_ and allowed to be _**m**ultivalued_. This _tesim suffix is a useful catch-all that gets your searches working predictably with minimal fuss. As you encounter cases where you need to index your content in more nuanced ways, there are ways to change these suffixes in order to achieve different results in Solr.
 
 #### Why doesn't the Book show up in Blacklight?
 
@@ -257,6 +260,6 @@ $> git commit -m "Created a book model and a datastream"
 ```
 
 # Next Step
-Go on to [[Lesson: Turn Off Access Controls]] or return to the [[Dive into Hydra]] page.
+Go on to [[Lesson: Make Blacklight Return Search Results]] or return to the [[Dive into Hydra]] page.
 
 If you want to learn about OM Terminologies and how they work, visit the [Tame your XML with OM](https://github.com/projecthydra/om/wiki/Tame-your-XML-with-OM) Tutorial.

data/doc/Lesson:-generate-a-rails-application.md

@@ -1,50 +1,91 @@
 # Goals
 * Create your new Ruby on Rails Application
+* Initialize the local git repository for your project
 
 # Explanation
 
-**Note:** This lesson is basically equivalent to the [Getting Started](http://curriculum.railsbridge.org/curriculum/getting_started) step in the RailsBridge Curriculum.
+**Note:** This lesson is roughly covers the [Getting Started](http://curriculum.railsbridge.org/curriculum/getting_started) and [Create A New Git Repo](http://curriculum.railsbridge.org/curriculum/create_a_new_git_repo) steps in the RailsBridge Curriculum.
 
-This lesson assumes you are using a **3.2 or 4.0 version of rails**.  To avoid confusion, it's better to have a clean gemset with only one version of rails installed.  Most people use either [RVM](http://rvm.io) or [rbenv](https://github.com/sstephenson/rbenv) to handle gemsets and ruby versions.
+This lesson assumes you are using a **3.2, 4.0, or 4.1 version of rails**.  To avoid confusion, it's better to have a clean gemset with only one version of rails installed.  Most people use either [RVM](http://rvm.io) or [rbenv](https://github.com/sstephenson/rbenv) to handle gemsets and ruby versions.
 
 The first step to creating a Hydra Head, or any other type of Rails Application, is to generate the basic skeleton of the application code.
 
+We'll also initialize our Git repository in this lesson so we can track incremental changes to our code. In order to track the changes you make to your code, to share your changes with others, and to pull other people's changes into your code, you need some form of Version Control.  The Hydra community uses Git for version control and to share work on Github.
+
 # Steps
 
 ### Step 1: Create a new rails application
 
-Once you have installed a suitable rails gem (any 3.2 or 4.0 release), begin by using it to generate a new rails application.  You can choose any name for your application.  In this tutorial we are calling it hydra-demo 
+Once you have installed a suitable rails gem (any 3.2, 4.0, or 4.1 release), begin by using it to generate a new rails application.  You can choose any name for your application.  In this tutorial we are calling it hydra-demo 
 
-```bash
-$> rails new hydra-demo
+```text
+rails new hydra-demo
 ```
 
 This generates the file structure for an empty rails application. And it runs 'bundler' which loads in all of the external dependencies for rails.
 
-Enter the directory for the new rails app: ```cd hydra-demo```, then you should see a file structure like this:
+Enter the directory for the new rails app:
+
+```text
+cd hydra-demo
+```
+
+When you type `ls` at the command prompt, you should see a file structure like this:
 
-```bash
-$> ls
+>
+```text
 Gemfile		Rakefile	config.ru	lib		script		vendor
 Gemfile.lock	app		db		log		test
 README.rdoc	config		doc		public		tmp
 ```
+>
+
+### Step 1a: *(Linux only)* Enable javascript runtime
+
+Find the line in your Gemfile that has ```# gem 'therubyracer', :platforms => :ruby``` and uncomment that line.  This allows your system to identify the appropriate javascript runtime.
+
+Now save the Gemfile and run ```bundle install```. This tells bundler to update your dependencies to reflect the change in your Gemfile.
+
+### Step 1b: *(Rails 3 only)* Remove the default rails 3 homepage
+
+Rails 3 generates a placeholder homepage at `public/index.html`.  You will need to remove this file in order for the blacklight generated homepage to be used:
+
+```text
+rm public/index.html
+```
 
 ### Step 2: Set your Ruby version for this project
 
-Create the file ```.ruby-version``` in your project's directory (hydra-demo). Put your Ruby's version inside that file. For example, if you're using ruby-2.0.0, your file would look like this:
+A file called ```.ruby-version``` in your project directory (hydra-demo) identifies which version of ruby your application is built with. Put your Ruby's version inside that file. For example, if you're using ruby-2.1.1, you can create the file by entering this at the command prompt:
+
+```text
+echo 'ruby-2.1.1' > .ruby-version
+```
+
+If you're using a Ruby environment manager such as RVM or rbenv, this will cause your system to automatically load the correct version of Ruby when you enter this directory.
+
+### Step 3: Initialize your git repository
+
+Now, let's turn the application directory into a git repository.  Type the following:
 
 ```text
-2.0.0
+git init .
 ```
 
-If you're using a Ruby environment manager such as RVM or rbenv, this will make it so you switch to the correct version of Ruby when you enter this directory.
+Then you should see something like this:
 
-> ### Linux only step: Enable javascript runtime
 >
-> Find the line in your Gemfile that has ```# gem 'therubyracer', :platforms => :ruby``` and uncomment that line.  This allows your system to identify the appropriate javascript runtime.
+```text
+Initialized empty Git repository in /Users/camper/hydra-demo/.git/
+```
 >
-> Now save the Gemfile and run ```bundle install```. This tells bundler to update your dependencies to reflect the change in your Gemfile.
+
+Next, we'll add all the files rails created into the repository.  This way we can jump back to this state later if the need arises.
+
+```text
+git add .
+git commit -m "Initial rails application"
+```
 
 # Next Step
-Go on to [[Lesson: Create a git Repository]] or return to the [[Dive into Hydra]] page.
+Go on to [[Lesson: Add the Hydra Dependencies]] or return to the [[Dive into Hydra]] page.

data/doc/Lesson:-install-hydra-jetty.md

@@ -1,27 +1,34 @@
-This lesson is known to work with hydra release version 6.1.0, 6.2.0.   
-_Please update this wiki to reflect any other versions that have been tested._
-
 # Goals
 * Install a copy of hydra-jetty, which includes pre-configured copies of Fedora and Solr
+* Learn to start and stop hydra-jetty (which contains Fedora and Solr)
 
 # Explanation
-In order to use blacklight and hydra-head, you need an installation of Solr.  Additionally, hydra-head requires a copy of the Fedora repository.  We have created a package called hydra-jetty, which provides both of these within a Jetty Java application server.
+In order to use blacklight and hydra-head, you need an installation of Solr.  In addition, hydra-head requires a copy of Fedora.  Fedora and Solr are both Java web applications that need to run in a servlet container like Tomcat or Jetty. 
 
-# Steps
+For developer environments, we have created a package called hydra-jetty which provides both services pre-installed within a Jetty Java application server. Whenever you need Fedora and Solr running in your development environment, just start or stop that copy of hydra-jetty.
+
+>
+**TIP** *DO NOT* use hydra-jetty for production installations.  The hydra-jetty passwords are well-known and the installation has not been secured for non-local use.
+>
 
+# Steps
 
 ### Step 1: Install the hydra-jetty package 
 
 Use the hydra:jetty generator to install the hydra-jetty package by running:
 
-```bash
-$> rails g hydra:jetty
+>
+**TIP** hydra-jetty is a very large download.  If you are completing this lesson as part of a workshop, the facilitator may have a copy of hydra-jetty that you can load from a flash-drive rather than downloading over the internet. The workshop facilitator will provide alternate instructions for this step.
+>
+
+```text
+rails g hydra:jetty
 ```
 
 This generator is provided by the jettywrapper gem.
 
 
-This can be very slow (over 100Mb of download).  When it's done you'll see the directory named ```jetty``` has been created. If you run '''git status''' you will see 
+This can be very slow (over 100Mb of download).  When it's done you'll see the directory named `jetty` has been created. If you run `git status` you will see 
 
 ```text
 # On branch master
@@ -37,7 +44,7 @@ This can be very slow (over 100Mb of download).  When it's done you'll see the d
 
 We want git to ignore the jetty directory for the same reasons that we don't check our development databases into git -- because it's big and bulky and you don't actually need other developers to have exact copies of your jetty as long as they have all the other code. 
 
-We do that by editing ```.gitignore``` and adding the something like this:
+We do that by editing `.gitignore` and adding the something like this:
 
 ```text
 # Ignore jetty directory (from hydra-jetty)
@@ -47,11 +54,89 @@ We do that by editing ```.gitignore``` and adding the something like this:
 
 Now commit this change
 
-```
+```text
 git add .gitignore
 git commit -m "Adds /jetty to .gitignore"
 ```
 
+### Step 3: Start Jetty
+At the project root, type 
+
+```text
+rake jetty:start
+```
+
+You should see output like this:
+
+>
+```text
+Starting jetty with these values: 
+jetty_home: /Users/justin/hydra-demo/jetty
+jetty_command: java -Djetty.port=8983 -Dsolr.solr.home=/Users/justin/hydra-demo/jetty/solr -Xmx256m -XX:MaxPermSize=128m -jar start.jar
+Logging jettywrapper stdout to /Users/justin/hydra-demo/jetty/jettywrapper.log
+Wrote pid file to /Users/justin/hydra-demo/tmp/pids/_Users_justin_hydra-demo_jetty.pid with value 8315
+Waited 5 seconds for jetty to start, but it is not yet listening on port 8983. Continuing anyway.
+Started jetty (5575.9ms)
+```
+>
+
+hydra-jetty has a fair amount of stuff in it, so it may take up to a minute to start.  You can check to see if it's started by going to [[http://localhost:8983/solr]]
+
+If Fedora, Solr, or jetty itself are not starting, you'll want to look at the jettywrapper log to diagnose.
+
+**Windows Tip:** This rake task is not currently working on Windows (see [jettywrapper issue #13](https://github.com/projecthydra/jettywrapper/issues/13) for status).  In the meantime, start jetty manually
+
+```text
+cd jetty
+java -Djetty.port=8983 -Dsolr.solr.home=/Users/justin/hydra-demo/jetty/solr -Xmx256m -XX:MaxPermSize=128m -jar start.jar
+```
+
+### Step 4: Look at the jettywrapper log
+
+The jetty:start rake task runs jetty as a background job, so jetty's logs won't appear in your terminal.  Instead they're written to the file `jetty/jettywrapper.log`.  If you look at the output from running the jetty:start task, you'll see that one line gives you the full path to the file, for example:
+
+```text
+Logging jettywrapper stdout to /Users/justin/hydra-demo/jetty/jettywrapper.log
+```
+
+You can open this log file with any text editor or log reader.
+
+```text
+vi jetty/jettywrapper.log
+```
+
+### Step 5: Monitor the jettywrapper log
+
+>
+**Tip:** if jetty is taking a long time to start, you can watch its output using the tail command with the path to your jettywrapper.log.  For example:
+
+```text
+tail -f jetty/jettywrapper.log
+```
+>
+
+As Jetty, Fedora, and Solr start you will see more info being written to the log file. After a few moments you will be able to open jetty at [[http://localhost:8983]] or [[http://0.0.0.0:8983]] (**note:** The root page will give a 404 error, but should have three links to the applications running in Jetty: /solr, /fedora and /fedora-test)
+
+### Step 6: Stop Jetty
+You might have guessed this one.  In order to stop jetty, at the project root, type
+
+```text
+rake jetty:stop
+```
+
+### Step 7: Start Jetty again
+Before proceeding to the next lesson, make sure jetty is running.  If you're not sure whether it's running, go to http://localhost:8983.  If jetty is running a page will load.  If jetty is not running no page will load.
+
+If it's not running, just use the jetty:start rake task again.
+
+```text
+rake jetty:start
+```
+
+
+>
+**Tip:** Sometimes people are confused about whether they need to restart jetty when they restart their Rails application.  In most cases it is fine to leave jetty running when you start, stop, and restart the Rails application.  The only exception is when you make changes to Solr's configuration or Fedora's configuration -- these would be changes to files inside of your copy of hydra-jetty (ie. jetty/solr/config), not changes to files in your Rails application's Ruby code.  In those cases, where you have made changes to Solr or Fedora's configuration, you need to restart Jetty in order for those changes to take effect.  The most common change that requires restarting jetty is when you modify the solrconfig.xml or schema.xml in your solr config directory.
+>
 
 # Next Step
-Go on to [[Lesson: Start Jetty]] or return to the [[Dive into Hydra]] page.
+Go on to [[Lesson: Start the Application & Search for Results]] or return to the [[Dive into Hydra]] page.

data/doc/Lesson:-make-blacklight-return-search-results.md

@@ -1,7 +1,5 @@
-This lesson is known to work with hydra version 6.1.0, 6.2.0.   
-_Please update this wiki to reflect any other versions that have been tested._
-
 # Goals
+* *(for now)* Turn off access controls for Blacklight-based searches and "show" views 
 * Tell Blacklight which fields to use in searches
 * Run a search in Blacklight and see results rendered
 
@@ -9,13 +7,37 @@ _Please update this wiki to reflect any other versions that have been tested._
 
 In [[Lesson: Build a Book Model]] you made a Book object, saved it, and saw that the Book's metadata was indexed in Solr.  Now we will make that Book appear in your Blacklight searches.
 
+One of the main features that Hydra adds to Blacklight is the ability to control who has access to which information in search results.  That topic gets a little bit complicated.  For the purpose of this Tutorial we want to stay focused on showing you how to set up an app, define models and create objects based on those models, so in order to keep things simple we will make this Hydra Head behave like an open access repository where everyone can see everything.  Once you've completed this tutorial, you can check out [Access Controls with Hydra](https://github.com/projecthydra/hydra-head/wiki/Access-Controls-with-Hydra) to learn how to assert access controls on objects and enforce those access controls in a Hydra Head.
+
+Once you've turned off access controls in step #1, we show you how to tell blacklight which fields you want to use for default searches in the remaining steps.
+
 # Steps
 
-### Step 1: Run a search in the CatalogController
+### Step 1: Comment out the lines that enforce access controls in Blacklight's CatalogController
+
+If you open ```app/controllers/catalog_controller.rb``` and look at the code near lines 8-12 you should see this:
+```ruby
+  # These before_filters apply the hydra access controls
+  before_filter :enforce_show_permissions, :only=>:show
+  # This applies appropriate access controls to all solr queries
+  CatalogController.solr_search_params_logic += [:add_access_controls_to_solr_params]
+```
+
+This code tells blacklight to enforce access controls on the search and result view pages.  For the time being we will turn this off by commenting out two lines so that it looks like this:
+
+```ruby
+  # These before_filters apply the hydra access controls
+  #before_filter :enforce_show_permissions, :only=>:show
+  # This applies appropriate access controls to all solr queries
+  #CatalogController.solr_search_params_logic += [:add_access_controls_to_solr_params]
+```
+Then, save the file.
+
+### Step 2: Run a search in the CatalogController
 
 Visit or reload the page at [[http://localhost:3000/]].  You should see the Blacklight search interface with a search box.  If you search for 'Anna' you don't see any results even though we created a Book called "Anna Karenina" and indexed it in Solr in the last lesson.  
 
-### Step 2: Tell Blacklight which fields to use in Queries
+### Step 3: Tell Blacklight which fields to use in Queries
 
 The reason why we're not getting any hits is because we haven't told Blacklight which fields to search in.  Let's fix that by setting the default 'qf' solr parameter.  Open `app/controllers/catalog_controller.rb` and set the `default_solr_params` section (around line 18) to this:
 
@@ -27,13 +49,13 @@ The reason why we're not getting any hits is because we haven't told Blacklight
     }
 ```
 
-### Step 3: Re-run your search
+### Step 4: Re-run your search
 
 Save the file, and refresh your web browser. You should now see a result for "Anna Karenina" when you search for "Anna"
 
 **Tip:** When you make changes like this, you *don't* need to restart the Rails server.  This is because in development mode (which is the default environment for the Rails server), the Rails server reloads any files in app/models, app/controllers, app/views, etc. for every request it receives from a browser.  This makes the server slower, but it makes life much smoother when you're actively developing and making changes.
 
-### Step 4: Commit your changes
+### Step 5: Commit your changes
 
 Now that we've updated our search functionality, it's a great time to commit to git:
 
@@ -43,5 +65,5 @@ $> git commit -m "Disabled access controls and set default search fields"
 ```
 
 # Next Step
-Go on to [[Lesson: Define Relationships Between Objects]] or 
+Go on to **BONUS** [[Lesson: Define Relationships Between Objects]] or 
 explore other [Dive into Hydra](Dive into Hydra#Bonus) tutorial bonus lessons.

data/doc/Lesson:-start-the-application-&-search-for-results.md

@@ -1,6 +1,3 @@
-This lesson is known to work with hydra release version 6.1.0.   
-_Please update this wiki to reflect any other versions that have been tested._
-
 # Goals
 * Start and Stop a local "development" copy of the application
 * Remove the default Welcome page provided by Rails
@@ -21,18 +18,7 @@ Leave that terminal window open.  It will print info whenever the server does an
 ### Step 2: Look at the application in your Browser
 
 Now you can visit your local copy of the application with a web browser when you point the browser at [[http://localhost:3000/]]
-
-> ####Rails 3-only step: Remove the Rails default "Welcome" page
->
-> If it worked you should see a page with the text: "Welcome aboard. You’re riding Ruby on Rails!".  This is the default page, but now that we know it works, we can delete it. In Rails 4 you will **NOT** see the default rails welcome page and you can proceed to the 'Run a Search' step.
->
-> Open a new terminal (so we can keep the server running) and type:
->
-> ```bash
-> $> rm public/index.html
-> ```
-> Then reload the page at [[http://localhost:3000/]].  
-
+ 
 ### Step 3: Run a Search
 
 Now that you've removed the default "Welcome" page and reloaded the page in your browser, you should see something that looks like a default Blacklight install.  If you enter a search query you don't see any results because we haven't created any objects yet -- your Solr index is empty.

data/hydra.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'om', '~> 3.0.4'
   gem.add_dependency 'solrizer', '~> 3.1.1'
   gem.add_dependency 'rsolr', '~> 1.0.10'
-  gem.add_dependency 'blacklight', '~> 5.3.0'
+  gem.add_dependency 'blacklight', '~> 5.4.0'
   gem.add_dependency 'nokogiri', '~> 1.6.0'
   gem.add_dependency 'rubydora', '~> 1.7.4'
   gem.add_dependency 'nom-xml', '~> 0.5.1'

data/lib/generators/hydra/install_generator.rb

@@ -5,7 +5,7 @@ module Hydra
     desc 'Generate a new hydra project'
 
     def run_other_generators
-      generate("blacklight --devise")
+      generate("blacklight:install --devise")
       generate('hydra:head -f')
       rake('db:migrate')
     end

data/lib/hydra/version.rb

@@ -1,3 +1,3 @@
 module Hydra
-  VERSION = "7.0.0.rc1"
+  VERSION = "7.0.0"
 end

data/script/grant_revoke_gem_authority.rb

@@ -46,6 +46,7 @@ HYDRA_COMMITTER_EMAILS = [
   "jpstroop@gmail.com",
   "justin@curationexperts.com",
   "leftwing@alumni.rutgers.edu",
+  "mark@curationexperts.com",
   "matt@curationexperts.com",
   "mbklein@gmail.com",
   "mstrom81@gmail.com",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra
 version: !ruby/object:Gem::Version
-  version: 7.0.0.rc1
+  version: 7.0.0
 platform: ruby
 authors:
 - Jeremy Friesen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-30 00:00:00.000000000 Z
+date: 2014-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-head
@@ -121,14 +121,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.3.0
+        version: 5.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.3.0
+        version: 5.4.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -217,15 +217,11 @@ files:
 - doc/Lesson:-add-the-Hydra-dependencies.md
 - doc/Lesson:-adding-content-datastreams.md
 - doc/Lesson:-build-a-book-model.md
-- doc/Lesson:-create-a-git-repository.md
 - doc/Lesson:-generate-a-rails-application.md
 - doc/Lesson:-install-hydra-jetty.md
 - doc/Lesson:-make-blacklight-return-search-results.md
-- doc/Lesson:-run-the-Hydra-generator.md
 - doc/Lesson:-set-up-your-Rails-Application-to-use-rspec.md
-- doc/Lesson:-start-jetty.md
 - doc/Lesson:-start-the-application-&-search-for-results.md
-- doc/Lesson:-turn-off-access-controls.md
 - doc/Migrating-to-Hydra-6.2.md
 - doc/Migration-Notes.md
 - doc/Models---Defining-a-Custom-Hydra-Model.textile
@@ -260,9 +256,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2

data/doc/Lesson:-create-a-git-repository.md

@@ -1,32 +0,0 @@
-Note: This lesson is basically equivalent to the [Create A New Git Repo](http://curriculum.railsbridge.org/curriculum/create_a_new_git_repo) step in the RailsBridge Curriculum.
-
-# Goals
-* Create a local git repository that will track all changes to this application's code
-
-# Explanation
-
-In order to track the changes you make to your code, to share your changes with others, and to pull other people's changes into your code, you need some form of Version Control.  All of the Hydra projects use Git for version control and share their work on Github.
-
-# Steps
-
-Now, let's turn this directory into a git repository.  Type the following:
-
-```bash
-$> git init .
-```
-
-Then you should see something like this:
-
-```
-Initialized empty Git repository in /Users/justin/hydra-demo/.git/
-```
-
-Next, we'll add all the files rails created into the repository.  This way we can jump back to this state later if the need arises.
-
-```bash
-$> git add .
-$> git commit -m "Initial rails application"
-```
-
-# Next Step
-Go on to [[Lesson: Add the Hydra Dependencies]] or return to the [[Dive into Hydra]] page.

data/doc/Lesson:-run-the-Hydra-generator.md

@@ -1,39 +0,0 @@
-This lesson is known to work with hydra version 6.1.0, 6.2.0.   
-_Please update this wiki to reflect any other versions that have been tested._
-
-# Goals
-* Add Hydra (Hydra, Blacklight, and Devise) functionality to your Rails Application
-
-# Explanation
-
-Hydra builds on and extends the features provided by Blacklight, the generator integrates core hydra and blacklight functionality into your application.  To do this, we run the custom [Rails generator](http://guides.rubyonrails.org/generators.html) provided by the hydra gem.  The generator creates a number of files in your application that will allow you to build a Hydra application and use and modify Blacklight's features in your application.  The default generator also installs [devise](https://github.com/plataformatec/devise) to provide simple user authentication and management.
-
-**Tip:** If you want to see clearly what changes that the generator has made, make sure that before you run the generator all of your current changes have been checked into git -- so before running the generator running 'git status' should report that there are no changes ("nothing to commit").  Then when you run the generator you will be able to see all of the changes it's made by runing 'git status'.
-
-# Steps
-
-**Note:** You must have completed the steps in [[Lesson: Add the Hydra Dependencies]] in order for the following steps to work.
-
-
-### Step 1: Run the code generator provided by the Hydra gem.  
-
-We do this by typing 
-
-```bash
-$> rails generate hydra:install
-```
-
-The hydra generator invokes both the blacklight generator and the hydra-head generator.  Additionally, the blacklight generator installed the devise gem and the bootstrap gem.  It's created an important file in our application `app/controllers/catalog_controller.rb`.  This is the primary place where you configure the blacklight search.
-
-When they are done, the generators have created a few database migrations that support saving user data, searches and bookmarks. Normally you would have to run `rake db:migrate` to update your database tables, but the hydra installer does this for you as one of its last steps.
-
-### Step 2: Commit your changes
-At this point it's a good idea to commit the changes:
-
-```bash
-$> git add .
-$> git commit -m "Ran hydra generator"
-```
-
-# Next Step
-Go on to [[Lesson: Install hydra-jetty]] or return to the [[Dive into Hydra]] page.

data/doc/Lesson:-start-jetty.md

@@ -1,85 +0,0 @@
-This lesson is known to work with hydra release version 6.1.0, 6.2.0.   
-_Please update this wiki to reflect any other versions that have been tested._
-
-# Goals
-* Start and Stop Jetty (which contains Fedora and Solr)
-
-# Explanation
-Fedora and Solr are both Java web applications that need to run in a servlet container like Tomcat or Jetty.  We installed hydra-jetty in the [[Lesson: Install hydra-jetty]].  Now whenever you need Fedora and Solr running, just start or stop that copy of hydra-jetty.
-
-**Tip:** Sometimes people are confused about whether they need to restart jetty when they restart their Rails application.  In most cases it is fine to leave jetty running when you start, stop, and restart the Rails application.  The only exception is when you make changes to Solr's configuration or Fedora's configuration -- these would be changes to files inside of your copy of hydra-jetty (ie. jetty/solr/config), not changes to files in your Rails application's Ruby code.  In those cases, where you have made changes to Solr or Fedora's configuration, you need to restart Jetty in order for those changes to take effect.  The most common change that requires restarting jetty is when you modify the solrconfig.xml or schema.xml in your solr config directory.
-
-# Steps
-
-### Step 1: Start Jetty
-At the project root, type 
-
-```bash
-$> rake jetty:start
-```
-
-You should see output like this:
-
-```text
-Starting jetty with these values: 
-jetty_home: /Users/justin/hydra-demo/jetty
-jetty_command: java -Djetty.port=8983 -Dsolr.solr.home=/Users/justin/hydra-demo/jetty/solr -Xmx256m -XX:MaxPermSize=128m -jar start.jar
-Logging jettywrapper stdout to /Users/justin/hydra-demo/jetty/jettywrapper.log
-Wrote pid file to /Users/justin/hydra-demo/tmp/pids/_Users_justin_hydra-demo_jetty.pid with value 8315
-Waited 5 seconds for jetty to start, but it is not yet listening on port 8983. Continuing anyway.
-Started jetty (5575.9ms)
-```
-
-hydra-jetty has a fair amount of stuff in it, so it may take up to a minute to start.  You can check to see if it's started by going to [[http://localhost:8983/solr]]
-
-If Fedora, Solr, or jetty itself are not starting, you'll want to look at the jettywrapper log to diagnose.
-
-**Windows Tip:** This rake task is not currently working on Windows (see [jettywrapper issue #13](https://github.com/projecthydra/jettywrapper/issues/13) for status).  In the meantime, start jetty manually
-```
-cd jetty
-java -Djetty.port=8983 -Dsolr.solr.home=/Users/justin/hydra-demo/jetty/solr -Xmx256m -XX:MaxPermSize=128m -jar start.jar
-```
-
-### Step 2: Look at the jettywrapper log
-
-The jetty:start rake task runs jetty as a background job, so jetty's logs won't appear in your terminal.  Instead they're written to the file ```jetty/jettywrapper.log```.  If you look at the output from running the jetty:start task, you'll see that one line gives you the full path to the file, for example:
-
-```text
-Logging jettywrapper stdout to /Users/justin/hydra-demo/jetty/jettywrapper.log
-```
-
-You can open this log file with any text editor or log reader.
-
-```bash
-$> vi jetty/jettywrapper.log
-```
-
-### Step 3: Monitor the jettywrapper log
-
-
-**Tip:** if jetty is taking a long time to start, you can watch its output using the tail command with the path to your jettywrapper.log.  For example:
-
-```bash
-$> tail -f jetty/jettywrapper.log
-```
-
-As Jetty, Fedora, and Solr start you will see more info being written to the log file. After a few moments you will be able to open jetty at [[http://localhost:8983]] or [[http://0.0.0.0:8983]] (**note:** The root page will give a 404 error, but should have three links to the applications running in Jetty: /solr, /fedora and /fedora-test)
-
-### Step 4: Stop Jetty
-You might have guessed this one.  In order to stop jetty, at the project root, type
-
-```bash
-$> rake jetty:stop
-```
-
-### Step 5: Start Jetty again
-Before proceeding to the next step, make sure jetty is running.  If you're not sure whether it's running, go to http://localhost:8983.  If jetty is running a page will load.  If jetty is not running no page will load.
-
-If it's not running, just use the jetty:start rake task again.
-
-```bash
-$> rake jetty:start
-```
-
-# Next Step
-Go on to [[Lesson: Start the Application & Search for Results]] or return to the [[Dive into Hydra]] page.

data/doc/Lesson:-turn-off-access-controls.md

@@ -1,37 +0,0 @@
-This lesson is known to work with hydra version 6.1.0, 6.2.0.   
-_Please update this wiki to reflect any other versions that have been tested._
-
-# Goals
-* *(for now)* Turn off access controls for Blacklight-based searches and "show" views 
-
-# Explanation
-One of the main features that Hydra adds to Blacklight is the ability to control who has access to which information in search results.  That topic gets a little bit complicated.  For the purpose of this Tutorial we want to stay focused on showing you how to set up an app, define models and create objects based on those models, so in order to keep things simple we will make this Hydra Head behave like an open access repository where everyone can see everything.  Once you've completed this tutorial, you can check out [Access Controls with Hydra](https://github.com/projecthydra/hydra-head/wiki/Access-Controls-with-Hydra) to learn how to assert access controls on objects and enforce those access controls in a Hydra Head.
-
-# Steps
-
-### Step 1: Comment out the lines that enforce access controls in Blacklight's CatalogController
-
-If you open ```app/controllers/catalog_controller.rb``` and look at the code near lines 8-12 you should see this:
-```ruby
-  # These before_filters apply the hydra access controls
-  before_filter :enforce_show_permissions, :only=>:show
-  # This applies appropriate access controls to all solr queries
-  CatalogController.solr_search_params_logic += [:add_access_controls_to_solr_params]
-```
-
-This code tells blacklight to enforce access controls on the search and result view pages.  For the time being we will turn this off by commenting out two lines so that it looks like this:
-
-```ruby
-  # These before_filters apply the hydra access controls
-  #before_filter :enforce_show_permissions, :only=>:show
-  # This applies appropriate access controls to all solr queries
-  #CatalogController.solr_search_params_logic += [:add_access_controls_to_solr_params]
-```
-
-### Step 2: Save the file
-
-Then, save the file.
-
-
-# Next Step
-Go on to [[Lesson: Make Blacklight Return Search Results]] or return to the [[Dive into Hydra]] page.