enju_event 0.2.3 → 0.3.0.beta.1

data/spec/factories/agent.rb

@@ -8,6 +8,6 @@ FactoryBot.define do
 end
 
 FactoryBot.define do
-  factory :invalid_agent, :class => Agent do |f|
+  factory :invalid_agent, class: Agent do |f|
   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/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/factories/user.rb

@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory :admin, :class => User do |f|
+  factory :admin, class: User do |f|
     f.sequence(:username){|n| "admin_#{n}"}
     f.sequence(:email){|n| "admin_#{n}@example.jp"}
     f.password 'adminpassword'
@@ -12,7 +12,7 @@ FactoryBot.define do
     end
   end
 
-  factory :librarian, :class => User do |f|
+  factory :librarian, class: User do |f|
     f.sequence(:username){|n| "librarian_#{n}"}
     f.sequence(:email){|n| "librarian_#{n}@example.jp"}
     f.password 'librarianpassword'
@@ -25,7 +25,7 @@ FactoryBot.define do
     end
   end
 
-  factory :user, :class => User do |f|
+  factory :user, class: User do |f|
     f.sequence(:username){|n| "user_#{n}"}
     f.sequence(:email){|n| "user_#{n}@example.jp"}
     f.password 'userpassword'
@@ -38,6 +38,6 @@ FactoryBot.define do
     end
   end
 
-  factory :invalid_user, :class => User do |f|
+  factory :invalid_user, class: User do |f|
   end
 end

data/spec/models/event_category_spec.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 require 'rails_helper'
 
 describe EventCategory do

data/spec/models/event_export_file_spec.rb

@@ -1,9 +1,8 @@
-# -*- encoding: utf-8 -*-
 require 'rails_helper'
-  
+
 describe EventExportFile do
   fixtures :all
-  
+
   it "should export in background" do
     message_count = Message.count
     file = EventExportFile.new

data/spec/models/event_import_file_spec.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 require 'rails_helper'
 
 describe EventImportFile do
@@ -7,17 +6,19 @@ describe EventImportFile do
 
   describe "When it is written in utf-8" do
     before(:each) do
-      @file = EventImportFile.create :event_import => File.new("#{Rails.root.to_s}/../../examples/event_import_file_sample1.tsv"), :default_library_id => 3
-      @file.default_library = Library.find(3)
-      @file.default_event_category = EventCategory.find(3)
-      @file.user = users(:admin)
+      @file = EventImportFile.create(
+        event_import: File.new("#{Rails.root.to_s}/../../examples/event_import_file_sample1.tsv"),
+        default_library_id: 3,
+        default_event_category: EventCategory.find(3),
+        user: users(:admin)
+      )
     end
 
     it "should be imported" do
       closing_days_size = Event.closing_days.size
       old_events_count = Event.count
       old_import_results_count = EventImportResult.count
-      @file.import_start.should eq({:imported => 2, :failed => 2})
+      @file.import_start.should eq({imported: 2, failed: 2})
       Event.count.should eq old_events_count + 2
       Event.closing_days.size.should eq closing_days_size + 1
       EventImportResult.count.should eq old_import_results_count + 5
@@ -48,10 +49,12 @@ describe EventImportFile do
 
   describe "When it is written in shift_jis" do
     before(:each) do
-      @file = EventImportFile.create :event_import => File.new("#{Rails.root.to_s}/../../examples/event_import_file_sample2.tsv")
-      @file.default_library = Library.find(3)
-      @file.default_event_category = EventCategory.find(3)
-      @file.user = users(:admin)
+      @file = EventImportFile.create!(
+        event_import: File.new("#{Rails.root.to_s}/../../examples/event_import_file_sample2.tsv"),
+        default_library: Library.find(3),
+        default_event_category: EventCategory.find(3),
+        user: users(:admin)
+      )
     end
 
     it "should be imported" do
@@ -68,7 +71,10 @@ describe EventImportFile do
 
   describe "When it is an invalid file" do
     before(:each) do
