blacklight 5.0.0.pre3 → 5.0.0.pre4

data/spec/helpers/catalog_helper_spec.rb

@@ -153,32 +153,32 @@ describe CatalogHelper do
 
   describe "has_thumbnail?" do
     it "should have a thumbnail if a thumbnail_method is configured" do
-      helper.stub(:blacklight_config => OpenStruct.new(:index => OpenStruct.new(:thumbnail_method => :xyz) ))
+      helper.stub(:blacklight_config => Blacklight::Configuration.new(:index => Blacklight::OpenStructWithHashAccess.new(:thumbnail_method => :xyz) ))
       document = double()
       expect(helper.has_thumbnail? document).to be_true
     end
 
     it "should have a thumbnail if a thumbnail_field is configured and it exists in the document" do
-      helper.stub(:blacklight_config => OpenStruct.new(:index => OpenStruct.new(:thumbnail_field => :xyz) ))
+      helper.stub(:blacklight_config => Blacklight::Configuration.new(:index => Blacklight::OpenStructWithHashAccess.new(:thumbnail_field => :xyz) ))
       document = double(:has? => true)
       expect(helper.has_thumbnail? document).to be_true
     end
     
     it "should not have a thumbnail if the thumbnail_field is missing from the document" do
-      helper.stub(:blacklight_config => OpenStruct.new(:index => OpenStruct.new(:thumbnail_field => :xyz) ))
+      helper.stub(:blacklight_config => Blacklight::Configuration.new(:index => Blacklight::OpenStructWithHashAccess.new(:thumbnail_field => :xyz) ))
       document = double(:has? => false)
       expect(helper.has_thumbnail? document).to be_false
     end
 
     it "should not have a thumbnail if none of the fields are configured" do
-      helper.stub(:blacklight_config => OpenStruct.new(:index => OpenStruct.new()))
+      helper.stub(:blacklight_config => Blacklight::Configuration.new(:index => Blacklight::OpenStructWithHashAccess.new() ))
       expect(helper.has_thumbnail? double()).to be_false
     end
   end
 
   describe "render_thumbnail_tag" do
     it "should call the provided thumbnail method" do
-      helper.stub(:blacklight_config => double(:index => double(:thumbnail_method => :xyz)))
+      helper.stub(:blacklight_config => Blacklight::Configuration.new(:index => Blacklight::OpenStructWithHashAccess.new(:thumbnail_method => :xyz) ))
       document = double()
       helper.stub(:xyz => "some-thumbnail")
 
@@ -187,7 +187,7 @@ describe CatalogHelper do
     end
 
     it "should create an image tag from the given field" do
-      helper.stub(:blacklight_config => double(:index => OpenStruct.new(:thumbnail_field => :xyz)))
+      helper.stub(:blacklight_config => Blacklight::Configuration.new(:index => Blacklight::OpenStructWithHashAccess.new(:thumbnail_field => :xyz) ))
       document = double()
 
       document.stub(:has?).with(:xyz).and_return(true)
@@ -198,14 +198,14 @@ describe CatalogHelper do
     end
 
     it "should return nil if no thumbnail is available" do
-      helper.stub(:blacklight_config => double(:index => OpenStruct.new()))
+      helper.stub(:blacklight_config => Blacklight::Configuration.new(:index => Blacklight::OpenStructWithHashAccess.new() ))
 
       document = double()
       expect(helper.render_thumbnail_tag document).to be_nil
     end
 
     it "should return nil if no thumbnail is returned from the thumbnail method" do
-      helper.stub(:blacklight_config => double(:index => OpenStruct.new(:thumbnail_method => :xyz)))
+      helper.stub(:blacklight_config => Blacklight::Configuration.new(:index => Blacklight::OpenStructWithHashAccess.new(:thumbnail_method => :xyz) ))
       helper.stub(:xyz => nil)
       document = double()
 
@@ -215,17 +215,17 @@ describe CatalogHelper do
 
   describe "thumbnail_url" do
     it "should pull the configured thumbnail field out of the document" do
-      helper.stub(:blacklight_config => double(:index => double(:thumbnail_field => "xyz")))
+      helper.stub(:blacklight_config => Blacklight::Configuration.new(:index => Blacklight::OpenStructWithHashAccess.new(:thumbnail_field => :xyz) ))
       document = double()
