enju_circulation 0.2.0.beta.2 → 0.2.0.beta.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb81a7452f8b4d3017732b57a7a802c7ba0e6ffd
-  data.tar.gz: 57749c399e58ad00e38067f4bfa0ff9798d4a2e0
+  metadata.gz: 8d1d84454c986115d3db9e73886c0abfca5f76df
+  data.tar.gz: 3fbd2b6d37dabd55eee9c0e5c7ec2d48aceef3c7
 SHA512:
-  metadata.gz: 808f55934861c02b251a87902256eb672132673c6d408f8d1e1bbcc425215eee041a044e0b85779a958603d366fb8551a6d6414d1cc05281279baa25294b2576
-  data.tar.gz: b20e422fdfaee111343e7ea781b55d5144536ad9c8bd39c68336247efc230bb619d417985ba34587bed626330961e92e55514cdb33f7dd2f840c6607b1c10242
+  metadata.gz: 4990f4b9e09874aa760dbfbee3315ab1899b1b10238d2e862e6d64b7185fa2d0eced8f381b1bccd3b2abfdedc54b6b65ad1fb43c315a05341280dc31a89d978c
+  data.tar.gz: 6e467c07538e1332b66ac99b6ad846bd5e74cb9aa62618b7e02e0a90f550dc20afba6d6deb4daa19f196c55edab7094da42db44e81f37e2ebebc0bc35293fb82

data/app/models/checkout_type.rb

@@ -19,7 +19,7 @@ end
 # Table name: checkout_types
 #
 #  id           :integer          not null, primary key
-#  name         :string(255)      not null
+#  name         :string           not null
 #  display_name :text
 #  note         :text
 #  position     :integer

data/app/models/circulation_status.rb

@@ -17,7 +17,7 @@ end
 # Table name: circulation_statuses
 #
 #  id           :integer          not null, primary key
-#  name         :string(255)      not null
+#  name         :string           not null
 #  display_name :text
 #  note         :text
 #  position     :integer

data/app/models/demand.rb

@@ -3,3 +3,15 @@ class Demand < ActiveRecord::Base
   belongs_to :item
   belongs_to :message
 end
+
+# == Schema Information
+#
+# Table name: demands
+#
+#  id         :integer          not null, primary key
+#  user_id    :integer
+#  item_id    :integer
+#  message_id :integer
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#

data/app/models/manifestation_checkout_stat_transition.rb

@@ -11,10 +11,11 @@ end
 # Table name: manifestation_checkout_stat_transitions
 #
 #  id                             :integer          not null, primary key
-#  to_state                       :string(255)
-#  metadata                       :text             default("{}")
+#  to_state                       :string
+#  metadata                       :text             default({})
 #  sort_key                       :integer
 #  manifestation_checkout_stat_id :integer
 #  created_at                     :datetime
 #  updated_at                     :datetime
+#  most_recent                    :boolean
 #

data/app/models/manifestation_reserve_stat_transition.rb

@@ -11,10 +11,11 @@ end
 # Table name: manifestation_reserve_stat_transitions
 #
 #  id                            :integer          not null, primary key
-#  to_state                      :string(255)
-#  metadata                      :text             default("{}")
+#  to_state                      :string
+#  metadata                      :text             default({})
 #  sort_key                      :integer
 #  manifestation_reserve_stat_id :integer
 #  created_at                    :datetime
 #  updated_at                    :datetime
+#  most_recent                   :boolean
 #

data/app/models/reserve_transition.rb

@@ -10,11 +10,12 @@ end
 #
 # Table name: reserve_transitions
 #
-#  id         :integer          not null, primary key
-#  to_state   :string(255)
-#  metadata   :text             default("{}")
-#  sort_key   :integer
-#  reserve_id :integer
-#  created_at :datetime
-#  updated_at :datetime
+#  id          :integer          not null, primary key
+#  to_state    :string
+#  metadata    :text             default({})
+#  sort_key    :integer
+#  reserve_id  :integer
+#  created_at  :datetime
+#  updated_at  :datetime
+#  most_recent :boolean
 #

data/app/models/use_restriction.rb

@@ -17,7 +17,7 @@ end
 # Table name: use_restrictions
 #
 #  id           :integer          not null, primary key
-#  name         :string(255)      not null
+#  name         :string           not null
 #  display_name :text
 #  note         :text
 #  position     :integer

data/app/models/user_checkout_stat_transition.rb

@@ -11,10 +11,11 @@ end
 # Table name: user_checkout_stat_transitions
 #
 #  id                    :integer          not null, primary key
-#  to_state              :string(255)
-#  metadata              :text             default("{}")
+#  to_state              :string
+#  metadata              :text             default({})
 #  sort_key              :integer
 #  user_checkout_stat_id :integer
 #  created_at            :datetime
 #  updated_at            :datetime
