works_cited 0.1.11 → 0.1.16

data/spec/factories/things.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :thing do
+    name { Faker::Lorem.words(number: [*1..5].sample).join(' ').titleize }
+    description { Faker::Lorem.paragraphs(number: [*1..5].sample).join("\n") }
+  end
+end

data/spec/models/doodad_spec.rb

@@ -3,7 +3,19 @@
 require 'rails_helper'
 
 RSpec.describe Doodad, type: :model do
-  describe 'Gem functioning' do
+  describe 'Mixin functioning' do
     it { should have_many(:works_cited_citations) }
   end
+  describe 'WorksCited Methods' do
+    describe '#works_cited_citations_attributes=' do
+      let!(:doodad) { FactoryBot.create(:doodad) }
+      it 'saves the citations' do
+        expect do
+          citation_attributes = FactoryBot.build(:works_cited_citation).attributes
+          doodad.works_cited_citations_attributes = { "0" => citation_attributes }
+          doodad.save
+        end.to change { doodad.works_cited_citations.count }.by(1)
+      end
+    end
+  end
 end

data/spec/models/thing_spec.rb

@@ -3,7 +3,19 @@
 require 'rails_helper'
 
 RSpec.describe Thing, type: :model do
-  describe 'Gem functioning' do
+  describe 'Mixin functioning' do
     it { should have_many(:works_cited_citations) }
   end
+  describe 'WorksCited Methods' do
+    describe '#works_cited_citations_attributes=' do
+      let!(:thing) { FactoryBot.create(:thing) }
+      it 'saves the citations' do
+        expect do
+          citation_attributes = FactoryBot.build(:works_cited_citation).attributes
+          thing.works_cited_citations_attributes = { "0" => citation_attributes }
+          thing.save
+        end.to change { thing.works_cited_citations.count }.by(1)
+      end
+    end
+  end
 end

data/spec/models/works_cited/citation_spec.rb

@@ -19,6 +19,18 @@ RSpec.describe WorksCited::Citation, type: :model do
     let(:electronic) { FactoryBot.create(:works_cited_citation, record: doodad, citation_type: 'electronic') }
     let(:interview) { FactoryBot.create(:works_cited_citation, record: doodad, citation_type: 'interview') }
     let(:email) { FactoryBot.create(:works_cited_citation, record: doodad, citation_type: 'email') }
+    describe '#works_cited_contributors_attributes=' do
+      before do
+        book.works_cited_contributors.destroy_all
+      end
+      it 'saves the contributors' do
+        expect do
+          contributor_attributes = FactoryBot.build(:works_cited_contributor).attributes
+          book.works_cited_contributors_attributes = { "0" => contributor_attributes }
+          book.save
+        end.to change { book.works_cited_contributors.count }.by(1)
+      end
+    end
     describe '#book?' do
       describe 'when true' do
         subject { book.book? }

data/spec/requests/works_cited/citations_spec.rb

@@ -41,7 +41,7 @@ module WorksCited
 
       describe 'GET /index' do
         before do
-          Citation.create! valid_attributes
+          citation
         end
         it 'disallows' do
           expect { get citations_url }.to raise_error(CanCan::AccessDenied)
@@ -60,10 +60,11 @@ module WorksCited
         end
       end
 
-      describe 'PATCH /preview' do
+      describe 'POST /preview' do
         it 'disallows' do
           expect do
-            patch preview_citation_url, params: { citation: valid_attributes }
+            params = { citation: valid_attributes }
+            post preview_citations_url, params: JSON.parse(params.to_json), as: :json
           end.to raise_error(CanCan::AccessDenied)
         end
       end
@@ -76,7 +77,7 @@ module WorksCited
 
       describe 'PATCH /update' do
         let(:new_attributes) do
-          { citation_type: 'book', title: 'New Title', record_id: doodad.id, record_type: 'Doodad' }
+          { citation_type: 'book', title: 'New Title', record: "Doodad:#{doodad.id}" }
         end
         it 'disallows' do
           expect do
@@ -105,7 +106,7 @@ module WorksCited
 
       describe 'GET /index' do
         before do
-          Citation.create! valid_attributes
+          citation
         end
         it 'renders a successful response when admin' do
           get citations_url
@@ -127,10 +128,11 @@ module WorksCited
         end
       end
 
-      describe 'PATCH /preview' do
+      describe 'POST /preview' do
         context 'with valid parameters' do
           it 'previews the Citation' do
-            patch preview_citation_url, params: { citation: valid_attributes }
+            params = { citation: valid_attributes }
+            post preview_citations_url, params: JSON.parse(params.to_json), as: :json
             expect(response).to be_successful
           end
         end
@@ -166,7 +168,7 @@ module WorksCited
 
       describe 'PATCH /update' do
         let(:new_attributes) do
