enju_subject 0.2.3 → 0.3.0.beta.1

data/spec/factories/profile.rb

@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory :profile, :class => Profile do |f|
+  factory :profile, class: Profile do |f|
     f.user_group_id {UserGroup.first.id}
     f.required_role_id {Role.where(name: 'User').first.id}
     f.sequence(:user_number){|n| "user_number_#{n}"}

data/spec/rails_helper.rb

@@ -8,7 +8,6 @@ ENV["RAILS_ENV"] ||= 'test'
 require File.expand_path("../dummy/config/environment", __FILE__)
 require 'rspec/rails'
 require 'factory_bot'
-require 'sunspot-rails-tester'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
@@ -32,19 +31,7 @@ RSpec.configure do |config|
   # instead of true.
   config.use_transactional_fixtures = true
 
-  config.extend ControllerMacros, :type => :controller
-
-  $original_sunspot_session = Sunspot.session
-
-  config.before do
-    Sunspot.session = Sunspot::Rails::StubSessionProxy.new($original_sunspot_session)
-  end
-
-  config.before :each, :solr => true do
-    Sunspot::Rails::Tester.start_original_sunspot_session
-    Sunspot.session = $original_sunspot_session
-    Sunspot.remove_all!
-  end
+  config.extend ControllerMacros, type: :controller
 
   config.infer_spec_type_from_file_location!
 end

data/spec/requests/subjects_spec.rb

@@ -1,7 +1,7 @@
 require 'rails_helper'
 
 describe "Subjects" do
-  describe "GET /subjects", :solr => true do
+  describe "GET /subjects", solr: true do
     it "works! (now write some real specs)" do
       get subjects_path
     end

data/spec/routing/subject_heading_types_routing_spec.rb

@@ -4,31 +4,31 @@ describe SubjectHeadingTypesController do
   describe "routing" do
 
     it "recognizes and generates #index" do
-      { :get => "/subject_heading_types" }.should route_to(:controller => "subject_heading_types", :action => "index")
+      { get: "/subject_heading_types" }.should route_to(controller: "subject_heading_types", action: "index")
     end
 
     it "recognizes and generates #new" do
-      { :get => "/subject_heading_types/new" }.should route_to(:controller => "subject_heading_types", :action => "new")
+      { get: "/subject_heading_types/new" }.should route_to(controller: "subject_heading_types", action: "new")
     end
 
     it "recognizes and generates #show" do
-      { :get => "/subject_heading_types/1" }.should route_to(:controller => "subject_heading_types", :action => "show", :id => "1")
+      { get: "/subject_heading_types/1" }.should route_to(controller: "subject_heading_types", action: "show", id: "1")
     end
 
     it "recognizes and generates #edit" do
-      { :get => "/subject_heading_types/1/edit" }.should route_to(:controller => "subject_heading_types", :action => "edit", :id => "1")
+      { get: "/subject_heading_types/1/edit" }.should route_to(controller: "subject_heading_types", action: "edit", id: "1")
     end
 
     it "recognizes and generates #create" do
-      { :post => "/subject_heading_types" }.should route_to(:controller => "subject_heading_types", :action => "create")
+      { post: "/subject_heading_types" }.should route_to(controller: "subject_heading_types", action: "create")
     end
 
     it "recognizes and generates #update" do
-      { :put => "/subject_heading_types/1" }.should route_to(:controller => "subject_heading_types", :action => "update", :id => "1")
+      { put: "/subject_heading_types/1" }.should route_to(controller: "subject_heading_types", action: "update", id: "1")
     end
 
     it "recognizes and generates #destroy" do
-      { :delete => "/subject_heading_types/1" }.should route_to(:controller => "subject_heading_types", :action => "destroy", :id => "1")
+      { delete: "/subject_heading_types/1" }.should route_to(controller: "subject_heading_types", action: "destroy", id: "1")
     end
 
   end

data/spec/routing/subject_types_routing_spec.rb

@@ -4,31 +4,31 @@ describe SubjectTypesController do
   describe "routing" do
 
     it "recognizes and generates #index" do
-      { :get => "/subject_types" }.should route_to(:controller => "subject_types", :action => "index")
+      { get: "/subject_types" }.should route_to(controller: "subject_types", action: "index")
     end
 
     it "recognizes and generates #new" do
-      { :get => "/subject_types/new" }.should route_to(:controller => "subject_types", :action => "new")
+      { get: "/subject_types/new" }.should route_to(controller: "subject_types", action: "new")
     end
 
     it "recognizes and generates #show" do
-      { :get => "/subject_types/1" }.should route_to(:controller => "subject_types", :action => "show", :id => "1")
+      { get: "/subject_types/1" }.should route_to(controller: "subject_types", action: "show", id: "1")
     end
 
     it "recognizes and generates #edit" do
-      { :get => "/subject_types/1/edit" }.should route_to(:controller => "subject_types", :action => "edit", :id => "1")
+      { get: "/subject_types/1/edit" }.should route_to(controller: "subject_types", action: "edit", id: "1")
     end
 
     it "recognizes and generates #create" do
