hydra-editor 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 485ad6a61a209f14ea02123a1d2c4d7e211f6370
-  data.tar.gz: ffae1f8424ce1a0478a4c0054ccc20cf1e4a19c0
+  metadata.gz: 57400fbf76b376d6d1d5e2ab6eed3f0669faa2c2
+  data.tar.gz: fe67f54e3baba3b681b76b20a8a0f4eccf861ca5
 SHA512:
-  metadata.gz: 76d53ed374df9271eea953254dbd4845d13639dc56e4316602039e5543f3cfd28ff165abce67010d3d8f86be275e057da57b5df79dcb1c713e881007bcee2a1d
-  data.tar.gz: 57a0b8ab3547a469d40b24f9f0fd2dcc2da91a29058b1a25008a7f7a3b4e40ec50ab17a81febfb522ac07932e3c880de925f9eb04d964c33d4e30a84289f7191
+  metadata.gz: 4bba897d6015ce54013e9c81a0c5a6db3fe16d3fc9ddf59e4d90dd67c2c99f1fd98e8c6d369b881408f876a4d103e1b8ddb081c77bcbcc102e42751aa44d3b09
+  data.tar.gz: 657a910594d85f3f671f08641ae05f411f0e7de845148736ec2e67a2e23d8d1081870024bd521480a7d2d6e4cad770723bd2d429d5d982236fd16445e7ed5c6c

data/app/assets/javascripts/hydra-editor/multiForm.js

@@ -21,7 +21,7 @@
 
       //clear out the value for the element being appended
       //so the new element has a blank value
-      cloneElem.find('input[type=text]').attr("value", "");
+      cloneElem.find('input[type=text]').val("");
       cloneElem.find('input[type=text]').attr("required", false);
 
       if (settings.afterAdd) {

data/app/helpers/concerns/records_helper_behavior.rb

@@ -24,10 +24,6 @@ module RecordsHelperBehavior
     render_edit_field_partial_with_action('records', key, locals)
   end
 
-  def render_batch_edit_field_partial(key, locals)
-    render_edit_field_partial_with_action('batch_edit', key, locals)
-  end
-
   def add_field (key)
     more_or_less_button(key, 'adder', '+')
   end

data/app/views/records/_edit_field.html.erb

@@ -1,7 +1,7 @@
 <% render_req ||= true # render_req is true for single file edit, false for batch edit%>
 <div class="control-group">
-  <% vals =  record[key] %>
-  <% if render_req && record.required?(key) %>
+  <% vals =  f.object[key] %>
+  <% if render_req && f.object.required?(key) %>
     <% tmp = '<span class="error">*</span>' + field_label(key) %>
     <%= f.label key, tmp.html_safe, :class=>"control-label"  %>
   <% else %>
@@ -9,7 +9,7 @@
   <% end %>
 
   <% vals.to_ary.each_with_index do |v, index| %>
-    <%= render_edit_field_partial(key, record: record, f:f,  v: v, index: index, render_req: render_req) %>
+    <%= render_edit_field_partial(key, f:f,  v: v, index: index, render_req: render_req) %>
   <% end %>
  </div><!-- /control-group -->
 

data/app/views/records/_form.html.erb

@@ -2,8 +2,8 @@
   <div id="descriptions_display">
     <h2 class="non lower">Descriptions <small class="pull-right"><span class="error">*</span> indicates required fields</small> </h2>
     <div class="well">
-      <% record.terms_for_editing.each do |term| %>
-        <%= render :partial => "records/edit_field", :locals => {record: record, :f =>f, :render_req => true, :key => term } %>
+      <% f.object.terms_for_editing.each do |term| %>
+        <%= render :partial => "records/edit_field", :locals => {:f =>f, :render_req => true, :key => term } %>
       <% end %>
     </div><!-- /well -->
   </div>

data/app/views/records/edit_fields/_default.html.erb

@@ -1,7 +1,7 @@
       <div class="controls" <%  if index == 0 %> id="additional_<%= key.to_s %>_clone" <% end %>>
-        <% required = render_req && (index == 0) && record.required?(key) %>
-        <%= text_field_tag "#{record.class.model_name.underscore}[#{key.to_s}][]", v,  :id => "#{record.class.model_name.underscore}_#{key.to_s}", :class => "input-large", :required => required  %>
-        <% unless record.class.unique?(key) %>
+        <% required = render_req && (index == 0) && f.object.required?(key) %>
+        <%= text_field_tag "#{f.object.class.model_name.underscore}[#{key.to_s}][]", v,  :id => "#{f.object.class.model_name.underscore}_#{key.to_s}", :class => "input-large", :required => required  %>
+        <% unless f.object.class.unique?(key) %>
           <%= render :partial=>"records/edit_fields/suffix", :locals=>{key: key, index: index} %>
         <% end %>
       </div>

data/lib/hydra_editor/version.rb

@@ -1,3 +1,3 @@
 module HydraEditor
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/dummy/Gemfile

@@ -13,4 +13,8 @@ gem 'rspec-rails'
 
 gem "devise"
 gem "devise-guests", "~> 0.3"
-gem "bootstrap-sass"
+gem "bootstrap-sass"
+group :development, :test do
+  gem "rspec-rails"
+  gem "jettywrapper"
+end

data/spec/dummy/Gemfile.lock

@@ -1,7 +1,9 @@
 PATH
   remote: ../../
   specs:
-    hydra-editor (0.0.1)
+    hydra-editor (0.0.2)
+      active-fedora (>= 6.3.0)
+      bootstrap_forms
       rails (~> 3.2.13)
 
 GEM
@@ -20,18 +22,16 @@ GEM
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    active-fedora (6.0.0)
-      activeresource (>= 3.0.0)
+    active-fedora (6.3.0)
       activesupport (>= 3.0.0)
-      builder (~> 3.0.0)
       deprecation
       mediashelf-loggable
       nom-xml (>= 0.5.1)
-      om (~> 2.0.0)
+      om (~> 2.1.0)
       rdf
       rdf-rdfxml (~> 1.0.0)
       rsolr
-      rubydora (~> 1.5)
+      rubydora (~> 1.6, >= 1.6.5)
     activemodel (3.2.13)
       activesupport (= 3.2.13)
       builder (~> 3.0.0)
@@ -48,10 +48,9 @@ GEM
       multi_json (~> 1.0)
     addressable (2.3.4)
     arel (3.0.2)
-    backports (3.3.0)
     bcrypt-ruby (3.0.1)
-    blacklight (4.2.0)
-      bootstrap-sass (~> 2.2.0)
+    blacklight (4.2.1)
+      bootstrap-sass (>= 2.2.0, < 2.4)
       kaminari (~> 0.13)
       marc (>= 0.4.3, < 1.1)
       nokogiri (~> 1.5)
@@ -60,23 +59,24 @@ GEM
       sass-rails
     block_helpers (0.3.3)
       activesupport (>= 2.0)
-    bootstrap-sass (2.2.2.0)
+    bootstrap-sass (2.3.2.0)
       sass (~> 3.2)
+    bootstrap_forms (3.0.1)
     builder (3.0.4)
-    cancan (1.6.9)
+    cancan (1.6.10)
     childprocess (0.3.9)
       ffi (~> 1.0, >= 1.0.11)
     daemons (1.1.9)
     deprecation (0.0.5)
       activesupport
-    devise (2.2.3)
+    devise (2.2.4)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.1)
       railties (~> 3.1)
       warden (~> 1.2.1)
     devise-guests (0.3.1)
       devise
-    diff-lcs (1.2.3)
+    diff-lcs (1.2.4)
     equivalent-xml (0.3.0)
       nokogiri (>= 1.4.3)
     erubis (2.7.0)
@@ -86,26 +86,26 @@ GEM
       factory_girl (~> 4.2.0)
       railties (>= 3.0.0)
     fastercsv (1.5.5)
-    ffi (1.7.0)
-    hike (1.2.2)
-    hooks (0.2.2)
-    hydra-access-controls (6.0.0)
-      active-fedora (>= 6.0.0)
+    ffi (1.9.0)
+    hike (1.2.3)
+    hooks (0.3.1)
+    hydra-access-controls (6.2.2)
+      active-fedora (~> 6.1)
       activesupport
       blacklight
       cancan
       deprecation
-    hydra-core (6.0.0)
+    hydra-core (6.2.2)
       active-fedora
       blacklight (~> 4.0)
       block_helpers
       deprecation (>= 0.0.5)
-      hydra-access-controls (= 6.0.0)
+      hydra-access-controls (= 6.2.2)
       jettywrapper (>= 1.4.1)
       rails (~> 3.2.3)
