enju_leaf 1.1.4 → 1.2.0.beta.1

data/spec/controllers/user_groups_controller_spec.rb

@@ -103,7 +103,7 @@ describe UserGroupsController do
 
       it "should not assign the requested user_group as @user_group" do
         get :new
-        assigns(:user_group).should_not be_valid
+        assigns(:user_group).should be_nil
         expect(response).to be_forbidden
       end
     end
@@ -113,7 +113,7 @@ describe UserGroupsController do
 
       it "should not assign the requested user_group as @user_group" do
         get :new
-        assigns(:user_group).should_not be_valid
+        assigns(:user_group).should be_nil
         expect(response).to be_forbidden
       end
     end
@@ -121,7 +121,7 @@ describe UserGroupsController do
     describe "When not logged in" do
       it "should not assign the requested user_group as @user_group" do
         get :new
-        assigns(:user_group).should_not be_valid
+        assigns(:user_group).should be_nil
         expect(response).to redirect_to(new_user_session_url)
       end
     end
@@ -207,7 +207,7 @@ describe UserGroupsController do
       describe "with valid params" do
         it "assigns a newly created user_group as @user_group" do
           post :create, user_group: @attrs
-          assigns(:user_group).should be_valid
+          assigns(:user_group).should be_nil
         end
 
         it "should be forbidden" do
@@ -219,7 +219,7 @@ describe UserGroupsController do
       describe "with invalid params" do
         it "assigns a newly created but unsaved user_group as @user_group" do
           post :create, user_group: @invalid_attrs
-          assigns(:user_group).should_not be_valid
+          assigns(:user_group).should be_nil
         end
 
         it "should be forbidden" do
@@ -235,7 +235,7 @@ describe UserGroupsController do
       describe "with valid params" do
         it "assigns a newly created user_group as @user_group" do
           post :create, user_group: @attrs
-          assigns(:user_group).should be_valid
+          assigns(:user_group).should be_nil
         end
 
         it "should be forbidden" do
@@ -247,7 +247,7 @@ describe UserGroupsController do
       describe "with invalid params" do
         it "assigns a newly created but unsaved user_group as @user_group" do
           post :create, user_group: @invalid_attrs
-          assigns(:user_group).should_not be_valid
+          assigns(:user_group).should be_nil
         end
 
         it "should be forbidden" do
@@ -261,7 +261,7 @@ describe UserGroupsController do
       describe "with valid params" do
         it "assigns a newly created user_group as @user_group" do
           post :create, user_group: @attrs
-          assigns(:user_group).should be_valid
+          assigns(:user_group).should be_nil
         end
 
         it "should be forbidden" do
@@ -273,7 +273,7 @@ describe UserGroupsController do
       describe "with invalid params" do
         it "assigns a newly created but unsaved user_group as @user_group" do
           post :create, user_group: @invalid_attrs
-          assigns(:user_group).should_not be_valid
+          assigns(:user_group).should be_nil
         end
 
         it "should be forbidden" do

data/spec/controllers/user_import_files_controller_spec.rb

@@ -27,7 +27,7 @@ describe UserImportFilesController do
 
       it "assigns empty as @user_import_files" do
         get :index
-        assigns(:user_import_files).should be_empty
+        assigns(:user_import_files).should be_nil
         expect(response).to be_forbidden
       end
     end
@@ -35,7 +35,7 @@ describe UserImportFilesController do
     describe "When not logged in" do
       it "assigns empty as @user_import_files" do
         get :index
-        assigns(:user_import_files).should be_empty
+        assigns(:user_import_files).should be_nil
         expect(response).to redirect_to(new_user_session_url)
       end
     end
@@ -114,7 +114,7 @@ describe UserImportFilesController do
 
       it "should not assign the requested user_import_file as @user_import_file" do
         get :new
-        assigns(:user_import_file).should_not be_valid
+        assigns(:user_import_file).should be_nil
         expect(response).to be_forbidden
       end
     end
@@ -122,7 +122,7 @@ describe UserImportFilesController do
     describe "When not logged in" do
       it "should not assign the requested user_import_file as @user_import_file" do
         get :new
-        assigns(:user_import_file).should_not be_valid
+        assigns(:user_import_file).should be_nil
         expect(response).to redirect_to(new_user_session_url)
       end
     end
@@ -155,7 +155,7 @@ describe UserImportFilesController do
 
       it "should be forbidden" do
         post :create, user_import_file: {user_import: fixture_file_upload("/../../examples/user_import_file_sample.tsv", 'text/csv') }
-        assigns(:user_import_file).user.should be_nil
+        assigns(:user_import_file).should be_nil
         expect(response).to be_forbidden
       end
     end
@@ -163,7 +163,7 @@ describe UserImportFilesController do
     describe "When not logged in" do
       it "should be redirected to new session url" do
         post :create, user_import_file: {user_import: fixture_file_upload("/../../examples/user_import_file_sample.tsv", 'text/csv') }
-        assigns(:user_import_file).user.should be_nil
+        assigns(:user_import_file).should be_nil
         expect(response).to redirect_to new_user_session_url
       end
     end

data/spec/controllers/user_import_results_controller_spec.rb

@@ -19,7 +19,7 @@ describe UserImportResultsController do
           @file.default_user_group = UserGroup.find(2)
           @file.default_library = Library.find(3)
           @file.save
-          result = @file.import_start
+          @file.import_start
         end
         render_views
         it "should assign all user_import_results for the user_import_file with a page parameter" do
@@ -48,7 +48,7 @@ describe UserImportResultsController do
 
       it "assigns empty as @user_import_results" do
         get :index
-        assigns(:user_import_results).should be_empty
+        assigns(:user_import_results).should be_nil
         response.should be_forbidden
       end
     end
@@ -56,7 +56,7 @@ describe UserImportResultsController do
     describe "When not logged in" do
       it "assigns empty as @user_import_results" do
         get :index
-        assigns(:user_import_results).should be_empty
+        assigns(:user_import_results).should be_nil
         response.should redirect_to(new_user_session_url)
       end
     end

data/spec/dummy/app/controllers/application_controller.rb

@@ -1,11 +1,10 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
-  enju_leaf
-  enju_biblio
-  enju_library
+  include EnjuLeaf::Controller
+  include EnjuBiblio::Controller
+  include EnjuLibrary::Controller
+  before_action :set_paper_trail_whodunnit
+  after_action :verify_authorized
 
-  mobylette_config do |config|
-    config[:skip_xhr_requests] = false
-    #config[:skip_user_agents] = Setting.enju.skip_mobile_agents.map{|a| a.to_sym}
-  end
+  include Pundit
 end

data/spec/dummy/app/models/user.rb

@@ -1,11 +1,10 @@
-# -*- encoding: utf-8 -*-
 class User < ActiveRecord::Base
   devise :database_authenticatable, #:registerable,
     :recoverable, :rememberable, :trackable, #, :validatable
     :lockable, :lock_strategy => :none, :unlock_strategy => :none
 
-  enju_leaf_user_model
-  enju_message_user_model
-  enju_circulation_user_model
-  enju_bookmark_user_model
+  include EnjuLeaf::EnjuUser
+  include EnjuMessage::EnjuUser
+  include EnjuCirculation::EnjuUser
+  include EnjuBookmark::EnjuUser
 end

data/spec/dummy/config/application.rb

@@ -4,6 +4,10 @@ require 'rails/all'
 
 Bundler.require
 require 'enju_leaf'
+require 'resque/server'
+require 'enju_circulation'
+require 'enju_bookmark'
+require 'enju_search_log'
 
 module Dummy
   class Application < Rails::Application
@@ -11,16 +15,6 @@ module Dummy
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
 
-    # Custom directories with classes and modules you want to be autoloadable.
-    # config.autoload_paths += %W(#{config.root}/extras)
-
-    # Only load the plugins named here, in the order given (default is alphabetical).
-    # :all can be used as a placeholder for all plugins not explicitly named.
-    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
-
-    # Activate observers that should always be running.
-    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
-
     # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
     # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
     # config.time_zone = 'Central Time (US & Canada)'
@@ -29,34 +23,8 @@ module Dummy
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
 
-    # Configure the default encoding used in templates for Ruby 1.9.
-    config.encoding = "utf-8"
-
-    # Configure sensitive parameters which will be filtered from the log file.
-    config.filter_parameters += [:password]
-
-    # Enable escaping HTML in JSON.
-    config.active_support.escape_html_entities_in_json = true
-
-    # Use SQL instead of Active Record's schema dumper when creating the database.
-    # This is necessary if your schema can't be completely dumped by the schema dumper,
-    # like if you have constraints or database-specific column types
-    # config.active_record.schema_format = :sql
-
-    # Enforce whitelist mode for mass assignment.
-    # This will create an empty whitelist of attributes available for mass-assignment for all models
-    # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
-    # parameters by using an attr_accessible or attr_protected declaration.
-    #config.active_record.whitelist_attributes = true
-
-    # Enable the asset pipeline
-    config.assets.enabled = true
-
-    # Version of your assets, change this if you want to expire all your assets
-    config.assets.version = '1.0'
+    # Do not swallow errors in after_commit/after_rollback callbacks.
+    config.active_record.raise_in_transactional_callbacks = true
   end
 end
 
-require 'enju_circulation'
-require 'enju_bookmark'
-require 'enju_search_log'

data/spec/dummy/config/environments/development.rb

@@ -1,37 +1,41 @@
-Dummy::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
 
   # In the development environment your application's code is reloaded on
   # every request. This slows down response time but is perfect for development
   # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
 
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
+  # Do not eager load code on boot.
+  config.eager_load = false
 
-  # Show full error reports and disable caching
+  # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
 
-  # Don't care if the mailer can't send
+  # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false
 
-  # Print deprecation notices to the Rails logger
+  # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
 
-  # Only use best-standards-support built into browsers
-  config.action_dispatch.best_standards_support = :builtin
+  # Raise an error on page load if there are pending migrations.
+  config.active_record.migration_error = :page_load
 
-  # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
+  # Debug mode disables concatenation and preprocessing of assets.
+  # This option may cause significant delays in view rendering with a large
+  # number of complex assets.
+  config.assets.debug = true
 
-  # Log the query plan for queries taking more than this (works
-  # with SQLite, MySQL, and PostgreSQL)
-  config.active_record.auto_explain_threshold_in_seconds = 0.5
+  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
+  # yet still be able to expire them through the digest params.
+  config.assets.digest = true
 
-  # Do not compress assets
-  config.assets.compress = false
+  # Adds additional error checking when serving assets at runtime.
+  # Checks for improperly declared sprockets dependencies.
+  # Raises helpful error messages.
+  config.assets.raise_runtime_errors = true
 
-  # Expands the lines which load the assets
-  config.assets.debug = true
+  # Raises error for missing translations
+  # config.action_view.raise_on_missing_translations = true
 end

data/spec/dummy/config/environments/production.rb

@@ -1,67 +1,79 @@
-Dummy::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
 
-  # Code is not reloaded between requests
+  # Code is not reloaded between requests.
   config.cache_classes = true
 
-  # Full error reports are disabled and caching is turned on
+  # Eager load code on boot. This eager loads most of Rails and
+  # your application in memory, allowing both threaded web servers
+  # and those relying on copy on write to perform better.
+  # Rake tasks automatically ignore this option for performance.
+  config.eager_load = true
+
+  # Full error reports are disabled and caching is turned on.
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true
 
-  # Disable Rails's static asset server (Apache or nginx will already do this)
-  config.serve_static_assets = false
+  # Enable Rack::Cache to put a simple HTTP cache in front of your application
+  # Add `rack-cache` to your Gemfile before enabling this.
+  # For large-scale production use, consider using a caching reverse proxy like
+  # NGINX, varnish or squid.
+  # config.action_dispatch.rack_cache = true
+
+  # Disable serving static files from the `/public` folder by default since
+  # Apache or NGINX already handles this.
+  config.serve_static_files = ENV['RAILS_SERVE_STATIC_FILES'].present?
 
-  # Compress JavaScripts and CSS
-  config.assets.compress = true
+  # Compress JavaScripts and CSS.
+  config.assets.js_compressor = :uglifier
+  # config.assets.css_compressor = :sass
 
-  # Don't fallback to assets pipeline if a precompiled asset is missed
+  # Do not fallback to assets pipeline if a precompiled asset is missed.
   config.assets.compile = false
 
-  # Generate digests for assets URLs
+  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
+  # yet still be able to expire them through the digest params.
   config.assets.digest = true
 
-  # Defaults to nil and saved in location specified by config.assets.prefix
-  # config.assets.manifest = YOUR_PATH
+  # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
 
-  # Specifies the header that your server uses for sending files
-  # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
-  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
+  # Specifies the header that your server uses for sending files.
+  # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache
+  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
 
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
   # config.force_ssl = true
 