-          { citation_type: 'book', title: 'New Title', record_id: doodad.id, record_type: 'Doodad' }
+          { citation_type: 'book', title: 'New Title', record: "Doodad:#{doodad.id}" }
         end
         context 'with valid parameters' do
           it 'updates the requested citation' do

data/spec/routing/works_cited/citations_routing_spec.rb

@@ -11,7 +11,11 @@ RSpec.describe WorksCited::CitationsController, type: :routing do
     end
 
     it 'routes to #preview' do
-      expect(patch: '/preview').to route_to('works_cited/citations#preview')
+      expect(post: '/citations/preview').to route_to('works_cited/citations#preview', format: :json)
+    end
+
+    it 'routes to #preview' do
+      expect(post: '/citations/1/preview').to route_to('works_cited/citations#preview', id: '1', format: :json)
     end
 
     it 'routes to #new' do

data/works_cited.gemspec

@@ -2,17 +2,17 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: works_cited 0.1.11 ruby lib
+# stub: works_cited 0.1.16 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "works_cited".freeze
-  s.version = "0.1.11"
+  s.version = "0.1.16"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.metadata = { "source_code_uri" => "http://github.com/gemvein/works_cited" } if s.respond_to? :metadata=
   s.require_paths = ["lib".freeze]
   s.authors = ["Loren Lundgren".freeze]
-  s.date = "2021-09-14"
+  s.date = "2021-09-24"
   s.description = "Works cited allows you to add a list of the works cited in ActiveRecord objects, to be formatted by a helper that can be added to relevant pages to format the citations like a bibliography.".freeze
   s.email = "loren.lundgren@gmail.com".freeze
   s.executables = ["rails".freeze]
@@ -31,8 +31,15 @@ Gem::Specification.new do |s|
     "README.md",
     "Rakefile",
     "VERSION",
+    "app/assets/javascripts/works_cited/addFields.js",
     "app/assets/javascripts/works_cited/application.js",
+    "app/assets/javascripts/works_cited/loadPreview.js",
+    "app/assets/javascripts/works_cited/removeFields.js",
+    "app/assets/javascripts/works_cited/shared.js",
+    "app/assets/javascripts/works_cited/showFields.js",
+    "app/assets/javascripts/works_cited/submitForm.js",
     "app/assets/stylesheets/works_cited/application.scss",
+    "app/controllers/concerns/works_cited/params.rb",
     "app/controllers/works_cited/citations_controller.rb",
     "app/helpers/works_cited/application_helper.rb",
     "app/models/works_cited/citation.rb",
@@ -51,6 +58,8 @@ Gem::Specification.new do |s|
     "app/views/works_cited/citation_types/fields/_interview.html.haml",
     "app/views/works_cited/citation_types/fields/_periodical.html.haml",
     "app/views/works_cited/citation_types/fields/_tweet.html.haml",
+    "app/views/works_cited/citations/_citation_fields.html.haml",
+    "app/views/works_cited/citations/_fields.html.haml",
     "app/views/works_cited/citations/_form.html.haml",
     "app/views/works_cited/citations/_list.html.haml",
     "app/views/works_cited/citations/edit.html.haml",
@@ -58,13 +67,14 @@ Gem::Specification.new do |s|
     "app/views/works_cited/citations/new.html.haml",
     "app/views/works_cited/citations/preview.html.haml",
     "app/views/works_cited/citations/show.html.haml",
-    "app/views/works_cited/contributors/_fields.html.haml",
+    "app/views/works_cited/contributors/_contributor_fields.html.haml",
     "bin/rails",
     "config/initializers/simple_form.rb",
     "config/locales/simple_form.en.yml",
     "config/routes.rb",
     "db/migrate/20210830165845_create_works_cited_citations.works_cited.rb",
     "db/migrate/20210831013102_create_works_cited_contributors.works_cited.rb",
+    "db/migrate/20210915160902_add_index_to_works_cited_contributors.rb",
     "lib/tasks/works_cited_tasks.rake",
     "lib/templates/haml/scaffold/_form.html.haml",
     "lib/works_cited.rb",
@@ -143,9 +153,10 @@ Gem::Specification.new do |s|
     "spec/dummy/db/development.sqlite3",
     "spec/dummy/db/migrate/20210830171235_create_doodads.rb",
     "spec/dummy/db/migrate/20210902150031_devise_create_users.rb",
-    "spec/dummy/db/migrate/20210902202653_create_works_cited_citations.works_cited.rb",
-    "spec/dummy/db/migrate/20210902202654_create_works_cited_contributors.works_cited.rb",
     "spec/dummy/db/migrate/20210907170207_create_things.rb",