-    hydra-head (6.0.0)
-      hydra-access-controls (= 6.0.0)
-      hydra-core (= 6.0.0)
+    hydra-head (6.2.2)
+      hydra-access-controls (= 6.2.2)
+      hydra-core (= 6.2.2)
       rails (>= 3.2.6)
     i18n (0.6.1)
     jettywrapper (1.4.1)
@@ -115,31 +115,32 @@ GEM
       logger
       mediashelf-loggable
     journey (1.0.4)
-    json (1.7.7)
+    json (1.8.0)
     kaminari (0.14.1)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     logger (1.2.8)
-    mail (2.5.3)
-      i18n (>= 0.4.0)
+    mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     marc (0.5.0)
     mediashelf-loggable (0.4.9)
-    mime-types (1.22)
-    multi_json (1.7.2)
-    nokogiri (1.5.9)
+    mime-types (1.23)
+    mini_portile (0.5.0)
+    multi_json (1.7.7)
+    nokogiri (1.6.0)
+      mini_portile (~> 0.5.0)
     nom-xml (0.5.1)
       activesupport
       i18n
       nokogiri
-    om (2.0.0)
+    om (2.1.2)
       activemodel
       activesupport
       deprecation
       mediashelf-loggable
       nokogiri (>= 1.4.2)
-      solrizer (~> 3.0.0)
+      solrizer (~> 3.1.0)
     orm_adapter (0.4.0)
     polyglot (0.3.3)
     rack (1.4.5)
@@ -165,13 +166,12 @@ GEM
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
     rake (10.0.4)
-    rdf (1.0.5)
+    rdf (1.0.7)
       addressable (>= 2.2)
     rdf-rdfxml (1.0.1)
       rdf (>= 1.0)
       rdf-xsd (>= 1.0)
-    rdf-xsd (1.0.0)
-      backports
+    rdf-xsd (1.0.2.1)
       nokogiri (>= 1.5.0)
       rdf (>= 0.3.4)
     rdoc (3.12.2)
@@ -184,29 +184,29 @@ GEM
     rspec-expectations (2.13.0)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.13.1)
-    rspec-rails (2.13.0)
+    rspec-rails (2.13.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
       rspec-core (~> 2.13.0)
       rspec-expectations (~> 2.13.0)
       rspec-mocks (~> 2.13.0)
-    rubydora (1.6.1)
+    rubydora (1.6.5)
       activemodel
       activesupport
       deprecation
       equivalent-xml
       fastercsv
-      hooks
+      hooks (~> 0.3.0)
       mime-types
       nokogiri
       rest-client
-    sass (3.2.7)
+    sass (3.2.9)
     sass-rails (3.2.6)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    solrizer (3.0.0)
+    solrizer (3.1.0)
       activesupport
       daemons
       mediashelf-loggable (~> 0.4.7)
@@ -221,8 +221,8 @@ GEM
     sqlite3 (1.3.7)
     stomp (1.2.9)
     thor (0.18.1)
-    tilt (1.3.7)
-    treetop (1.4.12)
+    tilt (1.4.1)
+    treetop (1.4.14)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.37)
@@ -241,6 +241,7 @@ DEPENDENCIES
   factory_girl_rails
   hydra-editor!
   hydra-head
+  jettywrapper
   rails (= 3.2.13)
   rspec-rails
   sqlite3

data/spec/dummy/app/controllers/catalog_controller.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 require 'blacklight/catalog'
 
-class CatalogController < ApplicationController  
+class CatalogController < ApplicationController
 
   include Blacklight::Catalog
   include Hydra::Controller::ControllerBehavior
@@ -14,14 +14,14 @@ class CatalogController < ApplicationController
 
 
   configure_blacklight do |config|
