hydra-head 3.0.0pre3 → 3.0.0pre4

data/test_support/spec/helpers/hydra_fedora_metadata_helper_spec.rb

@@ -23,95 +23,116 @@ describe HydraFedoraMetadataHelper do
   describe "fedora_text_field" do
     it "should generate a text field input with values from the given datastream" do
       generated_html = helper.fedora_text_field(@resource,"ng_ds",[:title, :main_title])
-      generated_html.should have_selector "#title_main_title_0-container.editable-container" do |container|
-        container.should have_selector "span#title_main_title_0-text.editable-text.text", "My Title"
-        container.should have_selector "input#title_main_title_0.editable-edit.edit" do |input|
-          input.should have_selector "[value=?]", "My Title"
-          input.should have_selector "[name=?]", "asset[ng_ds][title_main_title][0]"
-          input.should have_selector "[data-datastream-name=?]", "ng_ds" 
-          input.should have_selector "[rel=?]", "title_main_title"
-        end
+      # For Rails3:
+      # generated_html.should have_selector "input.fieldselector" do |tag|
+      #   tag.should have_selector "[value=?]", "title"
+      #   tag.should have_selector "[value=?]", "main_title"
+      # end
+      # generated_html.should have_selector "input#title_main_title_0.editable-edit.edit" do |tag|
+      #   tag.should have_selector "[value=?]", "My Title"
+      #   tag.should have_selector "[name=?]","asset[ng_ds][title_main_title][0]"
+      #   tag.should have_selector "[data-datastream-name=?]", "ng_ds" 
+      generated_html.should have_selector "input.fieldselector" do |input|
+        with_tag "[value=?]", "title"
+        with_tag "[value=?]", "main_title"
+      end
+      generated_html.should have_selector "input#title_main_title_0.editable-edit.edit" do
+        input.should have_selector "[value=?]", "My Title"
+        input.should have_selector "[name=?]","asset[ng_ds][title_main_title][0]"
+        input.should have_selector "[data-datastream-name=?]", "ng_ds" 
       end
     end
     it "should generate an ordered list of text field inputs" do
       generated_html = helper.fedora_text_field(@resource,"simple_ds","subject")
-      generated_html.should have_selector "ol[rel=subject]" do |tag|
-        tag.should have_selector "li#subject_0-container.editable-container.field" do |tag|
-          tag.should have_selector "a.destructive.field"
-          tag.should have_selector "span#subject_0-text.editable-text.text", "topic1"
-          tag.should have_selector "input#subject_0.editable-edit.edit" do |tag|
-            tag.should have_selector "[value=?]", "topic1"
-            tag.should have_selector "[name=?]", "asset[simple_ds][subject][0]"
-          end
-        end
-        tag.should have_selector "li#subject_1-container.editable-container.field" do |tag|
-          tag.should have_selector "a.destructive.field"
-          tag.should have_selector "span#subject_1-text.editable-text.text", "topic2"
-          tag.should have_selector "input#subject_1.editable-edit.edit" do |tag|
-            tag.should have_selector "[value=?]", "topic2"
-            tag.should have_selector "[name=?]", "asset[simple_ds][subject][1]"
-          end
-        end
+  # For Rails3
+    #   generated_html.should have_selector "input#subject_0.editable-edit.edit" do |tag|
+    #     tag.should have_selector "[value=?]", "topic1"
+    #     tag.should have_selector "[name=?]", "asset[simple_ds][subject][0]"
+    #   end
+    #   generated_html.should have_selector "input#subject_1.editable-edit.edit" do |tag|
+    #     tag.should have_selector "[value=?]", "topic2"
+    #     tag.should have_selector "[name=?]", "asset[simple_ds][subject][1]"
+    #   end
+    #   generated_html.should have_selector "a.destructive.field"
+    #   generated_html.should have_selector "input", :class=>"editable-edit", :id=>"subject_1", :name=>"asset[simple_ds][subject_1]", :value=>"topic9"                                                                                        
+    #   generated_html.should be_html_safe
+    # end
+    # it "should render an empty control if the field has no values" do
+    #   helper.fedora_text_field(@resource,"empty_ds","something").should have_selector "#something_0.editable-edit.edit", :value=>''
+    # end
+    # it "should limit to single-value output with no ordered list if :multiple=>false" do
+    #   generated_html = helper.fedora_text_field(@resource,"simple_ds","subject", :multiple=>false)
+    #   generated_html.should have_selector "input#subject.editable-edit.edit[value=topic1]" do |tag|
+    #     tag.should have_selector "[name=?]", "asset[simple_ds][subject][0]"
+    #   end
+      generated_html.should have_selector "input#subject_0.editable-edit.edit" do |input|
+        input.should have_selector "[value=?]", "topic1"
+        input.should have_selector "[name=?]", "asset[simple_ds][subject][0]"
+      end      
+      generated_html.should have_selector "input#subject_1.editable-edit.edit" do |input|
+        input.should have_selector "[value=?]", "topic2"
+        input.should have_selector "[name=?]", "asset[simple_ds][subject][1]"
       end
+      generated_html.should have_selector "a.destructive.field"
       generated_html.should have_selector "input", :class=>"editable-edit", :id=>"subject_1", :name=>"asset[simple_ds][subject_1]", :value=>"topic9"                                                                                        
-      generated_html.should be_html_safe
     end
     it "should render an empty control if the field has no values" do
-      helper.fedora_text_field(@resource,"empty_ds","something").should have_selector "li#something_0-container.editable-container" do |tag|
-        tag.should have_selector "#something_0-text.editable-text.text", ""
-      end
+      helper.fedora_text_field(@resource,"empty_ds","something").should have_selector "#something_0.editable-edit.edit", :value => ""
     end
     it "should limit to single-value output with no ordered list if :multiple=>false" do
-      generated_html = helper.fedora_text_field(@resource,"simple_ds","subject", :multiple=>false)
-      generated_html.should_not have_selector "ol"
-      generated_html.should_not have_selector "li"
-      
-      generated_html.should have_selector "span#subject-container.editable-container.field" do |tag|
-        tag.should have_selector "span#subject-text.editable-text.text", "topic1"
-        tag.should have_selector "input#subject.editable-edit.edit[value=topic1]" do |tag|
-          tag.should have_selector "[name=?]", "asset[simple_ds][subject][0]"
-        end
-      end
+      generated_html = helper.fedora_text_field(@resource,"simple_ds","subject", :multiple=>false)      
+      generated_html.should have_selector "input#subject.editable-edit.edit[value=topic1]" do |input|
+        input.should have_selector "[name=?]", "asset[simple_ds][subject][0]"
+      end                                                                                                                                                                                                
     end
   end
   
   describe "fedora_text_area" do
     it "should generate an ordered list of textile-enabled text area with values from the given datastream" do
-      helper.fedora_text_area(@resource,"simple_ds","subject").should have_selector "ol[rel=subject]" do |tag|
-        tag.should have_selector "li#subject_0-container.field" do |tag|
-          tag.should_not have_selector "a.destructive.field"
-          tag.should have_selector "span#subject_0-text.editable-text.text[style=display:none;]", "topic1"
-          tag.should have_selector "textarea#subject_0.editable-edit.edit", "topic1"
-        end 
-        tag.should have_selector "li#subject_1-container.field" do |tag|
-          tag.should have_selector "span#subject_1-text.editable-text.text[style=display:none;]","topic2"
-          tag.should have_selector "textarea#subject_1.editable-edit.edit", "topic2"
-        end 
-      end
+      generated_html = helper.fedora_text_area(@resource,"simple_ds","subject")
+    # Rails3:
+    #   generated_html.should have_selector "textarea#subject_0.editable-edit.edit", :value=>"topic1"
+    #   generated_html.should have_selector "textarea#subject_1.editable-edit.edit", :value=>"topic2"
+    #   generated_html.should have_selector "a.destructive.field"
+    # end
+    # it "should render an empty control if the field has no values" do      
+    #   helper.fedora_text_area(@resource,"empty_ds","something").should have_selector "li#something_0-container.field" do |tag|
+    #     tag.should have_selector "span#something_0-text.editable-text.text[style=display:none;]", ""
+    #     tag.should have_selector "textarea#something_0.editable-edit.edit", ""
+    #   end
+    # end
+    # it "should limit to single-value output if :multiple=>false" do
+    #   generated_html = helper.fedora_text_area(@resource,"simple_ds","subject", :multiple=>false)
+    #   generated_html.should_not have_selector "ol"
+    #   generated_html.should_not have_selector "li"
+    #   generated_html.should have_selector "span#subject-container.field" do |tag|
+    #     tag.should have_selector "span#subject-text.editable-text.text[style=display:none;]", "topic1"
+    #     tag.should have_selector "textarea#subject.editable-edit.edit", "topic1"
+    #   end
+    #   generated_html.should be_html_safe
+      generated_html.should have_selector "textarea#subject_0.editable-edit.edit", :value => "topic1"
+      generated_html.should have_selector "textarea#subject_1.editable-edit.edit", :value => "topic2"
+      generated_html.should have_selector "a.destructive.field"
     end
     it "should render an empty control if the field has no values" do      
-      helper.fedora_text_area(@resource,"empty_ds","something").should have_selector "li#something_0-container.field" do |tag|
-        tag.should have_selector "span#something_0-text.editable-text.text[style=display:none;]", ""
-        tag.should have_selector "textarea#something_0.editable-edit.edit", ""
-      end
+      helper.fedora_text_area(@resource,"empty_ds","something").should have_selector "textarea#something_0.editable-edit.edit", :value => ""
     end
     it "should limit to single-value output if :multiple=>false" do
       generated_html = helper.fedora_text_area(@resource,"simple_ds","subject", :multiple=>false)
-      generated_html.should_not have_selector "ol"
-      generated_html.should_not have_selector "li"
-      generated_html.should have_selector "span#subject-container.field" do |tag|
-        tag.should have_selector "span#subject-text.editable-text.text[style=display:none;]", "topic1"
-        tag.should have_selector "textarea#subject.editable-edit.edit", "topic1"
-      end
-      generated_html.should be_html_safe
+      generated_html.should have_selector "textarea#subject.editable-edit.edit", :value => "topic1"
     end
   end
   
   describe "fedora_select" do
     it "should generate a select with values from the given datastream" do
       generated_html = helper.fedora_select(@resource,"simple_ds","subject", :choices=>["topic1","topic2", "topic3"])
+      # Rails3:
+      # generated_html.should have_selector "select.metadata-dd[name='asset[simple_ds][subject][0]']" do |tag|
+      #   tag.should have_selector "[rel=?]", "subject" 
+      #   tag.should have_selector "option[value=topic1][selected=selected]"
+      #   tag.should have_selector "option[value=topic2][selected=selected]"
+      #   tag.should have_selector "option[value=topic3]"
       generated_html.should have_selector "select.metadata-dd[name='asset[simple_ds][subject][0]']" do |tag|
-        tag.should have_selector "[rel=?]", "subject" 
         tag.should have_selector "option[value=topic1][selected=selected]"
         tag.should have_selector "option[value=topic2][selected=selected]"
         tag.should have_selector "option[value=topic3]"
@@ -127,8 +148,14 @@ describe HydraFedoraMetadataHelper do
   describe "fedora_date_select" do
     it "should generate a date picker with values from the given datastream" do
       generated_html = helper.fedora_date_select(@resource,"simple_ds","subject")
+      # Rails3
+      # generated_html.should have_selector ".date-select[name='asset[simple_ds][subject]']" do |tag|
+      #   tag.should have_selector "[rel=?]", "subject" 
+      #   tag.should have_selector "input#subject-sel-y.controlled-date-part.w4em"
+      #   tag.should have_selector "select#subject-sel-mm.controlled-date-part" do |tag|
+      #     tag.should have_selector "option[value=01]", "January"
+      #     tag.should have_selector "option[value=12]", "December"
       generated_html.should have_selector ".date-select[name='asset[simple_ds][subject]']" do |tag|
-        tag.should have_selector "[rel=?]", "subject" 
         tag.should have_selector "input#subject-sel-y.controlled-date-part.w4em"
         tag.should have_selector "select#subject-sel-mm.controlled-date-part" do |tag|
           tag.should have_selector "option[value=01]", "January"
@@ -184,13 +211,19 @@ describe HydraFedoraMetadataHelper do
   describe "field_selectors_for" do
     it "should generate any necessary field_selector values for the given field" do
       generated_html = helper.field_selectors_for("myDsName", [{:name => 3}, :name_part])
