enju_circulation 0.1.0.pre38 → 0.1.0.pre39

data/spec/controllers/user_reserve_stats_controller_spec.rb

@@ -13,7 +13,7 @@ describe UserReserveStatsController do
 
       it "assigns all user_reserve_stats as @user_reserve_stats" do
         get :index
-        assigns(:user_reserve_stats).should eq(UserReserveStat.all)
+        assigns(:user_reserve_stats).should eq(UserReserveStat.order('id DESC').page(1))
       end
     end
 
@@ -22,7 +22,7 @@ describe UserReserveStatsController do
 
       it "assigns all user_reserve_stats as @user_reserve_stats" do
         get :index
-        assigns(:user_reserve_stats).should eq(UserReserveStat.all)
+        assigns(:user_reserve_stats).should eq(UserReserveStat.order('id DESC').page(1))
       end
     end
 
@@ -31,14 +31,14 @@ describe UserReserveStatsController do
 
       it "assigns all user_reserve_stats as @user_reserve_stats" do
         get :index
-        assigns(:user_reserve_stats).should eq(UserReserveStat.all)
+        assigns(:user_reserve_stats).should eq(UserReserveStat.order('id DESC').page(1))
       end
     end
 
     describe "When not logged in" do
       it "should not assign user_reserve_stats as @user_reserve_stats" do
         get :index
-        assigns(:user_reserve_stats).should eq(UserReserveStat.all)
+        assigns(:user_reserve_stats).should eq(UserReserveStat.order('id DESC').page(1))
       end
     end
   end

data/spec/dummy/config/boot.rb

@@ -1,5 +1,5 @@
 require 'rubygems'
-gemfile = File.expand_path('../../../../Gemfile', __FILE__)
+gemfile = ENV['BUNDLE_GEMFILE'] || File.expand_path('../../../../Gemfile', __FILE__)
 
 if File.exist?(gemfile)
   ENV['BUNDLE_GEMFILE'] = gemfile
@@ -7,4 +7,4 @@ if File.exist?(gemfile)
   Bundler.setup
 end
 
-$:.unshift File.expand_path('../../../../lib', __FILE__)
+$:.unshift File.expand_path('../../../../lib', __FILE__)

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

@@ -0,0 +1,90 @@
+# FriendlyId Global Configuration
+#
+# Use this to set up shared configuration options for your entire application.
+# Any of the configuration options shown here can also be applied to single
+# models by passing arguments to the `friendly_id` class method or defining
+# methods in your model.
+#
+# To learn more, check out the guide:
+#
+# http://norman.github.io/friendly_id/file.Guide.html
+
+if Rails::VERSION::MAJOR == 4
+FriendlyId.defaults do |config|
+  # ## Reserved Words
+  #
+  # Some words could conflict with Rails's routes when used as slugs, or are
+  # undesirable to allow as slugs. Edit this list as needed for your app.
+  config.use :reserved
+
+  config.reserved_words = %w(new edit index session login logout users admin
+    stylesheets assets javascripts images)
+
+  #  ## Friendly Finders
+  #
+  # Uncomment this to use friendly finders in all models. By default, if
+  # you wish to find a record by its friendly id, you must do:
+  #
+  #    MyModel.friendly.find('foo')
+  #
+  # If you uncomment this, you can do:
+  #
+  #    MyModel.find('foo')
+  #
+  # This is significantly more convenient but may not be appropriate for
+  # all applications, so you must explicity opt-in to this behavior. You can
+  # always also configure it on a per-model basis if you prefer.
+  #
+  # Something else to consider is that using the :finders addon boosts
+  # performance because it will avoid Rails-internal code that makes runtime
+  # calls to `Module.extend`.
+  #
+  config.use :finders
+  #
+  # ## Slugs
+  #
+  # Most applications will use the :slugged module everywhere. If you wish
+  # to do so, uncomment the following line.
+  #
+  # config.use :slugged
+  #
+  # By default, FriendlyId's :slugged addon expects the slug column to be named
+  # 'slug', but you can change it if you wish.
+  #
+  # config.slug_column = 'slug'
+  #
+  # When FriendlyId can not generate a unique ID from your base method, it appends
+  # a UUID, separated by a single dash. You can configure the character used as the
+  # separator. If you're upgrading from FriendlyId 4, you may wish to replace this
+  # with two dashes.
+  #
+  # config.sequence_separator = '-'
+  #
+  #  ## Tips and Tricks
+  #
+  #  ### Controlling when slugs are generated
+  #
+  # As of FriendlyId 5.0, new slugs are generated only when the slug field is
+  # nil, but if you're using a column as your base method can change this
+  # behavior by overriding the `should_generate_new_friendly_id` method that
+  # FriendlyId adds to your model. The change below makes FriendlyId 5.0 behave
+  # more like 4.0.
+  #
+  # config.use Module.new {
+  #   def should_generate_new_friendly_id?
+  #     slug.blank? || <your_column_name_here>_changed?
+  #   end
+  # }
+  #
+  # FriendlyId uses Rails's `parameterize` method to generate slugs, but for
+  # languages that don't use the Roman alphabet, that's not usually suffient. Here
+  # we use the Babosa library to transliterate Russian Cyrillic slugs to ASCII. If
+  # you use this, don't forget to add "babosa" to your Gemfile.
+  #
+  # config.use Module.new {
+  #   def normalize_friendly_id(text)
+  #     text.to_slug.normalize! :transliterations => [:russian, :latin]
+  #   end
+  # }
+end
+end