+#  most_recent           :boolean
 #

data/app/models/user_reserve_stat_transition.rb

@@ -11,10 +11,11 @@ end
 # Table name: user_reserve_stat_transitions
 #
 #  id                   :integer          not null, primary key
-#  to_state             :string(255)
-#  metadata             :text             default("{}")
+#  to_state             :string
+#  metadata             :text             default({})
 #  sort_key             :integer
 #  user_reserve_stat_id :integer
 #  created_at           :datetime
 #  updated_at           :datetime
+#  most_recent          :boolean
 #

data/lib/enju_circulation/version.rb

@@ -1,3 +1,3 @@
 module EnjuCirculation
-  VERSION = "0.2.0.beta.2"
+  VERSION = "0.2.0.beta.3"
 end

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

@@ -16,7 +16,7 @@ class EnjuCirculation::SetupGenerator < Rails::Generators::Base
     inject_into_class 'app/models/user.rb', User do
       "  include EnjuCirculation::EnjuUser\n"
     end
-    append_to_file "config/initializers/enju_leaf.rb", <<EOS
+    append_to_file "app/models/user.rb", <<EOS
 Accept.include(EnjuCirculation::EnjuAccept)
 Basket.include(EnjuCirculation::EnjuBasket)
 CarrierType.include(EnjuCirculation::EnjuCarrierType)

data/lib/tasks/enju_circulation_tasks.rake

@@ -39,11 +39,11 @@ namespace :enju_circulation do
 
   desc "upgrade enju_circulation"
   task :upgrade => :environment do
-    Reserve.transaction do
-      update_reserve
-      update_circulation_status
-      update_use_restriction
-    end
+    Rake::Task['statesman:backfill_most_recent'].invoke('ManifestationCheckoutStat')
+    Rake::Task['statesman:backfill_most_recent'].invoke('ManifestationReserveStat')
+    Rake::Task['statesman:backfill_most_recent'].invoke('UserCheckoutStat')
+    Rake::Task['statesman:backfill_most_recent'].invoke('UserCheckoutStat')
+    Rake::Task['statesman:backfill_most_recent'].invoke('Reserve')
     puts 'enju_circulation: The upgrade completed successfully.'
   end
 

data/spec/controllers/carrier_type_has_checkout_types_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe CarrierTypeHasCheckoutTypesController do
   fixtures :all

data/spec/controllers/checked_items_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe CheckedItemsController do
   fixtures :all

data/spec/controllers/checkins_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe CheckinsController do
   fixtures :all

data/spec/controllers/checkout_types_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe CheckoutTypesController do
   fixtures :all

data/spec/controllers/checkouts_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe CheckoutsController do
   fixtures :all

data/spec/controllers/circulation_statuses_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'sunspot/rails/spec_helper'
 
 describe CirculationStatusesController do

data/spec/controllers/item_has_use_restrictions_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'sunspot/rails/spec_helper'
 
 describe ItemHasUseRestrictionsController do

data/spec/controllers/lending_policies_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'sunspot/rails/spec_helper'
 
 describe LendingPoliciesController do

data/spec/controllers/manifestation_checkout_stats_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe ManifestationCheckoutStatsController do
   fixtures :all

data/spec/controllers/manifestation_reserve_stats_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe ManifestationReserveStatsController do
   fixtures :all

data/spec/controllers/profiles_controller_spec.rb

@@ -0,0 +1,16 @@
+require 'rails_helper'
+
+describe ProfilesController do
+  fixtures :all
+
+  describe "GET show" do
+    describe "When logged in as User" do
+      login_fixture_user
+
+      it "should show icalendar feed" do
+        get :edit, id: profiles(:profile_user1).id, mode: 'feed_token'
+        response.should render_template("profiles/_feed_token")
+      end
+    end
+  end
+end

data/spec/controllers/reserves_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe ReservesController do
   fixtures :all

data/spec/controllers/use_restrictions_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'sunspot/rails/spec_helper'
 
 describe UseRestrictionsController do

data/spec/controllers/user_checkout_stats_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe UserCheckoutStatsController do
   fixtures :all

data/spec/controllers/user_group_has_checkout_types_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe UserGroupHasCheckoutTypesController do
   fixtures :all

data/spec/controllers/user_reserve_stats_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe UserReserveStatsController do
   fixtures :all

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

@@ -4,7 +4,14 @@ class User < ActiveRecord::Base
   devise :database_authenticatable, #:registerable,
          :recoverable, :rememberable, :trackable, :validatable
 
-  include EnjuLeaf::EnjuUser
+  include EnjuSeed::EnjuUser
   include EnjuMessage::EnjuUser
   include EnjuCirculation::EnjuUser
 end
