enju_leaf 1.1.0.pre3 → 1.1.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dca2c161e223fc00c166d5e5e6c8bf7269b16b3b
-  data.tar.gz: bcd185aed88225b1553eb937ada754111c5592c8
+  metadata.gz: e460dfb746a695bc7488df46411d278b325f1b0f
+  data.tar.gz: 21c7e6d60ef5f7dbf40093ea0928612c4fc009c0
 SHA512:
-  metadata.gz: daec85fbc1a7d7a980111735dee1ba9056ad4ad08d80e9a7681665ba7c13b74f9d36be4ed1c896e316a14696d7939753738742b044e7ce9f894479bb1b477389
-  data.tar.gz: 130cbf879f58500cd18ea71eabbd750ec05a3f297890636d78592c07f8285dafb6284db64b434af48370c3c7a5dbfe1a15dd4e5ce101a5bb9753a800f0ccd843
+  metadata.gz: 8f89f9d2ade2efcecccf7d7bc2d9a69f5e757e1ae10bea255d9b1220996b851014e4617ddd52f36974746f224f4a7db31be53b6fd61f218326a84ebc860a06ce
+  data.tar.gz: 9e2b0c521f4e0d05a49674a84d916808104455017342d1bc5bd4ea0fd7fff72be70e5408e818deaa09018dcad3d857d7de644ad4671e5c38402b539d1d5e4d50

data/config/locales/translation_en.yml

@@ -262,6 +262,7 @@ en:
   advanced_search:
     from: "from"
     to: "to"
+    from_to: "-"
     all_libraries: "All libraries"
   work:
     patrons_work: "%{patron_name}'s works"

data/config/locales/translation_ja.yml

@@ -241,6 +241,7 @@ ja:
   advanced_search:
     from: "ここから"
     to: "ここまで"
+    from_to: "から"
     all_libraries: "全ての図書館"
   work:
     patron_work: "%{patron_name} の書いた資料"

data/lib/enju_leaf/engine.rb

@@ -1,6 +1,5 @@
 require 'enju_biblio'
 require 'enju_library'
-require 'enju_book_jacket'
 require 'enju_manifestation_viewer'
 require 'redcarpet'
 require 'mobylette'

data/lib/enju_leaf/version.rb

@@ -1,3 +1,3 @@
 module EnjuLeaf
-  VERSION = "1.1.0.pre3"
+  VERSION = "1.1.0.rc1"
 end

data/lib/enju_leaf.rb

@@ -268,10 +268,12 @@ module EnjuLeaf
           request.format = :mobile
         when 'false'
           session[:mobylette_override] = :ignore_mobile
-          request.format = :html if request.format == :mobile
+          unless params[:format]
+            request.format = :html if request.format == :mobile
+          end
         end
-      else
-        session[:mobylette_override] = nil
+      #else
+      #  session[:mobylette_override] = nil
       end
     end
 

data/lib/generators/enju_leaf/quick_install/quick_install_generator.rb

@@ -2,7 +2,9 @@ class EnjuLeaf::QuickInstallGenerator < Rails::Generators::Base
   source_root File.expand_path('../templates', __FILE__)
 
   def quick_install
-    environment = ENV['RAILS_ENV'] ||= 'development'
+    environment = ENV['ENJU_ENV'] || 'development'
+    rake("db:create:all")
+    rake("db:migrate", :env => environment)
     generate("enju_circulation:setup")
     generate("enju_subject:setup")
     gsub_file 'config/schedule.rb', /^set :environment, :development$/,
@@ -16,12 +18,18 @@ class EnjuLeaf::QuickInstallGenerator < Rails::Generators::Base
     gsub_file 'config/environments/production.rb',
       /# config.assets.precompile \+= %w\( search.js \)$/,
       "config.assets.precompile += %w( mobile.js mobile.css print.css )"
-    rake("db:migrate")
-    rake("enju_leaf:setup")
-    rake("enju_circulation:setup")
-    rake("enju_subject:setup")
-    #rake("sunspot:solr:start")
-    #rake("db:seed")
+    rake("db:migrate", :env => environment)
+    rake("enju_leaf:setup", :env => environment)
+    rake("enju_circulation:setup", :env => environment)
+    rake("enju_subject:setup", :env => environment)
     rake("assets:precompile") if environment == 'production'
+    rake("db:seed", :env => environment)
+    if ENV['OS'] == 'Windows_NT'
+      rake("sunspot:solr:run", :env => environment)
+    else
+      rake("sunspot:solr:start", :env => environment)
+      rake("enju_leaf:create_initial_index", :env => environment)
+      rake("sunspot:solr:stop", :env => environment)
+    end
   end
 end

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

@@ -48,7 +48,6 @@ EOS
       <<"EOS"
   include EnjuLeaf::EnjuLeafHelper
   include EnjuBiblio::BiblioHelper if defined?(EnjuBiblio)
-  include EnjuBookJacket::BookJacketHelper if defined?(EnjuBookJacket)
   include EnjuManifestationViewer::ManifestationViewerHelper if defined?(EnjuManifestationViewer)
 EOS
     end

data/lib/generators/enju_leaf/setup/templates/config/schedule.rb

@@ -23,31 +23,20 @@ set :path, '/path/to/enju_leaf'
 set :environment, :development
 set :output, "#{path}/log/cron_log.log"
 
-every 5.minute do
-  rake "enju:message:send"
+every 1.hour do
+  rake "enju:import:start"
+  rake "enju:import:expire"
 end
 
 every 1.day, :at => '0:00 am' do
-  rake "enju:circulation:expire"
   runner "User.lock_expired_users"
 end
 
-every 1.day, :at => '1:00 am' do
-  rake "enju:circulation:stat"
-#  rake "enju:bookmark:stat"
-end
-
-every 1.hour do
-  rake "enju:import:start"
-  rake "enju:import:expire"
-end
-
 every 1.day, :at => '3:00 am' do
   rake "sunspot:reindex"
 #  rake "sitemap:refresh:no_ping"
 end
 
 every 1.day, :at => '5:00 am' do
-  rake "enju:circulation:send_notification"
   rake "enju:import:destroy"
 end

data/lib/generators/enju_leaf/setup/templates/db/seeds.rb

@@ -4,13 +4,14 @@ password = 'adminpassword'
 
 # Don't edit!
 
-unless solr = Sunspot.commit rescue nil
-  raise "Solr is not running."
-end
+Sunspot.session = Sunspot::Rails::StubSessionProxy.new(Sunspot.session)
+#unless solr = Sunspot.commit rescue nil
+#  raise "Solr is not running."
+#end
 
-Patron.reindex
-Library.reindex
-Shelf.reindex
+#Patron.reindex
+#Library.reindex
+#Shelf.reindex
 
 system_user = User.new
 system_user.username = 'system'

data/lib/tasks/enju_leaf_tasks.rake

@@ -1,6 +1,6 @@
 require 'active_record/fixtures'
-desc "create initial records for enju_leaf"
 namespace :enju_leaf do
+  desc "create initial records for enju_leaf"
   task :setup => :environment do
     Dir.glob(Rails.root.to_s + '/db/fixtures/enju_leaf/*.yml').each do |file|
       ActiveRecord::Fixtures.create_fixtures('db/fixtures/enju_leaf', File.basename(file, '.*'))
@@ -11,4 +11,13 @@ namespace :enju_leaf do
 
     puts 'initial fixture files loaded.'
   end
+
+  desc "create initial index"
+  task :create_initial_index => :environment do
+    Library.reindex
+    Shelf.reindex
+    User.reindex
+
+    puts 'indexing completed.'
+  end
 end

data/spec/dummy/db/migrate/006_create_items.rb

@@ -4,8 +4,6 @@ class CreateItems < ActiveRecord::Migration
       #t.integer :manifestation_id
       t.string :call_number
       t.string :item_identifier
-      t.integer :circulation_status_id, :default => 5, :null => false
-      t.integer :checkout_type_id, :default => 1, :null => false
       t.timestamps
       t.datetime :deleted_at
       t.integer :shelf_id, :default => 1, :null => false
@@ -19,8 +17,6 @@ class CreateItems < ActiveRecord::Migration
       t.integer :required_score, :default => 0, :null => false
     end
     #add_index :items, :manifestation_id
-    add_index :items, :circulation_status_id
-    add_index :items, :checkout_type_id
     add_index :items, :shelf_id
     add_index :items, :item_identifier
     add_index :items, :required_role_id

data/spec/dummy/db/schema.rb

@@ -175,20 +175,18 @@ ActiveRecord::Schema.define(:version => 20130221154434) do
   create_table "items", :force => true do |t|
     t.string   "call_number"
     t.string   "item_identifier"
-    t.integer  "circulation_status_id", :default => 5,     :null => false
-    t.integer  "checkout_type_id",      :default => 1,     :null => false
-    t.datetime "created_at",                               :null => false
-    t.datetime "updated_at",                               :null => false
+    t.datetime "created_at",                             :null => false
+    t.datetime "updated_at",                             :null => false
     t.datetime "deleted_at"
