scooby_snacks 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 71788e2f8f9377b676cd9b41de1fa15259f2ac3c
-  data.tar.gz: 5da9e863b415a71d6e9e575ed05834246c629606
+SHA256:
+  metadata.gz: 228854434b05709dc74c5c33b7aeba6fb15983d3d91917e1a24ef32d2509e523
+  data.tar.gz: 55471a7d4165a20509d63f416ff25c7dcdd79779fc0b89dd9cc2c5b0fb3d1766
 SHA512:
-  metadata.gz: 249b1143cd172b0d87f9719f93efc420fed46d4bc24e50e7af339a7b35b09ceae4518028f3012fbe28dde8d00d7089b311fb13622b86983f7f7298671440c341
-  data.tar.gz: adb2c553faa85ad4892663a9f0e40001b9bcc44616108b09771b0cfe11069a259451c32722ea763c60b984fa9c1b21dc68faa3c0b8a8af3eba7c8173c0987b27
+  metadata.gz: 13a899775252d026e4d927e3028533ea6a406d8184cb6068e5003ed95878d24a399d65bdce913d7d4cd6851617171b33b9e57bf45009a55029445d7bb571ba71
+  data.tar.gz: ed34501d6617d98fbd940bb0f04393db896d10f3fd997d321f46ddc46445fdbf820aa19612b2b36160017ce2ac694413d465106ec0a04daa29f418e2b41195e5

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+*.gem

data/lib/scooby_snacks/blacklight_configuration.rb

@@ -12,19 +12,18 @@ module ScoobySnacks
     def self.add_show_fields(config)
        self.schema.display_fields.each do |field|
          begin
-           config.add_show_field field.solr_search_name, label: field.label
+           config.add_show_field field.solr_name, label: field.label
          rescue 
-           Rails.logger.error "error adding field: #{field.solr_search_name} for property #{field.label}. Redundant definition?"
+           Rails.logger.error "error adding field: #{field.solr_name} for property #{field.label}. Redundant definition?"
          end
        end
     end
 
     def self.add_search_fields(config)
       self.schema.searchable_fields.each do |field|
-        config.add_search_field(field.name) do |new_field|
-          new_field.label = field.label
-          new_field.solr_local_parameters = {
-            qf: field.solr_search_name,
+        config.add_search_field(field.name, label: field.label, include_in_advanced_search: true) do |new_field|
+          new_field.solr_parameters = {
+            qf: field.solr_search_name.to_s,
             pf: field.solr_search_name
           }
         end
@@ -45,7 +44,7 @@ module ScoobySnacks
 
     def self.add_search_result_display_fields(config)
        self.schema.search_result_display_fields.each do |field|
-         config.add_index_field(field.solr_search_name, self.get_index_options(field))
+         config.add_index_field(field.solr_name, self.get_index_options(field))
       end
     end
 
@@ -54,7 +53,7 @@ module ScoobySnacks
         options[:label] =  field.label || field.name
         options[:index_itemprop] = field.itemprop if field.itemprop
         options[:helper_method] = field.helper_method if field.helper_method
-        options[:link_to_search] = field.solr_search_name if field.search?
+        options[:link_to_search] = field.solr_search_name if field.searchable?
         return options
     end
 

data/lib/scooby_snacks/field.rb

@@ -105,9 +105,9 @@ module ScoobySnacks
 
     def display_options
       options = {label: label}
-      if search?
+      if searchable?
         options[:render_as] = :linked 
-        options[:search_field] = solr_search_name
+        options[:search_field] = name
       end
       return options
     end
@@ -136,29 +136,40 @@ module ScoobySnacks
       vocabularies.first
     end
 
-    def solr_name(facet: nil, keyword: false, string: false, symbol: false, tokenize: true)
-      facet = facet? if facet.nil?
-      facet = facet or keyword or string or symbol or !tokenize
-      case @raw_array['data_type'].downcase
-      when /string/, /keyword/, /symbol/
-        type = "s"
-      when /date/
-        type = "d"
-      else
-        type = "te"
-      end
-      type = "s" if facet
-      index = (search? or facet) ? "i" : ""
-      multiple = multiple? ? "m" : ""
-      return "#{name}_#{type}s#{index}#{multiple}"
+    def solr_names
+      solr_descriptors.reduce([]){|names, desc| names << solr_name(desc)}
+    end
+
+    def solr_name(descriptor = nil)
+      descriptor ||= solr_descriptors.first
+      Solrizer.solr_name(name,descriptor,type: solr_data_type)
     end
 
     def solr_search_name
-      solr_name(facet: false)
+      return "" unless searchable?
+      solr_name(:stored_searchable)
     end
 
     def solr_facet_name
-      solr_name(facet: true)
+      return "" unless facet?
+      solr_name(:facetable)
+    end
+
+    def solr_sort_name
+      return "" unless sort?
+      solr_name(:stored_sortable)
+    end
+
+    def solr_descriptors
+      descriptors = []
+      descriptors << :stored_searchable if searchable?
+      descriptors << :facetable if facet?
+      descriptors << :displayable if (descriptors.empty? && stored_in_solr?)
+      return descriptors
+    end
+
+    def solr_data_type
+      @raw_array['data_type'].downcase.to_sym || :text
     end
 
     private

data/lib/scooby_snacks/solr_behavior.rb

@@ -63,8 +63,8 @@ module ScoobySnacks::SolrBehavior
     ScoobySnacks::METADATA_SCHEMA.stored_in_solr_fields.each do |field|
       next if respond_to? field.name
       # define a attribute for the current property
-      attribute(field.name.to_sym, (field.date? ? Solr::Date : Solr::Array), field.solr_search_name) unless field.hidden?           
-      add_field_semantics(field.oai_element, field.solr_search_name) if (field.oai? && field.oai_ns == 'dc')
+      add_field_semantics(field.oai_element, field.solr_name) if (field.oai? && field.oai_ns == 'dc')
+      attribute(field.name.to_sym, (field.date? ? Solr::Date : Solr::Array), field.solr_name) unless field.hidden?           
     end
   end
 end

data/lib/scooby_snacks/version.rb

@@ -1,3 +1,3 @@
 module ScoobySnacks
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/lib/scooby_snacks/work_form_behavior.rb

@@ -28,9 +28,8 @@ module ScoobySnacks::WorkFormBehavior
       ScoobySnacks::METADATA_SCHEMA.controlled_field_names.each do |field_name|
         permitted << {"#{field_name}_attributes".to_sym => [:id, :_destroy]}
       end
-      return params
+      return permitted
     end
 
-
   end
 end

data/lib/scooby_snacks/work_model_behavior.rb

@@ -13,7 +13,8 @@ module ScoobySnacks::WorkModelBehavior
       # unless it is already defined (e.g. in hyrax core)
       unless respond_to? field.name.to_sym
         property field.name.to_sym, {predicate: field.predicate, multiple: field.multiple?}  do |index| 
-          index.as :stored_searchable
+          index.as *field.solr_descriptors
+          index.type field.solr_data_type
         end
       end
     end #end fields loop

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scooby_snacks
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - UCSC Library Digital Initiatives Department, Ned Henry
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-25 00:00:00.000000000 Z
+date: 2019-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -99,8 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A helper gem to define metadata schema in configuration files in Hyrax (Samvera)