data/spec/dummy/db/migrate/005_create_manifestations.rb

@@ -13,7 +13,6 @@ class CreateManifestations < ActiveRecord::Migration
       t.string :access_address
       t.integer :language_id, :default => 1, :null => false
       t.integer :carrier_type_id, :default => 1, :null => false
-      t.integer :extent_id, :default => 1, :null => false
       t.integer :start_page
       t.integer :end_page
       t.integer :height

data/spec/dummy/db/migrate/133_create_agent_merges.rb

@@ -0,0 +1,15 @@
+class CreateAgentMerges < ActiveRecord::Migration
+  def self.up
+    create_table :agent_merges do |t|
+      t.integer :agent_id, :agent_merge_list_id, :null => false
+
+      t.timestamps
+    end
+    add_index :agent_merges, :agent_id
+    add_index :agent_merges, :agent_merge_list_id
+  end
+
+  def self.down
+    drop_table :agent_merges
+  end
+end

data/spec/dummy/db/migrate/134_create_agent_merge_lists.rb

@@ -0,0 +1,13 @@
+class CreateAgentMergeLists < ActiveRecord::Migration
+  def self.up
+    create_table :agent_merge_lists do |t|
+      t.string :title
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :agent_merge_lists
+  end
+end

data/spec/dummy/db/migrate/20100925074559_create_agent_import_results.rb

@@ -3,7 +3,6 @@ class CreateAgentImportResults < ActiveRecord::Migration
     create_table :agent_import_results do |t|
       t.integer :agent_import_file_id
       t.integer :agent_id
-      t.integer :user_id
       t.text :body
 
       t.timestamps

data/spec/dummy/db/migrate/20110627035057_create_series_statement_merges.rb

@@ -7,6 +7,6 @@ class CreateSeriesStatementMerges < ActiveRecord::Migration
       t.timestamps
     end
     add_index :series_statement_merges, :series_statement_id
-    add_index :series_statement_merges, :series_statement_merge_list_id
+    add_index :series_statement_merges, :series_statement_merge_list_id, name: "index_series_statement_merges_on_list_id"
   end
 end

data/spec/dummy/db/migrate/20140813182425_add_publication_place_to_manifestation.rb

@@ -0,0 +1,5 @@
+class AddPublicationPlaceToManifestation < ActiveRecord::Migration
+  def change
+    add_column :manifestations, :publication_place, :text
+  end
+end

data/spec/dummy/db/migrate/20140822114527_add_error_message_to_resource_import_result.rb

@@ -0,0 +1,5 @@
+class AddErrorMessageToResourceImportResult < ActiveRecord::Migration
+  def change
+    add_column :resource_import_results, :error_message, :text
+  end
+end