+    "spec/dummy/db/migrate/20210915161011_create_works_cited_citations.works_cited.rb",
+    "spec/dummy/db/migrate/20210915161012_create_works_cited_contributors.works_cited.rb",
+    "spec/dummy/db/migrate/20210915161013_add_index_to_works_cited_contributors.works_cited.rb",
     "spec/dummy/db/schema.rb",
     "spec/dummy/db/test.sqlite3",
     "spec/dummy/lib/assets/.keep",
@@ -166,6 +177,7 @@ Gem::Specification.new do |s|
     "spec/factories/citations.rb",
     "spec/factories/contributors.rb",
     "spec/factories/doodads.rb",
+    "spec/factories/things.rb",
     "spec/factories/users.rb",
     "spec/helpers/works_cited/application_helper_spec.rb",
     "spec/models/doodad_spec.rb",
@@ -191,39 +203,39 @@ Gem::Specification.new do |s|
   if s.respond_to? :add_runtime_dependency then
     s.add_runtime_dependency(%q<rails>.freeze, [">= 6", "< 7"])
     s.add_runtime_dependency(%q<haml-rails>.freeze, [">= 2.0", "< 3"])
-    s.add_runtime_dependency(%q<sass-rails>.freeze, [">= 6", "< 7"])
+    s.add_runtime_dependency(%q<sass-rails>.freeze, [">= 5", "< 7"])
     s.add_runtime_dependency(%q<cancancan>.freeze, [">= 3.3", "< 4"])
     s.add_runtime_dependency(%q<simple_form>.freeze, [">= 5.1", "< 6"])
     s.add_runtime_dependency(%q<vanilla_nested>.freeze, [">= 1.3", "< 2"])
     s.add_runtime_dependency(%q<kaminari>.freeze, [">= 1.2.1", "< 2"])
     s.add_development_dependency(%q<database_cleaner>.freeze, [">= 1.8", "< 2"])
     s.add_development_dependency(%q<devise>.freeze, [">= 4.8", "< 5"])
-    s.add_development_dependency(%q<faker>.freeze, [">= 0"])
+    s.add_development_dependency(%q<faker>.freeze, [">= 0.2.19", "< 1"])
     s.add_development_dependency(%q<sqlite3>.freeze, [">= 1.4.2", "< 2"])
     s.add_development_dependency(%q<bundler>.freeze, [">= 2", "< 3"])
     s.add_development_dependency(%q<factory_bot_rails>.freeze, [">= 5.1", "< 6"])
     s.add_development_dependency(%q<juwelier>.freeze, ["~> 2.1.0"])
-    s.add_development_dependency(%q<rubocop>.freeze, [">= 0"])
-    s.add_development_dependency(%q<rubocop-rails>.freeze, [">= 0"])
-    s.add_development_dependency(%q<rubocop-rspec>.freeze, [">= 0"])
+    s.add_development_dependency(%q<rubocop>.freeze, [">= 1.2.0", "< 2"])
+    s.add_development_dependency(%q<rubocop-rails>.freeze, [">= 2.11.3", "< 3"])
+    s.add_development_dependency(%q<rubocop-rspec>.freeze, [">= 2.4.0", "< 3"])
   else
     s.add_dependency(%q<rails>.freeze, [">= 6", "< 7"])
     s.add_dependency(%q<haml-rails>.freeze, [">= 2.0", "< 3"])
-    s.add_dependency(%q<sass-rails>.freeze, [">= 6", "< 7"])
+    s.add_dependency(%q<sass-rails>.freeze, [">= 5", "< 7"])
     s.add_dependency(%q<cancancan>.freeze, [">= 3.3", "< 4"])
     s.add_dependency(%q<simple_form>.freeze, [">= 5.1", "< 6"])
     s.add_dependency(%q<vanilla_nested>.freeze, [">= 1.3", "< 2"])
     s.add_dependency(%q<kaminari>.freeze, [">= 1.2.1", "< 2"])
     s.add_dependency(%q<database_cleaner>.freeze, [">= 1.8", "< 2"])
     s.add_dependency(%q<devise>.freeze, [">= 4.8", "< 5"])
-    s.add_dependency(%q<faker>.freeze, [">= 0"])
+    s.add_dependency(%q<faker>.freeze, [">= 0.2.19", "< 1"])
     s.add_dependency(%q<sqlite3>.freeze, [">= 1.4.2", "< 2"])
     s.add_dependency(%q<bundler>.freeze, [">= 2", "< 3"])
     s.add_dependency(%q<factory_bot_rails>.freeze, [">= 5.1", "< 6"])
     s.add_dependency(%q<juwelier>.freeze, ["~> 2.1.0"])