+
+Basket.include(EnjuCirculation::EnjuBasket)
+Manifestation.include(EnjuCirculation::EnjuManifestation)
+Item.include(EnjuCirculation::EnjuItem)
+Profile.include(EnjuCirculation::EnjuProfile)
+Item.include(EnjuLibrary::EnjuItem)
+UserGroup.include(EnjuCirculation::EnjuUserGroup)

data/spec/dummy/config/application.rb

@@ -3,8 +3,10 @@ require File.expand_path('../boot', __FILE__)
 require 'rails/all'
 
 Bundler.require(*Rails.groups)
-require 'enju_leaf'
 require 'enju_circulation'
+require 'enju_leaf'
+require 'globalize'
+require 'globalize-accessors'
 require 'resque/server'
 
 module Dummy

data/spec/dummy/db/migrate/20140110122216_create_user_import_files.rb

@@ -6,7 +6,7 @@ class CreateUserImportFiles < ActiveRecord::Migration
       t.datetime :executed_at
       t.string :user_import_file_name
       t.string :user_import_content_type
-      t.string :user_import_file_size
+      t.integer :user_import_file_size
       t.datetime :user_import_updated_at
       t.string :user_import_fingerprint
       t.string :edit_mode

data/spec/dummy/db/migrate/20150506105356_add_error_message_to_user_import_result.rb

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

data/spec/dummy/db/migrate/20160610093229_add_html_snippet_to_library_group.rb

@@ -0,0 +1,5 @@
+class AddHtmlSnippetToLibraryGroup < ActiveRecord::Migration
+  def change
+    add_column :library_groups, :html_snippet, :text
+  end
+end

data/spec/dummy/db/migrate/20160627232219_add_most_recent_to_user_import_file_transitions.rb

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

data/spec/dummy/db/migrate/20160627232316_add_most_recent_to_user_export_file_transitions.rb

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

data/spec/dummy/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/spec/dummy/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/spec/dummy/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/spec/dummy/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/spec/dummy/db/migrate/20160814165332_add_most_recent_to_message_request_transitions.rb

@@ -0,0 +1,9 @@
+class AddMostRecentToMessageRequestTransitions < ActiveRecord::Migration
+  def up
+    add_column :message_request_transitions, :most_recent, :boolean, null: true
+  end
+
+  def down
+    remove_column :message_request_transitions, :most_recent
+  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: 20160703190209) do
+ActiveRecord::Schema.define(version: 20160814165332) do
 
   create_table "accepts", force: :cascade do |t|
     t.integer  "basket_id"
@@ -675,9 +675,9 @@ ActiveRecord::Schema.define(version: 20160703190209) 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"
@@ -686,11 +686,17 @@ ActiveRecord::Schema.define(version: 20160703190209) do
     t.datetime "created_at"
     t.datetime "updated_at"
     t.text     "admin_networks"
-    t.string   "url",            default: "http://localhost:3000/"
+    t.string   "url",                           default: "http://localhost:3000/"
     t.text     "settings"
+    t.text     "html_snippet"
+    t.integer  "max_number_of_results",         default: 500
+    t.boolean  "family_name_first",             default: true
+    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
@@ -856,6 +862,7 @@ ActiveRecord::Schema.define(version: 20160703190209) do
     t.integer  "message_request_id"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.boolean  "most_recent"
   end
 
   add_index "message_request_transitions", ["message_request_id"], name: "index_message_request_transitions_on_message_request_id"
@@ -1321,6 +1328,7 @@ ActiveRecord::Schema.define(version: 20160703190209) do
     t.integer  "user_export_file_id"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.boolean  "most_recent"
   end
 
   add_index "user_export_file_transitions", ["sort_key", "user_export_file_id"], name: "index_user_export_file_transitions_on_sort_key_and_file_id", unique: true
@@ -1389,6 +1397,7 @@ ActiveRecord::Schema.define(version: 20160703190209) do
     t.integer  "user_import_file_id"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.boolean  "most_recent"
   end
 
   add_index "user_import_file_transitions", ["sort_key", "user_import_file_id"], name: "index_user_import_file_transitions_on_sort_key_and_file_id", unique: true
@@ -1400,7 +1409,7 @@ ActiveRecord::Schema.define(version: 20160703190209) do
     t.datetime "executed_at"
     t.string   "user_import_file_name"
     t.string   "user_import_content_type"
-    t.string   "user_import_file_size"
+    t.integer  "user_import_file_size"
     t.datetime "user_import_updated_at"
     t.string   "user_import_fingerprint"
     t.string   "edit_mode"
