enju_library 0.2.0.beta.9 → 0.2.0.beta.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0492192a430ab753775d9271dca0f07c2c113cd6
-  data.tar.gz: 0409e1c90e310d2454abc020ee49d46f2b58b181
+  metadata.gz: abcddb43d158f905d8828446e2f61d5a9bf74a7e
+  data.tar.gz: 86049349dac62af10b3735b6dbc4b5605dda2f29
 SHA512:
-  metadata.gz: 39a23aab017b58a997f44d2f99161f172604dce7cec913f1ea0f6fc063b1a3bd93ad32d41dd336fb726e0b376d00fe5f407df08bd439a8acf37b4787d3a6112c
-  data.tar.gz: cd2f94914e1252b74fcfd8e368c924eb16beba26cf3f244d50929551c28eedff4ad9f8f8f40745fb39e6f845c617948c66974c038dad259b1425f3b148c7160f
+  metadata.gz: 1658860672bcc6c4ad687f4a9bbe83424a146739c34402e5cd2beb35e66cead01e4c506d7a3ac26f055ad85294daee6385b561471ff1a50647dcbd7055246934
+  data.tar.gz: c017b6438e20daf3a1cccc333b8e876106b2fdfe8fd0cb351c96ea028ae6b3e2679f316a913c96038f35f2b28f09db222e39599722968b6b7738cd575fc4817b

data/app/models/library_group.rb

@@ -18,8 +18,14 @@ class LibraryGroup < ActiveRecord::Base
     :erms_url
   ], coder: JSON
 
-  translates :login_banner, :footer_banner
-  globalize_accessors if defined?(Globalize::Accessors)
+  if defined?(Globalize::Accessors)
+    translates :login_banner, :footer_banner
+    globalize_accessors
+  end
+
+  if defined?(AwesomeHstoreTranslate)
+    translates :login_banner, :footer_banner, accessors: I18n.available_locales
+  end
 
   def self.site_config
     LibraryGroup.order(:created_at).first

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

@@ -41,8 +41,8 @@
   <tr class="line<%= cycle("0", "1") -%>">
     <td>
       <%- if policy(library).update? and params[:query].blank? -%>
-        <%= library.first? ? image_tag('icons/stop.png', size: '16x16') : link_to(image_tag('icons/arrow_up.png', size: '16x16', alt: t('page.asc')), {action: 'update', move: 'higher', id: library.name}, method: :put) -%>
-        <%= library.last? ? image_tag('icons/stop.png', size: '16x16') : link_to(image_tag('icons/arrow_down.png', size: '16x16', alt: t('page.desc')), {action: 'update', move: 'lower', id: library.name}, method: :put) -%>
+        <%= library.first? ? image_tag('icons/stop.png', size: '16x16') : link_to(image_tag('icons/arrow_up.png', size: '16x16', class: 'enju_icon', alt: t('page.asc')), {action: 'update', move: 'higher', id: library.name}, method: :put) -%>
+        <%= library.last? ? image_tag('icons/stop.png', size: '16x16') : link_to(image_tag('icons/arrow_down.png', size: '16x16', class: 'enju_icon', alt: t('page.desc')), {action: 'update', move: 'lower', id: library.name}, method: :put) -%>
       <%- end -%>
     </td>
     <td><%= library.name -%></td>

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

@@ -73,7 +73,7 @@
               <td>
                 <%= link_to shelf.display_name.localize, shelf_path(shelf, library_id: @library.name) -%>
                 <%- shelf.picture_files.each do |picture_file| -%>