-    t.integer  "shelf_id",              :default => 1,     :null => false
-    t.boolean  "include_supplements",   :default => false, :null => false
+    t.integer  "shelf_id",            :default => 1,     :null => false
+    t.boolean  "include_supplements", :default => false, :null => false
     t.text     "note"
     t.string   "url"
     t.integer  "price"
-    t.integer  "lock_version",          :default => 0,     :null => false
-    t.integer  "required_role_id",      :default => 1,     :null => false
+    t.integer  "lock_version",        :default => 0,     :null => false
+    t.integer  "required_role_id",    :default => 1,     :null => false
     t.string   "state"
-    t.integer  "required_score",        :default => 0,     :null => false
+    t.integer  "required_score",      :default => 0,     :null => false
     t.datetime "acquired_at"
     t.integer  "bookstore_id"
     t.integer  "budget_type_id"
@@ -196,8 +194,6 @@ ActiveRecord::Schema.define(:version => 20130221154434) do
   end
 
   add_index "items", ["bookstore_id"], :name => "index_items_on_bookstore_id"
-  add_index "items", ["checkout_type_id"], :name => "index_items_on_checkout_type_id"
-  add_index "items", ["circulation_status_id"], :name => "index_items_on_circulation_status_id"
   add_index "items", ["item_identifier"], :name => "index_items_on_item_identifier"
   add_index "items", ["required_role_id"], :name => "index_items_on_required_role_id"
   add_index "items", ["shelf_id"], :name => "index_items_on_shelf_id"

data/spec/fixtures/items.yml

@@ -2,8 +2,6 @@
 item_00001: 
   updated_at: 2007-08-24 23:46:00.484813 +09:00
   item_identifier: '00001'
-  circulation_status_id: 2
-  checkout_type_id: 1
   shelf_id: 1
   call_number: 
   id: 1
@@ -12,8 +10,6 @@ item_00001:
 item_00002: 
   updated_at: 2007-08-24 23:46:01.641413 +09:00
   item_identifier: '00002'
-  circulation_status_id: 2
-  checkout_type_id: 1
   shelf_id: 1
   call_number: 
   id: 2
@@ -22,8 +18,6 @@ item_00002:
 item_00003: 
   updated_at: 2007-08-24 23:46:02.502569 +09:00
   item_identifier: '00003'
-  circulation_status_id: 2
-  checkout_type_id: 2
   shelf_id: 1
   call_number: 
   id: 3
@@ -32,8 +26,6 @@ item_00003:
 item_00004: 
   updated_at: 2007-08-24 23:46:03.520781 +09:00
   item_identifier: '00004'
-  circulation_status_id: 2
-  checkout_type_id: 1
   shelf_id: 1
   call_number: 
   id: 4
@@ -42,8 +34,6 @@ item_00004:
 item_00005: 
   updated_at: 2007-08-24 23:46:04.538073 +09:00
   item_identifier: '00005'
-  circulation_status_id: 2
-  checkout_type_id: 2
   shelf_id: 1
   call_number: 
   id: 5
@@ -52,8 +42,6 @@ item_00005:
 item_00006: 
   updated_at: 2007-08-24 23:46:05.555353 +09:00
   item_identifier: '00006'
-  circulation_status_id: 2
-  checkout_type_id: 2
   shelf_id: 1
   call_number: 
   id: 6
@@ -62,8 +50,6 @@ item_00006:
 item_00007: 
   updated_at: 2007-08-24 23:46:06.572631 +09:00
   item_identifier: '00007'
-  circulation_status_id: 2
-  checkout_type_id: 1
   shelf_id: 1
   call_number: 
   id: 7
@@ -72,8 +58,6 @@ item_00007:
 item_00008: 
   updated_at: 2007-08-24 23:46:07.589909 +09:00
   item_identifier: '00008'
-  circulation_status_id: 2
-  checkout_type_id: 2
   shelf_id: 1
   call_number: 
   id: 8
@@ -82,8 +66,6 @@ item_00008:
 item_00009: 
   updated_at: 2007-08-24 23:46:08.607081 +09:00
   item_identifier: '00009'
-  circulation_status_id: 2
-  checkout_type_id: 1
   shelf_id: 4
   call_number: 
   id: 9
@@ -92,8 +74,6 @@ item_00009:
 item_00010: 
   updated_at: 2007-08-24 23:46:09.624281 +09:00
   item_identifier: '00010'
-  circulation_status_id: 2
-  checkout_type_id: 2
   shelf_id: 1
   call_number: 
   id: 10
