enju_library 0.2.0.beta.7 → 0.2.0.beta.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d99cafa9e33418200cd2fe5c0a2eb1931cd99d71
-  data.tar.gz: bee9a19cc682a7949f26ec9f9032b69b8d306601
+  metadata.gz: 622c32ce548424d47ce882631aed7e4612cd8b64
+  data.tar.gz: e63bb53a0a5b5add1d9d8439e85d900276347b57
 SHA512:
-  metadata.gz: 287f324b2805c9eb09cbf23687325371353884505943007c45556f6519f40a1294670be410de42752aba844c8ed07f0f93d659c7007e73fa177b0d638197433b
-  data.tar.gz: cc6bdfe17d275dec87fe4a11e5e3dcf9fb90cfd88d8d9741fd181a6d03d1b5c52931dded794beca4d946ac0ea31158e0a939e0dce8dd7fda20a6bd0533db5b75
+  metadata.gz: 610b738cfdd85d596678390aa44fce50a84f03b89ac5404767b0ac254a886f71a0b03b592799ae95f382163803ac6a24c9c9c3dce914820ad10f0b7f67ec7457
+  data.tar.gz: 5f1521f4965ffb4c85446488e5d53b11ede7189508c2be36954671fd67ce2b992161c73ec5a4b366a2141f3a0817098509cbb73f20761f84ca8ffaf2507fdb86

data/app/controllers/library_groups_controller.rb

@@ -62,6 +62,9 @@ class LibraryGroupsController < ApplicationController
       {
         :colors_attributes =>  [:id, :property, :code]
       },
+      {
+        :user_attributes => [:email]
+      },
       *LibraryGroup.globalize_attribute_names,
     )
   end

data/app/mailers/notifier.rb

@@ -2,7 +2,7 @@ class Notifier < ActionMailer::Base
   def message_notification(message_id)
     message = Message.find(message_id)
     I18n.locale = message.receiver.profile.locale.try(:to_sym) || I18n.default_locale
-    from = "#{LibraryGroup.system_name(message.receiver.profile.locale)} <#{LibraryGroup.site_config.email}>"
+    from = "#{LibraryGroup.system_name(message.receiver.profile.locale)} <#{LibraryGroup.site_config.user.email}>"
     if message.subject
       subject = message.subject
     else
@@ -21,7 +21,7 @@ class Notifier < ActionMailer::Base
   def manifestation_info(user_id, manifestation_id)
     user = User.find(user_id)
     manifestation = Manifestation.find(manifestation_id)
-    from = "#{LibraryGroup.system_name(user.profile.locale)} <#{LibraryGroup.site_config.email}>"
+    from = "#{LibraryGroup.system_name(user.profile.locale)} <#{LibraryGroup.site_config.user.email}>"
     subject = "#{manifestation.original_title} : #{LibraryGroup.system_name(user.profile.locale)}"
     @user = user
     @manifestation = manifestation

data/app/models/library_group.rb

@@ -5,17 +5,17 @@ class LibraryGroup < ActiveRecord::Base
   has_many :libraries
   has_many :colors
   belongs_to :country
+  belongs_to :user
 
   validates :url, presence: true, url: true
   validates :max_number_of_results, numericality: {
-      greater_than_or_equal_to: 0
+      greater_than_or_equal_to: 1
     }
   accepts_nested_attributes_for :colors, update_only: true
+  accepts_nested_attributes_for :user, update_only: true
   store :settings, accessors: [
-    :max_number_of_results, :family_name_first,
-    :pub_year_facet_range_interval,
-    :book_jacket_source, :book_jacket_unknown_resource,
-    :screenshot_generator, :erms_url
+    :book_jacket_unknown_resource,
+    :erms_url
   ], coder: JSON
 
   translates :login_banner, :footer_banner
@@ -78,5 +78,5 @@ end
 #  url                         :string           default("http://localhost:3000/")
 #  settings                    :text
 #  html_snippet                :text
-#  email                       :string
+#  user_id                     :integer
 #

data/app/views/library_groups/_form.html.erb

@@ -13,7 +13,9 @@
 
   <div class="field">
     <%= f.label :email -%><br />
-    <%= f.email_field :email, class: 'resource_email' -%>
+    <%= f.fields_for :user do |user_form| %>
+      <%= user_form.email_field :email, class: 'resource_email' -%>
+    <% end %>
   </div>
 
   <div class="field">
@@ -40,10 +42,12 @@
     <%= f.number_field :max_number_of_results -%>
   </div>
 
-  <div class="field">
-    <%= f.label :book_jacket_source -%>
-    <%= f.select :book_jacket_source, [['Google', 'google']] -%><br />
-  </div>
+  <% if defined?(EnjuManifestationViewer) %>
+    <div class="field">
+      <%= f.label :book_jacket_source -%>
+      <%= f.select :book_jacket_source, [['Google', 'google']] -%><br />
+    </div>
+  <% end %>
 
   <div class="field">
     <%= f.label :color -%><br />

