hyrax 5.0.1 → 5.0.3

data/docker-compose.yml

@@ -1,183 +1,2 @@
-version: '3.7'
-
-services:
-  app: &app
-    build:
-      context: .
-      target: hyrax-engine-dev
-      args:
-        - EXTRA_APK_PACKAGES=git less
-        - BUNDLE_GEMFILE=Gemfile.dassie
-    image: samvera/dassie
-    entrypoint: dev-entrypoint.sh
-    command: sh -c 'bundle exec puma -v -b tcp://0.0.0.0:3000'
-    stdin_open: true
-    tty: true
-    user: root
-    env_file:
-      - .dassie/.env
-    environment:
-      - RAILS_ROOT=/app/samvera/hyrax-webapp
-    depends_on:
-      - chrome
-      - db_migrate
-      - fcrepo
-      - memcached
-      - postgres
-      - redis
-      - solr
-    ports:
-      - 3000:3000
-      - 9876:9876
-    volumes:
-      - ./bin:/app/samvera
-      - .dassie:/app/samvera/hyrax-webapp
-      - .:/app/samvera/hyrax-engine
-      - bundle:/app/bundle
-      - hyrax-derivatives:/app/samvera/hyrax-webapp/derivatives
-      - hyrax-uploads:/app/samvera/hyrax-webapp/uploads
-      - rails-public:/app/samvera/hyrax-webapp/public
-      - rails-tmp:/app/samvera/hyrax-webapp/tmp
-    networks:
-      - hyrax
-
-  sidekiq:
-    image: samvera/dassie
-    entrypoint: dev-entrypoint.sh
-    command: sh -c 'bundle exec sidekiq'
-    user: root
-    env_file:
-      - .dassie/.env
-    depends_on:
-      - db_migrate
-      - fcrepo
-      - memcached
-      - postgres
-      - redis
-      - solr
-    volumes:
-      - ./bin:/app/samvera
-      - .dassie:/app/samvera/hyrax-webapp
-      - .:/app/samvera/hyrax-engine
-      - bundle:/app/bundle
-      - hyrax-derivatives:/app/samvera/hyrax-webapp/derivatives
-      - hyrax-uploads:/app/samvera/hyrax-webapp/uploads
-      - rails-public:/app/samvera/hyrax-webapp/public
-      - rails-tmp:/app/samvera/hyrax-webapp/tmp
-    networks:
-      - hyrax
-
-  db_migrate:
-    image: samvera/dassie
-    user: root
-    env_file:
-      - .dassie/.env
-    entrypoint: dev-entrypoint.sh
-    command: db-migrate-seed.sh
-    depends_on:
-      - postgres
-    volumes:
-      - ./bin:/app/samvera
-      - .dassie:/app/samvera/hyrax-webapp
-      - .:/app/samvera/hyrax-engine
-      - bundle:/app/bundle
-      - rails-public:/app/samvera/hyrax-webapp/public
-      - rails-tmp:/app/samvera/hyrax-webapp/tmp
-    networks:
-      - hyrax
-
-  chrome:
-    image: seleniarm/standalone-chromium:114.0
-    environment:
-      - START_XVFB=false
-    logging:
-      driver: none
-    volumes:
-      - /dev/shm:/dev/shm
-    shm_size: 2G
-    ports:
-      - "4445:4444"
-      - "5960:5900"
-    networks:
-      - hyrax
-
-  postgres:
-    image: postgres:15
-    environment:
-      - POSTGRES_USER=hyrax_user
-      - POSTGRES_PASSWORD=hyrax_password
-      - POSTGRES_DB=hyrax
-      - POSTGRES_HOST_AUTH_METHOD=trust
-    ports:
-      - "5432:5432"
-    volumes:
-      - db:/var/lib/postgresql/data
-    networks:
-      - hyrax
-
-  fcrepo:
-    image: ghcr.io/samvera/fcrepo4:4.7.5
-    volumes:
-      - fcrepo:/data:cached
-    ports:
-      - 8080:8080
-    networks:
-      - hyrax
-
-  fits:
-    image: ghcr.io/samvera/fitsservlet:1.6.0
-    ports:
-      - 8080
-    networks:
-      - hyrax
-
-  memcached:
-    image: bitnami/memcached
-    ports:
-      - '11211:11211'
-    networks:
-      - hyrax
-
-  redis:
-    image: bitnami/redis:6.2
-    env_file:
-      - .dassie/.env
-    volumes:
-      - redis:/bitnami/redis/data
-    networks:
-      - hyrax
-
-  solr:
-    image: solr:8.11
-    ports:
-      - 8983:8983
-    command:
-      - sh
-      - "-c"
-      - "precreate-core hyrax_test /opt/solr/server/configsets/hyraxconf; precreate-core hyrax-valkyrie-test /opt/solr/server/configsets/hyraxconf; precreate-core hyrax-valkyrie-dev /opt/solr/server/configsets/hyraxconf; solr-precreate hyrax /opt/solr/server/configsets/hyraxconf"
-    volumes:
-      - solr_home:/var/solr/data:cached
-      - .dassie/solr/conf:/opt/solr/server/configsets/hyraxconf
-    ulimits:
-      nofile:
-        soft: 65536
-        hard: 524288
-    networks:
-      - hyrax
-
-volumes:
-  bundle:
-  db:
-  fcrepo:
-  hyrax-derivatives:
-  hyrax-uploads:
-  rails-public:
-  rails-tmp:
-  redis:
-  solr_home:
-
-networks:
-  hyrax:
-    driver: bridge
-    driver_opts:
-      com.docker.network.bridge.name: br-hyrax
+include:
+  - docker-compose-dassie.yml