@@ -102,8 +82,6 @@ item_00010:
 item_00011: 
   updated_at: 2007-08-24 23:46:10.484813 +09:00
   item_identifier: '00011'
-  circulation_status_id: 2
-  checkout_type_id: 1
   shelf_id: 1
   call_number: 
   id: 11
@@ -112,8 +90,6 @@ item_00011:
 item_00012: 
   updated_at: 2007-08-24 23:46:11.484813 +09:00
   item_identifier: '00012'
-  circulation_status_id: 3
-  checkout_type_id: 2
   shelf_id: 1
   call_number: 
   id: 12
@@ -122,8 +98,6 @@ item_00012:
 item_00013: 
   updated_at: 2007-08-24 23:46:12.484813 +09:00
   item_identifier: '00013'
-  circulation_status_id: 10
-  checkout_type_id: 1
   shelf_id: 1
   call_number: 
   id: 13
@@ -132,8 +106,6 @@ item_00013:
 item_00014: 
   updated_at: 2007-08-24 23:46:13.484813 +09:00
   item_identifier: '00014'
-  circulation_status_id: 10
-  checkout_type_id: 2
   shelf_id: 1
   call_number: 
   id: 14
@@ -142,8 +114,6 @@ item_00014:
 item_00015: 
   updated_at: 2007-08-24 23:46:14.484813 +09:00
   item_identifier: '00015'
-  circulation_status_id: 10
-  checkout_type_id: 3
   shelf_id: 1
   call_number: 
   id: 15
@@ -152,8 +122,6 @@ item_00015:
 item_00016: 
   updated_at: 2007-08-24 23:46:15.484813 +09:00
   item_identifier: '00016'
-  circulation_status_id: 10
-  checkout_type_id: 2
   shelf_id: 1
   call_number: 
   id: 16
@@ -162,8 +130,6 @@ item_00016:
 item_00017: 
   updated_at: 2007-08-24 23:46:16.484813 +09:00
   item_identifier: '00017'
-  circulation_status_id: 10
-  checkout_type_id: 3
   shelf_id: 1
   call_number: 
   id: 17
@@ -172,8 +138,6 @@ item_00017:
 item_00018: 
   updated_at: 2007-08-24 23:46:17.484813 +09:00
   item_identifier: '00018'
-  circulation_status_id: 10
-  checkout_type_id: 3
   shelf_id: 1
   call_number: 
   id: 18
@@ -182,8 +146,6 @@ item_00018:
 item_00019: 
   updated_at: 2007-08-24 23:46:18.484813 +09:00
   item_identifier: '00019'
-  circulation_status_id: 2
-  checkout_type_id: 3
   shelf_id: 1
   call_number: 
   id: 19
@@ -192,8 +154,6 @@ item_00019:
 item_00020: 
   updated_at: 2007-08-24 23:46:19.484813 +09:00
   item_identifier: '00020'
-  circulation_status_id: 13
-  checkout_type_id: 3
   shelf_id: 1
   call_number: 
   id: 20
@@ -202,8 +162,6 @@ item_00020:
 item_00021: 
   updated_at: 2007-08-24 23:46:20.484813 +09:00
   item_identifier: '00021'
-  circulation_status_id: 2
-  checkout_type_id: 3
   shelf_id: 1
   call_number: 
   id: 21
@@ -212,8 +170,6 @@ item_00021:
 item_00022: 
   updated_at: 2007-08-24 23:46:20.484813 +09:00
   item_identifier: '00022'
-  circulation_status_id: 2
-  checkout_type_id: 3
   shelf_id: 1
   call_number: 
   id: 22
@@ -222,8 +178,6 @@ item_00022:
 item_00023: 
   updated_at: 2007-08-24 23:46:20.484813 +09:00
   item_identifier: '00023'
-  circulation_status_id: 15
-  checkout_type_id: 3
   shelf_id: 2
   call_number: 
   id: 23
@@ -238,14 +192,11 @@ item_00023:
 #  id                    :integer         not null, primary key
 #  call_number           :string(255)
 #  item_identifier       :string(255)
-#  circulation_status_id :integer         default(5), not null
-#  checkout_type_id      :integer         default(1), not null
 #  created_at            :datetime        not null
 #  updated_at            :datetime        not null
 #  deleted_at            :datetime
 #  shelf_id              :integer         default(1), not null
 #  include_supplements   :boolean         default(FALSE), not null
-#  checkouts_count       :integer         default(0), not null
 #  owns_count            :integer         default(0), not null
 #  note                  :text
 #  url                   :string(255)