-      generated_html.should have_selector "input.fieldselector[type=hidden][name='field_selectors[myDsName][name_3_name_part][][name]']" do |tag|
-        tag.should have_selector "[rel=name_3_name_part]"
-        tag.should have_selector "[value=3]"
+      # Rails3
+      # generated_html.should have_selector "input.fieldselector[type=hidden][name='field_selectors[myDsName][name_3_name_part][][name]']" do |tag|
+      #   tag.should have_selector "[rel=name_3_name_part]"
+      #   tag.should have_selector "[value=3]"
+      # end
+      # generated_html.should have_selector "input.fieldselector[type=hidden][name='field_selectors[myDsName][name_3_name_part][]']" do |tag|
+      #   tag.should have_selector "[rel=name_3_name_part]"
+      #   tag.should have_selector "[value=name_part]"
+      generated_html.should have_selector "input.fieldselector[type=hidden][name='field_selectors[myDsName][name_3_name_part][][name]']" do |input|
+        input.should have_selector "[value=3]"
       end
-      generated_html.should have_selector "input.fieldselector[type=hidden][name='field_selectors[myDsName][name_3_name_part][]']" do |tag|
-        tag.should have_selector "[rel=name_3_name_part]"
-        tag.should have_selector "[value=name_part]"
+      generated_html.should have_selector "input.fieldselector[type=hidden][name='field_selectors[myDsName][name_3_name_part][]']" do |input|
+        input.should have_selector "[value=name_part]"
       end
       # ordering is important.  this next line makes sure that the inputs are in the correct order
       # (tried using CSS3 nth-of-type selectors in have_selector but it didn't work)

data/test_support/spec/helpers/hydra_helper_spec.rb

@@ -70,4 +70,19 @@ describe HydraHelper do
     end
   end
   
+  describe "submit_name" do
+    it "should return 'Save' when the scripts session variable is set" do
+      stubs(:session).returns({:scripts=>true})
+      submit_name.should == "Save"
+    end
+    it "should return 'Continue' when the new_asset param is set" do
+      stubs(:params).returns({:new_asset=>true})
+      submit_name.should == "Continue"
+    end
+    it "should return 'Save and Continue' if all else fails" do
+      stubs(:params).returns({})
+      submit_name.should == "Save and Continue"
+    end
+  end
+  
 end

data/test_support/spec/lib/hydra_submission_workflow_spec.rb

