scooby_snacks 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 228854434b05709dc74c5c33b7aeba6fb15983d3d91917e1a24ef32d2509e523
-  data.tar.gz: 55471a7d4165a20509d63f416ff25c7dcdd79779fc0b89dd9cc2c5b0fb3d1766
+  metadata.gz: 361226b5fb0d156ad6a8bccb9f048d76191d075aa2aa60193062ad490cb11f5c
+  data.tar.gz: 73f9eeea08df5835c8a18d5dd6caf738d09fe382b4cf531effd301fae7f5fe4f
 SHA512:
-  metadata.gz: 13a899775252d026e4d927e3028533ea6a406d8184cb6068e5003ed95878d24a399d65bdce913d7d4cd6851617171b33b9e57bf45009a55029445d7bb571ba71
-  data.tar.gz: ed34501d6617d98fbd940bb0f04393db896d10f3fd997d321f46ddc46445fdbf820aa19612b2b36160017ce2ac694413d465106ec0a04daa29f418e2b41195e5
+  metadata.gz: ad4d57284a2cbf20abc73b80916812a64e38b7e879839a8acc39f82dfa6dcb10c1077a8f243c8e2cadb82b3483691efb8f953aea682e777764c70a384e5e38f9
+  data.tar.gz: cc986ab2032483c5d30be23b3b4a25b8fe7b1ab296a4debccf30ffc91d5825271f7be095f1405dfb4d1cb74100bb64d3190248c9233c1fc2dd9e00f54f5114ed

data/lib/scooby_snacks/field.rb

@@ -105,7 +105,9 @@ module ScoobySnacks
 
     def display_options
       options = {label: label}
-      if searchable?
+      if date?
+        options[:render_as] = :date
+      elsif searchable?
         options[:render_as] = :linked 
         options[:search_field] = name
       end

data/lib/scooby_snacks/metadata_schema.rb

@@ -50,6 +50,53 @@ module ScoobySnacks
       SS_DISPLAY_GROUPS + custom_display_groups
     end
 
+    def self.define_display_group_methods display_groups
+      # define methods to list display group contents
+      display_groups.each do |display_group|
+
+        define_method("#{display_group}_display_field_names") do 
+          field_names = instance_variable_get("@#{display_group}_display_field_names")
+          if field_names.nil?
+            send("#{display_group}_display_fields".to_sym).map{|field| field.name}
+          else
+            field_names
+          end
+        end
+
+        define_method("#{display_group}_display_fields") do 
+          field_names = instance_variable_get("@#{display_group}_display_field_names")
+          if field_names.nil?
+            fields = all_fields.select{|field| field.in_display_group?(display_group)}
+            instance_variable_set("@#{display_group}_display_field_names", fields.map{|field| field.name}) 
+            fields
+          else
+            field_names.map{|name| get_field(name)}
+          end
+        end   
+      end
+    end
+
+    define_display_group_methods(display_groups)
+
+    def self.define_boolean_attribute_methods boolean_attributes
+
+      # Define methods to cache and return lists of fields & field names
+      # that share certain boolean characteristics (controlled, required, etc). 
+      boolean_attributes.each do |attribute|
+        # Skip any attribute we have a custom method for      
+        next if [:work_title].include? attribute
+        define_method("#{attribute}_fields".to_sym) do
+          @fields.values.select{|field| field.send("#{attribute}?".to_sym)}
+        end
+        define_method("#{attribute}_field_names".to_sym) do
+          field_names = send("#{attribute}_fields".to_sym).map{|field| field.name}
+          instance_variable_set("@#{attribute}_field_names".to_sym, field_names)
+        end
+      end
+    end
+
+    define_boolean_attribute_methods(boolean_attributes)
+
     def initialize (schema_config_path: nil, raw_schema: nil)
       schema_config_path ||= default_schema_config_path
       raw_schema ||= YAML.load_file(schema_config_path)
@@ -61,40 +108,7 @@ module ScoobySnacks
         fields
       end
     end
-
-    # define methods to list display group contents
-    display_groups.each do |display_group|
-      define_method("#{display_group}_display_field_names") do 
-        field_names = instance_variable_get("@#{display_group}_display_field_names")
-        if field_names.nil?
-          send("#{display_group}_display_fields".to_sym).map{|field| field.name}
-        else
-          field_names
-        end
-      end
-      define_method("#{display_group}_display_fields") do 
-        field_names = instance_variable_get("@#{display_group}_display_field_names")
-        return field_names.map{|name| get_field(name)} unless field_names.nil?
-        fields = @fields.values.select{|field| field.in_display_group?(display_group)}
-        instance_variable_set("@#{display_group}_display_field_names", fields.map{|field| field.name})
-        return fields       
-      end
-    end
-
-    # Define methods to cache and return lists of fields & field names
-    # that share certain boolean characteristics (controlled, required, etc). 
-    boolean_attributes.each do |attribute|
-      # Skip any attribute we have a custom method for      
-      next if [:work_title].include? attribute
-      define_method("#{attribute}_fields".to_sym) do
-        @fields.values.select{|field| field.send("#{attribute}?".to_sym)}
-      end
-      define_method("#{attribute}_field_names".to_sym) do
-        field_names = send("#{attribute}_fields".to_sym).map{|field| field.name}
-        instance_variable_set("@#{attribute}_field_names".to_sym, field_names)
-      end
-    end
-
+    
     def get_field(name)
       @fields[name.to_s] || @fields[label_map[name.to_s]]
     end

data/lib/scooby_snacks/solr_behavior.rb

@@ -44,13 +44,18 @@ module ScoobySnacks::SolrBehavior
 
     class Date
       # @return [Date]
-      def self.coerce(input)
-        field = String.coerce(input)
-        return if field.blank?
-        begin
-          ::Date.parse(field)
-        rescue ArgumentError
-          Rails.logger.info "Unable to parse date: #{field.first.inspect}"
+      def self.coerce(inputs)
+        ::Array.wrap(inputs).reject{|input| input.blank?}.map do |input|
+          field = String.coerce(input)
+          begin
+            if (field.to_i.to_s == field) && (field.to_i < 3000)
+              ::Date.new(field.to_i)
+            else
+              ::Date.parse(field)
+            end
+          rescue ArgumentError
+            Rails.logger.info "Unable to parse date: #{field.inspect}"
+          end
         end
       end
     end

data/lib/scooby_snacks/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scooby_snacks
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - UCSC Library Digital Initiatives Department, Ned Henry
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-02 00:00:00.000000000 Z
+date: 2019-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler