enju_library 0.2.0.beta.8 → 0.2.0.beta.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 622c32ce548424d47ce882631aed7e4612cd8b64
-  data.tar.gz: e63bb53a0a5b5add1d9d8439e85d900276347b57
+  metadata.gz: 0492192a430ab753775d9271dca0f07c2c113cd6
+  data.tar.gz: 0409e1c90e310d2454abc020ee49d46f2b58b181
 SHA512:
-  metadata.gz: 610b738cfdd85d596678390aa44fce50a84f03b89ac5404767b0ac254a886f71a0b03b592799ae95f382163803ac6a24c9c9c3dce914820ad10f0b7f67ec7457
-  data.tar.gz: 5f1521f4965ffb4c85446488e5d53b11ede7189508c2be36954671fd67ce2b992161c73ec5a4b366a2141f3a0817098509cbb73f20761f84ca8ffaf2507fdb86
+  metadata.gz: 39a23aab017b58a997f44d2f99161f172604dce7cec913f1ea0f6fc063b1a3bd93ad32d41dd336fb726e0b376d00fe5f407df08bd439a8acf37b4787d3a6112c
+  data.tar.gz: cd2f94914e1252b74fcfd8e368c924eb16beba26cf3f244d50929551c28eedff4ad9f8f8f40745fb39e6f845c617948c66974c038dad259b1425f3b148c7160f

data/app/controllers/concerns/enju_library/controller.rb

@@ -235,13 +235,13 @@ module EnjuLibrary
 
     def get_library
       if params[:library_id]
-        @library = Library.find(params[:library_id])
+        @library = Library.friendly.find(params[:library_id])
         authorize @library, :show?
       end
     end
 
     def get_libraries
-      @libraries = Library.all_cache
+      @libraries = Library.order(:position)
     end
 
     def get_bookstore

data/app/controllers/libraries_controller.rb

@@ -118,7 +118,7 @@ class LibrariesController < ApplicationController
 
   private
   def set_library
-    @library = Library.find(params[:id])
+    @library = Library.friendly.find(params[:id])
     authorize @library
   end
 

data/app/jobs/user_export_file_job.rb

@@ -0,0 +1,7 @@
+class UserExportFileJob < ActiveJob::Base
+  queue_as :enju_leaf
+
+  def perform(user_export_file)
+    user_export_file.export!
+  end
+end

data/app/jobs/user_import_file_job.rb

@@ -0,0 +1,7 @@
+class UserImportFileJob < ActiveJob::Base
+  queue_as :enju_leaf
+
+  def perform(user_import_file)
+    user_import_file.import_start
+  end
+end

data/lib/enju_library/version.rb

@@ -1,3 +1,3 @@
 module EnjuLibrary
-  VERSION = "0.2.0.beta.8"
+  VERSION = "0.2.0.beta.9"
 end

data/lib/generators/enju_library/setup/setup_generator.rb

@@ -7,5 +7,6 @@ class EnjuLibrary::SetupGenerator < Rails::Generators::Base
     return if file == 'fixture'
     inject_into_file 'app/controllers/application_controller.rb',
       "  include EnjuLibrary::Controller\n", after: "include EnjuLeaf::Controller\n"
+    append_to_file("app/models/user.rb", "Item.include(EnjuLibrary::EnjuItem)\n")
   end
 end

data/lib/tasks/enju_library_tasks.rake

@@ -37,6 +37,8 @@ EOS
     library_group.login_banner_en = login_en if library_group.login_banner_en.blank?
     library_group.footer_banner_ja = footer_ja if library_group.footer_banner_ja.blank?
     library_group.footer_banner_en = footer_en if library_group.footer_banner_en.blank?
+    library_group.book_jacket_source = 'google'
+    library_group.screenshot_generator = 'mozshot'
     library_group.save
     puts 'enju_library: The upgrade completed successfully.'
   end

data/spec/controllers/baskets_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe BasketsController do
   fixtures :all

data/spec/controllers/bookstores_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'sunspot/rails/spec_helper'
 
 describe BookstoresController do

data/spec/controllers/budget_types_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 # This spec was generated by rspec-rails when you ran the scaffold generator.
 # It demonstrates how one might use RSpec to specify the controller code that

data/spec/controllers/libraries_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe LibrariesController do
   fixtures :all
@@ -44,7 +44,7 @@ describe LibrariesController do
       it "should get index with query" do
         get :index, :query => 'kamata'
         response.should be_success
-        assigns(:libraries).include?(Library.find('kamata')).should be_truthy
+        assigns(:libraries).include?(Library.friendly.find('kamata')).should be_truthy
       end
     end
   end

data/spec/controllers/library_groups_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe LibraryGroupsController do
   fixtures :all

data/spec/controllers/request_status_types_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'sunspot/rails/spec_helper'
 
 describe RequestStatusTypesController do

data/spec/controllers/request_types_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'sunspot/rails/spec_helper'
 
 describe RequestTypesController do

data/spec/controllers/search_engines_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'sunspot/rails/spec_helper'
 
 describe SearchEnginesController do

data/spec/controllers/shelves_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe ShelvesController do
   fixtures :all
@@ -48,7 +48,7 @@ describe ShelvesController do
 
       it "assigns all shelves as @shelves with library_id" do
         get :index, :library_id => 'kamata'
-        assigns(:shelves).map(&:id).should eq(Library.find('kamata').shelves.order(:position).page(1).pluck(:id))
+        assigns(:shelves).map(&:id).should eq(Library.friendly.find('kamata').shelves.order(:position).page(1).pluck(:id))
         response.should be_success
       end
 

data/spec/controllers/subscribes_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe SubscribesController do
   fixtures :all

data/spec/controllers/subscriptions_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'sunspot/rails/spec_helper'
 
 describe SubscriptionsController do

data/spec/controllers/user_export_files_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe UserExportFilesController do
   fixtures :all

data/spec/controllers/user_groups_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe UserGroupsController do
   fixtures :all

data/spec/dummy/db/migrate/20160703185015_add_most_recent_to_message_transitions.rb

@@ -0,0 +1,9 @@
+class AddMostRecentToMessageTransitions < ActiveRecord::Migration
+  def up
+    add_column :message_transitions, :most_recent, :boolean, null: true
+  end
+
+  def down
+    remove_column :message_transitions, :most_recent
+  end
+end

data/spec/dummy/db/migrate/20160814165332_add_most_recent_to_message_request_transitions.rb

@@ -0,0 +1,9 @@
+class AddMostRecentToMessageRequestTransitions < ActiveRecord::Migration
+  def up
+    add_column :message_request_transitions, :most_recent, :boolean, null: true
+  end
+
+  def down
+    remove_column :message_request_transitions, :most_recent
+  end
+end

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20160813203039) do
+ActiveRecord::Schema.define(version: 20160814165332) do
 
   create_table "accepts", force: :cascade do |t|
     t.integer  "basket_id"
@@ -938,6 +938,7 @@ ActiveRecord::Schema.define(version: 20160813203039) do
     t.integer  "message_request_id"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.boolean  "most_recent"
   end
 
   add_index "message_request_transitions", ["message_request_id"], name: "index_message_request_transitions_on_message_request_id"
@@ -968,11 +969,12 @@ ActiveRecord::Schema.define(version: 20160813203039) do
 
   create_table "message_transitions", force: :cascade do |t|
     t.string   "to_state"
-    t.text     "metadata",   default: "{}"
+    t.text     "metadata",    default: "{}"
     t.integer  "sort_key"
     t.integer  "message_id"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.boolean  "most_recent"
   end
 
   add_index "message_transitions", ["message_id"], name: "index_message_transitions_on_message_id"

data/spec/fixtures/library_groups.yml

@@ -12,8 +12,6 @@ one:
   login_banner: "*Next-L Enju*"
   admin_networks: "0.0.0.0/0\r\n\
     ::/0"
-  settings: 
-    "{\"max_number_of_results\":200,\"family_name_first\":true}"
   user_id: 1
   pub_year_facet_range_interval: 10
 

data/spec/models/accept_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Accept do
   fixtures :all

data/spec/models/basket_spec.rb

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-require 'spec_helper'
+require 'rails_helper'
 
 describe Basket do
   fixtures :all

data/spec/models/bookstore_spec.rb

@@ -1,5 +1,4 @@
-# -*- encoding: utf-8 -*-
-require 'spec_helper'
+require 'rails_helper'
 
 describe Bookstore do
   #pending "add some examples to (or delete) #{__FILE__}"

data/spec/models/budget_type_spec.rb

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-require 'spec_helper'
+require 'rails_helper'
 
 describe BudgetType do
   it 'should create budget_type' do

data/spec/models/library_group_spec.rb

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-require 'spec_helper'
+require 'rails_helper'
 
 describe LibraryGroup do
   fixtures :library_groups

data/spec/models/library_spec.rb

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-require 'spec_helper'
+require 'rails_helper'
 
 describe Library do
   fixtures :all

data/spec/models/request_status_type_spec.rb

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-require 'spec_helper'
+require 'rails_helper'
 
 describe RequestStatusType do
   #pending "add some examples to (or delete) #{__FILE__}"

data/spec/models/request_type_spec.rb

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-require 'spec_helper'
+require 'rails_helper'
 
 describe RequestType do
   #pending "add some examples to (or delete) #{__FILE__}"

data/spec/models/search_engine_spec.rb

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-require 'spec_helper'
+require 'rails_helper'
 
 describe SearchEngine do
   fixtures :search_engines

data/spec/models/shelf_spec.rb

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-require 'spec_helper'
+require 'rails_helper'
 
 describe Shelf do
   fixtures :all

data/spec/models/subscribe_spec.rb

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-require 'spec_helper'
+require 'rails_helper'
 
 describe Subscribe do
   #pending "add some examples to (or delete) #{__FILE__}"

data/spec/models/subscription_spec.rb

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-require 'spec_helper'
+require 'rails_helper'
 
 describe Subscription do
   fixtures :subscriptions, :manifestations, :subscribes

data/spec/models/user_export_file_spec.rb

@@ -1,15 +1,16 @@
 # -*- encoding: utf-8 -*-
-require 'spec_helper'
+require 'rails_helper'
   
 describe UserExportFile do
   fixtures :all
   
-  it "should export in background" do
+  it "should export users" do
     message_count = Message.count
     file = UserExportFile.new
     file.user = users(:admin)
     file.save
-    UserExportFileJob.perform_later(file).should be_truthy
+    file.export!
+    #UserExportFileJob.perform_later(file).should be_truthy
     Message.count.should eq message_count + 1
     Message.order(:id).last.subject.should eq 'エクスポートが完了しました'
   end

data/spec/models/user_group_spec.rb

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-require 'spec_helper'
+require 'rails_helper'
 
 describe UserGroup do
   fixtures :user_groups

data/spec/models/user_import_file_spec.rb

@@ -131,7 +131,7 @@ describe UserImportFile do
       @file = UserImportFile.create user_import: File.new("#{Rails.root}/../../examples/user_update_file2.tsv"), user: users(:admin)
       result = @file.modify
       result.should have_key(:user_updated)
-      user001 = User.find('user001')
+      user001 = User.friendly.find('user001')
       user001.email.should eq 'user001@example.jp'
       user001.profile.user_number.should eq '001'
       user001.profile.full_name.should eq 'User 001'

data/spec/models/user_import_result_spec.rb

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-require 'spec_helper'
+require 'rails_helper'
 
 describe UserImportResult do
   #pending "add some examples to (or delete) #{__FILE__}"

data/spec/views/accepts/edit.html.erb_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "accepts/edit" do
   before(:each) do

data/spec/views/accepts/index.html.erb_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "accepts/index" do
   fixtures :all

data/spec/views/accepts/new.html.erb_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "accepts/new" do
   fixtures :all

data/spec/views/accepts/show.html.erb_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "accepts/show" do
   before(:each) do

data/spec/views/budget_types/edit.html.erb_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "budget_types/edit" do
   before(:each) do

data/spec/views/budget_types/index.html.erb_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "budget_types/index" do
   before(:each) do

data/spec/views/budget_types/new.html.erb_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "budget_types/new" do
   before(:each) do

data/spec/views/budget_types/show.html.erb_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "budget_types/show" do
   before(:each) do

data/spec/views/libraries/show.html.erb_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "libraries/show" do
   fixtures :all

data/spec/views/library_groups/edit.html.erb_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "library_groups/edit" do
   before(:each) do

data/spec/views/library_groups/show.html.erb_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "library_groups/show" do
   before(:each) do

data/spec/views/user_export_files/new.html.erb_spec.rb

@@ -1,11 +1,11 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "user_export_files/new" do
   before(:each) do
     assign(:user_export_file, stub_model(
       UserExportFile
     ).as_new_record)
-    view.stub(:current_user).and_return(User.find('enjuadmin'))
+    view.stub(:current_user).and_return(User.friendly.find('enjuadmin'))
   end
 
   it "renders new user form" do

data/spec/views/user_import_results/index.html.erb_spec.rb

@@ -5,7 +5,7 @@ describe "user_import_results/index" do
 
   before(:each) do
     assign(:user_import_results, UserImportResult.page(1))
-    admin = User.find('enjuadmin')
+    admin = User.friendly.find('enjuadmin')
     view.stub(:current_user).and_return(admin)
   end
 

data/spec/views/withdraws/new.html.erb_spec.rb

@@ -18,7 +18,7 @@ RSpec.describe "withdraws/new", type: :view do
         :created_at => Time.zone.now
       )
     ]).page(1))
-    view.stub(:current_user).and_return(User.where(username: 'enjuadmin').first)
+    view.stub(:current_user).and_return(User.friendly.find('enjuadmin'))
   end
 
   it "renders new withdraw form" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_library
 version: !ruby/object:Gem::Version
-  version: 0.2.0.beta.8
+  version: 0.2.0.beta.9
 platform: ruby
 authors:
 - Kosuke Tanabe
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0.beta.5
+        version: 0.2.0.beta.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0.beta.5
+        version: 0.2.0.beta.6
 - !ruby/object:Gem::Dependency
   name: paper_trail
   requirement: !ruby/object:Gem::Requirement
@@ -56,16 +56,16 @@ dependencies:
   name: statesman
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
@@ -360,6 +360,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  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'
 description: Library module for Next-L Enju
 email:
 - nabeta@fastmail.fm
@@ -389,6 +403,8 @@ files:
 - app/controllers/user_import_results_controller.rb
 - app/controllers/withdraws_controller.rb
 - app/helpers/shelves_helper.rb
+- app/jobs/user_export_file_job.rb
+- app/jobs/user_import_file_job.rb
 - app/mailers/notifier.rb
 - app/models/accept.rb
 - app/models/basket.rb
@@ -830,9 +846,11 @@ files:
 - spec/dummy/db/migrate/20160703184723_add_most_recent_to_manifestation_reserve_stat_transitions.rb
 - spec/dummy/db/migrate/20160703184747_add_most_recent_to_user_checkout_stat_transitions.rb
 - spec/dummy/db/migrate/20160703184805_add_most_recent_to_user_reserve_stat_transitions.rb
+- spec/dummy/db/migrate/20160703185015_add_most_recent_to_message_transitions.rb
 - spec/dummy/db/migrate/20160703190209_add_foreign_key_on_manifestation_id_to_reserve.rb
 - spec/dummy/db/migrate/20160813191533_add_book_jacket_source_to_library_group.rb
 - spec/dummy/db/migrate/20160813191820_add_screenshot_generator_to_library_group.rb
+- spec/dummy/db/migrate/20160814165332_add_most_recent_to_message_request_transitions.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
@@ -1206,9 +1224,11 @@ test_files:
 - spec/dummy/db/migrate/20160703184723_add_most_recent_to_manifestation_reserve_stat_transitions.rb
 - spec/dummy/db/migrate/20160703184747_add_most_recent_to_user_checkout_stat_transitions.rb
 - spec/dummy/db/migrate/20160703184805_add_most_recent_to_user_reserve_stat_transitions.rb
+- spec/dummy/db/migrate/20160703185015_add_most_recent_to_message_transitions.rb
 - spec/dummy/db/migrate/20160703190209_add_foreign_key_on_manifestation_id_to_reserve.rb
 - spec/dummy/db/migrate/20160813191533_add_book_jacket_source_to_library_group.rb
 - spec/dummy/db/migrate/20160813191820_add_screenshot_generator_to_library_group.rb
+- spec/dummy/db/migrate/20160814165332_add_most_recent_to_message_request_transitions.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html