active-fedora 3.1.0.pre1 → 3.1.0.pre2

data/Gemfile.lock

@@ -45,7 +45,7 @@ GEM
     httpi (0.9.5)
       rack
     i18n (0.5.0)
-    jettywrapper (1.0.0)
+    jettywrapper (1.0.1)
       activesupport (>= 3.0.0)
       childprocess
       i18n
@@ -121,7 +121,7 @@ PLATFORMS
 DEPENDENCIES
   RedCloth
   active-fedora!
-  jettywrapper (>= 1.0.0)
+  jettywrapper (>= 1.0.1)
   mocha (>= 0.9.8)
   rake
   rcov

data/active-fedora.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency("rake")
   s.add_development_dependency("rcov")
   s.add_development_dependency("solrizer-fedora", ">=1.1.2") # used by the fixtures rake tasks
-  s.add_development_dependency("jettywrapper", ">=1.0.0")
+  s.add_development_dependency("jettywrapper", ">=1.0.1")
   s.add_development_dependency("rspec", "<2.0.0")
   s.add_development_dependency("mocha", ">= 0.9.8")
   s.add_development_dependency("ruby-debug")  

data/lib/active_fedora/delegating.rb

@@ -7,11 +7,14 @@ module ActiveFedora
       # as member of the base object. Pass the target datastream via the 
       # <tt>:to</tt> argument. If you want to return a unique result, (e.g. string 
       # instead of an array) set the <tt>:unique</tt> argument to true.
+      #
+      # The optional <tt>:at</tt> argument provides a terminology that the delegate will point to.
       #   
       #   class Foo < ActiveFedora::Base
       #     has_metadata :name => "descMetadata", :type => MyDatastream 
       #     
       #     delegate :field1, :to=>"descMetadata", :unique=>true
+      #     delegate :field2, :to=>"descMetadata", :at=>[:term1, :term2]
       #   end
       #
       #   foo = Foo.new
@@ -29,7 +32,8 @@ module ActiveFedora
             define_method field do
               ds = self.send(args[:to])
               val = if ds.kind_of? ActiveFedora::NokogiriDatastream 
-                ds.send(:term_values, field)
+                terminology = args[:at] || [field]
+                ds.send(:term_values, *terminology)
               else 
                 ds.send(:get_values, field)
               end 
@@ -42,7 +46,8 @@ module ActiveFedora
             define_method "#{field}=".to_sym do |v|
               ds = self.send(args[:to])
               if ds.kind_of? ActiveFedora::NokogiriDatastream 
-                ds.send(:update_indexed_attributes, {[field] => v})
+                terminology = args[:at] || [field]
+                ds.send(:update_indexed_attributes, {terminology => v})
               else 
                 ds.send(:set_value, field, v)
               end

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-    VERSION = "3.1.0.pre1"
+    VERSION = "3.1.0.pre2"
 end

data/lib/tasks/active_fedora.rake

@@ -1,4 +1,3 @@
-# require File.expand_path(File.dirname(__FILE__) + '/hydra_jetty.rb')
 require "active-fedora"
 require "solrizer-fedora"
 require "active_support" # This is just to load ActiveSupport::CoreExtensions::String::Inflections

data/lib/tasks/active_fedora_dev.rake

@@ -42,8 +42,9 @@ task :hudson do
   Rake::Task["active_fedora:doc"].invoke
   Rake::Task["active_fedora:configure_jetty"].invoke
   jetty_params = Jettywrapper.load_config
+  jetty_params[:startup_wait]= 20
   error = Jettywrapper.wrap(jetty_params) do
-    ENV["FEDORA_HOME"]=File.expand_path(File.join(File.dirname(__FILE__),'..','..','jetty','fedora','default'))
+    #ENV["FEDORA_HOME"]=File.expand_path(File.join(File.dirname(__FILE__),'..','..','jetty','fedora','default'))
     Rake::Task["active_fedora:load_fixtures"].invoke
     Rake::Task["active_fedora:rspec"].invoke
   end

data/spec/unit/base_delegate_spec.rb

@@ -65,7 +65,6 @@ describe ActiveFedora::Base do
     end
 
     it "should be able to delegate deeply into the terminology" do
-      pending
       @n.duck=["Quack", "Peep"]
       @n.duck.should == ["Quack", "Peep"]
     end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: active-fedora
 version: !ruby/object:Gem::Version 
-  hash: 1923832027
+  hash: 1923832029
   prerelease: 6
   segments: 
   - 3
   - 1
   - 0
   - pre
-  - 1
-  version: 3.1.0.pre1
+  - 2
+  version: 3.1.0.pre2
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -299,12 +299,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 21
         segments: 
         - 1
         - 0
-        - 0
-        version: 1.0.0
+        - 1
+        version: 1.0.1
   type: :development
   version_requirements: *id019
 - !ruby/object:Gem::Dependency