data/app/views/library_groups/index.html.erb

@@ -14,7 +14,7 @@
   <tr class="line<%= cycle("0", "1") -%>">
     <td><%= link_to h(library_group.display_name.localize), library_group -%></td>
     <td><%= library_group.name -%></td>
-    <td><%= library_group.email -%></td>
+    <td><%= library_group.user.email -%></td>
     <td>
       <%= link_to t('page.edit'), edit_library_group_path(library_group) if policy(library_group).update? -%>
     </td>

data/app/views/library_groups/show.html.erb

@@ -15,7 +15,7 @@
 
 <p>
   <strong><%= t('activerecord.attributes.library_group.email') -%>:</strong>
-  <%= @library_group.email -%>
+  <%= @library_group.user.email -%>
 </p>
 
 <p>
@@ -38,10 +38,12 @@
   <%= @library_group.max_number_of_results -%>
 </p>
 
-<p>
-  <strong><%= t('activerecord.attributes.library_group.book_jacket_source') -%>:</strong>
-  <%= @library_group.book_jacket_source -%>
-</p>
+<% if defined?(EnjuManifestationViewer) %>
+  <p>
+    <strong><%= t('activerecord.attributes.library_group.book_jacket_source') -%>:</strong>
+    <%= @library_group.book_jacket_source -%>
+  </p>
+<% end %>
 
 <div>
   <strong><%= t('activerecord.attributes.library_group.color') -%>:</strong>

data/db/migrate/20160813191647_add_max_number_of_results_to_library_group.rb

@@ -0,0 +1,5 @@
+class AddMaxNumberOfResultsToLibraryGroup < ActiveRecord::Migration
+  def change
+    add_column :library_groups, :max_number_of_results, :integer, default: 500
+  end
+end

data/db/migrate/20160813191733_add_family_name_first_to_library_group.rb

@@ -0,0 +1,5 @@
+class AddFamilyNameFirstToLibraryGroup < ActiveRecord::Migration
+  def change
+    add_column :library_groups, :family_name_first, :boolean, default: true
+  end
+end

data/db/migrate/20160813192542_add_pub_year_facet_range_interval_to_library_group.rb

@@ -0,0 +1,5 @@
+class AddPubYearFacetRangeIntervalToLibraryGroup < ActiveRecord::Migration
+  def change
+    add_column :library_groups, :pub_year_facet_range_interval, :integer, default: 10
+  end
+end

data/db/migrate/20160813203039_add_user_id_to_library_group.rb

@@ -0,0 +1,5 @@
+class AddUserIdToLibraryGroup < ActiveRecord::Migration
+  def change
+    add_reference :library_groups, :user, index: true, foreign_key: true
+  end
+end

data/lib/enju_library/version.rb

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

data/lib/tasks/enju_library_tasks.rake

@@ -18,7 +18,7 @@ namespace :enju_library do
     Rake::Task['statesman:backfill_most_recent'].invoke('UserExportFile')
     Rake::Task['statesman:backfill_most_recent'].invoke('UserImportFile')
     library_group = LibraryGroup.site_config
-    library_group.email = User.find(1).try(:email)
+    library_group.user = User.find(1)
     login_ja = <<"EOS"
 このシステムはオープンソース図書館システム Next-L Enju です。このメッセージは管理者によって変更することができます。
 EOS
@@ -27,11 +27,11 @@ Next-L Enju, an open-source integrated library system. You can edit this message
 EOS
     footer_ja = <<"EOS"
 [Next-L Enju Leaf #{EnjuLeaf::VERSION}](https://github.com/next-l/enju_leaf), オープンソース統合図書館システム  
-Developed by Kosuke Tanabe and [Project Next-L](http://www.next-l.jp) \| [このシステムについて](/page/about) \| [不具合を報告する](https://github.com/next-l/enju_leaf/issues) \| [マニュアル](https://next-l.github.com/manual/1.2/)
+Developed by [Kosuke Tanabe](https://github.com/nabeta) and [Project Next-L](http://www.next-l.jp) \| [このシステムについて](/page/about) \| [不具合を報告する](https://github.com/next-l/enju_leaf/issues) \| [マニュアル](https://next-l.github.com/manual/1.2/)
 EOS
     footer_en = <<"EOS"
 [Next-L Enju Leaf #{EnjuLeaf::VERSION}](https://github.com/next-l/enju_leaf), an open source integrated library system  
-Developed by Kosuke Tanabe and [Project Next-L](http://www.next-l.jp) \| [About this system](/page/about) \| [Report bugs](https://github.com/next-l/enju_leaf/issues) \| [Manual](https://next-l.github.com/manual/1.2/)
+Developed by [Kosuke Tanabe](https://github.com/nabeta) and [Project Next-L](http://www.next-l.jp) \| [About this system](/page/about) \| [Report bugs](https://github.com/next-l/enju_leaf/issues) \| [Manual](https://next-l.github.com/manual/1.2/)
 EOS
     library_group.login_banner_ja = login_ja if library_group.login_banner_ja.blank?
     library_group.login_banner_en = login_en if library_group.login_banner_en.blank?

data/spec/dummy/db/migrate/20160813191533_add_book_jacket_source_to_library_group.rb

@@ -0,0 +1,5 @@
+class AddBookJacketSourceToLibraryGroup < ActiveRecord::Migration
+  def change
+    add_column :library_groups, :book_jacket_source, :string
+  end
+end

data/spec/dummy/db/migrate/20160813191820_add_screenshot_generator_to_library_group.rb

@@ -0,0 +1,5 @@
+class AddScreenshotGeneratorToLibraryGroup < ActiveRecord::Migration
+  def change
+    add_column :library_groups, :screenshot_generator, :string
+  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: 20160813130535) do
+ActiveRecord::Schema.define(version: 20160813203039) do
 
   create_table "accepts", force: :cascade do |t|
     t.integer  "basket_id"
@@ -746,9 +746,9 @@ ActiveRecord::Schema.define(version: 20160813130535) do
   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.string   "name",                                                             null: false
     t.text     "display_name"
-    t.string   "short_name",                                                     null: false
+    t.string   "short_name",                                                       null: false
     t.text     "my_networks"
     t.text     "login_banner"
     t.text     "note"
@@ -757,14 +757,20 @@ ActiveRecord::Schema.define(version: 20160813130535) do
     t.datetime "created_at"
     t.datetime "updated_at"
     t.text     "admin_networks"
-    t.boolean  "allow_bookmark_external_url", default: false,                    null: false
-    t.string   "url",                         default: "http://localhost:3000/"
+    t.boolean  "allow_bookmark_external_url",   default: false,                    null: false
+    t.string   "url",                           default: "http://localhost:3000/"
     t.text     "settings"
     t.text     "html_snippet"
-    t.string   "email"
+    t.string   "book_jacket_source"
+    t.integer  "max_number_of_results",         default: 500
+    t.boolean  "family_name_first",             default: true
+    t.string   "screenshot_generator"
+    t.integer  "pub_year_facet_range_interval", default: 10
+    t.integer  "user_id"
   end
 
   add_index "library_groups", ["short_name"], name: "index_library_groups_on_short_name"
+  add_index "library_groups", ["user_id"], name: "index_library_groups_on_user_id"
 
   create_table "licenses", force: :cascade do |t|
     t.string   "name",         null: false

data/spec/fixtures/library_groups.yml

@@ -14,6 +14,8 @@ one:
     ::/0"
   settings: 
     "{\"max_number_of_results\":200,\"family_name_first\":true}"
+  user_id: 1
+  pub_year_facet_range_interval: 10
 
 # == Schema Information
 #
@@ -35,5 +37,5 @@ one:
 #  url                         :string           default("http://localhost:3000/")
 #  settings                    :text
 #  html_snippet                :text
-#  email                       :string
+#  user_id                     :integer
 #

data/spec/models/library_group_spec.rb

@@ -35,5 +35,5 @@ end
 #  url                         :string           default("http://localhost:3000/")
 #  settings                    :text
 #  html_snippet                :text
-#  email                       :string
+#  user_id                     :integer
 #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_library
 version: !ruby/object:Gem::Version
-  version: 0.2.0.beta.7
+  version: 0.2.0.beta.8
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-13 00:00:00.000000000 Z
+date: 2016-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: enju_seed
@@ -579,7 +579,10 @@ files:
 - db/migrate/20160610093229_add_html_snippet_to_library_group.rb
 - db/migrate/20160627232219_add_most_recent_to_user_import_file_transitions.rb
 - db/migrate/20160627232316_add_most_recent_to_user_export_file_transitions.rb
-- db/migrate/20160813130535_add_email_to_library_group.rb
+- db/migrate/20160813191647_add_max_number_of_results_to_library_group.rb
+- db/migrate/20160813191733_add_family_name_first_to_library_group.rb
+- db/migrate/20160813192542_add_pub_year_facet_range_interval_to_library_group.rb
+- db/migrate/20160813203039_add_user_id_to_library_group.rb
 - lib/enju_library.rb
 - lib/enju_library/engine.rb
 - lib/enju_library/version.rb
@@ -828,6 +831,8 @@ files:
 - 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/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/schema.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
@@ -1202,6 +1207,8 @@ test_files:
 - 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/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/schema.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html

data/db/migrate/20160813130535_add_email_to_library_group.rb

@@ -1,5 +0,0 @@
-class AddEmailToLibraryGroup < ActiveRecord::Migration
-  def change
-    add_column :library_groups, :email, :string
-  end
-end