-    config.default_solr_params = { 
+    config.default_solr_params = {
       :qt => 'search',
-      :rows => 10 
+      :rows => 10
     }
 
     # solr field configuration for search results/index views
     config.index.show_link = 'title_tesim'
-    config.index.record_tsim_type = 'has_model_ssim'
+    config.index.record_display_type = 'has_model_ssim'
 
     # solr field configuration for document/show views
     config.show.html_title = 'title_tesim'
@@ -35,25 +35,25 @@ class CatalogController < ApplicationController
     # * If left unset, then all facet values returned by solr will be displayed.
     # * If set to an integer, then "f.somefield.facet.limit" will be added to
     # solr request, with actual solr request being +1 your configured limit --
-    # you configure the number of items you actually want _tsimed_ in a page.    
+    # you configure the number of items you actually want _tsimed_ in a page.
     # * If set to 'true', then no additional parameters will be sent to solr,
     # but any 'sniffed' request limit parameters will be used for paging, with
-    # paging at requested limit -1. Can sniff from facet.limit or 
+    # paging at requested limit -1. Can sniff from facet.limit or
     # f.specific_field.facet.limit solr request params. This 'true' config
     # can be used if you set limits in :default_solr_params, or as defaults
     # on the solr side in the request handler itself. Request handler defaults
     # sniffing requires solr requests to be made with "echoParams=all", for
-    # app code to actually have it echo'd back to see it.  
+    # app code to actually have it echo'd back to see it.
     #
-    # :show may be set to false if you don't want the facet to be drawn in the 
+    # :show may be set to false if you don't want the facet to be drawn in the
     # facet bar
-    config.add_facet_field solr_name('object_type', :facetable), :label => 'Format' 
-    config.add_facet_field solr_name('pub_date', :facetable), :label => 'Publication Year' 
-    config.add_facet_field solr_name('subject_topic', :facetable), :label => 'Topic', :limit => 20 
-    config.add_facet_field solr_name('language', :facetable), :label => 'Language', :limit => true 
-    config.add_facet_field solr_name('lc1_letter', :facetable), :label => 'Call Number' 
-    config.add_facet_field solr_name('subject_geo', :facetable), :label => 'Region' 
-    config.add_facet_field solr_name('subject_era', :facetable), :label => 'Era'  
+    config.add_facet_field solr_name('object_type', :facetable), :label => 'Format'
+    config.add_facet_field solr_name('pub_date', :facetable), :label => 'Publication Year'
+    config.add_facet_field solr_name('subject_topic', :facetable), :label => 'Topic', :limit => 20
+    config.add_facet_field solr_name('language', :facetable), :label => 'Language', :limit => true
+    config.add_facet_field solr_name('lc1_letter', :facetable), :label => 'Call Number'
+    config.add_facet_field solr_name('subject_geo', :facetable), :label => 'Region'
+    config.add_facet_field solr_name('subject_era', :facetable), :label => 'Era'
 
     # Have BL send all facet field names to Solr, which has been the default
     # previously. Simply remove these lines if you'd rather use Solr request
@@ -64,26 +64,26 @@ class CatalogController < ApplicationController
 
 
     # solr fields to be displayed in the index (search results) view
-    #   The ordering of the field names is the order of the display 
-    config.add_index_field solr_name('title', :stored_searchable, type: :string), :label => 'Title:' 
-    config.add_index_field solr_name('title_vern', :stored_searchable, type: :string), :label => 'Title:' 
-    config.add_index_field solr_name('author', :stored_searchable, type: :string), :label => 'Author:' 
-    config.add_index_field solr_name('author_vern', :stored_searchable, type: :string), :label => 'Author:' 
-    config.add_index_field solr_name('format', :symbol), :label => 'Format:' 
+    #   The ordering of the field names is the order of the display
+    config.add_index_field solr_name('title', :stored_searchable, type: :string), :label => 'Title:'
+    config.add_index_field solr_name('title_vern', :stored_searchable, type: :string), :label => 'Title:'
+    config.add_index_field solr_name('author', :stored_searchable, type: :string), :label => 'Author:'
+    config.add_index_field solr_name('author_vern', :stored_searchable, type: :string), :label => 'Author:'
+    config.add_index_field solr_name('format', :symbol), :label => 'Format:'
     config.add_index_field solr_name('language', :stored_searchable, type: :string), :label => 'Language:'
     config.add_index_field solr_name('published', :stored_searchable, type: :string), :label => 'Published:'
     config.add_index_field solr_name('published_vern', :stored_searchable, type: :string), :label => 'Published:'
     config.add_index_field solr_name('lc_callnum', :stored_searchable, type: :string), :label => 'Call number:'
 
     # solr fields to be displayed in the show (single result) view
-    #   The ordering of the field names is the order of the display 
-    config.add_show_field solr_name('title', :stored_searchable, type: :string), :label => 'Title:' 
-    config.add_show_field solr_name('title_vern', :stored_searchable, type: :string), :label => 'Title:' 
-    config.add_show_field solr_name('subtitle', :stored_searchable, type: :string), :label => 'Subtitle:' 
-    config.add_show_field solr_name('subtitle_vern', :stored_searchable, type: :string), :label => 'Subtitle:' 
-    config.add_show_field solr_name('author', :stored_searchable, type: :string), :label => 'Author:' 
-    config.add_show_field solr_name('author_vern', :stored_searchable, type: :string), :label => 'Author:' 
-    config.add_show_field solr_name('format', :symbol), :label => 'Format:' 
+    #   The ordering of the field names is the order of the display
+    config.add_show_field solr_name('title', :stored_searchable, type: :string), :label => 'Title:'
+    config.add_show_field solr_name('title_vern', :stored_searchable, type: :string), :label => 'Title:'
+    config.add_show_field solr_name('subtitle', :stored_searchable, type: :string), :label => 'Subtitle:'
+    config.add_show_field solr_name('subtitle_vern', :stored_searchable, type: :string), :label => 'Subtitle:'
+    config.add_show_field solr_name('author', :stored_searchable, type: :string), :label => 'Author:'
+    config.add_show_field solr_name('author_vern', :stored_searchable, type: :string), :label => 'Author:'
+    config.add_show_field solr_name('format', :symbol), :label => 'Format:'
     config.add_show_field solr_name('url_fulltext_tsim', :stored_searchable, type: :string), :label => 'URL:'
     config.add_show_field solr_name('url_suppl_tsim', :stored_searchable, type: :string), :label => 'More Information:'
     config.add_show_field solr_name('language', :stored_searchable, type: :string), :label => 'Language:'
@@ -104,48 +104,43 @@ class CatalogController < ApplicationController
     # The :key is what will be used to identify this BL search field internally,
     # as well as in URLs -- so changing it after deployment may break bookmarked
     # urls.  A display label will be automatically calculated from the :key,
-    # or can be specified manually to be different. 
+    # or can be specified manually to be different.
 
     # This one uses all the defaults set by the solr request handler. Which
     # solr request handler? The one set in config[:default_solr_parameters][:qt],
-    # since we aren't specifying it otherwise. 
-    
+    # since we aren't specifying it otherwise.
+
     config.add_search_field 'all_fields', :label => 'All Fields'
-    
+
 
     # Now we see how to over-ride Solr request handler defaults, in this
     # case for a BL "search field", which is really a dismax aggregate
-    # of Solr search fields. 
-    
-    config.add_search_field('title') do |field|
-      # solr_parameters hash are sent to Solr as ordinary url query params. 
-      field.solr_parameters = { :'spellcheck.dictionary' => 'title' }
+    # of Solr search fields.
 
+    config.add_search_field('title') do |field|
       # :solr_local_parameters will be sent using Solr LocalParams
       # syntax, as eg {! qf=$title_qf }. This is neccesary to use
       # Solr parameter de-referencing like $title_qf.
       # See: http://wiki.apache.org/solr/LocalParams
-      field.solr_local_parameters = { 
+      field.solr_local_parameters = {
         :qf => '$title_qf',
         :pf => '$title_pf'
       }
     end
-    
+
     config.add_search_field('author') do |field|
-      field.solr_parameters = { :'spellcheck.dictionary' => 'author' }
-      field.solr_local_parameters = { 
+      field.solr_local_parameters = {
         :qf => '$author_qf',
         :pf => '$author_pf'
       }
     end
-    
+
     # Specifying a :qt only to show it's possible, and so our internal automated
-    # tests can test it. In this case it's the same as 
-    # config[:default_solr_parameters][:qt], so isn't actually neccesary. 
+    # tests can test it. In this case it's the same as
+    # config[:default_solr_parameters][:qt], so isn't actually neccesary.
     config.add_search_field('subject') do |field|
-      field.solr_parameters = { :'spellcheck.dictionary' => 'subject' }
       field.qt = 'search'
-      field.solr_local_parameters = { 
+      field.solr_local_parameters = {
         :qf => '$subject_qf',
         :pf => '$subject_pf'
       }
@@ -160,11 +155,11 @@ class CatalogController < ApplicationController
     config.add_sort_field 'author_tesi asc, title_tesi asc', :label => 'author'
     config.add_sort_field 'title_tesi asc, pub_date_dtsi desc', :label => 'title'
 
-    # If there are more than this many search results, no spelling ("did you 
+    # If there are more than this many search results, no spelling ("did you
     # mean") suggestion is offered.
     config.spell_max = 5
   end
 
 
 
-end 
+end