active-fedora 4.0.0.rc18 → 4.0.0.rc19

data/CONSOLE_GETTING_STARTED.textile

@@ -1 +1 @@
-Moved to "https://github.com/mediashelf/active_fedora/wiki/Getting-Started:---Console-Tour":https://github.com/mediashelf/active_fedora/wiki/Getting-Started:---Console-Tour
+Moved to "https://github.com/projecthydra/active_fedora/wiki/Getting-Started:-Console-Tour":https://github.com/projecthydra/active_fedora/wiki/Getting-Started:-Console-Tour

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active-fedora (4.0.0.rc18)
+    active-fedora (4.0.0.rc19)
       activeresource (>= 3.0.0)
       activesupport (>= 3.0.0)
       equivalent-xml

data/History.txt

@@ -1,4 +1,4 @@
-4.0.0.rc18
+4.0.0.rc19
 Removed deprecations
   * allowing :fedora level in fedora.yml
   * automatic includes of Relationships and FileMethods is removed
@@ -25,6 +25,7 @@ HYDRA-766 Model#classname_from_uri singularizes terms, but it shouldn't change t
 HYDRA-767 Remove Model::DEFAULT_NS
 Upgrade Om to 1.6.0
 QualifiedDublinCore now extends immediately from NokogiriDatastream
+Deprecated MetadataDatastream
 
 3.3.2
 HYDRA-745 No need to require :url be present on external datastreams

data/NOKOGIRI_DATASTREAMS.textile