-                  <%= link_to image_tag('icons/picture.png', size: '16x16', alt: t('page.picture')), picture_file_path(picture_file, format: :download), rel: "shelf_#{h(shelf.id)}" -%>
+                  <%= link_to image_tag('icons/picture.png', size: '16x16', class: 'enju_icon', alt: t('page.picture')), picture_file_path(picture_file, format: :download), rel: "shelf_#{h(shelf.id)}" -%>
                 <%- end -%>
                 <script type="text/javascript">
                   $(document).ready(function(){

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

@@ -45,7 +45,7 @@
   <% if defined?(EnjuManifestationViewer) %>
     <div class="field">
       <%= f.label :book_jacket_source -%>
-      <%= f.select :book_jacket_source, [['Google', 'google']] -%><br />
+      <%= f.select :book_jacket_source, [[t('book_jacket.google'), 'google'], [t('book_jacket.hanmotocom'), 'hanmotocom']] -%><br />
     </div>
   <% end %>
 

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

@@ -14,10 +14,10 @@
   <ul>
     <li>
     <% if @user_import_file %>
-      <%= link_to((image_tag 'icons/page_white_excel.png', size: '16x16', alt: 'TSV', class: 'icon'), user_import_results_path(user_import_file_id: @user_import_file.id, format: :txt, locale: @locale.to_s)) -%>
+      <%= link_to((image_tag 'icons/page_white_excel.png', size: '16x16', class: 'enju_icon', alt: 'TSV'), user_import_results_path(user_import_file_id: @user_import_file.id, format: :txt, locale: @locale.to_s)) -%>
       (<%= link_to 'TSV', user_import_results_path(user_import_file_id: @user_import_file.id, format: :txt, locale: @locale.to_s) -%>)
     <% else %>
-      <%= link_to((image_tag 'icons/page_white_excel.png', size: '16x16', alt: 'TSV', class: 'icon'), user_import_results_path(format: :txt, locale: @locale.to_s)) -%>
+      <%= link_to((image_tag 'icons/page_white_excel.png', size: '16x16', class: 'enju_icon', alt: 'TSV'), user_import_results_path(format: :txt, locale: @locale.to_s)) -%>
       (<%= link_to 'TSV', user_import_results_path(format: :txt, locale: @locale.to_s) -%>)
     <% end %>
     </li>

data/config/locales/translation_en.yml

@@ -126,3 +126,6 @@ en:
     already_withdrawn: " is already withdrawn."
     withdraw: "Withdraw!"
     successfully_withdrawn: "This items was successfully withdrawn."
+  book_jacket:
+    google: Google Books
+    hanmotocom: Hanmoto.com

data/config/locales/translation_ja.yml

@@ -126,3 +126,6 @@ ja:
     already_withdrawn: "はすでに除籍されています。"
     withdraw: "除籍"
     successfully_withdrawn: "この資料は正常に除籍されました。"
+  book_jacket:
+    google: Googleブックス
+    hanmotocom: 版元ドットコム

data/db/migrate/059_create_libraries.rb

@@ -1,9 +1,9 @@
 class CreateLibraries < ActiveRecord::Migration
   def change
     create_table :libraries do |t|
-      t.string :name, :null => false
+      t.string :name, index: true, null: false
       t.text :display_name
-      t.string :short_display_name, :null => false
+      t.string :short_display_name, null: false
       t.string :zip_code
       t.text :street
       t.text :locality
@@ -12,17 +12,15 @@ class CreateLibraries < ActiveRecord::Migration
       t.string :telephone_number_2
       t.string :fax_number
       t.text :note
-      t.integer :call_number_rows, :default => 1, :null => false
-      t.string :call_number_delimiter, :default => "|", :null => false
-      t.integer :library_group_id, :default => 1, :null => false
-      t.integer :users_count, :default => 0, :null => false
+      t.integer :call_number_rows, default: 1, null: false
+      t.string :call_number_delimiter, default: "|", null: false
+      t.references :library_group, index: true, null: false
+      t.integer :users_count, default: 0, null: false
       t.integer :position
-      t.integer :country_id
+      t.references :country
 
       t.timestamps
       t.datetime :deleted_at
     end
-    add_index :libraries, :library_group_id
-    add_index :libraries, :name, :unique => true
   end
 end

data/db/migrate/069_create_shelves.rb

@@ -1,15 +1,14 @@
 class CreateShelves < ActiveRecord::Migration
   def change
     create_table :shelves do |t|
-      t.string :name, :null => false
+      t.string :name, null: false
       t.text :display_name
       t.text :note
-      t.integer :library_id, :default => 1, :null => false
-      t.integer :items_count, :default => 0, :null => false
+      t.references :library, index: true, null: false
+      t.integer :items_count, default: 0, null: false
       t.integer :position
       t.timestamps
       t.datetime :deleted_at
     end
-    add_index :shelves, :library_id
   end
 end

data/db/migrate/080_create_library_groups.rb

@@ -1,9 +1,9 @@
 class CreateLibraryGroups < ActiveRecord::Migration
   def change
     create_table :library_groups 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, index: true, null: false
       t.text :my_networks
       t.text :login_banner
       t.text :note
@@ -12,6 +12,5 @@ class CreateLibraryGroups < ActiveRecord::Migration
 
       t.timestamps
     end
-    add_index :library_groups, :short_name
   end
 end

data/db/migrate/120_create_baskets.rb

@@ -1,12 +1,11 @@
 class CreateBaskets < ActiveRecord::Migration
   def change
     create_table :baskets do |t|
-      t.integer :user_id
+      t.references :user, index: true
       t.text :note
-      t.integer :lock_version, :default => 0, :null => false
+      t.integer :lock_version, default: 0, null: false
 
       t.timestamps
     end
-    add_index :baskets, :user_id
   end
 end

data/db/migrate/20081006090811_create_subscriptions.rb

@@ -1,17 +1,14 @@
 class CreateSubscriptions < ActiveRecord::Migration
   def change
     create_table :subscriptions do |t|
-      t.text :title, :null => false
+      t.text :title, null: false
       t.text :note
-      #t.integer :subscription_list_id, :integer
-      t.integer :user_id
-      t.integer :order_list_id
+      t.references :user, index: true
+      t.references :order_list, index: true
       t.datetime :deleted_at
-      t.integer :subscribes_count, :default => 0, :null => false
+      t.integer :subscribes_count, default: 0, null: false
 
       t.timestamps
     end
-    add_index :subscriptions, :user_id
-    add_index :subscriptions, :order_list_id
   end
 end

data/db/migrate/20081006093246_create_subscribes.rb

@@ -1,14 +1,13 @@
 class CreateSubscribes < ActiveRecord::Migration
   def change
     create_table :subscribes do |t|
-      t.integer :subscription_id, :null => false
-      t.integer :work_id, :null => false
-      t.datetime :start_at, :null => false
-      t.datetime :end_at, :null => false
+      t.references :subscription, index: true, null: false
+      t.integer :work_id, null: false
+      t.datetime :start_at, null: false
+      t.datetime :end_at, null: false
 
       t.timestamps
     end
-    add_index :subscribes, :subscription_id
     add_index :subscribes, :work_id
   end
 end

data/db/migrate/20120319173203_create_accepts.rb

@@ -1,14 +1,11 @@
 class CreateAccepts < ActiveRecord::Migration
   def change
     create_table :accepts do |t|
-      t.integer :basket_id
-      t.integer :item_id
-      t.integer :librarian_id
+      t.references :basket, index: true
+      t.references :item, index: true
+      t.references :librarian, index: true
 
       t.timestamps
     end
-
-    add_index :accepts, :basket_id
-    add_index :accepts, :item_id
   end
 end

data/db/migrate/20140110122216_create_user_import_files.rb

@@ -1,7 +1,7 @@
 class CreateUserImportFiles < ActiveRecord::Migration
   def change
     create_table :user_import_files do |t|
-      t.integer :user_id
+      t.references :user, index: true
       t.text :note
       t.datetime :executed_at
       t.string :user_import_file_name

data/db/migrate/20140110131010_create_user_import_results.rb

@@ -1,8 +1,8 @@
 class CreateUserImportResults < ActiveRecord::Migration
   def change
     create_table :user_import_results do |t|
-      t.integer :user_import_file_id
-      t.integer :user_id
+      t.references :user_import_file, index: true
+      t.references :user, index: true
       t.text :body
 
       t.timestamps

data/db/migrate/20140524074813_create_user_import_file_transitions.rb

@@ -8,11 +8,10 @@ class CreateUserImportFileTransitions < ActiveRecord::Migration
         t.text :metadata, default: "{}"
       end
       t.integer :sort_key
-      t.integer :user_import_file_id
+      t.references :user_import_file, index: true
       t.timestamps
     end
 
-    add_index :user_import_file_transitions, :user_import_file_id
     add_index :user_import_file_transitions, [:sort_key, :user_import_file_id], unique: true, name: "index_user_import_file_transitions_on_sort_key_and_file_id"
   end
 end

data/db/migrate/20140709113413_create_user_export_files.rb

@@ -1,7 +1,7 @@
 class CreateUserExportFiles < ActiveRecord::Migration
   def change
     create_table :user_export_files do |t|
-      t.integer :user_id
+      t.references :user, index: true
       t.attachment :user_export
       t.datetime :executed_at
 

data/db/migrate/20140709113905_create_user_export_file_transitions.rb

@@ -8,7 +8,7 @@ class CreateUserExportFileTransitions < ActiveRecord::Migration
         t.text :metadata, default: "{}"
       end
       t.integer :sort_key
-      t.integer :user_export_file_id
+      t.references :user_export_file, index: true
       t.timestamps
     end
 

data/db/migrate/20140720170714_add_default_library_id_to_user_import_file.rb

@@ -1,5 +1,5 @@
 class AddDefaultLibraryIdToUserImportFile < ActiveRecord::Migration
   def change
-    add_column :user_import_files, :default_library_id, :integer
+    add_reference :user_import_files, :default_library
   end
 end

data/db/migrate/20140720170735_add_default_user_group_id_to_user_import_file.rb

@@ -1,5 +1,5 @@
 class AddDefaultUserGroupIdToUserImportFile < ActiveRecord::Migration
   def change
-    add_column :user_import_files, :default_user_group_id, :integer
+    add_reference :user_import_files, :default_user_group
   end
 end

data/db/migrate/20140821151023_create_colors.rb

@@ -1,14 +1,12 @@
 class CreateColors < ActiveRecord::Migration
   def change
     create_table :colors do |t|
-      t.integer :library_group_id
+      t.references :library_group, index: true
       t.string :property
       t.string :code
       t.integer :position
 
       t.timestamps
     end
-
-    add_index :colors, :library_group_id
   end
 end

data/db/migrate/20150924115059_create_withdraws.rb

@@ -1,13 +1,11 @@
 class CreateWithdraws < ActiveRecord::Migration
   def change
     create_table :withdraws do |t|
-      t.integer :basket_id
-      t.integer :item_id
-      t.integer :librarian_id
+      t.references :basket, index: true
+      t.references :item, index: true
+      t.references :librarian, index: true
 
       t.timestamps null: false
     end
-    add_index :withdraws, :basket_id
-    add_index :withdraws, :item_id
   end
 end

data/db/migrate/20151213070943_add_translation_table_to_library_group.rb

@@ -1,13 +1,26 @@
+# This migration comes from enju_library_engine (originally 20151213070943)
 class AddTranslationTableToLibraryGroup < ActiveRecord::Migration
   def up
-    LibraryGroup.create_translation_table!({
-      login_banner: :text
-    }, {
-      migrate_data: true
-    })
+    if defined?(Globalize)
+      LibraryGroup.create_translation_table!({
+        login_banner: :text
+      }, {
+        migrate_data: true
+      })
+    end
+
+    if defined?(AwesomeHstoreTranslate)
+      add_column :library_groups, :login_banner, :hstore
+    end
   end
 
   def down
-    LibraryGroup.drop_translation_table! migrate_data: true
+    if defined?(Globalize)
+      LibraryGroup.drop_translation_table! migrate_data: true
+    end
+
+    if defined?(AwesomeHstoreTranslate)
+      remove_column :library_groups, :login_banner
+    end
   end
 end

data/db/migrate/20151213072705_add_footer_banner_to_library_group.rb

@@ -1,9 +1,22 @@
+# This migration comes from enju_library_engine (originally 20151213072705)
 class AddFooterBannerToLibraryGroup < ActiveRecord::Migration
   def up
-    LibraryGroup.add_translation_fields! footer_banner: :text
+    if defined?(Globalize)
+      LibraryGroup.add_translation_fields! footer_banner: :text
+    end
+
+    if defined?(AwesomeHstoreTranslate)
+      add_column :library_groups, :footer_banner, :hstore
+    end
   end
 
   def down
-    remove_column :library_group_translations, :footer_banner
+    if defined?(Globalize)
+      remove_column :library_group_translations, :footer_banner
+    end
+
+    if defined?(AwesomeHstoreTranslate)
+      remove_column :library_groups, :footer_banner
+    end
   end
 end

data/lib/enju_library/version.rb

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

data/spec/controllers/budget_types_controller_spec.rb

@@ -126,7 +126,8 @@ describe BudgetTypesController do
         position = budget_type.position
         put :update, :id => budget_type.id, :move => 'higher'
         response.should redirect_to budget_types_url
-        assigns(:budget_type).position.should eq position - 1
+        budget_type.reload
+        budget_type.position.should eq position - 1
       end
     end
 

data/spec/dummy/config/application.rb

@@ -6,6 +6,7 @@ Bundler.require(*Rails.groups)
 require 'enju_circulation'
 require 'enju_event'
 require 'enju_leaf'
+require 'enju_manifestation_viewer'
 require 'globalize'
 require 'globalize-accessors'
 

data/spec/dummy/db/migrate/20091012101112_add_dcndl_schema.rb

@@ -8,7 +8,7 @@ class AddDcndlSchema < ActiveRecord::Migration
     add_column :manifestations, :valid_until, :timestamp
     add_column :manifestations, :date_submitted, :timestamp
     add_column :manifestations, :date_accepted, :timestamp
-    add_column :manifestations, :date_caputured, :timestamp
+    add_column :manifestations, :date_captured, :timestamp
     rename_column :manifestations, :copyright_date, :date_copyrighted
   end
 
@@ -21,7 +21,7 @@ class AddDcndlSchema < ActiveRecord::Migration
     remove_column :manifestations, :valid_until
     remove_column :manifestations, :date_submitted
     remove_column :manifestations, :date_accepted
-    remove_column :manifestations, :date_caputured
+    remove_column :manifestations, :date_captured
     rename_column :manifestations, :date_copyrighted, :copyright_date
   end
 end

data/spec/dummy/db/migrate/20150117111136_add_foreign_key_to_items_referencing_manifestations.rb

@@ -0,0 +1,5 @@
+class AddForeignKeyToItemsReferencingManifestations < ActiveRecord::Migration
+  def change
+    add_foreign_key :items, :manifestations
+  end
+end

data/spec/dummy/db/migrate/20151125004028_add_profile_id_to_agent.rb

@@ -0,0 +1,6 @@
+class AddProfileIdToAgent < ActiveRecord::Migration
+  def change
+    add_column :agents, :profile_id, :integer
+    add_index :agents, :profile_id
+  end
+end

data/spec/dummy/db/migrate/20160801080612_add_most_recent_to_import_request_transitions.rb

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

data/spec/dummy/db/migrate/20160801080619_add_most_recent_to_resource_import_file_transitions.rb

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

data/spec/dummy/db/migrate/20160801080637_add_most_recent_to_resource_export_file_transitions.rb

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

data/spec/dummy/db/migrate/20160801080643_add_most_recent_to_agent_import_file_transitions.rb

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

data/spec/dummy/db/migrate/20160811102604_add_picture_width_to_picture_file.rb

@@ -0,0 +1,6 @@
+class AddPictureWidthToPictureFile < ActiveRecord::Migration
+  def change
+    add_column :picture_files, :picture_width, :integer
+    add_column :picture_files, :picture_height, :integer
+  end
+end

data/spec/dummy/db/migrate/20160820004638_add_attachment_attachment_to_carrier_types.rb

@@ -0,0 +1,11 @@
+class AddAttachmentAttachmentToCarrierTypes < ActiveRecord::Migration
+  def self.up
+    change_table :carrier_types do |t|
+      t.attachment :attachment
+    end
+  end
+
+  def self.down
+    remove_attachment :carrier_types, :attachment
+  end
+end