data/documentation/developing-your-hyrax-based-app.md

@@ -32,7 +32,7 @@ You can also try [Running Hyrax-based application in local VM](https://github.co
 During development, running only the dependent services in a container environment may be beneficial. This avoids potential headaches concerning file permissions and eases the use of debugging tools. The application generation instructions below use [Lando](https://lando.dev) to achieve this setup.
 
 This document contains instructions specific to setting up an app with __Hyrax
-v5.0.1__. If you are looking for instructions on installing a different
+v5.0.3__. If you are looking for instructions on installing a different
 version, be sure to select the appropriate branch or tag from the drop-down
 menu above.
 
@@ -148,7 +148,7 @@ Generate a new Rails application using the template.
 **NOTE:** `HYRAX_SKIP_WINGS` is needed here to avoid loading the Wings compatibility layer during the application generation process.
 
 ```shell
-HYRAX_SKIP_WINGS=true rails _6.1.7.7_ new my_app --database=postgresql -m https://raw.githubusercontent.com/samvera/hyrax/hyrax-v5.0.1/template.rb
+HYRAX_SKIP_WINGS=true rails _6.1.7.7_ new my_app --database=postgresql -m https://raw.githubusercontent.com/samvera/hyrax/hyrax-v5.0.3/template.rb
 ```
 
 Generating a new Rails application using Hyrax's template above takes cares of a number of steps for you, including:

data/hyrax.gemspec

@@ -38,12 +38,12 @@ SUMMARY
   spec.add_dependency 'almond-rails', '~> 0.1'
   spec.add_dependency 'awesome_nested_set', '~> 3.1'
   spec.add_dependency 'blacklight', '~> 7.29'
-  spec.add_dependency 'blacklight-gallery', '~> 4.0'
+  spec.add_dependency 'blacklight-gallery', '~> 4.7.0'
   spec.add_dependency 'breadcrumbs_on_rails', '~> 3.0'
   spec.add_dependency 'browse-everything', '>= 0.16', '< 2.0'
   spec.add_dependency 'carrierwave', '~> 1.0'
   spec.add_dependency 'clipboard-rails', '~> 1.5'
-  spec.add_dependency 'concurrent-ruby', '~> 1.0'
+  spec.add_dependency 'concurrent-ruby', '1.3.4' # Pinned until Rails 7 update
   spec.add_dependency 'connection_pool', '~> 2.4'
   spec.add_dependency 'draper', '~> 4.0'
   spec.add_dependency 'dry-logic', '~> 1.5'
@@ -55,6 +55,7 @@ SUMMARY
   # Pin more tightly because 0.x gems are potentially unstable
   spec.add_dependency 'flot-rails', '~> 0.0.6'
   spec.add_dependency 'font-awesome-rails', '~> 4.2'
+  spec.add_dependency 'google-analytics-data', '~> 0.6'
   spec.add_dependency 'hydra-derivatives', '~> 3.3'
   spec.add_dependency 'hydra-editor', '~> 6.0'
   spec.add_dependency 'hydra-file_characterization', '~> 1.1'
@@ -69,7 +70,7 @@ SUMMARY
   spec.add_dependency 'noid-rails', '~> 3.0'
   spec.add_dependency 'oauth'
   spec.add_dependency 'oauth2', '~> 1.2'
-  spec.add_dependency 'openseadragon'
+  spec.add_dependency 'openseadragon', '~> 0.9'
   spec.add_dependency 'posix-spawn'
   spec.add_dependency 'qa', '~> 5.5', '>= 5.5.1' # questioning_authority
   spec.add_dependency 'rails_autolink', '~> 1.1'
@@ -83,7 +84,7 @@ SUMMARY
   spec.add_dependency 'retriable', '>= 2.9', '< 4.0'
   spec.add_dependency 'signet'
   spec.add_dependency 'tinymce-rails', '~> 5.10'
-  spec.add_dependency 'valkyrie', '~> 3.1.1'
+  spec.add_dependency 'valkyrie', '~> 3.5'
   spec.add_dependency 'view_component', '~> 2.74.1' # Pin until blacklight is updated with workaround for https://github.com/ViewComponent/view_component/issues/1565
   spec.add_dependency 'sprockets', '3.7.2' # 3.7.3 fails feature specs
   spec.add_dependency 'sass-rails', '~> 6.0'

data/lib/freyja/custom_query_container.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+module Freyja
+  class CustomQueryContainer < Goddess::CustomQueryContainer
+  end
+end

data/lib/freyja/metadata_adapter.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require_relative 'persister'
+require_relative 'query_service'
+require_relative 'resource_factory'
+
+module Freyja
+  class MetadataAdapter
+    include Goddess::Metadata
+
+    ##
+    # @return [Freyja::Persister]
+    def persister
+      @persister ||= Freyja::Persister.new(adapter: self)
+    end
+
+    ##
+    # @return [Freyja::QueryService, #services]
+    def query_service
+      @query_service ||= Freyja::QueryService.new(
+        Valkyrie::Persistence::Postgres::QueryService.new(adapter: self, resource_factory: resource_factory),
+        Valkyrie::MetadataAdapter.adapters[:wings_adapter].query_service
+      )
+    end
+
+    ##
+    # @return [Freyja::ResourceFactory]
+    def resource_factory
+      @resource_factory ||= Freyja::ResourceFactory.new(adapter: self)
+    end
+  end
+end

data/lib/freyja/persister.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Freyja
+  # Persister for Postgres MetadataAdapter.
+  class Persister < Valkyrie::Persistence::Postgres::Persister
+    # Persists a resource within the database
+    #
+    # Modified from the upstream to skip previously persisted check
+    #
+    # @param [Valkyrie::Resource] resource
+    # @return [Valkyrie::Resource] the persisted/updated resource
+    # @raise [Valkyrie::Persistence::StaleObjectError] raised if the resource
+    #   was modified in the database between been read into memory and persisted
+    # rubocop:disable Lint/UnusedMethodArgument
+    def save(resource:, external_resource: false, perform_af_validation: false)
+      orm_object = resource_factory.from_resource(resource: resource)
+      orm_object.transaction do
+        orm_object.save!
+        if resource.id && resource.id.to_s != orm_object.id
+          raise Valkyrie::Persistence::UnsupportedDatatype,
+                "Postgres' primary key column can not save with the given ID #{resource.id}. " \
+                "To avoid this error, set the ID to be nil via `resource.id = nil` before you save it. \n" \
+                "Called from #{Gem.location_of_caller.join(':')}"
+        end
+      end
+      convert_and_migrate_resource(orm_object)
+
+    rescue ActiveRecord::StaleObjectError
+      raise Valkyrie::Persistence::StaleObjectError, "The object #{resource.id} has been updated by another process."
+    end
+    # rubocop:enable Lint/UnusedMethodArgument
+
+    def convert_and_migrate_resource(orm_object)
+      new_resource = resource_factory.to_resource(object: orm_object)
+      if Hyrax.config.valkyrie_transition?
+        MigrateFilesToValkyrieJob.perform_later(new_resource) if new_resource.is_a?(Hyrax::FileSet) && new_resource.file_ids.size == 1 && new_resource.file_ids.first.id.to_s.match('/files/')
+        MigrateResourcesJob.perform_later(ids: new_resource.member_ids.map(&:to_s)) if new_resource.is_a?(Hyrax::Work)
+      end
+      new_resource
+    end
+  end
+end

data/lib/freyja/query_service.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+module Freyja
+  class QueryService
+    include Goddess::Query
+
+    def orm_class
+      services.first.orm_class
+    end
+
+    ##
+    # Constructs a Valkyrie::Persistence::CustomQueryContainer using this
+    # query service
+    #
+    # @return [Valkyrie::Persistence::CustomQueryContainer]
+    def custom_queries
+      @custom_queries ||= Freyja::CustomQueryContainer.new(query_service: self)
+    end
+    alias custom_query custom_queries
+  end
+end

data/lib/freyja/resource_factory.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Freyja
+  # Provides access to generic methods for converting to/from
+  # {Valkyrie::Resource} and {Valkyrie::Persistence::Postgres::ORM::Resource}.
+  class ResourceFactory < Valkyrie::Persistence::Postgres::ResourceFactory
+  end
+end

data/lib/freyja.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require 'wings'
+require 'goddess/metadata'
+require 'goddess/query'
+require 'goddess/custom_query_container'
+require 'freyja/metadata_adapter'
+require 'freyja/custom_query_container'
+require 'freyja/resource_factory'
+require 'freyja/persister'
+require 'freyja/query_service'
+
+module Freyja
+end

data/lib/frigg/custom_query_container.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+module Frigg
+  class CustomQueryContainer < Goddess::CustomQueryContainer
+  end
+end

data/lib/frigg/metadata_adapter.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require_relative 'persister'
+require_relative 'query_service'
+
+module Frigg
+  class MetadataAdapter
+    include Goddess::Metadata
+
+    def persister
+      @persister ||= Frigg::Persister.new(adapter: self)
+    end
+
+    # @return [Class] +Valkyrie::Persistence::Postgres::QueryService+
+    def query_service
+      @query_service ||= Frigg::QueryService.new(
+        Valkyrie::Persistence::Fedora::QueryService.new(adapter: self),
+        Valkyrie::MetadataAdapter.adapters[:wings_adapter].query_service
+      )
+    end
+  end
+end

data/lib/frigg/persister.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Frigg
+  # Persister for Postgres MetadataAdapter.
+  class Persister < Valkyrie::Persistence::Fedora::Persister
+    # Persists a resource within the database
+    #
+    # Modified from the upstream to skip previously persisted check
+    #
+    # @param [Valkyrie::Resource] resource
+    # @return [Valkyrie::Resource] the persisted/updated resource
+    # @raise [Valkyrie::Persistence::StaleObjectError] raised if the resource
+    #   was modified in the database between been read into memory and persisted
+    # rubocop:disable Lint/UnusedMethodArgument
+    def save(resource:, external_resource: false, perform_af_validation: false)
+      # TODO
+      #   orm_object = resource_factory.from_resource(resource: resource)
+      #   orm_object.transaction do
+      #     orm_object.save!
+      #     if resource.id && resource.id.to_s != orm_object.id
+      #       raise Valkyrie::Persistence::UnsupportedDatatype,
+      #             "Postgres' primary key column can not save with the given ID #{resource.id}. " \
+      #             "To avoid this error, set the ID to be nil via `resource.id = nil` before you save it. \n" \
+      #             "Called from #{Gem.location_of_caller.join(':')}"
+      #     end
+      #   end
+      #   resource_factory.to_resource(object: orm_object)
+      # rescue ActiveRecord::StaleObjectError
+      #   raise Valkyrie::Persistence::StaleObjectError, "The object #{resource.id} has been updated by another process."
+    end
+    # rubocop:enable Lint/UnusedMethodArgument
+  end
+end

data/lib/frigg/query_service.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+module Frigg
+  class QueryService
+    include Goddess::Query
+
+    ##
+    # Constructs a Valkyrie::Persistence::CustomQueryContainer using this
+    # query service
+    #
+    # @return [Valkyrie::Persistence::CustomQueryContainer]
+    def custom_queries
+      @custom_queries ||= Frigg::CustomQueryContainer.new(query_service: self)
+    end
+  end
+end

data/lib/frigg.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'wings'
+require 'goddess/metadata'
+require 'goddess/query'
+require 'goddess/custom_query_container'
+require 'frigg/metadata_adapter'
+require 'frigg/custom_query_container'
+require 'frigg/persister'
+require 'frigg/query_service'
+
+module Frigg
+end

data/lib/generators/hyrax/install_generator.rb

@@ -209,5 +209,10 @@ module Hyrax
         gem 'dotenv-rails', '~> 2.8'
       end
     end
+
+    def support_analytics
+      gem 'google-protobuf', force_ruby_platform: true # required because google-protobuf is not compatible with Alpine linux
+      gem 'grpc', force_ruby_platform: true # required because grpc is not compatible with Alpine linux
+    end
   end
 end

data/lib/generators/hyrax/templates/config/analytics.yml

@@ -2,12 +2,17 @@
 # You can manually fill in these values or use the ENV variables.
 #
 analytics:
+  ga4:
+    analytics_id: <%= ENV['GOOGLE_ANALYTICS_ID'] %>
+    property_id: <%= ENV['GOOGLE_ANALYTICS_PROPERTY_ID'] %>
+    account_json: <%= ENV['GOOGLE_ACCOUNT_JSON'] %>
+    account_json_path: <%= ENV['GOOGLE_ACCOUNT_JSON_PATH'] %>
   google:
     analytics_id: <%= ENV['GOOGLE_ANALYTICS_ID'] %>
     app_name: <%= ENV['GOOGLE_OAUTH_APP_NAME'] %>
     app_version: <%= ENV['GOOGLE_OAUTH_APP_VERSION'] %>
-    privkey_value: <%= ENV['GOOGLE_OAUTH_PRIVATE_KEY_VALUE'] %>
     privkey_path: <%= ENV['GOOGLE_OAUTH_PRIVATE_KEY_PATH'] %>
+    privkey_value: <%= ENV['GOOGLE_OAUTH_PRIVATE_KEY_VALUE'] %>
     privkey_secret: <%= ENV['GOOGLE_OAUTH_PRIVATE_KEY_SECRET'] %>
     client_email: <%= ENV['GOOGLE_OAUTH_CLIENT_EMAIL'] %>
   matomo:

data/lib/generators/hyrax/templates/config/initializers/1_valkyrie.rb

@@ -36,7 +36,9 @@ Valkyrie::MetadataAdapter.register(
 #     )),
 #     base_path: Rails.env,
 #     schema: Valkyrie::Persistence::Fedora::PermissiveSchema.new(Hyrax::SimpleSchemaLoader.new.permissive_schema_for_valkrie_adapter),
-#     fedora_version: 6
+#     fedora_version: 6.5,
+#     fedora_pairtree_count: 4,
+#     fedora_pairtree_length: 2
 #   ), :fedora_metadata
 # )
 
@@ -68,7 +70,9 @@ Valkyrie.config.metadata_adapter = ENV.fetch('VALKYRIE_METADATA_ADAPTER') { :pg_
 #       ENV.fetch('FCREPO_URL') { "http://localhost:8080/fcrepo/rest" }
 #     )),
 #     base_path: Rails.env,
-#     fedora_version: 6
+#     fedora_version: 6.5,
+#     fedora_pairtree_count: 4,
+#     fedora_pairtree_length: 2
 #   ), :fedora_storage
 # )
 

data/lib/generators/hyrax/templates/config/valkyrie_index.yml

@@ -2,6 +2,6 @@
 development:
   url: <%= ENV['SOLR_URL'] || "http://127.0.0.1:#{ENV.fetch('SOLR_DEVELOPMENT_PORT', 8983)}/solr/hydra-development" %>
 test:
-  url: <%= ENV['SOLR_URL'] || "http://127.0.0.1:#{ENV.fetch('SOLR_TEST_PORT', 8985)}/solr/hydra-test" %>
+  url: <%= ENV['SOLR_TEST_URL'] || ENV['SOLR_URL'] || "http://127.0.0.1:#{ENV.fetch('SOLR_TEST_PORT', 8985)}/solr/hydra-test" %>
 production:
   url: <%= ENV['SOLR_URL'] || "http://your.production.server:8080/bl_solr/core0" %>

data/lib/goddess/custom_query_container.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+module Goddess
+  class CustomQueryContainer < Valkyrie::Persistence::CustomQueryContainer
+    include Goddess::Query::MethodMissingMachinations
+    ##
+    # @!group Class Attributes
+    #
+    # @!attribute :known_custom_queries_and_their_strategies [r|w]
+    #   @return [Hash<Symbol,Symbol>]
+    #   Valid strategies are :find_multiple
+    #   @see Goddess::Query::MethodMissingMachinations
+    #   @todo Audit the current custom queries and assign strategies.
+    class_attribute(:known_custom_queries_and_their_strategies,
+                    default: {
+                      find_by_date_range: :find_multiple,
+                      find_child_collection_ids: :find_multiple,
+                      find_child_collections: :find_multiple,
+                      find_child_file_set_ids: :find_multiple,
+                      find_child_file_sets: :find_multiple,
+                      find_child_fileset_ids: :find_multiple,
+                      find_child_filesets: :find_multiple,
+                      find_child_work_ids: :find_multiple,
+                      find_child_works: :find_multiple,
+                      find_collections_by_type: :find_multiple,
+                      find_collections_for: :find_multiple,
+                      find_count_by: :count_multiple,
+                      find_extracted_text: :find_single,
+                      find_file_metadata_by: :find_single,
+                      find_file_metadata_by_alternate_identifier: :find_single,
+                      find_files: :find_multiple,
+                      find_ids_by_model: :find_multiple,
+                      find_many_by_alternate_ids: :find_multiple,
+                      find_many_file_metadata_by_ids: :find_multiple,
+                      find_many_file_metadata_by_use: :find_multiple,
+                      find_members_of: :find_multiple,
+                      find_models_by_access: :find_multiple,
+                      find_original_file: :find_single,
+                      find_parent_collection_ids: :find_multiple,
+                      find_parent_collections: :find_multiple,
+                      find_parent_work: :find_single_or_nil,
+                      find_parent_work_id: :find_single_or_nil,
+                      find_parents: :find_multiple,
+                      find_thumbnail: :find_single,
+                      find_access_control_for: :find_single
+                    })
+    class_attribute(:fallback_query_strategy, default: :find_single)
+    # @!endgroup Class Attributes
+    ##
+
+    def services
+      @services ||= query_service.services.map(&:custom_queries)
+    end
+
+    private
+
+    def method_missing(method_name, *args, **opts, &block)
+      return super unless services.detect { |service| service.respond_to?(method_name) }
+
+      strategy = known_custom_queries_and_their_strategies.fetch(method_name, fallback_query_strategy)
+      dispatch_method_name = "query_strategy_for_#{strategy}"
+
+      # We want to check for private methods
+      return super unless respond_to?(dispatch_method_name, true)
+      send(dispatch_method_name, method_name, *args, **opts, &block)
+    end
+
+    def respond_to_missing?(method_name, _include_private = false)
+      services.detect { |service| service.respond_to?(method_name) }.present? || super
+    end
+  end
+end

data/lib/goddess/metadata.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Goddess
+  module Metadata
+    # @return [Valkyrie::ID] Identifier for this metadata adapter.
+    def id
+      @id ||= begin
+                to_hash = "migrate_adapter"
+                ::Valkyrie::ID.new(Digest::MD5.hexdigest(to_hash))
+              end
+    end
+  end
+end