kithe 2.0.0.pre.beta1 → 2.0.0.pre.rc1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kithe
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.beta1
+  version: 2.0.0.pre.rc1
 platform: ruby
 authors:
 - Jonathan Rochkind
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-26 00:00:00.000000000 Z
+date: 2020-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -182,6 +182,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: fx
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: traject
   requirement: !ruby/object:Gem::Requirement
@@ -356,6 +376,7 @@ files:
 - lib/kithe/blacklight_tools/search_service_bulk_load.rb
 - lib/kithe/engine.rb
 - lib/kithe/indexable_settings.rb
+- lib/kithe/patch_fx.rb
 - lib/kithe/sti_preload.rb
 - lib/kithe/version.rb
 - lib/shrine/plugins/kithe_accept_remote_url.rb
@@ -421,7 +442,7 @@ files:
 - spec/dummy/config/routes.rb
 - spec/dummy/config/spring.rb
 - spec/dummy/config/storage.yml
-- spec/dummy/db/structure.sql
+- spec/dummy/db/schema.rb
 - spec/dummy/log/development.log
 - spec/dummy/log/test.log
 - spec/dummy/package.json
@@ -486,8 +507,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Shareable tools/components for building a digital collections app in Rails.
@@ -548,7 +568,7 @@ test_files:
 - spec/dummy/public/404.html
 - spec/dummy/public/apple-touch-icon-precomposed.png
 - spec/dummy/package.json
-- spec/dummy/db/structure.sql
+- spec/dummy/db/schema.rb
 - spec/dummy/log/test.log
 - spec/dummy/log/development.log
 - spec/dummy/tmp/development_secret.txt

data/spec/dummy/db/structure.sql