-      document.stub(:has?).with("xyz").and_return(true)
-      document.stub(:first).with("xyz").and_return("asdf")
+      document.stub(:has?).with(:xyz).and_return(true)
+      document.stub(:first).with(:xyz).and_return("asdf")
       expect(helper.thumbnail_url document).to eq("asdf")
     end
 
     it "should return nil if the thumbnail field doesn't exist" do
-      helper.stub(:blacklight_config => double(:index => double(:thumbnail_field => "xyz")))
+      helper.stub(:blacklight_config => Blacklight::Configuration.new(:index => Blacklight::OpenStructWithHashAccess.new(:thumbnail_field => :xyz) ))
       document = double()
-      document.stub(:has?).with("xyz").and_return(false)
+      document.stub(:has?).with(:xyz).and_return(false)
       expect(helper.thumbnail_url document).to be_nil
     end
   end

data/spec/helpers/facets_helper_spec.rb

@@ -281,133 +281,6 @@ describe FacetsHelper do
     end 
   end
 
-  describe "add_facet_params" do
-    before do
-      @params_no_existing_facet = {:q => "query", :search_field => "search_field", :per_page => "50"}
-      @params_existing_facets = {:q => "query", :search_field => "search_field", :per_page => "50", :f => {"facet_field_1" => ["value1"], "facet_field_2" => ["value2", "value2a"]}}
-    end
-
-    it "should add facet value for no pre-existing facets" do
-      helper.stub(:params).and_return(@params_no_existing_facet)
-
-      result_params = helper.add_facet_params("facet_field", "facet_value")
-      expect(result_params[:f]).to be_a_kind_of(Hash)
-      expect(result_params[:f]["facet_field"]).to be_a_kind_of(Array)
-      expect(result_params[:f]["facet_field"]).to eq ["facet_value"]
-    end
-
-    it "should add a facet param to existing facet constraints" do
-      helper.stub(:params).and_return(@params_existing_facets)
-      
-      result_params = helper.add_facet_params("facet_field_2", "new_facet_value")
-
-      expect(result_params[:f]).to be_a_kind_of(Hash)
-
-      @params_existing_facets[:f].each_pair do |facet_field, value_list|
-        expect(result_params[:f][facet_field]).to be_a_kind_of(Array)
-        
-        if facet_field == 'facet_field_2'
-          expect(result_params[:f][facet_field]).to eq (@params_existing_facets[:f][facet_field] | ["new_facet_value"])
-        else
-          expect(result_params[:f][facet_field]).to eq @params_existing_facets[:f][facet_field]
-        end        
-      end
-    end
-    it "should leave non-facet params alone" do
-      [@params_existing_facets, @params_no_existing_facet].each do |params|
-        helper.stub(:params).and_return(params)
-
-        result_params = helper.add_facet_params("facet_field_2", "new_facet_value")
-
-        params.each_pair do |key, value|
-          next if key == :f
-          expect(result_params[key]).to eq params[key]
-        end        
-      end
-    end    
-
-    it "should replace facets for facets configured as single" do
-      helper.should_receive(:facet_configuration_for_field).with('single_value_facet_field').and_return(double(:single => true))
-      params = { :f => { 'single_value_facet_field' => 'other_value'}}
-      helper.stub(:params).and_return params
-
-      result_params = helper.add_facet_params('single_value_facet_field', 'my_value')
-
-
-      expect(result_params[:f]['single_value_facet_field']).to have(1).item
-      expect(result_params[:f]['single_value_facet_field'].first).to eq 'my_value'
-    end
-
-    it "should accept a FacetItem instead of a plain facet value" do
-          
-      result_params = helper.add_facet_params('facet_field_1', double(:value => 123))
-
-      expect(result_params[:f]['facet_field_1']).to include(123)
-    end
-
-    it "should defer to the field set on a FacetItem" do
-          
-      result_params = helper.add_facet_params('facet_field_1', double(:field => 'facet_field_2', :value => 123))
-
-      expect(result_params[:f]['facet_field_1']).to be_blank
-      expect(result_params[:f]['facet_field_2']).to include(123)
-    end
-
-    it "should add any extra fq parameters from the FacetItem" do
-          
-      result_params = helper.add_facet_params('facet_field_1', double(:value => 123, :fq => {'facet_field_2' => 'abc'}))
-
-      expect(result_params[:f]['facet_field_1']).to include(123)
-      expect(result_params[:f]['facet_field_2']).to include('abc')
-    end
-  end
-
-  describe "add_facet_params_and_redirect" do
-    before do
-      catalog_facet_params = {:q => "query", 
-                :search_field => "search_field", 
-                :per_page => "50",
-                :page => "5",
-                :f => {"facet_field_1" => ["value1"], "facet_field_2" => ["value2", "value2a"]},
-                Blacklight::Solr::FacetPaginator.request_keys[:offset] => "100",
-                Blacklight::Solr::FacetPaginator.request_keys[:sort] => "index",
-                :id => 'facet_field_name'
-      }
-      helper.stub(:params).and_return(catalog_facet_params)
-    end
-    it "should redirect to 'index' action" do
-      params = helper.add_facet_params_and_redirect("facet_field_2", "facet_value")
-
-      expect(params[:action]).to eq "index"
-    end
-    it "should not include request parameters used by the facet paginator" do
-      params = helper.add_facet_params_and_redirect("facet_field_2", "facet_value")
-
-      bad_keys = Blacklight::Solr::FacetPaginator.request_keys.values + [:id]
-      bad_keys.each do |paginator_key|
-        expect(params.keys).to_not include(paginator_key)        
-      end
-    end
-    it 'should remove :page request key' do
-      params = helper.add_facet_params_and_redirect("facet_field_2", "facet_value")
-
-      expect(params.keys).to_not include(:page)
-    end
-    it "should otherwise do the same thing as add_facet_params" do
-      added_facet_params = helper.add_facet_params("facet_field_2", "facet_value")
-      added_facet_params_from_facet_action = helper.add_facet_params_and_redirect("facet_field_2", "facet_value")
-
-      added_facet_params_from_facet_action.each_pair do |key, value|
-        next if key == :action
-        expect(value).to eq added_facet_params[key]
-      end      
-    end
-  end
-
-  describe "remove_facet_params" do
-
-  end
-
   describe "facet_field_in_params?" do
     it "should check if the facet field is selected in the user params" do
       helper.stub(:params => { :f => { "some-field" => ["x"]}})