@@ -0,0 +1,141 @@
+require File.expand_path( File.join( File.dirname(__FILE__),'..','spec_helper') )
+
+mods_asset_model = "info:fedora/afmodel:ModsAsset"
+
+describe Hydra::SubmissionWorkflow do
+  before(:each) do
+    @document = SolrDocument.new({:has_model_s => [mods_asset_model]})
+  end
+  include Hydra::SubmissionWorkflow
+  
+  describe "first step in workflow" do
+    it "should return the first step of a given workflow" do
+      first_step_in_workflow.should == "contributor"
+    end
+  end
+  
+  describe "next in workflow" do
+    it "should provide the next step based on the provided step" do
+      next_step_in_workflow(:contributor).should == "publication"
+    end
+    it "should return nil if there is no step (denoting the last step)" do
+      next_step_in_workflow(:permissions).should be_nil
+    end
+    it "should return the step after the first if a blank current step is provided (e.g. started from the first step so no wf_step param)" do
+      next_step_in_workflow(nil).should == "publication"
+      next_step_in_workflow("").should == "publication"
+    end
+  end
+
+  describe "partial for step" do
+    it "should return the partial for the given step" do
+      workflow_partial_for_step(:contributor).should match(/contributor_form/)
+    end
+  end
+
+  describe "previous show partials" do
+    it "should return all of the previous show partials for display in the HTML-only workflow" do
+      prev_partials = previous_show_partials(:permissions)
+      prev_partials.is_a?(Array).should be_true
+      prev_partials.length.should == 4
+      prev_partials.first.should match(/mods.*contributors/)
+      prev_partials.last.should match(/mods.*file_assets/)
+    end
+    it "should return an empty array for the first step in the workflow" do
+      previous_show_partials(:contributor).should == []
+      previous_show_partials("").should == []
+    end
+  end
+
+  describe "model specific configurations" do
+    it "should return the appropriate configuration when an @document object is available" do
+      config = model_config
+      config.is_a?(Array).should be_true
+      config.length.should == 5
+      partial_is_mods = []
+      config.each do |c|
+        c.is_a?(Hash).should be_true
+        c.has_key?(:name).should be_true
+        c.has_key?(:edit_partial).should be_true
+        partial_is_mods << c[:edit_partial].include?("mods_assets")
+      end
+      partial_is_mods.include?(true).should be_true
+    end
+    it "should return the appropriate config when a model is available in the params hash" do
+      @document = nil
+      to = SubmissionWorkflowObject.new
+      to.stubs(:params).returns({:content_type => "generic_content"})
+      config = to.model_config
+      config.is_a?(Array).should be_true
+      config.length.should == 4
+      partial_is_generic = []
+      config.each do |c|
+        c.is_a?(Hash).should be_true
+        c.has_key?(:name).should be_true
+        c.has_key?(:edit_partial).should be_true
+        partial_is_generic << c[:edit_partial].include?("generic_content")
+      end
+      partial_is_generic.include?(true).should be_true
+    end
+    it "should return the appropriate config when the ID of an object is available in the params hash" do
+      @document = nil
+      to = SubmissionWorkflowObject.new
+      to.stubs(:params).returns({:id=>"hydrangea:fixture_mods_article1"})
+      config = to.model_config
+      config.is_a?(Array).should be_true
+      config.length.should == 5
+      config.each do |c|
+        c.is_a?(Hash).should be_true
+        c.has_key?(:name).should be_true
+        c.has_key?(:edit_partial).should be_true
+      end
+    end
+    it "should return the configuration for non mods assets (generic_content)" do
+      @document = nil
+      to = SubmissionWorkflowObject.new
+      to.stubs(:params).returns(:id=>"hydra:test_generic_content")
+      config = to.model_config
+      config.is_a?(Array).should be_true
+      config.length.should == 4
+      partial_is_generic = []
+      config.each do |c|
+        c.is_a?(Hash).should be_true
+        c.has_key?(:name).should be_true
+        c.has_key?(:edit_partial).should be_true
+        partial_is_generic << c[:edit_partial].include?("generic_content")
+      end
+      partial_is_generic.include?(true).should be_true
+    end
+    it "should return nil if an ID is the only context available and it is not a valid object" do
+      @document = nil
+      to = SubmissionWorkflowObject.new
+      to.stubs(:params).returns(:id=>"hydra:not_an_actual_record")
+      to.model_config.should be_nil
+    end
+  end
+  describe "before_filter validation" do
+    it "should redirect back when the validation method returns false." do
+      @document = nil
+      to = SubmissionWorkflowObject.new
+      to.stubs(:params).returns({:id=>"hydrangea:fixture_mods_article1",:action=>"create"})
+      to.expects(:redirect_to).with(:back)
+      to.validate_workflow_step
+    end
+    it "should not redirect when the validation method returns true." do
+      @document = nil
+      to = SubmissionWorkflowObject.new
+      to.stubs(:params).returns({:id=>"hydrangea:fixture_mods_article1",:action=>"update"})
+      to.expects(:redirect_to).never
+      to.validate_workflow_step
+    end
+  end
+end
+class SubmissionWorkflowObject
+  include Hydra::SubmissionWorkflow
+  def mods_assets_create_validation
+    return false
+  end
+  def mods_assets_update_validation
+    return true
+  end
+end

data/test_support/spec/models/generic_image_spec.rb

@@ -18,6 +18,11 @@ describe GenericImage do
     @hydra_image.should respond_to(:apply_depositor_metadata)
   end
   
+  it "should include Hydra Generic Image Methods" do
+    @hydra_image.class.included_modules.should include(Hydra::GenericImage)
+    @hydra_image.should respond_to(:derivation_options)
+  end
+  
   it "should have accessors for its default datastreams of content and original" do
     @hydra_image.should respond_to(:has_content?)
     @hydra_image.should respond_to(:content)
@@ -45,7 +50,7 @@ describe GenericImage do
   end
   
   describe '#content=' do
-    it "shoutld create a content datastream when given an image file" do
+    it "should create a content datastream when given an image file" do
     end
   end
 

data/uninstall.rb

@@ -0,0 +1 @@
+# Uninstall hook code here