@@ -1,309 +0,0 @@
-SET statement_timeout = 0;
-SET lock_timeout = 0;
-SET idle_in_transaction_session_timeout = 0;
-SET client_encoding = 'UTF8';
-SET standard_conforming_strings = on;
-SELECT pg_catalog.set_config('search_path', '', false);
-SET check_function_bodies = false;
-SET client_min_messages = warning;
-SET row_security = off;
-
---
--- Name: pgcrypto; Type: EXTENSION; Schema: -; Owner: -
---
-
-CREATE EXTENSION IF NOT EXISTS pgcrypto WITH SCHEMA public;
-
-
---
--- Name: EXTENSION pgcrypto; Type: COMMENT; Schema: -; Owner: -
---
-
-COMMENT ON EXTENSION pgcrypto IS 'cryptographic functions';
-
-
---
--- Name: kithe_models_friendlier_id_gen(bigint, bigint); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.kithe_models_friendlier_id_gen(min_value bigint, max_value bigint) RETURNS text
-    LANGUAGE plpgsql
-    AS $$
-  DECLARE
-    new_id_int bigint;
-    new_id_str character varying := '';
-    done bool;
-    tries integer;
-    alphabet char[] := ARRAY['0','1','2','3','4','5','6','7','8','9',
-      'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
-      'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z'];
-    alphabet_length integer := array_length(alphabet, 1);
-
-  BEGIN
-    done := false;
-    tries := 0;
-    WHILE (NOT done) LOOP
-      tries := tries + 1;
-      IF (tries > 3) THEN
-        RAISE 'Could not find non-conflicting friendlier_id in 3 tries';
-      END IF;
-
-      new_id_int := trunc(random() * (max_value - min_value) + min_value);
-
-      -- convert bigint to a Base-36 alphanumeric string
-      -- see https://web.archive.org/web/20130420084605/http://www.jamiebegin.com/base36-conversion-in-postgresql/
-      -- https://gist.github.com/btbytes/7159902
-      WHILE new_id_int != 0 LOOP
-        new_id_str := alphabet[(new_id_int % alphabet_length)+1] || new_id_str;
-        new_id_int := new_id_int / alphabet_length;
-      END LOOP;
-
-      done := NOT exists(SELECT 1 FROM kithe_models WHERE friendlier_id=new_id_str);
-    END LOOP;
-    RETURN new_id_str;
-  END;
-  $$;
-
-
-SET default_tablespace = '';
-
-SET default_with_oids = false;
-
---
--- Name: ar_internal_metadata; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.ar_internal_metadata (
-    key character varying NOT NULL,
-    value character varying,
-    created_at timestamp without time zone NOT NULL,
-    updated_at timestamp without time zone NOT NULL
-);
-
-
---
--- Name: kithe_derivatives; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.kithe_derivatives (
-    id bigint NOT NULL,
-    key character varying NOT NULL,
-    file_data jsonb,
-    asset_id uuid NOT NULL,
-    created_at timestamp without time zone NOT NULL,
-    updated_at timestamp without time zone NOT NULL
-);
-
-
---
--- Name: kithe_derivatives_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-CREATE SEQUENCE public.kithe_derivatives_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-
---
--- Name: kithe_derivatives_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
---
-
-ALTER SEQUENCE public.kithe_derivatives_id_seq OWNED BY public.kithe_derivatives.id;
-
-
---
--- Name: kithe_model_contains; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.kithe_model_contains (
-    containee_id uuid,
-    container_id uuid
-);
-
-
---
--- Name: kithe_models; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.kithe_models (
-    id uuid DEFAULT public.gen_random_uuid() NOT NULL,
-    title character varying NOT NULL,
-    type character varying NOT NULL,
-    "position" integer,
-    json_attributes jsonb,
-    created_at timestamp without time zone NOT NULL,
-    updated_at timestamp without time zone NOT NULL,
-    parent_id uuid,
-    friendlier_id character varying DEFAULT public.kithe_models_friendlier_id_gen('2821109907456'::bigint, '101559956668415'::bigint) NOT NULL,
-    file_data jsonb,
-    representative_id uuid,
-    leaf_representative_id uuid,
-    kithe_model_type integer NOT NULL
-);
-
-
---
--- Name: schema_migrations; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.schema_migrations (
-    version character varying NOT NULL
-);
-
-
---
--- Name: kithe_derivatives id; Type: DEFAULT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.kithe_derivatives ALTER COLUMN id SET DEFAULT nextval('public.kithe_derivatives_id_seq'::regclass);
-
-
---
--- Name: ar_internal_metadata ar_internal_metadata_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.ar_internal_metadata
-    ADD CONSTRAINT ar_internal_metadata_pkey PRIMARY KEY (key);
-
-
---
--- Name: kithe_derivatives kithe_derivatives_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.kithe_derivatives
-    ADD CONSTRAINT kithe_derivatives_pkey PRIMARY KEY (id);
-
-
---
--- Name: kithe_models kithe_models_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.kithe_models
-    ADD CONSTRAINT kithe_models_pkey PRIMARY KEY (id);
-
-
---
--- Name: schema_migrations schema_migrations_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.schema_migrations
-    ADD CONSTRAINT schema_migrations_pkey PRIMARY KEY (version);
-
-
---
--- Name: index_kithe_derivatives_on_asset_id; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX index_kithe_derivatives_on_asset_id ON public.kithe_derivatives USING btree (asset_id);
-
-
---
--- Name: index_kithe_derivatives_on_asset_id_and_key; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE UNIQUE INDEX index_kithe_derivatives_on_asset_id_and_key ON public.kithe_derivatives USING btree (asset_id, key);
-
-
---
--- Name: index_kithe_model_contains_on_containee_id; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX index_kithe_model_contains_on_containee_id ON public.kithe_model_contains USING btree (containee_id);
-
-
---
--- Name: index_kithe_model_contains_on_container_id; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX index_kithe_model_contains_on_container_id ON public.kithe_model_contains USING btree (container_id);
-
-
---
--- Name: index_kithe_models_on_friendlier_id; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE UNIQUE INDEX index_kithe_models_on_friendlier_id ON public.kithe_models USING btree (friendlier_id);
-
-
---
--- Name: index_kithe_models_on_parent_id; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX index_kithe_models_on_parent_id ON public.kithe_models USING btree (parent_id);
-
-
---
--- Name: index_kithe_models_on_representative_id; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX index_kithe_models_on_representative_id ON public.kithe_models USING btree (representative_id);
-
-
---
--- Name: kithe_model_contains fk_rails_091010187b; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.kithe_model_contains
-    ADD CONSTRAINT fk_rails_091010187b FOREIGN KEY (container_id) REFERENCES public.kithe_models(id);
-
-
---
--- Name: kithe_derivatives fk_rails_3dac8b4201; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.kithe_derivatives
-    ADD CONSTRAINT fk_rails_3dac8b4201 FOREIGN KEY (asset_id) REFERENCES public.kithe_models(id);
-
-
---
--- Name: kithe_models fk_rails_403cce5c0d; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.kithe_models
-    ADD CONSTRAINT fk_rails_403cce5c0d FOREIGN KEY (leaf_representative_id) REFERENCES public.kithe_models(id);
-
-
---
--- Name: kithe_model_contains fk_rails_490c1158f7; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.kithe_model_contains
-    ADD CONSTRAINT fk_rails_490c1158f7 FOREIGN KEY (containee_id) REFERENCES public.kithe_models(id);
-
-
---
--- Name: kithe_models fk_rails_90130a9780; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.kithe_models
-    ADD CONSTRAINT fk_rails_90130a9780 FOREIGN KEY (parent_id) REFERENCES public.kithe_models(id);
-
-
---
--- Name: kithe_models fk_rails_afa93b7b5d; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.kithe_models
-    ADD CONSTRAINT fk_rails_afa93b7b5d FOREIGN KEY (representative_id) REFERENCES public.kithe_models(id);
-
-
---
--- PostgreSQL database dump complete
---
-
-SET search_path TO "$user", public;
-
-INSERT INTO "schema_migrations" (version) VALUES
-('20181015143259'),
-('20181015143413'),
-('20181015143737'),
-('20181031190647'),
-('20181128185658'),
-('20190103144947'),
-('20190109192252'),
-('20190404144551');
-
-