-  # See everything in the log (default is :info)
-  # config.log_level = :debug
+  # Use the lowest log level to ensure availability of diagnostic information
+  # when problems arise.
+  config.log_level = :debug
 
-  # Prepend all log lines with the following tags
+  # Prepend all log lines with the following tags.
   # config.log_tags = [ :subdomain, :uuid ]
 
-  # Use a different logger for distributed setups
+  # Use a different logger for distributed setups.
   # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
 
-  # Use a different cache store in production
+  # Use a different cache store in production.
   # config.cache_store = :mem_cache_store
 
-  # Enable serving of images, stylesheets, and JavaScripts from an asset server
-  # config.action_controller.asset_host = "http://assets.example.com"
-
-  # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
-  # config.assets.precompile += %w( search.js )
+  # Enable serving of images, stylesheets, and JavaScripts from an asset server.
+  # config.action_controller.asset_host = 'http://assets.example.com'
 
-  # Disable delivery errors, bad email addresses will be ignored
+  # Ignore bad email addresses and do not raise email delivery errors.
+  # Set this to true and configure the email server for immediate delivery to raise delivery errors.
   # config.action_mailer.raise_delivery_errors = false
 
-  # Enable threaded mode
-  # config.threadsafe!
-
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
-  # the I18n.default_locale when a translation can not be found)
+  # the I18n.default_locale when a translation cannot be found).
   config.i18n.fallbacks = true
 
-  # Send deprecation notices to registered listeners
+  # Send deprecation notices to registered listeners.
   config.active_support.deprecation = :notify
 
-  # Log the query plan for queries taking more than this (works
-  # with SQLite, MySQL, and PostgreSQL)
-  # config.active_record.auto_explain_threshold_in_seconds = 0.5
+  # Use default logging formatter so that PID and timestamp are not suppressed.
+  config.log_formatter = ::Logger::Formatter.new
+
+  # Do not dump schema after migrations.
+  config.active_record.dump_schema_after_migration = false
 end

data/spec/dummy/config/environments/test.rb

@@ -1,5 +1,5 @@
-Dummy::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
 
   # The test environment is used exclusively to run your application's
   # test suite. You never need to work with it otherwise. Remember that
@@ -7,33 +7,38 @@ Dummy::Application.configure do
   # and recreated between test runs. Don't rely on the data there!
   config.cache_classes = true
 
-  # Configure static asset server for tests with Cache-Control for performance
-  config.serve_static_assets = true
-  config.static_cache_control = "public, max-age=3600"
+  # Do not eager load code on boot. This avoids loading your whole application
+  # just for the purpose of running a single test. If you are using a tool that
+  # preloads Rails for running tests, you may have to set it to true.
+  config.eager_load = false
 
-  # Log error messages when you accidentally call methods on nil
-  config.whiny_nils = true
+  # Configure static file server for tests with Cache-Control for performance.
+  config.serve_static_files   = true
+  config.static_cache_control = 'public, max-age=3600'
 
-  # Show full error reports and disable caching
+  # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
 
-  # Raise exceptions instead of rendering exception templates
+  # Raise exceptions instead of rendering exception templates.
   config.action_dispatch.show_exceptions = false
 
-  # Disable request forgery protection in test environment
-  config.action_controller.allow_forgery_protection    = false
+  # Disable request forgery protection in test environment.
+  config.action_controller.allow_forgery_protection = false
 
   # Tell Action Mailer not to deliver emails to the real world.
   # The :test delivery method accumulates sent emails in the
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
-  # Raise exception on mass assignment protection for Active Record models
-  #config.active_record.mass_assignment_sanitizer = :strict
+  # Randomize the order test cases are executed.
+  config.active_support.test_order = :random
 
-  # Print deprecation notices to the stderr
+  # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
 
+  # Raises error for missing translations
+  # config.action_view.raise_on_missing_translations = true
+
   config.action_mailer.default_url_options = {:host => 'localhost:3000'}
 end

data/spec/dummy/config/initializers/enju_leaf.rb

@@ -0,0 +1,2 @@
+Profile.include(EnjuCirculation::EnjuProfile)
+UserGroup.include(EnjuCirculation::EnjuUserGroup)

data/spec/dummy/config/routes.rb

@@ -1,5 +1,9 @@
 Dummy::Application.routes.draw do
