enju_biblio 0.1.0.pre3 → 0.1.0.pre4

data/app/controllers/manifestations_controller.rb

@@ -201,7 +201,7 @@ class ManifestationsController < ApplicationController
           else
             flash[:search_query] = @search_query
             @manifestation_ids = search.build do
-              paginate :page => 1, :per_page => configatron.max_number_of_results
+              paginate :page => 1, :per_page => Setting.max_number_of_results
             end.execute.raw_results.collect(&:primary_key).map{|id| id.to_i}
           end
         end
@@ -210,7 +210,7 @@ class ManifestationsController < ApplicationController
           if params[:view] == 'tag_cloud'
             unless @manifestation_ids
               @manifestation_ids = search.build do
-                paginate :page => 1, :per_page => configatron.max_number_of_results
+                paginate :page => 1, :per_page => Setting.max_number_of_results
               end.execute.raw_results.collect(&:primary_key).map{|id| id.to_i}
             end
             #bookmark_ids = Bookmark.where(:manifestation_id => flash[:manifestation_ids]).limit(1000).pluck(:id)
@@ -237,8 +237,8 @@ class ManifestationsController < ApplicationController
         end
       end
       search_result = search.execute
-      if @count[:query_result] > configatron.max_number_of_results
-        max_count = configatron.max_number_of_results
+      if @count[:query_result] > Setting.max_number_of_results
+        max_count = Setting.max_number_of_results
       else
         max_count = @count[:query_result]
       end
@@ -366,7 +366,7 @@ class ManifestationsController < ApplicationController
     end
 
     if @manifestation.attachment.path
-      if configatron.uploaded_file.storage == :s3
+      if Setting.uploaded_file.storage == :s3
         data = open(@manifestation.attachment.url).read.force_encoding('UTF-8')
       else
         file = @manifestation.attachment.path