data/spec/helpers/hash_as_hidden_fields_spec.rb

@@ -8,7 +8,7 @@ describe HashAsHiddenFieldsHelper do
 
   it "should convert a hash with nested complex data to Rails-style hidden form fields" do
 
-    generated = hash_as_hidden_fields(@hash)
+    generated = render_hash_as_hidden_fields(@hash)
 
     expect(generated).to have_selector("input[type='hidden'][name='q'][value='query']")
     expect(generated).to have_selector("input[type='hidden'][name='per_page'][value='10']")

data/spec/helpers/url_helper_spec.rb

@@ -0,0 +1,360 @@
+require 'spec_helper'
+
+describe BlacklightHelper do
+
+  let(:blacklight_config) do
+    @config ||= Blacklight::Configuration.new.configure do |config|
+      config.index.title_field = 'title_display'
+      config.index.display_type_field = 'format'
+    end
+  end
+
+  before(:each) do
+    helper.stub(:search_action_url) do |*args|
+      catalog_index_url *args
+    end
+
+    helper.stub(:blacklight_config).and_return blacklight_config
+  end
+
+  def current_search_session
+
+  end
+
+  describe "link_back_to_catalog" do
+    let(:query_params)  {{:q => "query", :f => "facets", :per_page => "10", :page => "2", :controller=>'catalog'}}
+    let(:bookmarks_query_params) {{ :page => "2", :controller=>'bookmarks'}}
+
+    it "should build a link tag to catalog using session[:search] for query params" do
+      helper.stub(:current_search_session).and_return double(:query_params => query_params)
+      tag = helper.link_back_to_catalog
+      expect(tag).to match /q=query/
+      expect(tag).to match /f=facets/
+      expect(tag).to match /per_page=10/
+      expect(tag).to match /page=2/
+    end
+
+    it "should build a link tag to bookmarks using session[:search] for query params" do
+      helper.stub(:current_search_session).and_return double(:query_params => bookmarks_query_params)
+      tag = helper.link_back_to_catalog
+      expect(tag).to match /Back to Bookmarks/
+      expect(tag).to match /\/bookmarks/
+      expect(tag).to match /page=2/
+    end
+
+    describe "when an alternate scope is passed in" do
+      let(:my_engine) { double("Engine") }
+
+      it "should call url_for on the engine scope" do
+        helper.stub(:current_search_session).and_return double(:query_params => query_params)
+        expect(my_engine).to receive(:url_for).and_return(url_for(query_params))
+        tag = helper.link_back_to_catalog(route_set: my_engine)
+        expect(tag).to match /Back to Search/
+        expect(tag).to match /q=query/
+        expect(tag).to match /f=facets/
+        expect(tag).to match /per_page=10/
+        expect(tag).to match /page=2/
+      end
+    end
+  end
+
+  describe "link_to_query" do
+    it "should build a link tag to catalog using query string (no other params)" do
+      query = "brilliant"
+      self.should_receive(:params).and_return({})
+      tag = link_to_query(query)
+      expect(tag).to match /q=#{query}/
+      expect(tag).to match />#{query}<\/a>/
+    end
+    it "should build a link tag to catalog using query string and other existing params" do
+      query = "wonderful"
+      self.should_receive(:params).and_return({:qt => "title_search", :per_page => "50"})
+      tag = link_to_query(query)
+      expect(tag).to match /qt=title_search/
+      expect(tag).to match /per_page=50/
+    end
+    it "should ignore existing :page param" do
+      query = "yes"
+      self.should_receive(:params).and_return({:page => "2", :qt => "author_search"})
+      tag = link_to_query(query)
+      expect(tag).to match /qt=author_search/
+      expect(tag).to_not match /page/
+    end
+    it "should be html_safe" do
+      query = "brilliant"
+      self.should_receive(:params).and_return({:page => "2", :qt => "author_search"})
+      tag = link_to_query(query)
+      expect(tag).to be_html_safe
+    end
+  end
+
+  describe "sanitize_search_params" do
+    it "should strip nil values" do
+      result = sanitize_search_params(:a => nil, :b => 1)
+      expect(result).to_not have_key(:a)
+      expect(result[:b]).to eq 1
+    end
+
+    it "should remove blacklisted keys" do
+      result = sanitize_search_params(:action => true, :controller => true, :id => true, :commit => true, :utf8 => true)
+      expect(result).to be_empty
+    end
+  end
+
+  describe "params_for_search" do
+    def params
+      { 'default' => 'params'}
+    end
+
+    it "should default to using the controller's params" do
+      result = params_for_search
+      expect(result).to eq params
+      expect(params.object_id).to_not eq result.object_id
+    end
+
+    it "should let you pass in params to merge into the controller's params" do
+      source_params = { :q => 'query'}
+      result = params_for_search( source_params )
+      expect(result).to include(:q => 'query', 'default' => 'params')
+    end
+
+    it "should not return blacklisted elements" do
+      source_params = { :action => 'action', :controller => 'controller', :id => "id", :commit => 'commit'}
+      result = params_for_search(source_params)
+      expect(result.keys).to_not include(:action, :controller, :commit, :id)
+    end
+
+    it "should adjust the current page if the per_page changes" do
+      source_params = { :per_page => 20, :page => 5}
+      result = params_for_search(source_params, :per_page => 100)
+      expect(result[:page]).to eq 1
+    end
+
+    it "should not adjust the current page if the per_page is the same as it always was" do
+      source_params = { :per_page => 20, :page => 5}
+      result = params_for_search(source_params, :per_page => 20)
+      expect(result[:page]).to eq 5
+    end
+
+    it "should adjust the current page if the sort changes" do
+      source_params = { :sort => 'field_a', :page => 5}
+      result = params_for_search(source_params, :sort => 'field_b')
+      expect(result[:page]).to eq 1
+    end
+
+    it "should not adjust the current page if the sort is the same as it always was" do
+      source_params = { :sort => 'field_a', :page => 5}
+      result = params_for_search(source_params, :sort => 'field_a')
+      expect(result[:page]).to eq 5
+    end
+
+    describe "params_for_search with a block" do
+      it "should evalute the block and allow it to add or remove keys" do
+        result = params_for_search({:a => 1, :b => 2}, :c => 3) do |params|
+          params.except! :a, :b 
+          params[:d] = 'd'
+        end
+
+        result.keys.should_not include(:a, :b)
+        expect(result[:c]).to eq 3
+        expect(result[:d]).to eq 'd'
+      end
+
+    end
+
+  end
+
+
+  describe "start_over_path" do
+    it 'should be the catalog path with the current view type' do
+      blacklight_config.stub(:view) { { list: nil, abc: nil} }
+      helper.stub(:blacklight_config => blacklight_config)
+      expect(helper.start_over_path(:view => 'abc')).to eq catalog_index_url(:view => 'abc')
+    end
+
+    it 'should not include the current view type if it is the default' do
+      blacklight_config.stub(:view) { { list: nil, asdf: nil} }
+      helper.stub(:blacklight_config => blacklight_config)
+      expect(helper.start_over_path(:view => 'list')).to eq catalog_index_url
+    end
+  end
+
+  describe "link_to_document" do
+    it "should consist of the document title wrapped in a <a>" do
+      data = {'id'=>'123456','title_display'=>['654321'] }
+      @document = SolrDocument.new(data)
+      expect(link_to_document(@document, { :label => :title_display })).to have_selector("a", :text => '654321', :count => 1)
+    end
+
+    it "should accept and return a string label" do
+      data = {'id'=>'123456','title_display'=>['654321'] }
+      @document = SolrDocument.new(data)
+      expect(link_to_document(@document, { :label => "title_display" })).to have_selector("a", :text => 'title_display', :count => 1)
+    end
+
+    it "should accept and return a Proc" do
+      data = {'id'=>'123456','title_display'=>['654321'] }
+      @document = SolrDocument.new(data)
+      expect(link_to_document(@document, { :label => Proc.new { |doc, opts| doc.get(:id) + ": " + doc.get(:title_display) } })).to have_selector("a", :text => '123456: 654321', :count => 1)
+    end
+
+    it "should return id when label is missing" do
+      data = {'id'=>'123456'}
+      @document = SolrDocument.new(data)
+      expect(link_to_document(@document, { :label => :title_display })).to have_selector("a", :text => '123456', :count => 1)
+    end
+
+    it "should be html safe" do
+      data = {'id'=>'123456'}
+      @document = SolrDocument.new(data)
+      expect(link_to_document(@document, { :label => :title_display })).to be_html_safe
+    end
+
+    it "should convert the counter parameter into a data- attribute" do
+      data = {'id'=>'123456','title_display'=>['654321']}
+      @document = SolrDocument.new(data)
+      expect(link_to_document(@document, { :label => :title_display, :counter => 5  })).to match /data-counter="5"/
+    end
+
+    it "passes on the title attribute to the link_to_with_data method" do
+      @document = SolrDocument.new('id'=>'123456')
+      expect(link_to_document(@document,:label=>"Some crazy long label...",:title=>"Some crazy longer label")).to match(/title=\"Some crazy longer label\"/)
+    end
+
+    it "doesn't add an erroneous title attribute if one isn't provided" do
+      @document = SolrDocument.new('id'=>'123456')
+      expect(link_to_document(@document,:label=>"Some crazy long label...")).to_not match(/title=/)
+    end
+  end
+
+  describe "link_to_previous_search" do
+    it "should link to the given search parameters" do
+      params = {}
+      helper.should_receive(:render_search_to_s).with(params).and_return "link text"
+      expect(helper.link_to_previous_search({})).to eq helper.link_to("link text", catalog_index_path)
+    end
+  end
+
+  describe "add_facet_params" do
+    before do
+      @params_no_existing_facet = {:q => "query", :search_field => "search_field", :per_page => "50"}
+      @params_existing_facets = {:q => "query", :search_field => "search_field", :per_page => "50", :f => {"facet_field_1" => ["value1"], "facet_field_2" => ["value2", "value2a"]}}
+    end
+
+    it "should add facet value for no pre-existing facets" do
+      helper.stub(:params).and_return(@params_no_existing_facet)
+
+      result_params = helper.add_facet_params("facet_field", "facet_value")
+      expect(result_params[:f]).to be_a_kind_of(Hash)
+      expect(result_params[:f]["facet_field"]).to be_a_kind_of(Array)
+      expect(result_params[:f]["facet_field"]).to eq ["facet_value"]
+    end
+
+    it "should add a facet param to existing facet constraints" do
+      helper.stub(:params).and_return(@params_existing_facets)
+      
+      result_params = helper.add_facet_params("facet_field_2", "new_facet_value")
+
+      expect(result_params[:f]).to be_a_kind_of(Hash)
+
+      @params_existing_facets[:f].each_pair do |facet_field, value_list|
+        expect(result_params[:f][facet_field]).to be_a_kind_of(Array)
+        
+        if facet_field == 'facet_field_2'
+          expect(result_params[:f][facet_field]).to eq (@params_existing_facets[:f][facet_field] | ["new_facet_value"])
+        else
+          expect(result_params[:f][facet_field]).to eq @params_existing_facets[:f][facet_field]
+        end        
+      end
+    end
+    it "should leave non-facet params alone" do
+      [@params_existing_facets, @params_no_existing_facet].each do |params|
+        helper.stub(:params).and_return(params)
+
+        result_params = helper.add_facet_params("facet_field_2", "new_facet_value")
+
+        params.each_pair do |key, value|
+          next if key == :f
+          expect(result_params[key]).to eq params[key]
+        end        
+      end
+    end    
+
+    it "should replace facets for facets configured as single" do
+      helper.should_receive(:facet_configuration_for_field).with('single_value_facet_field').and_return(double(:single => true))
+      params = { :f => { 'single_value_facet_field' => 'other_value'}}
+      helper.stub(:params).and_return params
+
+      result_params = helper.add_facet_params('single_value_facet_field', 'my_value')
+
+
+      expect(result_params[:f]['single_value_facet_field']).to have(1).item
+      expect(result_params[:f]['single_value_facet_field'].first).to eq 'my_value'
+    end
+
+    it "should accept a FacetItem instead of a plain facet value" do
+          
+      result_params = helper.add_facet_params('facet_field_1', double(:value => 123))
+
+      expect(result_params[:f]['facet_field_1']).to include(123)
+    end
+
+    it "should defer to the field set on a FacetItem" do
+          
+      result_params = helper.add_facet_params('facet_field_1', double(:field => 'facet_field_2', :value => 123))
+
+      expect(result_params[:f]['facet_field_1']).to be_blank
+      expect(result_params[:f]['facet_field_2']).to include(123)
+    end
+
+    it "should add any extra fq parameters from the FacetItem" do
+          
+      result_params = helper.add_facet_params('facet_field_1', double(:value => 123, :fq => {'facet_field_2' => 'abc'}))
+
+      expect(result_params[:f]['facet_field_1']).to include(123)
+      expect(result_params[:f]['facet_field_2']).to include('abc')
+    end
+  end
+
+  describe "add_facet_params_and_redirect" do
+    before do
+      catalog_facet_params = {:q => "query", 
+                :search_field => "search_field", 
+                :per_page => "50",
+                :page => "5",
+                :f => {"facet_field_1" => ["value1"], "facet_field_2" => ["value2", "value2a"]},
+                Blacklight::Solr::FacetPaginator.request_keys[:offset] => "100",
+                Blacklight::Solr::FacetPaginator.request_keys[:sort] => "index",
+                :id => 'facet_field_name'
+      }
+      helper.stub(:params).and_return(catalog_facet_params)
+    end
+    it "should redirect to 'index' action" do
+      params = helper.add_facet_params_and_redirect("facet_field_2", "facet_value")
+
+      expect(params[:action]).to eq "index"
+    end
+    it "should not include request parameters used by the facet paginator" do
+      params = helper.add_facet_params_and_redirect("facet_field_2", "facet_value")
+
+      bad_keys = Blacklight::Solr::FacetPaginator.request_keys.values + [:id]
+      bad_keys.each do |paginator_key|
+        expect(params.keys).to_not include(paginator_key)        
+      end
+    end
+    it 'should remove :page request key' do
+      params = helper.add_facet_params_and_redirect("facet_field_2", "facet_value")
+
+      expect(params.keys).to_not include(:page)
+    end
+    it "should otherwise do the same thing as add_facet_params" do
+      added_facet_params = helper.add_facet_params("facet_field_2", "facet_value")
+      added_facet_params_from_facet_action = helper.add_facet_params_and_redirect("facet_field_2", "facet_value")
+
+      added_facet_params_from_facet_action.each_pair do |key, value|
+        next if key == :action
+        expect(value).to eq added_facet_params[key]
+      end      
+    end
+  end
+end