enju_bookmark 0.2.2 → 0.3.0.beta.1

data/spec/factories/bookmark.rb

@@ -1,7 +1,8 @@
 FactoryBot.define do
-  factory :bookmark do |f|
-    f.sequence(:title){|n| "bookmark_#{n}"}
-    f.sequence(:url){|n| "http://example.jp/#{n}"}
-    f.user_id{FactoryBot.create(:user).id}
+  factory :bookmark do
+    sequence(:title){|n| "bookmark_#{n}"}
+    sequence(:url){|n| "http://example.jp/#{n}"}
+    user_id{FactoryBot.create(:user).id}
+    association :manifestation
   end
 end

data/spec/factories/library.rb

@@ -7,7 +7,7 @@ FactoryBot.define do
 end
 
 FactoryBot.define do
-  factory :invalid_library, :class => Library do |f|
+  factory :invalid_library, class: Library do |f|
     f.library_group_id{LibraryGroup.first.id}
   end
 end

data/spec/factories/manifestation.rb

@@ -3,4 +3,12 @@ FactoryBot.define do
     f.sequence(:original_title){|n| "manifestation_title_#{n}"}
     f.carrier_type_id{CarrierType.find(1).id}
   end
+
+  factory :manifestation_serial, class: Manifestation do |f|
+    f.sequence(:original_title){|n| "manifestation_title_#{n}"}
+    f.carrier_type_id{CarrierType.find(1).id}
+    f.language_id{Language.find(1).id}
+    f.serial{true}
+    f.series_statements{[FactoryBot.create(:series_statement_serial)]}
+  end
 end

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/fixtures/frequencies.yml

@@ -0,0 +1,68 @@
+--- 
+frequency_00001: 
+  name: unknown
+  display_name: "en: unknown\r\n\
+    ja: 不明・不定期刊"
+  id: 1
+  position: 1
+frequency_00002: 
+  name: daily
+  display_name: "en: daily\r\n\
+    ja: 日刊"
+  id: 2
+  position: 2
+frequency_00003: 
+  name: weekly
+  display_name: "en: weekly\r\n\
+    ja: 週刊"
+  id: 3
+  position: 3
+frequency_00004: 
+  name: biweekly
+  display_name: "en: biweekly\r\n\
+    ja: 隔週刊"
+  id: 4
+  position: 4
+frequency_00005: 
+  name: monthly
+  display_name: "en: monthly\r\n\
+    ja: 月刊"
+  id: 5
+  position: 5
+frequency_00006: 
+  name: bimonthly
+  display_name: "en: bimonthly\r\n\
+    ja: 隔月刊"
+  id: 6
+  position: 6
+frequency_00007: 
+  name: quarterly
+  display_name: "en: quarterly\r\n\
+    ja: 季刊"
+  id: 7
+  position: 7
+frequency_00008: 
+  name: yearly
+  display_name: "en: yearly\r\n\
+    ja: 年刊"
+  id: 8
+  position: 8
+frequency_00009: 
+  name: biyearly
+  display_name: "en: biyearly\r\n\
+    ja: 隔年刊"
+  id: 9
+  position: 9
+
+# == Schema Information
+#
+# Table name: frequencies
+#
+#  id           :integer          not null, primary key
+#  name         :string           not null
+#  display_name :text
+#  note         :text
+#  position     :integer
+#  created_at   :datetime
+#  updated_at   :datetime
+#

data/spec/models/bookmark_spec.rb

@@ -13,7 +13,7 @@ describe Bookmark do
     old_manifestation_count = Manifestation.count
     old_item_count = Item.count
     lambda{
-      bookmark = FactoryBot.create(:user).bookmarks.create(:url => 'http://www.example.com/', :title => 'test')
+      bookmark = FactoryBot.create(:user).bookmarks.create(url: 'http://www.example.com/', title: 'test')
     }.should change(Bookmark, :count)
     Manifestation.count.should eq old_manifestation_count + 1
     Item.count.should eq old_item_count + 1
@@ -23,7 +23,7 @@ describe Bookmark do
     old_manifestation_count = Manifestation.count
     old_item_count = Item.count
     lambda{
-      bookmark = FactoryBot.create(:user).bookmarks.create(:url => "#{LibraryGroup.site_config.url}manifestations/1", :title => 'test')
+      bookmark = FactoryBot.create(:user).bookmarks.create(url: "#{LibraryGroup.site_config.url}manifestations/1", title: 'test')
     }.should change(Bookmark, :count)
     assert_equal old_manifestation_count, Manifestation.count
     assert_equal old_item_count, Item.count
@@ -33,7 +33,7 @@ describe Bookmark do
     old_manifestation_count = Manifestation.count
     old_item_count = Item.count
     lambda{
-      bookmark = FactoryBot.create(:user).bookmarks.create(:url => "#{LibraryGroup.site_config.url}libraries/1", :title => 'test')
+      bookmark = FactoryBot.create(:user).bookmarks.create(url: "#{LibraryGroup.site_config.url}libraries/1", title: 'test')
     }.should_not change(Bookmark, :count)
     assert_equal old_manifestation_count, Manifestation.count
     assert_equal old_item_count, Item.count

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_bookmark
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  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-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: enju_biblio
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 0.3.0.beta.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 0.3.0.beta.2
 - !ruby/object:Gem::Dependency
   name: acts-as-taggable-on
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !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
@@ -100,14 +100,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: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
@@ -126,16 +126,16 @@ dependencies:
   name: sunspot_solr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -150,20 +150,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sunspot-rails-tester
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -188,6 +174,7 @@ files:
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
+- app/assets/config/enju_bookmark_manifest.js
 - app/assets/stylesheets/enju_bookmark/acts_as_taggable_stylesheet.css
 - app/controllers/bookmark_stats_controller.rb
 - app/controllers/bookmarks_controller.rb