-    s.add_dependency(%q<rubocop>.freeze, [">= 0"])
-    s.add_dependency(%q<rubocop-rails>.freeze, [">= 0"])
-    s.add_dependency(%q<rubocop-rspec>.freeze, [">= 0"])
+    s.add_dependency(%q<rubocop>.freeze, [">= 1.2.0", "< 2"])
+    s.add_dependency(%q<rubocop-rails>.freeze, [">= 2.11.3", "< 3"])
+    s.add_dependency(%q<rubocop-rspec>.freeze, [">= 2.4.0", "< 3"])
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: works_cited
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.16
 platform: ruby
 authors:
 - Loren Lundgren
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-14 00:00:00.000000000 Z
+date: 2021-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -56,7 +56,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '5'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '5'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
@@ -196,14 +196,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.19
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.19
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -284,42 +290,60 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.11.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.11.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.4.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.4.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 description: Works cited allows you to add a list of the works cited in ActiveRecord
   objects, to be formatted by a helper that can be added to relevant pages to format
   the citations like a bibliography.
@@ -341,8 +365,15 @@ files:
 - README.md
 - Rakefile
 - VERSION
+- app/assets/javascripts/works_cited/addFields.js
 - app/assets/javascripts/works_cited/application.js
+- app/assets/javascripts/works_cited/loadPreview.js
+- app/assets/javascripts/works_cited/removeFields.js
+- app/assets/javascripts/works_cited/shared.js
+- app/assets/javascripts/works_cited/showFields.js
+- app/assets/javascripts/works_cited/submitForm.js
 - app/assets/stylesheets/works_cited/application.scss
+- app/controllers/concerns/works_cited/params.rb
 - app/controllers/works_cited/citations_controller.rb
 - app/helpers/works_cited/application_helper.rb
 - app/models/works_cited/citation.rb
@@ -361,6 +392,8 @@ files:
 - app/views/works_cited/citation_types/fields/_interview.html.haml
 - app/views/works_cited/citation_types/fields/_periodical.html.haml
 - app/views/works_cited/citation_types/fields/_tweet.html.haml
+- app/views/works_cited/citations/_citation_fields.html.haml
+- app/views/works_cited/citations/_fields.html.haml
 - app/views/works_cited/citations/_form.html.haml
 - app/views/works_cited/citations/_list.html.haml
 - app/views/works_cited/citations/edit.html.haml
@@ -368,13 +401,14 @@ files:
 - app/views/works_cited/citations/new.html.haml
 - app/views/works_cited/citations/preview.html.haml
 - app/views/works_cited/citations/show.html.haml
-- app/views/works_cited/contributors/_fields.html.haml
+- app/views/works_cited/contributors/_contributor_fields.html.haml
 - bin/rails
 - config/initializers/simple_form.rb
 - config/locales/simple_form.en.yml
 - config/routes.rb
 - db/migrate/20210830165845_create_works_cited_citations.works_cited.rb
 - db/migrate/20210831013102_create_works_cited_contributors.works_cited.rb
+- db/migrate/20210915160902_add_index_to_works_cited_contributors.rb
 - lib/tasks/works_cited_tasks.rake
 - lib/templates/haml/scaffold/_form.html.haml
 - lib/works_cited.rb
@@ -453,9 +487,10 @@ files:
 - spec/dummy/db/development.sqlite3
 - spec/dummy/db/migrate/20210830171235_create_doodads.rb
 - spec/dummy/db/migrate/20210902150031_devise_create_users.rb
-- spec/dummy/db/migrate/20210902202653_create_works_cited_citations.works_cited.rb
-- spec/dummy/db/migrate/20210902202654_create_works_cited_contributors.works_cited.rb
 - spec/dummy/db/migrate/20210907170207_create_things.rb
+- spec/dummy/db/migrate/20210915161011_create_works_cited_citations.works_cited.rb
+- spec/dummy/db/migrate/20210915161012_create_works_cited_contributors.works_cited.rb
+- spec/dummy/db/migrate/20210915161013_add_index_to_works_cited_contributors.works_cited.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
 - spec/dummy/lib/assets/.keep
@@ -476,6 +511,7 @@ files:
 - spec/factories/citations.rb
 - spec/factories/contributors.rb
 - spec/factories/doodads.rb
+- spec/factories/things.rb
 - spec/factories/users.rb
 - spec/helpers/works_cited/application_helper_spec.rb
 - spec/models/doodad_spec.rb

data/app/views/works_cited/contributors/_fields.html.haml

@@ -1,9 +0,0 @@
-%fieldset
-  %legend Contributor
-  = form.input :contributor_role, collection: WorksCited.configuration.valid_contributor_roles.map { |x| [x, x] }
-  = form.input :first
-  = form.input :middle, hint: 'Only the initial is used'
-  = form.input :last
-  = form.input :suffix
-  = form.input :handle
-  = link_to_remove_nested form, link_classes: 'button button-danger'