data/spec/dummy/db/migrate/20140823083524_add_extent_to_manifestation.rb

@@ -0,0 +1,5 @@
+class AddExtentToManifestation < ActiveRecord::Migration
+  def change
+    add_column :manifestations, :extent, :text
+  end
+end

data/spec/dummy/db/migrate/20140823094847_add_dimensions_to_manifestation.rb

@@ -0,0 +1,5 @@
+class AddDimensionsToManifestation < ActiveRecord::Migration
+  def change
+    add_column :manifestations, :dimensions, :text
+  end
+end

data/spec/dummy/db/migrate/20140823095740_rename_manifestation_periodical_to_serial.rb

@@ -0,0 +1,9 @@
+class RenameManifestationPeriodicalToSerial < ActiveRecord::Migration
+  def up
+    rename_column :manifestations, :periodical, :serial
+  end
+
+  def down
+    rename_column :manifestations, :serial, :periodical
+  end
+end

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20140811031145) do
+ActiveRecord::Schema.define(:version => 20140823095740) do
 
   create_table "agent_import_file_transitions", :force => true do |t|
     t.string   "to_state"
@@ -50,12 +50,27 @@ ActiveRecord::Schema.define(:version => 20140811031145) do
   create_table "agent_import_results", :force => true do |t|
     t.integer  "agent_import_file_id"
     t.integer  "agent_id"
-    t.integer  "user_id"
     t.text     "body"
     t.datetime "created_at",           :null => false
     t.datetime "updated_at",           :null => false
   end
 
+  create_table "agent_merge_lists", :force => true do |t|
+    t.string   "title"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "agent_merges", :force => true do |t|
+    t.integer  "agent_id",            :null => false
+    t.integer  "agent_merge_list_id", :null => false
+    t.datetime "created_at",          :null => false
+    t.datetime "updated_at",          :null => false
+  end
+
+  add_index "agent_merges", ["agent_id"], :name => "index_agent_merges_on_agent_id"
+  add_index "agent_merges", ["agent_merge_list_id"], :name => "index_agent_merges_on_agent_merge_list_id"
+
   create_table "agent_relationship_types", :force => true do |t|
     t.string   "name",         :null => false
     t.text     "display_name"
@@ -656,7 +671,6 @@ ActiveRecord::Schema.define(:version => 20140811031145) do
     t.string   "access_address"
     t.integer  "language_id",                     :default => 1,     :null => false
     t.integer  "carrier_type_id",                 :default => 1,     :null => false
-    t.integer  "extent_id",                       :default => 1,     :null => false
     t.integer  "start_page"
     t.integer  "end_page"
     t.integer  "height"
@@ -697,8 +711,11 @@ ActiveRecord::Schema.define(:version => 20140811031145) do
     t.text     "attachment_meta"
     t.integer  "month_of_publication"
     t.boolean  "fulltext_content"
-    t.boolean  "periodical"
+    t.boolean  "serial"
     t.text     "statement_of_responsibility"
+    t.text     "publication_place"
+    t.text     "extent"
+    t.text     "dimensions"
   end
 
   add_index "manifestations", ["access_address"], :name => "index_manifestations_on_access_address"
@@ -1015,6 +1032,7 @@ ActiveRecord::Schema.define(:version => 20140811031145) do
     t.text     "body"
     t.datetime "created_at",              :null => false
     t.datetime "updated_at",              :null => false
+    t.text     "error_message"
   end
 
   add_index "resource_import_results", ["item_id"], :name => "index_resource_import_results_on_item_id"
@@ -1055,7 +1073,7 @@ ActiveRecord::Schema.define(:version => 20140811031145) do
   end
 
   add_index "series_statement_merges", ["series_statement_id"], :name => "index_series_statement_merges_on_series_statement_id"
-  add_index "series_statement_merges", ["series_statement_merge_list_id"], :name => "index_series_statement_merges_on_series_statement_merge_list_id"
+  add_index "series_statement_merges", ["series_statement_merge_list_id"], :name => "index_series_statement_merges_on_list_id"
 
   create_table "series_statements", :force => true do |t|
     t.text     "original_title"