@@ -1418,6 +1427,7 @@ ActiveRecord::Schema.define(version: 20160703190209) do
     t.text     "body"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.text     "error_message"
   end
 
   create_table "user_reserve_stat_transitions", force: :cascade do |t|

data/spec/fixtures/checkout_types.yml

@@ -24,7 +24,7 @@ checkout_type_00003:
 # Table name: checkout_types
 #
 #  id           :integer          not null, primary key
-#  name         :string(255)      not null
+#  name         :string           not null
 #  display_name :text
 #  note         :text
 #  position     :integer

data/spec/fixtures/circulation_statuses.yml

@@ -110,7 +110,7 @@ circulation_status_00016:
 # Table name: circulation_statuses
 #
 #  id           :integer          not null, primary key
-#  name         :string(255)      not null
+#  name         :string           not null
 #  display_name :text
 #  note         :text
 #  position     :integer

data/spec/fixtures/demands.yml

@@ -9,3 +9,15 @@ two:
   user_id: 1
   item_id: 1
   message_id: 1
+
+# == Schema Information
+#
+# Table name: demands
+#
+#  id         :integer          not null, primary key
+#  user_id    :integer
+#  item_id    :integer
+#  message_id :integer
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#

data/spec/fixtures/library_groups.yml

@@ -7,12 +7,7 @@ one:
   note: 
   my_networks: 0.0.0.0/0
   url: "http://localhost:3000/"
-  settings: <% if Rails::VERSION::MAJOR > 3 %>
-    "{\"max_number_of_results\":200,\"family_name_first\":true,\"book_jacket_source\":\"google\",\"screenshot_generator\":\"mozshot\"}"
-  <% else %>
-    "---\n:max_number_of_results: 200\n:family_name_first: true\n:book_jacket_source: \"google\"\n:screenshot_generator: \"mozshot\""
-  <% end %>
-
+  user_id: 1
 
 # == Schema Information
 #

data/spec/fixtures/reserve_transitions.yml

@@ -78,11 +78,12 @@ reserve_transition_00015:
 #
 # Table name: reserve_transitions
 #
-#  id         :integer          not null, primary key
-#  to_state   :string(255)
-#  metadata   :text             default("{}")
-#  sort_key   :integer
-#  reserve_id :integer
-#  created_at :datetime
-#  updated_at :datetime
+#  id          :integer          not null, primary key
+#  to_state    :string
+#  metadata    :text             default({})
+#  sort_key    :integer
+#  reserve_id  :integer
+#  created_at  :datetime
+#  updated_at  :datetime
+#  most_recent :boolean
 #

data/spec/fixtures/use_restrictions.yml

@@ -83,7 +83,7 @@ use_restriction_00013:
 # Table name: use_restrictions
 #
 #  id           :integer          not null, primary key
-#  name         :string(255)      not null
+#  name         :string           not null
 #  display_name :text
 #  note         :text
 #  position     :integer

data/spec/models/basket_spec.rb

@@ -1,5 +1,4 @@
-# -*- encoding: utf-8 -*-
-require 'spec_helper'
+require 'rails_helper'
 
 describe Basket do
   fixtures :all

data/spec/models/carrier_type_has_checkout_type_spec.rb

@@ -1,5 +1,4 @@
-# -*- encoding: utf-8 -*-
-require 'spec_helper'
+require 'rails_helper'
 
 describe CarrierTypeHasCheckoutType do
   #pending "add some examples to (or delete) #{__FILE__}"

data/spec/models/checked_item_spec.rb

@@ -1,5 +1,4 @@
-# -*- encoding: utf-8 -*-
-require 'spec_helper'
+require 'rails_helper'
 
 describe CheckedItem do
   fixtures :all

data/spec/models/checkin_spec.rb

@@ -1,5 +1,4 @@
-# -*- encoding: utf-8 -*-
-require 'spec_helper'
+require 'rails_helper'
 
 describe Checkin do
   fixtures :all

data/spec/models/checkout_spec.rb

@@ -1,5 +1,4 @@
-# -*- encoding: utf-8 -*-
-require 'spec_helper'
+require 'rails_helper'
 
 describe Checkout do
   #pending "add some examples to (or delete) #{__FILE__}"

data/spec/models/checkout_stat_has_manifestation_spec.rb

@@ -1,5 +1,4 @@
-# -*- encoding: utf-8 -*-
-require 'spec_helper'
+require 'rails_helper'
 
 describe CheckoutStatHasManifestation do
   #pending "add some examples to (or delete) #{__FILE__}"

data/spec/models/checkout_stat_has_user_spec.rb

@@ -1,5 +1,4 @@
-# -*- encoding: utf-8 -*-
-require 'spec_helper'
+require 'rails_helper'
 
 describe CheckoutStatHasUser do
   #pending "add some examples to (or delete) #{__FILE__}"