@@ -392,7 +392,7 @@ class ManifestationsController < ApplicationController
       #format.js
       format.download {
         if @manifestation.attachment.path
-          if configatron.uploaded_file.storage == :s3
+          if Setting.uploaded_file.storage == :s3
             send_data @manifestation.attachment.data, :filename => File.basename(@manifestation.attachment_file_name), :type => 'application/octet-stream'
           else
             if File.exist?(file) and File.file?(file)

data/app/controllers/patron_import_files_controller.rb

@@ -16,7 +16,7 @@ class PatronImportFilesController < ApplicationController
   # GET /patron_import_files/1.json
   def show
     if @patron_import_file.patron_import.path
-      unless configatron.uploaded_file.storage == :s3
+      unless Setting.uploaded_file.storage == :s3
         file = @patron_import_file.patron_import.path
       end
     end
@@ -25,7 +25,7 @@ class PatronImportFilesController < ApplicationController
       format.html # show.html.erb
       format.json { render :json => @patron_import_file }
       format.download {
-        if configatron.uploaded_file.storage == :s3
+        if Setting.uploaded_file.storage == :s3
           redirect_to @patron_import_file.patron_import.expiring_url(10)
         else
           send_file file, :filename => @patron_import_file.patron_import_file_name, :type => 'application/octet-stream'

data/app/controllers/picture_files_controller.rb

@@ -31,7 +31,7 @@ class PictureFilesController < ApplicationController
     end
 
     if @picture_file.picture.path
-      if configatron.uploaded_file.storage == :s3
+      if Setting.uploaded_file.storage == :s3
         file = open(@picture_file.picture.expiring_url).read.force_encoding('UTF-8')
       else
         file = @picture_file.picture.path(size)
@@ -166,7 +166,7 @@ class PictureFilesController < ApplicationController
     end
 
     if @picture_file.picture.path
-      if configatron.uploaded_file.storage == :s3
+      if Setting.uploaded_file.storage == :s3
         send_data file, :filename => File.basename(@picture_file.picture_file_name), :type => @picture_file.picture_content_type, :disposition => disposition
       else
         if File.exist?(file) and File.file?(file)

data/app/controllers/resource_import_files_controller.rb

@@ -16,7 +16,7 @@ class ResourceImportFilesController < ApplicationController
   # GET /resource_import_files/1.json
   def show
     if @resource_import_file.resource_import.path
-      unless configatron.uploaded_file.storage == :s3
+      unless Setting.uploaded_file.storage == :s3
         file = @resource_import_file.resource_import.path
       end
     end
@@ -25,7 +25,7 @@ class ResourceImportFilesController < ApplicationController
       format.html # show.html.erb
       format.json { render :json => @resource_import_file }
       format.download {
-        if configatron.uploaded_file.storage == :s3
+        if Setting.uploaded_file.storage == :s3
           redirect_to @resource_import_file.resource_import.expiring_url(10)
         else
           send_file file, :filename => @resource_import_file.resource_import_file_name, :type => 'application/octet-stream'

data/app/models/create.rb

@@ -1,5 +1,5 @@
 class Create < ActiveRecord::Base
-  attr_accessible :patron_id, :work_id, :create_type_id
+  attr_accessible :patron_id, :work_id, :create_type_id, :position
   belongs_to :patron
   belongs_to :work, :class_name => 'Manifestation', :foreign_key => 'work_id'
   belongs_to :create_type

data/app/models/create_type.rb

@@ -1,5 +1,5 @@
 class CreateType < ActiveRecord::Base
-  attr_accessible :name, :display_name, :note
+  attr_accessible :name, :display_name, :note, :position
   include MasterModel
   default_scope :order => 'create_types.position'
 end

data/app/models/exemplify.rb

@@ -1,5 +1,5 @@
 class Exemplify < ActiveRecord::Base
-  attr_accessible :manifestation_id, :item_id
+  attr_accessible :manifestation_id, :item_id, :position
   belongs_to :manifestation
   belongs_to :item
   #accepts_nested_attributes_for :item

data/app/models/manifestation.rb

@@ -180,7 +180,7 @@ class Manifestation < ActiveRecord::Base
   #enju_export
 
   has_paper_trail
-  if configatron.uploaded_file.storage == :s3
+  if Setting.uploaded_file.storage == :s3
     has_attached_file :attachment, :storage => :s3, :s3_credentials => "#{Rails.root.to_s}/config/s3.yml",
       :s3_permissions => :private
   else

data/app/models/patron.rb

@@ -89,7 +89,7 @@ class Patron < ActiveRecord::Base
 
   def set_full_name
     if self.full_name.blank?
-      if self.last_name.to_s.strip and self.first_name.to_s.strip and configatron.family_name_first == true
+      if self.last_name.to_s.strip and self.first_name.to_s.strip and Setting.family_name_first == true
         self.full_name = [last_name, middle_name, first_name].compact.join(" ").to_s.strip
       else
         self.full_name = [first_name, last_name, middle_name].compact.join(" ").to_s.strip

data/app/models/patron_import_file.rb

@@ -5,7 +5,7 @@ class PatronImportFile < ActiveRecord::Base
   scope :not_imported, where(:state => 'pending')
   scope :stucked, where('created_at < ? AND state = ?', 1.hour.ago, 'pending')
 
-  if configatron.uploaded_file.storage == :s3
+  if Setting.uploaded_file.storage == :s3
     has_attached_file :patron_import, :storage => :s3, :s3_credentials => "#{Rails.root.to_s}/config/s3.yml",
       :s3_permissions => :private
   else
@@ -174,7 +174,7 @@ class PatronImportFile < ActiveRecord::Base
   private
   def open_import_file
     tempfile = Tempfile.new('patron_import_file')
-    if configatron.uploaded_file.storage == :s3
+    if Setting.uploaded_file.storage == :s3
       uploaded_file_path = patron_import.expiring_url(10)
     else
       uploaded_file_path = patron_import.path

data/app/models/picture_file.rb

@@ -4,7 +4,7 @@ class PictureFile < ActiveRecord::Base
   scope :attached, where('picture_attachable_id IS NOT NULL')
   belongs_to :picture_attachable, :polymorphic => true, :validate => true
 
-  if configatron.uploaded_file.storage == :s3
+  if Setting.uploaded_file.storage == :s3
     has_attached_file :picture, :storage => :s3, :styles => { :medium => "600x600>", :thumb => "100x100>" },
       :s3_credentials => "#{Rails.root.to_s}/config/s3.yml",
       :s3_permissions => :private

data/app/models/produce.rb

@@ -1,5 +1,5 @@
 class Produce < ActiveRecord::Base
-  attr_accessible :patron_id, :manifestation_id, :produce_type_id
+  attr_accessible :patron_id, :manifestation_id, :produce_type_id, :position
   belongs_to :patron
   belongs_to :manifestation
   belongs_to :produce_type

data/app/models/produce_type.rb

@@ -1,5 +1,5 @@
 class ProduceType < ActiveRecord::Base
-  attr_accessible :name, :display_name, :note
+  attr_accessible :name, :display_name, :note, :position
   include MasterModel
   default_scope :order => 'produce_types.position'
 end

data/app/models/realize.rb

@@ -1,5 +1,5 @@
 class Realize < ActiveRecord::Base
-  attr_accessible :patron_id, :expression_id, :realize_type_id
+  attr_accessible :patron_id, :expression_id, :realize_type_id, :position
   belongs_to :patron
   belongs_to :expression, :class_name => 'Manifestation', :foreign_key => 'expression_id'
   belongs_to :realize_type

data/app/models/realize_type.rb

@@ -1,5 +1,5 @@
 class RealizeType < ActiveRecord::Base
-  attr_accessible :name, :display_name, :note
+  attr_accessible :name, :display_name, :note, :position
   include MasterModel
   default_scope :order => 'realize_types.position'
 end

data/app/models/resource_import_file.rb

@@ -6,7 +6,7 @@ class ResourceImportFile < ActiveRecord::Base
   scope :not_imported, where(:state => 'pending')
   scope :stucked, where('created_at < ? AND state = ?', 1.hour.ago, 'pending')
 
-  if configatron.uploaded_file.storage == :s3
+  if Setting.uploaded_file.storage == :s3
     has_attached_file :resource_import, :storage => :s3, :s3_credentials => "#{Rails.root.to_s}/config/s3.yml",
       :s3_permissions => :private
   else
@@ -335,7 +335,7 @@ class ResourceImportFile < ActiveRecord::Base
   private
   def open_import_file
     tempfile = Tempfile.new('patron_import_file')
-    if configatron.uploaded_file.storage == :s3
+    if Setting.uploaded_file.storage == :s3
       uploaded_file_path = resource_import.expiring_url(10)
     else
       uploaded_file_path = resource_import.path

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

@@ -95,7 +95,7 @@
   <div class="field">
     <%= f.label :lccn -%>
     <%= f.text_field :lccn, :class => 'resource_isbn_issn', :style => 'ime-mode: disabled' -%>
-    <% if @manifestation.periodical? %>
+    <%- if @series_statement.try(:periodical?) -%>
       <%= f.label :issn -%>
       <%= f.text_field :issn, :class => 'resource_isbn_issn', :style => 'ime-mode: disabled' -%>
     <% end %>

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

@@ -28,9 +28,9 @@
   <%- if @manifestations.total_count > 0 -%>
     <p>
       <%= t('page.number_of_search_results', :count => @count[:query_result], :numdocs => Manifestation.search.total, :seconds => sprintf("%.3f", @seconds)) -%>
-      <%- if @count[:query_result] > configatron.max_number_of_results -%>
+      <%- if @count[:query_result] > Setting.max_number_of_results -%>
         <br />
-        <%= t('page.limit_exceeded', :count => configatron.max_number_of_results) -%>
+        <%= t('page.limit_exceeded', :count => Setting.max_number_of_results) -%>
       <%- end -%>
     </p>
 

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

@@ -9,7 +9,7 @@
 
   <div class="field">
     <span id="name_person">
-      <%- if configatron.family_name_first == true -%>
+      <%- if Setting.family_name_first == true -%>
         <%= render 'patrons/form_family_name_first', :f => f -%>
       <%- else -%>
         <%= render 'patrons/form_family_name_last', :f => f -%>

data/lib/enju_biblio/version.rb

@@ -1,3 +1,3 @@
 module EnjuBiblio
-  VERSION = "0.1.0.pre3"
+  VERSION = "0.1.0.pre4"
 end

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

@@ -0,0 +1,4 @@
+class Setting < Settingslogic
+  source "#{Rails.root}/config/application.yml"
+  namespace Rails.env
+end

data/spec/dummy/config/application.yml

@@ -0,0 +1,37 @@
+defaults: &defaults
+  enju:
+    web_hostname: localhost
+    web_port_number: 3000
+
+  family_name_first: true
+  max_number_of_results: 500
+  write_search_log_to_file: true
+  csv_charset_conversion: true
+
+# Choose a locale from 'ca', 'de', 'fr', 'jp', 'uk', 'us'
+#AMAZON_AWS_HOSTNAME = 'ecs.amazonaws.com'
+  amazon:
+    aws_hostname: ecs.amazonaws.jp
+    hostname: www.amazon.co.jp
+    access_key: REPLACE_WITH_YOUR_AMAZON_ACCESS_KEY
+    secret_access_key: REPLACE_WITH_YOUR_AMAZON_SECRET_ACCESS_KEY
+
+# :google, :amazon
+  book_jacket:
+    source: :google
+
+# :mozshot, :simpleapi, :heartrails, :thumbalizr
+  screenshot:
+    generator: :mozshot
+
+  uploaded_file:
+    storage: :local
+
+development:
+  <<: *defaults
+
+test:
+  <<: *defaults
+
+production:
+  <<: *defaults

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_biblio
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre3
+  version: 0.1.0.pre4
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-31 00:00:00.000000000 Z
+date: 2012-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -242,7 +242,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre
+        version: 0.1.1.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -250,7 +250,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre
+        version: 0.1.1.pre
 - !ruby/object:Gem::Dependency
   name: resque_mailer
   requirement: !ruby/object:Gem::Requirement
@@ -370,7 +370,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre
+        version: 0.1.0.pre2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -378,7 +378,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre
+        version: 0.1.0.pre2
 - !ruby/object:Gem::Dependency
   name: enju_inventory
   requirement: !ruby/object:Gem::Requirement
@@ -1000,6 +1000,7 @@ files:
 - spec/dummy/app/models/ability.rb
 - spec/dummy/app/models/local_patron.rb
 - spec/dummy/app/models/role.rb
+- spec/dummy/app/models/setting.rb
 - spec/dummy/app/models/user.rb
 - spec/dummy/app/models/user_group.rb
 - spec/dummy/app/models/user_has_role.rb
@@ -1011,19 +1012,14 @@ files:
 - spec/dummy/app/views/page/404.mobile.erb
 - spec/dummy/app/views/page/404.xml.erb
 - spec/dummy/config/application.rb
+- spec/dummy/config/application.yml
 - spec/dummy/config/boot.rb
-- spec/dummy/config/configatron/defaults.rb
-- spec/dummy/config/configatron/development.rb
-- spec/dummy/config/configatron/production.rb
-- spec/dummy/config/configatron/production.rb.sample
-- spec/dummy/config/configatron/test.rb
 - spec/dummy/config/database.yml
 - spec/dummy/config/environment.rb
 - spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/production.rb
 - spec/dummy/config/environments/test.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/configatron.rb
 - spec/dummy/config/initializers/devise.rb
 - spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/initializers/kaminari_config.rb
@@ -1036,6 +1032,7 @@ files:
 - spec/dummy/config/locales/ja.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
+- spec/dummy/db/development.sqlite3
 - spec/dummy/db/migrate/032_create_checkins.rb
 - spec/dummy/db/migrate/033_create_checkouts.rb
 - spec/dummy/db/migrate/035_create_reserves.rb
@@ -1106,6 +1103,7 @@ files:
 - spec/dummy/db/migrate/20120415060342_rename_event_import_file_imported_at_to_executed_at.rb
 - spec/dummy/db/migrate/20120424103932_add_librarian_id_to_checked_item.rb
 - spec/dummy/db/migrate/20120510140958_add_closed_to_shelf.rb
+- spec/dummy/db/production.sqlite3
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
 - spec/dummy/lib/plugins/ext/event-calendar.rb
@@ -1155,7 +1153,7 @@ files:
 - spec/dummy/solr/conf/stopwords.txt
 - spec/dummy/solr/conf/synonyms.txt
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_5hq
+- spec/dummy/solr/data/test/index/segments_5px
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/dummy/tmp/cache/4F7/F90/default_role
@@ -1442,6 +1440,7 @@ test_files:
 - spec/dummy/app/models/ability.rb
 - spec/dummy/app/models/local_patron.rb
 - spec/dummy/app/models/role.rb
+- spec/dummy/app/models/setting.rb
 - spec/dummy/app/models/user.rb
 - spec/dummy/app/models/user_group.rb
 - spec/dummy/app/models/user_has_role.rb
@@ -1453,19 +1452,14 @@ test_files:
 - spec/dummy/app/views/page/404.mobile.erb
 - spec/dummy/app/views/page/404.xml.erb
 - spec/dummy/config/application.rb
+- spec/dummy/config/application.yml
 - spec/dummy/config/boot.rb
-- spec/dummy/config/configatron/defaults.rb
-- spec/dummy/config/configatron/development.rb
-- spec/dummy/config/configatron/production.rb
-- spec/dummy/config/configatron/production.rb.sample
-- spec/dummy/config/configatron/test.rb
 - spec/dummy/config/database.yml
 - spec/dummy/config/environment.rb
 - spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/production.rb
 - spec/dummy/config/environments/test.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/configatron.rb
 - spec/dummy/config/initializers/devise.rb
 - spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/initializers/kaminari_config.rb
@@ -1478,6 +1472,7 @@ test_files:
 - spec/dummy/config/locales/ja.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
+- spec/dummy/db/development.sqlite3
 - spec/dummy/db/migrate/032_create_checkins.rb
 - spec/dummy/db/migrate/033_create_checkouts.rb
 - spec/dummy/db/migrate/035_create_reserves.rb
@@ -1548,6 +1543,7 @@ test_files:
 - spec/dummy/db/migrate/20120415060342_rename_event_import_file_imported_at_to_executed_at.rb
 - spec/dummy/db/migrate/20120424103932_add_librarian_id_to_checked_item.rb
 - spec/dummy/db/migrate/20120510140958_add_closed_to_shelf.rb
+- spec/dummy/db/production.sqlite3
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
 - spec/dummy/lib/plugins/ext/event-calendar.rb
@@ -1597,7 +1593,7 @@ test_files:
 - spec/dummy/solr/conf/stopwords.txt
 - spec/dummy/solr/conf/synonyms.txt
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_5hq
+- spec/dummy/solr/data/test/index/segments_5px
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/dummy/tmp/cache/4F7/F90/default_role

data/spec/dummy/config/configatron/defaults.rb

@@ -1,28 +0,0 @@
-# Put all your default configatron settings here.
-
-# Example:
-#   configatron.emails.welcome.subject = 'Welcome!'
-#   configatron.emails.sales_reciept.subject = 'Thanks for your order'
-# 
-#   configatron.file.storage = :s3
-
-configatron.enju.web_hostname = 'localhost'
-configatron.enju.web_port_number = 3000
-
-# パトロンの名前を入力する際、姓を先に表示する
-configatron.family_name_first = true
-
-configatron.max_number_of_results = 500
-configatron.write_search_log_to_file = true
-configatron.csv_charset_conversion = true
-
-# Choose a locale from 'ca', 'de', 'fr', 'jp', 'uk', 'us'
-#AMAZON_AWS_HOSTNAME = 'ecs.amazonaws.com'
-configatron.amazon.aws_hostname = 'ecs.amazonaws.jp'
-configatron.amazon.hostname = 'www.amazon.co.jp'
-
-# :google, :amazon
-configatron.book_jacket.source = :google
-
-# :mozshot, :simpleapi, :heartrails, :thumbalizr
-configatron.screenshot.generator = :mozshot

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

@@ -1,4 +0,0 @@
-# Override your default settings for the Development environment here.
-# 
-# Example:
-#   configatron.file.storage = :local

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

@@ -1,12 +0,0 @@
-# Override your default settings for the Production environment here.
-# 
-# Example:
-#   configatron.uploaded_file.storage = :s3
-
-#configatron.uploaded_file.storage = :s3
-
-configatron.amazon.access_key = 'REPLACE_WITH_YOUR_AMAZON_ACCESS_KEY'
-configatron.amazon.secret_access_key = 'REPLACE_WITH_YOUR_AMAZON_SECRET_ACCESS_KEY'
-
-#configatron.google.google_maps_api_key = 'REPLACE_WITH_YOUR_GOOGLE_MAPS_API_KEY'
-#configatron.thumbalizr.api_key = 'REPLACE_WITH_YOUR_THUMBALIZR_API_KEY'

data/spec/dummy/config/configatron/production.rb.sample

@@ -1,12 +0,0 @@
-# Override your default settings for the Production environment here.
-# 
-# Example:
-#   configatron.uploaded_file.storage = :s3
-
-#configatron.uploaded_file.storage = :s3
-
-configatron.amazon.access_key = 'REPLACE_WITH_YOUR_AMAZON_ACCESS_KEY'
-configatron.amazon.secret_access_key = 'REPLACE_WITH_YOUR_AMAZON_SECRET_ACCESS_KEY'
-
-#configatron.google.google_maps_api_key = 'REPLACE_WITH_YOUR_GOOGLE_MAPS_API_KEY'
-#configatron.thumbalizr.api_key = 'REPLACE_WITH_YOUR_THUMBALIZR_API_KEY'

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

@@ -1,7 +0,0 @@
-# Override your default settings for the Test environment here.
-# 
-# Example:
-#   configatron.file.storage = :local
-
-configatron.amazon.access_key = 'REPLACE_WITH_YOUR_AMAZON_ACCESS_KEY'
-configatron.amazon.secret_access_key = 'REPLACE_WITH_YOUR_AMAZON_SECRET_ACCESS_KEY'

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

@@ -1,2 +0,0 @@
-require 'configatron'
-Configatron::Rails.init