-      { :post => "/subject_types" }.should route_to(:controller => "subject_types", :action => "create")
+      { post: "/subject_types" }.should route_to(controller: "subject_types", action: "create")
     end
 
     it "recognizes and generates #update" do
-      { :put => "/subject_types/1" }.should route_to(:controller => "subject_types", :action => "update", :id => "1")
+      { put: "/subject_types/1" }.should route_to(controller: "subject_types", action: "update", id: "1")
     end
 
     it "recognizes and generates #destroy" do
-      { :delete => "/subject_types/1" }.should route_to(:controller => "subject_types", :action => "destroy", :id => "1")
+      { delete: "/subject_types/1" }.should route_to(controller: "subject_types", action: "destroy", id: "1")
     end
 
   end

data/spec/routing/subjects_routing_spec.rb

@@ -4,31 +4,31 @@ describe SubjectsController do
   describe "routing" do
 
     it "recognizes and generates #index" do
-      { :get => "/subjects" }.should route_to(:controller => "subjects", :action => "index")
+      { get: "/subjects" }.should route_to(controller: "subjects", action: "index")
     end
 
     it "recognizes and generates #new" do
-      { :get => "/subjects/new" }.should route_to(:controller => "subjects", :action => "new")
+      { get: "/subjects/new" }.should route_to(controller: "subjects", action: "new")
     end
 
     it "recognizes and generates #show" do
-      { :get => "/subjects/1" }.should route_to(:controller => "subjects", :action => "show", :id => "1")
+      { get: "/subjects/1" }.should route_to(controller: "subjects", action: "show", id: "1")
     end
 
     it "recognizes and generates #edit" do
-      { :get => "/subjects/1/edit" }.should route_to(:controller => "subjects", :action => "edit", :id => "1")
+      { get: "/subjects/1/edit" }.should route_to(controller: "subjects", action: "edit", id: "1")
     end
 
     it "recognizes and generates #create" do
-      { :post => "/subjects" }.should route_to(:controller => "subjects", :action => "create")
+      { post: "/subjects" }.should route_to(controller: "subjects", action: "create")
     end
 
     it "recognizes and generates #update" do
-      { :put => "/subjects/1" }.should route_to(:controller => "subjects", :action => "update", :id => "1")
+      { put: "/subjects/1" }.should route_to(controller: "subjects", action: "update", id: "1")
     end
 
     it "recognizes and generates #destroy" do
-      { :delete => "/subjects/1" }.should route_to(:controller => "subjects", :action => "destroy", :id => "1")
+      { delete: "/subjects/1" }.should route_to(controller: "subjects", action: "destroy", id: "1")
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_subject
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0.beta.1
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-07 00:00:00.000000000 Z
+date: 2018-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: enju_biblio
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.3.0.beta.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.3.0.beta.2
 - !ruby/object:Gem::Dependency
   name: enju_leaf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.3.0.beta.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.3.0.beta.2
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -126,30 +126,16 @@ dependencies:
   name: sunspot_solr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.2.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.2.0
-- !ruby/object:Gem::Dependency
-  name: sunspot-rails-tester
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -257,9 +243,6 @@ files:
 - db/migrate/20150925092505_add_label_to_classification.rb
 - lib/enju_subject.rb
 - lib/enju_subject/engine.rb
-- lib/enju_subject/expire_editable_fragment.rb
-- lib/enju_subject/master_model.rb
-- lib/enju_subject/page_sweeper.rb
 - lib/enju_subject/version.rb
 - lib/generators/enju_subject/setup/USAGE
 - lib/generators/enju_subject/setup/setup_generator.rb
@@ -285,16 +268,23 @@ files:
 - spec/dummy/bin/rails
 - spec/dummy/bin/rake
 - spec/dummy/bin/setup
+- spec/dummy/bin/update
+- spec/dummy/bin/yarn
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
+- spec/dummy/config/cable.yml
 - spec/dummy/config/database.yml
 - spec/dummy/config/environment.rb
 - spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/production.rb
 - spec/dummy/config/environments/test.rb
+- spec/dummy/config/initializers/application_controller_renderer.rb
+- spec/dummy/config/initializers/assets.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
+- spec/dummy/config/initializers/cookies_serializer.rb
 - spec/dummy/config/initializers/devise.rb
+- spec/dummy/config/initializers/filter_parameter_logging.rb
 - spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/initializers/mime_types.rb
 - spec/dummy/config/initializers/secret_token.rb
@@ -303,7 +293,11 @@ files:
 - spec/dummy/config/locales/devise.en.yml
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/locales/ja.yml
+- spec/dummy/config/puma.rb
 - spec/dummy/config/routes.rb
+- spec/dummy/config/secrets.yml
+- spec/dummy/config/spring.rb
+- spec/dummy/config/sunspot.yml
 - spec/dummy/db/fixtures/roles.yml
 - spec/dummy/db/migrate/001_create_agents.rb
 - spec/dummy/db/migrate/002_devise_create_users.rb