@@ -1,293 +1 @@
-h1. Using OM-based NokogiriDatastreams
-
-This document is about working with (Active)Fedora datastreams with XML content.  Nokogiri is a ruby gem for working with xml, and OM (Opinionated Metadata) allows you to define a “terminology” to ease translation between XML and ruby objects.
-
-h3. Learning More about OM (Opinionated Metadata)
-
-For deeper exposure to what you can do with OM, see the "OM documentation":http://hudson.projecthydra.org/job/om/Documentation/ for "Getting Started":http://hudson.projecthydra.org/job/om/Documentation/file.GETTING_STARTED.html, "Querying Documents":http://hudson.projecthydra.org/job/om/Documentation/file.QUERYING_DOCUMENTS.html, and "Updating Documents":http://hudson.projecthydra.org/job/om/Documentation/file.UPDATING_DOCUMENTS.html.   There is also information in the "solrizer":http://github.com/projecthydra/solrizer documentation about Solrizing documents. 
-
-You can run most of the examples from those tutorials against the descMetadata datastream you've created here.
-
-<pre>
-doc = st.datastreams["descMetadata"]  # the datastream is the OM Document
-...
-doc.class
-=> Hydra::ModsArticleDatastream  # Hydra::ModsArticleDatastream is the Document Class
-terminology = doc.class.terminology # The terminology is attached to the Document Class
-</pre>
-
-h2. Setup
-
-This tutorial assumes that you've run script/console from the root of ActiveFedora and have imported the hydrangea:fixture_mods_article1 object.  If you haven't done that, see "CONSOLE_GETTING_STARTED":http://hudson.projecthydra.org/job/active_fedora/Documentation/file.CONSOLE_GETTING_STARTED.html for instructions.
-
-The model definition we're using in this tutorial is SpecialThing ( "see the code":https://github.com/mediashelf/active_fedora/blob/master/spec/samples/special_thing.rb )
-
-
-Look in these datastream definitions to see the OM Terminologies they define.  They have extra comments in the code:
-* Hydra::ModsArticleDatastream ( "see the code":https://github.com/mediashelf/active_fedora/blob/master/spec/samples/hydra-mods_article_datastream.rb ) 
-* Hydra::RightsMetadataDatastream ( "see the code":https://github.com/mediashelf/active_fedora/blob/master/spec/samples/hydra-rights_metadata_datastream.rb }
-* Marpa::DcDatastream ( "see the code":https://github.com/mediashelf/active_fedora/blob/master/spec/samples/marpa-dc_datastream.rb )
-
-
-h2. Using Existing OM Terminology
-
-First, load the Fedora object as an instance of the SpecialThing ActiveFedora Model
-
-<pre>
-st = SpecialThing.load_instance("hydrangea:fixture_mods_article1")
-</pre>
-
-Take a look at the datastreams in the object.
-
-<pre>
-st.datastreams.keys
-</pre>
-
-Each datastream is associated with a class that is aware of its content.  These classes are specified in the model.  
-
-<pre>
-st.datastreams["rightsMetadata"].class
-st.datastreams["descMetadata"].class
-</pre>
-  
-You can retrieve the xml from the object as xml (string) using to_xml, or you can access it as a Nokogiri::XML::Document using .ng_xml
-
-<pre>
-st.datastreams["rightsMetadata"].to_xml
-st.datastreams["rightsMetadata"].ng_xml.class
-</pre>
-
-An OM terminology is attached to the datastream's class.  OM's convenience methods use the terminology to look up nodes and values for you.
-
-<pre>
-st.datastreams["rightsMetadata"].class.terminology
-Hydra::RightsMetadataDatastream.terminology
-</pre>
-
-The Terminology in Hydra::ModsArticleDatastream lets you retrieve values from the descMetadata datastream's MODS content.
-
-<pre>
-mods_ds = st.datastreams["descMetadata"]
-mods_ds.term_values(:person, :first_name)
-mods_ds.term_values(:person, :last_name)
-</pre>
-
-You can use OM's find_by_terms method to retrieve xml nodes from the datastream.  It returns Nokogiri::XML::Node objects.
-
-<pre>
-mods_ds.find_by_terms(:person)
-mods_ds.find_by_terms(:person).length
-mods_ds.find_by_terms(:person).each {|n| puts n.to_xml}
-</pre>
-
-Hydra::ModsArticleDatastream has all of the behaviors of an OM::Document.  
-
-h1. Setting the XML in a NokogiriDatastream from a file
-
-h2. Creating a new Datastream using from_xml
-
-<pre>
-my_path = "spec/fixtures/mods_articles/hydrangea_article1.xml"
-f = File.new(my_path)
-mods_ds = Hydra::ModsArticleDatastream.from_xml(f)
-</pre>
-
-If you want to add that datastream to an object, set the datastream's dsid and then pass the datastream into the object's add_datastream method.
-
-<pre>
-mods_ds.dsid = "descMetadata"
-st.add_datastream(mods_ds)
-</pre>
-
-
-h2. Saving the Datastream
-
-After calling add_datastream, then everything will be ready to save to Fedora.  In order to make sure that your updated datastream is actually saved to fedora, call .save _on the datastream_.  If you call .save on the _object_, the changes you've made to the datastream might not be saved.
-
-<pre>
-st.datastreams["descMetadata"].save
-</pre>
-
-h2. (Rails3) Using ActiveModel methods and delegate to treat xml nodes like regular ActiveModel attributes
-
-h3. Handling most xml fields with delegate method
-
-Say you want to treat a mods title like a regular ActiveModel attribute so that you can use all of the Rails helpers and methods like form_for.
-
-The Datastream definition:
-
-<pre>
-  # app/models/mods_generic_content.rb
-  class ModsGenericContent < ObjectMods
-
-    set_terminology do |t|
-      t.root(:path=>"mods", :xmlns=>"http://www.loc.gov/mods/v3", :schema=>"http://www.loc.gov/standards/mods/v3/mods-3-2.xsd")
-
-      t.title_info(:path=>"titleInfo") {
-        t.main_title(:path=>"title", :label=>"title", :index_as=>[:facetable])
-      }
-      
-      # Proxy Terms (delegate can only reference root terms, so you have to create a root term "title" that proxies to the correct spot in the Terminology)
-      t.title(:proxy=>[:title_info, :main_title]) 
-    end
-  end
-</pre>
-
-The Model: 
-
-
-<pre>
-  # app/models/generic_content.rb
-  class GenericContent < ActiveFedora::Base
-
-    include Hydra::ModelMethods
-    has_metadata :name => "descMetadata", :label=>"MODS metadata", :type => ModsGenericContent
-    
-    delegate :title, :to=>:descMetadata
-  end
-</pre>
-
-Example form:
-
-
-<pre>
-  # app/views/generic_contents.html.erb
-  <%= form_for @generic_content do |f| %>
-    <dl>
-      <dt class="title">
-        <%= f.label "Title:" %>
-      </dt>
-      <dd class="title">
-        <%= f.text_field :title %>
-      </dd>
-    </dl>
-    <%= f.submit "Save Changes" %>
-  <% end %>
-</pre>
-
-The Controller that processes updates:
-
-<pre>
-  # app/controllers/generic_contents_controller.rb
-  class GenericContentsController < ApplicationController 
-  
-    # This renders the edit form
-    def edit
-      @generic_content = GenericContent.find(params[:id])
-    end
-
-    # This updates the object based on the info submitted by your form, which puts the Hash of new values into params["generic_content"]
-    def update
-      @generic_content = GenericContent.find(params[:id])
-      @generic_content.update_attributes(params[:generic_content])
-      if @generic_content.save
-        flash[:notice] = "Saved changes to #{@generic_content.title}"
-      else
-        flash[:error] = "Failed to save your changes!"
-      end
-      redirect_to edit_generic_content_path(@generic_content)
-    end
-  end
-</pre>
-
-h3. Handling complex xml structures in attributes= method
-
-This approach complements the usage of the delegate method to handle most xml nodes in your datasreams.
-
-With this approach, you can still create relatively normal Rails forms while updating complex xml structures (ie. MODS name entries) internally without creating a separate controller & model for those structures.
-
-Example: You want to create/edit xml like this in a descMetadata datastream that uses the GenericContentXml datatstream definition.
-
-<pre>
-  <subject>
-    <topic>Subject 1</topic>
-    <catgegory>topic</category>
-  </subject>
-  <subject>
-    <topic>Subject 2</topic>
-    <catgegory>geographic</category>
-  </subject>
-</pre>
-
-You have a form that submits parameters like this:
-
-<pre>
-  {
-    "generic_content" => {
-      "subjects" =>[
-        {
-            "topic" => "Subject 1",
-            "category" => "topic"
-          },{
-            "topic" => "Subject 2",
-            "category" => "geographic"      
-        }
-        ]
-  }}
-</pre>
-
-Here's the test:
-
-<pre>
-  # spec/models/generic_content_spec.rb
-  describe "attributes=" do
-    before do
-      @node = GenericContent.new
-      @sample_post_params = {
-        "generic_content" => {
-          "subjects" =>[
-            {
-                "topic" => "Subject 1",
-                "category" => "topic"
-              },{
-                "topic" => "Subject 2",
-                "category" => "geographic"      
-            }
-            ]
-      }}
-
-    end
-    it "with subjects" do
-      @node.attributes = @sample_post_params["generic_content"]
-      @node.descMetadata.subject.length.should == 2
-      @node.descMetadata.subject(0).topic.should == ["Subject 1"]
-      @node.descMetadata.subject(0).category.should == ["topic"]
-      @node.descMetadata.subject(1).topic.should == ["Subject 2"]
-      @node.descMetadata.subject(1).category.should == ["geographic"]
-    end
-  end
-</pre>
-
-In the OM terminology of the Datasream definition:
-
-<pre>
-  # app/models/generic_content_xml.rb
-  ...
-  t.subject(:path=>"subject", :attributes=>{:authority=>"UoH"}) {
-   t.topic(:index_as=>[:facetable])
-   t.category
-  }
-  ...
-</pre>
-
-The Model:
-
-<pre>
-  # app/models/generic_content.rb
-  class GenericContent < ActiveFedora::Base
-
-    include Hydra::ModelMethods
-    has_metadata :name => "descMetadata", :label=>"generic metadata", :type => GenericContentXml
-
-    def attributes=(properties)
-      if (properties["subjects"])
-        self.descMetadata.subject.nodeset.remove  # wipe out existing values
-        properties["subjects"].each_with_index do |subject_hash, index|
-          self.descMetadata.subject(index).topic = subject_hash["topic"]
-          self.descMetadata.subject(index).category = subject_hash["category"]
-        end
-        properties.delete("subjects")
-      end
-      super
-  end
-</pre>
+Moved to "https://github.com/projecthydra/active_fedora/wiki/Nokogiri-Datastreams":https://github.com/projecthydra/active_fedora/wiki/Nokogiri-Datastreams

data/README.textile

@@ -4,8 +4,8 @@ RubyFedora and ActiveFedora provide a set of Ruby gems for creating and managing
 
 h2. Getting Help
 
-* Project Homepage: "http://yourmediashelf.com/activefedora":http://yourmediashelf.com/activefedora
 * Community Discussions & Mailing List are located at "http://groups.google.com/group/active-fedora":http://groups.google.com/group/active-fedora
+* Developers hang out on IRC in #projecthydra on freenet.
 
 h2. Installation
 
@@ -15,14 +15,14 @@ The gem is hosted on gemcutter.
 
 h2. Getting Started
 
-The "ActiveFedora Console Tour":http://hudson.projecthydra.org/job/active_fedora/Documentation/file.CONSOLE_GETTING_STARTED.html  gives you a brief tour through ActiveFedora's features on the command line.
+The "ActiveFedora Console Tour":https://github.com/projecthydra/active_fedora/wiki/Getting-Started:-Console-Tour  gives you a brief tour through ActiveFedora's features on the command line.
 
 h2. Testing (this Gem)
 
 In order to run the RSpec tests, you need to have a copy of the ActiveFedora source code, and then run bundle install in the source directory.
 
 <pre>
-git clone https://github.com/mediashelf/active_fedora.git
+git clone https://github.com/projecthydra/active_fedora.git
 cd /wherever/active_fedora/is
 bundle install
 git submodule init
@@ -84,11 +84,11 @@ h2. Acknowledgements
 Creator: Matt Zumwalt ("MediaShelf":http://yourmediashelf.com)
 
 Developers: 
-McClain Looney & Eddie Shin ("MediaShelf":http://yourmediashelf.com), Rick Johnson (Notre Dame)
+Justin Coyne, McClain Looney & Eddie Shin ("MediaShelf":http://yourmediashelf.com), Rick Johnson (Notre Dame)
 
 h2. LICENSE:
 
-Copyright (c) 2009-2010 Matt Zumwalt & MediaShelf, LLC
+Copyright (c) 2009-2012 Matt Zumwalt & MediaShelf, LLC
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License (LGPL) as 

data/TODO

@@ -1 +1,2 @@
 Get rid of ActiveFedora::Relationships methods in specs (except in relationships_spec.rb of course)
+Remove calls to ActiveFedora::MetadataDatastream from the specs

data/lib/active_fedora/associations.rb

@@ -219,7 +219,12 @@ module ActiveFedora
         def collection_reader_method(reflection, association_proxy_class)
           redefine_method(reflection.name) do |*params|
             
-            force_reload = params.first unless params.empty?
+            if (params.first.is_a?(Hash) && params.first[:response_format] == :solr)
+              load_from_solr = true
+              force_reload = false 
+            else 
+              force_reload = params.first unless params.empty?
+            end
             association = association_instance_get(reflection.name)
             unless association
               association = association_proxy_class.new(self, reflection)
@@ -227,6 +232,7 @@ module ActiveFedora
             end
 
             association.reload if force_reload
+            return association.load_from_solr if load_from_solr
 
             association
           end

data/lib/active_fedora/associations/association_collection.rb

@@ -136,6 +136,11 @@ module ActiveFedora
         return ActiveFedora::SolrService.reify_solr_results(solr_result)
       end
 
+      def load_from_solr
+        return [] if @finder_query.empty?
+        SolrService.query(@finder_query, :rows=>1000)
+      end
+
 
       def add_record_to_target_with_callbacks(record)
       #  callback(:before_add, record)

data/lib/active_fedora/metadata_datastream.rb

@@ -11,10 +11,11 @@ module ActiveFedora
     # .to_solr (among other things) is provided by ActiveFedora::MetadataDatastreamHelper
     include ActiveFedora::MetadataDatastreamHelper
 
-    # def initialize(digital_object, dsid)
-    #   ActiveSupport::Deprecation.warn("MetadataDatastream is deprecated and will be removed in a future release. Create a NokogiriDatastream to structure your data")
-    #   super
-    # end
+    def initialize(digital_object, dsid)
+      ActiveSupport::Deprecation.warn("MetadataDatastream is deprecated and will be removed in a future release. Create a NokogiriDatastream to structure your data")
+      super
+    end
+
     def to_solr(solr_doc = Hash.new) # :nodoc:
       fields.each do |field_key, field_info|
         if field_info.has_key?(:values) && !field_info[:values].nil?

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-    VERSION = "4.0.0.rc18"
+    VERSION = "4.0.0.rc19"
 end

data/spec/integration/associations_spec.rb

@@ -60,6 +60,32 @@ describe ActiveFedora::Base do
         
       end
 
+      it "saving the parent should save the relationships on the children" do
+        @library.save
+        @library.books = [@book, @book2]
+        @library.save
+        @library = Library.find(@library.pid)
+        @library.books.to_a.should == [@book, @book2]
+      end
+
+
+      it "should let you lookup an array of objects with solr" do
+        @library.save
+        @book.library = @library
+        @book2.library = @library
+        @book.save
+        @book2.save
+
+        @library = Library.find(@library.pid)
+        @library.books.to_a.should == [@book, @book2]
+      
+        solr_resp =  @library.books(:response_format=>:solr)
+        solr_resp.size.should == 2
+        solr_resp[0]['id'].should == @book.pid 
+        solr_resp[1]['id'].should == @book2.pid 
+      
+      end
+
 
 
       after do

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: active-fedora
 version: !ruby/object:Gem::Version 
-  hash: 15424177
+  hash: 15424179
   prerelease: 6
   segments: 
   - 4
   - 0
   - 0
   - rc
-  - 18
-  version: 4.0.0.rc18
+  - 19
+  version: 4.0.0.rc19
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-29 00:00:00 Z
+date: 2012-03-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false