-  devise_for :users, :path => 'accounts'
+  devise_for :users
+  authenticate :user, lambda {|u| u.role.try(:name) == 'Administrator' } do
+    mount Resque::Server.new, at: "/resque", as: :resque
+  end
+
   # The priority is based upon order of creation:
   # first created -> highest priority.
 

data/spec/dummy/db/migrate/20151213070943_add_translation_table_to_library_group.rb

@@ -0,0 +1,13 @@
+class AddTranslationTableToLibraryGroup < ActiveRecord::Migration
+  def up
+    LibraryGroup.create_translation_table!({
+      login_banner: :text
+    }, {
+      migrate_data: true
+    })
+  end
+
+  def down
+    LibraryGroup.drop_translation_table! migrate_data: true
+  end
+end

data/spec/dummy/db/migrate/20151213072705_add_footer_banner_to_library_group.rb

@@ -0,0 +1,9 @@
+class AddFooterBannerToLibraryGroup < ActiveRecord::Migration
+  def up
+    LibraryGroup.add_translation_fields! footer_banner: :text
+  end
+
+  def down
+    remove_column :library_group_translations, :footer_banner
+  end
+end

data/spec/dummy/db/schema.rb

@@ -505,6 +505,7 @@ ActiveRecord::Schema.define(version: 20160703185015) do
     t.integer  "profile_id"
     t.datetime "created_at",      null: false
     t.datetime "updated_at",      null: false
+    t.string   "provider"
   end
 
   add_index "identities", ["email"], name: "index_identities_on_email"
@@ -649,6 +650,18 @@ ActiveRecord::Schema.define(version: 20160703185015) do
   add_index "libraries", ["library_group_id"], name: "index_libraries_on_library_group_id"
   add_index "libraries", ["name"], name: "index_libraries_on_name", unique: true
 
+  create_table "library_group_translations", force: :cascade do |t|
+    t.integer  "library_group_id", null: false
+    t.string   "locale",           null: false
+    t.datetime "created_at",       null: false
+    t.datetime "updated_at",       null: false
+    t.text     "login_banner"
+    t.text     "footer_banner"
+  end
+
+  add_index "library_group_translations", ["library_group_id"], name: "index_library_group_translations_on_library_group_id"
+  add_index "library_group_translations", ["locale"], name: "index_library_group_translations_on_locale"
+
   create_table "library_groups", force: :cascade do |t|
     t.string   "name",                                                           null: false
     t.text     "display_name"
@@ -1353,6 +1366,7 @@ ActiveRecord::Schema.define(version: 20160703185015) do
     t.integer  "user_export_file_id"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.boolean  "most_recent"
   end
 
   add_index "user_export_file_transitions", ["sort_key", "user_export_file_id"], name: "index_user_export_file_transitions_on_sort_key_and_file_id", unique: true
@@ -1421,6 +1435,7 @@ ActiveRecord::Schema.define(version: 20160703185015) do
     t.integer  "user_import_file_id"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.boolean  "most_recent"
   end
 
   add_index "user_import_file_transitions", ["sort_key", "user_import_file_id"], name: "index_user_import_file_transitions_on_sort_key_and_file_id", unique: true

data/spec/factories/profile.rb

@@ -5,13 +5,13 @@ FactoryGirl.define do
     f.sequence(:user_number){|n| "user_number_#{n}"}
     f.library_id 2
     f.locale "ja"
-    factory :librarian_profile, :class => Profile do |f|
-      f.required_role_id {Role.where(name: 'Librarian').first.id}
-      f.association :user, factory: :librarian
+    factory :librarian_profile, :class => Profile do |profile|
+      profile.required_role_id {Role.where(name: 'Librarian').first.id}
+      profile.association :user, factory: :librarian
     end
-    factory :admin_profile, :class => Profile do |f|
-      f.required_role_id {Role.where(name: 'Administrator').first.id}
-      f.association :user, factory: :admin
+    factory :admin_profile, :class => Profile do |profile|
+      profile.required_role_id {Role.where(name: 'Administrator').first.id}
+      profile.association :user, factory: :admin
     end
   end
 end

data/spec/models/user_export_file_spec.rb

@@ -9,7 +9,7 @@ describe UserExportFile do
     file = UserExportFile.new
     file.user = users(:admin)
     file.save
-    UserExportFileQueue.perform(file.id).should be_truthy
+    UserExportFileJob.perform_later(file).should be_truthy
     Message.count.should eq message_count + 1
     Message.order(:id).last.subject.should eq 'エクスポートが完了しました'
   end