-      @file = EventImportFile.create :event_import => File.new("#{Rails.root.to_s}/../../examples/invalid_file.tsv")
+      @file = EventImportFile.create!(
+        event_import: File.new("#{Rails.root.to_s}/../../examples/invalid_file.tsv"),
+        user: users(:admin)
+      )
     end
 
     it "should not be imported" do
@@ -82,8 +88,11 @@ describe EventImportFile do
 
   describe "when its mode is 'update'" do
     it "should update events" do
-      @file = EventImportFile.create :event_import => File.new("#{Rails.root.to_s}/../../examples/event_update_file.tsv")
-      @file.modify
+      file = EventImportFile.create!(
+        event_import: File.new("#{Rails.root.to_s}/../../examples/event_update_file.tsv"),
+        user: users(:admin)
+      )
+      file.modify
       event1 = Event.find(1)
       event1.name.should eq '変更後のイベント名'
       event1.start_at.should eq Time.zone.parse('2012-04-01').beginning_of_day
@@ -98,20 +107,25 @@ describe EventImportFile do
       event3.name.should eq 'ミーティング'
     end
   end
-    
+
 
   describe "when its mode is 'destroy'" do
     it "should destroy events" do
       old_event_count = Event.count
-      @file = EventImportFile.create :event_import => File.new("#{Rails.root.to_s}/../../examples/event_destroy_file.tsv")
-      @file.remove
+      file = EventImportFile.create!(
+        event_import: File.new("#{Rails.root.to_s}/../../examples/event_destroy_file.tsv"),
+        user: users(:admin)
+      )
+      file.remove
       Event.count.should eq old_event_count - 2
     end
   end
 
   it "should import in background" do
-    file = EventImportFile.create :event_import => File.new("#{Rails.root.to_s}/../../examples/event_import_file_sample1.tsv")
-    file.user = users(:admin)
+    file = EventImportFile.create!(
+      event_import: File.new("#{Rails.root.to_s}/../../examples/event_import_file_sample1.tsv"),
+      user: users(:admin)
+    )
     file.save
     EventImportFileJob.perform_later(file).should be_truthy
   end

data/spec/models/event_import_result_spec.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 require 'rails_helper'
 
 describe EventImportResult do

data/spec/models/event_spec.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 require 'rails_helper'
 
 describe Event do

data/spec/models/participate_spec.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 require 'rails_helper'
 
 describe Participate do

data/spec/rails_helper.rb

@@ -12,7 +12,6 @@ require 'spec_helper'
 require 'rspec/rails'
 # Add additional requires below this line. Rails is not loaded until this point!
 require 'factory_bot'
-require 'sunspot-rails-tester'
 require 'rspec/active_model/mocks'
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
@@ -59,21 +58,8 @@ RSpec.configure do |config|
   # https://relishapp.com/rspec/rspec-rails/docs
   config.infer_spec_type_from_file_location!
 
-  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
 end
 
 FactoryBot.definition_file_paths << "#{::Rails.root}/../../spec/factories"
 FactoryBot.find_definitions
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_event
 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-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: enju_message
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.3.0.beta.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.3.0.beta.1
 - !ruby/object:Gem::Dependency
   name: ri_cal
   requirement: !ruby/object:Gem::Requirement
@@ -38,20 +38,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: jbuilder
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '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 +114,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 +140,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 +164,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: rspec-activemodel-mocks
   requirement: !ruby/object:Gem::Requirement
@@ -230,6 +230,7 @@ files:
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
+- app/assets/config/enju_event_manifest.js
 - app/assets/images/icons/calendar.png
 - app/assets/javascripts/enju_event/application.js
 - app/assets/javascripts/enju_event/fullcalendar.js
@@ -356,16 +357,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
@@ -373,7 +381,11 @@ files:
 - spec/dummy/config/initializers/session_store.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/002_devise_create_users.rb
 - spec/dummy/db/migrate/005_create_manifestations.rb
@@ -646,12 +658,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_event plugin
@@ -663,23 +675,34 @@ 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/cookies_serializer.rb
 - spec/dummy/config/initializers/devise.rb
 - spec/dummy/config/initializers/friendly_id.rb
 - spec/dummy/config/initializers/secret_token.rb