@@ -232,14 +219,17 @@ files:
 - db/migrate/20081212151614_create_bookmark_stats.rb
 - db/migrate/20081212151820_create_bookmark_stat_has_manifestations.rb
 - db/migrate/20100222124420_add_allow_bookmark_external_url_to_library_group.rb
-- db/migrate/20100525171356_acts_as_taggable_on_migration.rb
 - db/migrate/20140524135607_create_bookmark_stat_transitions.rb
 - db/migrate/20140812093836_add_share_bookmarks_to_profile.rb
-- db/migrate/20141013152011_add_missing_unique_indices.acts_as_taggable_on_engine.rb
-- db/migrate/20141013152012_add_taggings_counter_cache_to_tags.acts_as_taggable_on_engine.rb
-- db/migrate/20141013152013_add_missing_taggable_index.acts_as_taggable_on_engine.rb
 - db/migrate/20160815045420_add_most_recent_to_bookmark_stat_transitions.rb
 - db/migrate/20180107172413_add_constraints_to_most_recent_for_bookmark_stat_transitions.rb
+- db/migrate/20180709023035_acts_as_taggable_on_migration.acts_as_taggable_on_engine.rb
+- db/migrate/20180709023036_add_missing_unique_indices.acts_as_taggable_on_engine.rb
+- db/migrate/20180709023037_add_taggings_counter_cache_to_tags.acts_as_taggable_on_engine.rb
+- db/migrate/20180709023038_add_missing_taggable_index.acts_as_taggable_on_engine.rb
+- db/migrate/20180709023039_change_collation_for_tag_names.acts_as_taggable_on_engine.rb
+- db/migrate/20180709023040_add_missing_indexes_on_taggings.acts_as_taggable_on_engine.rb
+- db/migrate/20180709161346_add_created_at_to_tag.rb
 - lib/enju_bookmark.rb
 - lib/enju_bookmark/bookmark_helper.rb
 - lib/enju_bookmark/bookmark_url.rb
@@ -254,6 +244,7 @@ files:
 - lib/tasks/enju_bookmark_tasks.rake
 - spec/controllers/bookmark_stats_controller_spec.rb
 - spec/controllers/bookmarks_controller_spec.rb
+- spec/controllers/manifestations_controller_spec.rb
 - spec/controllers/tags_controller_spec.rb
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/javascripts/application.js
@@ -266,16 +257,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/friendly_id.rb
 - spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/initializers/mime_types.rb
@@ -284,7 +282,11 @@ files:
 - spec/dummy/config/initializers/statesman.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.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/migrate/001_create_agents.rb
 - spec/dummy/db/migrate/005_create_manifestations.rb
 - spec/dummy/db/migrate/006_create_items.rb
@@ -533,6 +535,7 @@ files:
 - spec/fixtures/circulation_statuses.yml
 - spec/fixtures/content_types.yml
 - spec/fixtures/exemplifies.yml
+- spec/fixtures/frequencies.yml
 - spec/fixtures/items.yml
 - spec/fixtures/languages.yml
 - spec/fixtures/libraries.yml
@@ -568,12 +571,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_bookmark plugin
@@ -585,24 +588,35 @@ 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/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/statesman.rb
+- spec/dummy/config/initializers/cookies_serializer.rb
 - spec/dummy/config/initializers/devise.rb
 - spec/dummy/config/initializers/friendly_id.rb
 - spec/dummy/config/initializers/secret_token.rb
@@ -868,6 +882,7 @@ test_files:
 - spec/fixtures/user_groups.yml
 - spec/fixtures/agents.yml
 - spec/fixtures/libraries.yml
+- spec/fixtures/frequencies.yml
 - spec/fixtures/shelves.yml
 - spec/fixtures/items.yml
 - spec/fixtures/checkout_types.yml
@@ -878,5 +893,6 @@ test_files:
 - spec/fixtures/bookmark_stats.yml
 - spec/controllers/bookmark_stats_controller_spec.rb
 - spec/controllers/bookmarks_controller_spec.rb
+- spec/controllers/manifestations_controller_spec.rb
 - spec/controllers/tags_controller_spec.rb
 - spec/rails_helper.rb

data/db/migrate/20100525171356_acts_as_taggable_on_migration.rb

@@ -1,30 +0,0 @@
-class ActsAsTaggableOnMigration < ActiveRecord::Migration
-  def self.up
-    create_table :tags do |t|
-      t.string :name
-      t.string :name_transcription
-      t.timestamps
-    end
-
-    create_table :taggings do |t|
-      t.references :tag
-
-      # You should make sure that the column created is
-      # long enough to store the required class names.
-      t.references :taggable, :polymorphic => true
-      t.references :tagger, :polymorphic => true
-
-      t.string :context
-
-      t.datetime :created_at
-    end
-
-    add_index :taggings, :tag_id
-    add_index :taggings, [:taggable_id, :taggable_type, :context]
-  end
-
-  def self.down
-    drop_table :taggings
-    drop_table :tags
-  end
-end