@@ -516,12 +510,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: enju_subject plugin
@@ -533,25 +527,36 @@ test_files:
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/bin/update
 - spec/dummy/bin/rake
 - spec/dummy/bin/setup
 - spec/dummy/bin/bundle
+- spec/dummy/bin/yarn
 - spec/dummy/bin/rails
+- spec/dummy/config/secrets.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/locales/ja.yml
 - spec/dummy/config/locales/devise.en.yml
+- spec/dummy/config/cable.yml
 - spec/dummy/config/environments/production.rb
 - spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/test.rb
+- spec/dummy/config/spring.rb
 - spec/dummy/config/environment.rb
 - spec/dummy/config/application.rb
+- spec/dummy/config/puma.rb
 - spec/dummy/config/database.yml
 - spec/dummy/config/boot.rb
+- spec/dummy/config/sunspot.yml
+- spec/dummy/config/initializers/application_controller_renderer.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
 - spec/dummy/config/initializers/mime_types.rb
+- spec/dummy/config/initializers/filter_parameter_logging.rb
 - spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
+- spec/dummy/config/initializers/assets.rb
+- spec/dummy/config/initializers/cookies_serializer.rb
 - spec/dummy/config/initializers/devise.rb
 - spec/dummy/config/initializers/secret_token.rb
 - spec/dummy/config/initializers/inflections.rb

data/lib/enju_subject/expire_editable_fragment.rb

@@ -1,56 +0,0 @@
-module ExpireEditableFragment
-  def expire_editable_fragment(record, fragments = [], formats = [])
-    fragments.uniq!
-    fragments = ['detail'] if fragments.empty?
-    if record
-      if record.is_a?(Manifestation)
-        expire_manifestation_cache(record, fragments, formats)
-      else
-        I18n.available_locales.each do |locale|
-          Role.all_cache.each do |role|
-            fragments.each do |fragment|
-              expire_fragment(:controller => record.class.to_s.pluralize.downcase, :action => :show, :id => record.id, :page => fragment, :role => role.name, :locale => locale)
-            end
-          end
-        end
-      end
-    end
-  end
-
-  def expire_manifestation_cache(manifestation, fragments = [], formats = [])
-    fragments = %w[detail pickup book_jacket title picture_file show_list edit_list reserve_list show_index] if fragments.size == 1 and fragments.first == 'detail'
-    expire_fragment(:controller => :manifestations, :action => :index, :page => 'numdocs')
-    fragments.uniq.each do |fragment|
-      expire_manifestation_fragment(manifestation, fragment, formats)
-    end
-    if defined?(EnjuBookmark)
-      manifestation.bookmarks.each do |bookmark|
-        expire_tag_cloud(bookmark)
-      end
-    end
-  end
-
-  def expire_manifestation_fragment(manifestation, fragment, formats = [])
-    formats = ['atom', 'csv', 'html', 'mods', 'mobile', 'oai_list_identifiers', 'oai_list_records', 'rdf', 'rss'] if formats.empty?
-    if manifestation
-      I18n.available_locales.each do |locale|
-        Role.all_cache.each do |role|
-          expire_fragment(:controller => :manifestations, :action => :show, :id => manifestation.id, :page => fragment, :role => role.name, :locale => locale, :manifestation_id => nil)
-          formats.each do |format|
-            expire_fragment(:controller => :manifestations, :action => :show, :id => manifestation.id, :page => fragment, :role => role.name, :locale => locale, :format => format, :manifestation_id => nil)
-          end
-        end
-      end
-    end
-  end
-
-  def expire_tag_cloud(bookmark)
-    I18n.available_locales.each do |locale|
-      Role.all_cache.each do |role|
-        expire_fragment(:controller => :tags, :action => :index, :page => 'user_tag_cloud', :user_id => bookmark.user.username, :locale => locale, :role => role.name, :user_id => nil)
-        expire_fragment(:controller => :tags, :action => :index, :page => 'public_tag_cloud', :locale => locale, :role => role.name, :user_id => nil)
-      end
-    end
-  end
-
-end

data/lib/enju_subject/master_model.rb

@@ -1,41 +0,0 @@
-module MasterModel
-  def self.included(base)
-    #base.extend ClassMethods
-    base.send :include, InstanceMethods
-    base.class_eval do
-      acts_as_list
-      validates_uniqueness_of :name, case_sensitive: false
-      validates_presence_of :name, :display_name
-      before_validation :set_display_name, on: :create
-      stirp_attributes only: :name
-    end
-  end
-
-  module InstanceMethods
-    def set_display_name
-      self.display_name = self.name if self.display_name.blank?
-    end
-
-    def check_creatable
-      if creatable?
-        raise NotModifiableError
-      end
-    end
-
-    def check_deletable
-      if deletable?
-        raise NotModifiableError
-      end
-    end
-
-    def creatable?
-      false
-    end
-
-    def deletable?
-      false
-    end
-  end
-
-  class NotModifiableError < StandardError; end
-end