RubyGems - enju_circulation - Versions diffs - 0.1.0.pre36 → 0.1.0.pre37 - Mend

enju_circulation 0.1.0.pre36 → 0.1.0.pre37

Files changed (398) hide show

data/spec/fixtures/reserve_transitions.yml ADDED Viewed

@@ -0,0 +1,88 @@
+reserve_transition_00001:
+  id: 1
+  to_state: requested
+  reserve_id: 1
+  sort_key: 0
+reserve_transition_00002:
+  id: 2
+  to_state: requested
+  reserve_id: 2
+  sort_key: 0
+reserve_transition_00003:
+  id: 3
+  to_state: requested
+  reserve_id: 3
+  sort_key: 0
+reserve_transition_00004:
+  id: 4
+  to_state: requested
+  reserve_id: 4
+  sort_key: 0
+reserve_transition_00005:
+  id: 5
+  to_state: requested
+  reserve_id: 5
+  sort_key: 0
+reserve_transition_00006:
+  id: 6
+  to_state: requested
+  reserve_id: 6
+  sort_key: 0
+reserve_transition_00007:
+  id: 7
+  to_state: requested
+  reserve_id: 7
+  sort_key: 0
+reserve_transition_00008:
+  id: 8
+  to_state: expired
+  reserve_id: 8
+  sort_key: 0
+reserve_transition_00009:
+  id: 9
+  to_state: requested
+  reserve_id: 9
+  sort_key: 0
+reserve_transition_00010:
+  id: 10
+  to_state: completed
+  reserve_id: 10
+  sort_key: 0
+reserve_transition_00011:
+  id: 11
+  to_state: expired
+  reserve_id: 11
+  sort_key: 0
+reserve_transition_00012:
+  id: 12
+  to_state: retained
+  reserve_id: 12
+  sort_key: 0
+reserve_transition_00013:
+  id: 13
+  to_state: requested
+  reserve_id: 13
+  sort_key: 0
+reserve_transition_00014:
+  id: 14
+  to_state: retained
+  reserve_id: 14
+  sort_key: 0
+reserve_transition_00015:
+  id: 15
+  to_state: requested
+  reserve_id: 15
+  sort_key: 0
+# == Schema Information
+#
+# 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         not null
+#  updated_at :datetime         not null
+#

data/spec/fixtures/reserves.yml CHANGED Viewed

@@ -7,7 +7,6 @@ reserve_00001:
   id: 1
   created_at: 2007-09-01 14:14:52.356803 +09:00
   expired_at: <%= 1.week.from_now %>
-  state: requested
   lock_version: 0
 reserve_00002:
   updated_at: 2007-09-01 14:20:05.530854 +09:00
@@ -17,7 +16,6 @@ reserve_00002:
   id: 2
   created_at: 2007-09-01 14:20:05.530854 +09:00
   expired_at: <%= 1.week.from_now %>
-  state: requested
   lock_version: 0
 reserve_00003:
   updated_at: 2007-09-02 17:46:52.791614 +09:00
@@ -27,7 +25,6 @@ reserve_00003:
   id: 3
   created_at: 2007-09-02 17:46:52.791614 +09:00
   expired_at: <%= 1.week.from_now %>
-  state: requested
   lock_version: 0
 reserve_00004:
   updated_at: 2007-09-02 18:37:25.576087 +09:00
@@ -37,7 +34,6 @@ reserve_00004:
   id: 4
   created_at: 2007-09-02 18:37:25.576087 +09:00
   expired_at: <%= 1.week.from_now %>
-  state: requested
   lock_version: 0
 reserve_00005:
   updated_at: 2007-09-02 19:16:55.714812 +09:00
@@ -47,7 +43,6 @@ reserve_00005:
   id: 5
   created_at: 2007-09-02 19:16:55.714812 +09:00
   expired_at: <%= 1.week.from_now %>
-  state: requested
   lock_version: 0
 reserve_00006:
   updated_at: 2007-09-02 19:20:06.530854 +09:00
@@ -57,7 +52,6 @@ reserve_00006:
   id: 6
   created_at: 2007-09-02 19:20:06.530854 +09:00
   expired_at: <%= 1.week.from_now %>
-  state: requested
   lock_version: 0
 reserve_00007:
   updated_at: 2007-09-02 19:20:07.530854 +09:00
@@ -67,7 +61,6 @@ reserve_00007:
   id: 7
   created_at: 2007-09-02 19:20:07.530854 +09:00
   expired_at: <%= 1.week.from_now %>
-  state: requested
   lock_version: 0
 reserve_00008:
   updated_at: 2007-09-02 19:46:53.791614 +09:00
@@ -77,7 +70,6 @@ reserve_00008:
   id: 8
   created_at: 2007-09-02 19:46:53.791614 +09:00
   expired_at: <%= 1.week.ago %>
-  state: expired
   lock_version: 0
 reserve_00009:
   updated_at: 2007-09-02 19:46:54.791614 +09:00
@@ -87,7 +79,6 @@ reserve_00009:
   id: 9
   created_at: 2007-09-02 19:46:54.791614 +09:00
   expired_at: <%= 1.day.ago %>
-  state: requested
   lock_version: 0
 reserve_00010:
   updated_at: 2007-09-02 19:46:55.791614 +09:00
@@ -98,7 +89,6 @@ reserve_00010:
   created_at: 2007-09-02 19:46:55.791614 +09:00
   expired_at: <%= 1.hour.ago %>
   checked_out_at: <%= 1.week.ago %>
-  state: completed
   item_id: 25
   lock_version: 0
 reserve_00011:
@@ -109,7 +99,6 @@ reserve_00011:
   id: 11
   created_at: 2007-09-03 14:20:05.530854 +09:00
   expired_at: <%= 1.day.ago %>
-  state: expired
   lock_version: 0
 reserve_00012:
   updated_at: 2007-09-03 14:20:06.530854 +09:00
@@ -119,7 +108,6 @@ reserve_00012:
   id: 12
   created_at: 2007-09-03 14:20:06.530854 +09:00
   expired_at: <%= 1.day.ago %>
-  state: retained
   lock_version: 0
 reserve_00013:
   updated_at: 2007-09-03 14:20:07.530854 +09:00
@@ -129,7 +117,6 @@ reserve_00013:
   id: 13
   created_at: 2007-09-03 14:20:07.530854 +09:00
   expired_at: <%= 1.day.ago %>
-  state: requested
   lock_version: 0
 reserve_00014:
   updated_at: 2007-09-03 14:20:08.530854 +09:00
@@ -140,7 +127,6 @@ reserve_00014:
   created_at: 2007-09-03 14:20:08.530854 +09:00
   retained_at: <%= 1.hour.from_now %>
   expired_at: <%= 1.day.from_now %>
-  state: retained
   item_id: 21
   lock_version: 0
 reserve_00015:
@@ -151,7 +137,6 @@ reserve_00015:
   id: 15
   created_at: 2007-09-03 14:20:09.530854 +09:00
   expired_at: <%= 1.day.from_now %>
-  state: requested
   lock_version: 0
 # == Schema Information
@@ -169,11 +154,9 @@ reserve_00015:
 #  canceled_at                  :datetime
 #  expired_at                   :datetime
 #  deleted_at                   :datetime
-#  state                        :string(255)
-#  expiration_notice_to_agent  :boolean          default(FALSE)
+#  expiration_notice_to_patron  :boolean          default(FALSE)
 #  expiration_notice_to_library :boolean          default(FALSE)
 #  retained_at                  :datetime
 #  postponed_at                 :datetime
 #  lock_version                 :integer          default(0), not null
 #

data/spec/fixtures/user_checkout_stats.yml CHANGED Viewed

@@ -5,14 +5,14 @@ one:
   start_date: 2008-12-15 18:43:02
   end_date: 2008-12-16 18:43:02
   note: MyText
-  state: pending
+  user_id: 2
 two:
   id: 2
   start_date: 2008-12-15 18:43:02
   end_date: 2008-12-16 18:43:02
   note: MyText
-  state: pending
+  user_id: 2
 # == Schema Information
 #
@@ -22,10 +22,9 @@ two:
 #  start_date   :datetime
 #  end_date     :datetime
 #  note         :text
-#  state        :string(255)
 #  created_at   :datetime         not null
 #  updated_at   :datetime         not null
 #  started_at   :datetime
 #  completed_at :datetime
+#  user_id      :integer
 #

data/spec/fixtures/user_groups.yml CHANGED Viewed

@@ -1,6 +1,6 @@
 ---
 user_group_00001:
-  name: (not specified)
+  name: not_specified
   display_name: (not specified)
   updated_at: 2007-12-13 21:00:51.564542 +09:00
   id: 1
@@ -10,7 +10,7 @@ user_group_00001:
   valid_period_for_new_user: 0
   number_of_day_to_notify_due_date: 2
 user_group_00002:
-  name: User
+  name: user
   display_name: User
   updated_at: 2007-12-23 03:14:56.836548 +09:00
   id: 2
@@ -21,7 +21,7 @@ user_group_00002:
   number_of_day_to_notify_overdue: 30
   number_of_time_to_notify_overdue: 6
 user_group_00003:
-  name: Faculty
+  name: faculty
   display_name: Faculty
   updated_at: 2007-12-23 03:15:05.134351 +09:00
   id: 3

data/spec/fixtures/user_reserve_stats.yml CHANGED Viewed

@@ -5,14 +5,14 @@ one:
   start_date: 2008-12-20 11:36:28
   end_date: 2008-12-21 11:36:28
   note: MyText
-  state: pending
+  user_id: 2
 two:
   id: 2
   start_date: 2008-12-20 11:36:28
   end_date: 2008-12-21 11:36:28
   note: MyText
-  state: pending
+  user_id: 2
 # == Schema Information
 #
@@ -22,10 +22,9 @@ two:
 #  start_date   :datetime
 #  end_date     :datetime
 #  note         :text
-#  state        :string(255)
 #  created_at   :datetime         not null
 #  updated_at   :datetime         not null
 #  started_at   :datetime
 #  completed_at :datetime
+#  user_id      :integer
 #

data/spec/fixtures/users.yml CHANGED Viewed

@@ -1,106 +1,51 @@
 ---
 admin:
   updated_at: 2008-05-31 13:16:30.163731 +09:00
-  checkout_icalendar_token: 577830b08ecf9c4c4333d599a57a6f44a7fe76c0
   encrypted_password: $2a$10$vHohD1WflnTIqAa8zMkF9evwAgIZRw3XuR4d3bi29M.jph/MB/AJi
-  user_group_id: 2
   id: 1
-  note:
   username: admin
-  library_id: 2
   email: tanabe@kamata.lib.teu.ac.jp
   created_at: 2007-11-19 16:58:32.111941 +09:00
-  save_checkout_history: true
-  required_role_id: 4
-  user_number: "00001"
-  locale: "ja"
 librarian1:
   updated_at: 2008-05-31 12:41:16.337474 +09:00
-  checkout_icalendar_token: AVRjefcBcey6f1WyYXDl
   encrypted_password: $2a$10$9O2VuTccN4gHq36ARg0QReSrb1D7WrBBhZZ759RM9moHbB0W5zCzS
-  user_group_id: 1
   id: 2
-  note:
   username: librarian1
-  library_id: 1
   email: librarian1@kamata.lib.teu.ac.jp
   created_at: 2007-11-19 16:58:33.172441 +09:00
-  save_checkout_history: false
-  required_role_id: 1
-  user_number: "00002"
-  locale: "ja"
 user1:
   updated_at: 2008-05-31 13:02:25.101261 +09:00
-  checkout_icalendar_token: h75t40Hk364eBQOkmVnH
   encrypted_password: $2a$10$JthS59A0BNkDOoFpCXM0V.GhhffKaoWKbzpPahYp/vTFrOyM7h/uW
-  user_group_id: 1
   id: 3
-  note:
   username: user1
-  library_id: 2
   email: user1@kamata.lib.teu.ac.jp
   created_at: 2007-11-19 16:58:34.637413 +09:00
-  save_checkout_history: true
-  required_role_id: 3
-  checkout_icalendar_token: e3e0277cbba03183c3a12d2b740f3eabebd7df0d
-  user_number: "00003"
-  locale: "ja"
 librarian2:
   updated_at: 2008-05-31 12:42:23.340575 +09:00
-  checkout_icalendar_token:
   encrypted_password: $2a$10$YmmTGrYQ1Ir6oc7wXnp.GuNeO1eYLoP3sv8wMSIrTdaGw2BPwRrpS
-  user_group_id: 1
   id: 4
-  note:
   username: librarian2
-  library_id: 2
   email: librarian2@library.example.jp
   created_at: 2008-01-18 12:24:04.222344 +09:00
-  required_role_id: 1
-  user_number: "00004"
-  locale: "ja"
 user2:
   updated_at: 2008-05-31 12:42:44.711117 +09:00
-  checkout_icalendar_token:
   encrypted_password: $2a$10$i7UjJhLVrJM/J7qaTwW39OXw1NiwowUEbtNHVDV0sqMLjX9.UO9ca
-  user_group_id: 1
   id: 5
-  note:
   username: user2
-  library_id: 1
   email: user2@library.example.jp
   created_at: 2008-01-18 13:29:06.922728 +09:00
-  required_role_id: 2
-#  user_number: '00005'
-  locale: "ja"
 user3:
   updated_at: 2008-05-31 13:02:25.101261 +09:00
-  checkout_icalendar_token: h75t40Hk364eBQOkmVnH
   encrypted_password: cc53de0c2d9a1a228daa9a673ec824473747e17507a6c3c4f7e5eff8821f531d4b9e23616b3ddc66fe17006b2298a556fbd567ac080e87f00f37eef8cee6c417
-  user_group_id: 1
   id: 6
-  note:
   username: user3
-  library_id: 2
   email: user3@kamata.lib.teu.ac.jp
   created_at: 2007-11-19 16:58:34.637413 +09:00
-  required_role_id: 3
-  checkout_icalendar_token:
-  user_number: "00006"
-  locale: "ja"
 user4:
   updated_at: 2008-05-31 13:02:25.101261 +09:00
-  checkout_icalendar_token: h75t40Hk364eBQOkmVnH
   encrypted_password: cc53de0c2d9a1a228daa9a673ec824473747e17507a6c3c4f7e5eff8821f531d4b9e23616b3ddc66fe17006b2298a556fbd567ac080e87f00f37eef8cee6c417
-  user_group_id: 1
   id: 7
-  note:
   username: user4
-  library_id: 2
   email: user4@kamata.lib.teu.ac.jp
   created_at: 2007-11-19 16:58:34.637413 +09:00
-  required_role_id: 3
-  checkout_icalendar_token:
-  user_number: "00007"
-  locale: "ja"
   locked_at: <%= 1.day.ago %>

data/spec/models/checked_item_spec.rb CHANGED Viewed

@@ -9,7 +9,8 @@ describe CheckedItem do
   end
   it "should change circulation_status when a missing item is found" do
-    basket = FactoryGirl.create(:basket)
+    basket = Basket.new
+    basket.user = users(:admin)
     checked_item = CheckedItem.new
     checked_item.item = items(:item_00024)
     checked_item.basket = basket

data/spec/models/checkout_spec.rb CHANGED Viewed

@@ -74,4 +74,3 @@ end
 #  created_at             :datetime         not null
 #  updated_at             :datetime         not null
 #

data/spec/models/manifestation_checkout_stat_spec.rb CHANGED Viewed

@@ -5,7 +5,10 @@ describe ManifestationCheckoutStat do
   fixtures :manifestation_checkout_stats
   it "calculates manifestation count" do
+    old_message_count = Message.count
     manifestation_checkout_stats(:one).transition_to!(:started).should be_truthy
+    Message.count.should eq old_message_count + 1
+    Message.order(:id).last.subject.should eq '集計が完了しました'
   end
   it "should calculate in background" do
@@ -21,10 +24,9 @@ end
 #  start_date   :datetime
 #  end_date     :datetime
 #  note         :text
-#  state        :string(255)
 #  created_at   :datetime         not null
 #  updated_at   :datetime         not null
 #  started_at   :datetime
 #  completed_at :datetime
+#  user_id      :integer
 #

data/spec/models/manifestation_reserve_stat_spec.rb CHANGED Viewed

@@ -5,7 +5,10 @@ describe ManifestationReserveStat do
   fixtures :manifestation_reserve_stats
   it "calculates manifestation count" do
+    old_message_count = Message.count
     manifestation_reserve_stats(:one).transition_to!(:started).should be_truthy
+    Message.count.should eq old_message_count + 1
+    Message.order(:id).last.subject.should eq '集計が完了しました'
   end
   it "should calculate in background" do
@@ -21,10 +24,9 @@ end
 #  start_date   :datetime
 #  end_date     :datetime
 #  note         :text
-#  state        :string(255)
 #  created_at   :datetime         not null
 #  updated_at   :datetime         not null
 #  started_at   :datetime
 #  completed_at :datetime
+#  user_id      :integer
 #

data/spec/models/reserve_spec.rb CHANGED Viewed

@@ -12,19 +12,19 @@ describe Reserve do
     old_count = Message.count
     reserve = reserves(:reserve_00014)
     item = reserve.next_reservation.item
-    reserve.sm_expire!
-    reserve.state.should eq 'expired'
+    reserve.transition_to!(:expired)
+    reserve.current_state.should eq 'expired'
     item.should eq reserve.item
-    Message.count.should eq old_count + 2
+    Message.count.should eq old_count + 4
   end
   it "should expire reservation" do
-    reserves(:reserve_00001).sm_expire!
+    reserves(:reserve_00001).transition_to!(:expired)
     reserves(:reserve_00001).request_status_type.name.should eq 'Expired'
   end
   it "should cancel reservation" do
-    reserves(:reserve_00001).sm_cancel!
+    reserves(:reserve_00001).transition_to!(:canceled)
     reserves(:reserve_00001).canceled_at.should be_truthy
     reserves(:reserve_00001).request_status_type.name.should eq 'Cannot Fulfill Request'
   end
@@ -75,13 +75,13 @@ describe Reserve do
     reservation.item = old_reservation.item
     reservation.item.retained?.should be_falsy
-    reservation.sm_retain!
+    reservation.transition_to!(:retained)
     old_reservation.reload
     old_reservation.item.should be_nil
     reservation.retained_at.should be_truthy
-    old_reservation.retained_at.should be_nil
-    old_reservation.postponed_at.should be_truthy
-    old_reservation.state.should eq 'postponed'
+#    old_reservation.retained_at.should be_nil
+#    old_reservation.postponed_at.should be_truthy
+    old_reservation.current_state.should eq 'postponed'
     MessageRequest.count.should eq old_count + 4
     reservation.item.retained?.should be_truthy
   end
@@ -116,11 +116,9 @@ end
 #  canceled_at                  :datetime
 #  expired_at                   :datetime
 #  deleted_at                   :datetime
-#  state                        :string(255)
 #  expiration_notice_to_patron  :boolean          default(FALSE)
 #  expiration_notice_to_library :boolean          default(FALSE)
 #  retained_at                  :datetime
 #  postponed_at                 :datetime
 #  lock_version                 :integer          default(0), not null
 #

data/spec/models/user_checkout_stat_spec.rb CHANGED Viewed

@@ -5,7 +5,10 @@ describe UserCheckoutStat do
   fixtures :user_checkout_stats
   it "calculates user count" do
+    old_message_count = Message.count
     user_checkout_stats(:one).transition_to!(:started).should be_truthy
+    Message.count.should eq old_message_count + 1
+    Message.order(:id).last.subject.should eq '集計が完了しました'
   end
   it "should calculate in background" do
@@ -21,10 +24,9 @@ end
 #  start_date   :datetime
 #  end_date     :datetime
 #  note         :text
-#  state        :string(255)
 #  created_at   :datetime         not null
 #  updated_at   :datetime         not null
 #  started_at   :datetime
 #  completed_at :datetime
+#  user_id      :integer
 #

data/spec/models/user_reserve_stat_spec.rb CHANGED Viewed

@@ -5,7 +5,10 @@ describe UserReserveStat do
   fixtures :user_reserve_stats
   it "calculates user count" do
+    old_message_count = Message.count
     user_reserve_stats(:one).transition_to!(:started).should be_truthy
+    Message.count.should eq old_message_count + 1
+    Message.order(:id).last.subject.should eq '集計が完了しました'
   end
   it "should calculate in background" do
@@ -21,10 +24,9 @@ end
 #  start_date   :datetime
 #  end_date     :datetime
 #  note         :text
-#  state        :string(255)
 #  created_at   :datetime         not null
 #  updated_at   :datetime         not null
 #  started_at   :datetime
 #  completed_at :datetime
+#  user_id      :integer
 #

data/spec/support/resque.rb CHANGED Viewed

@@ -3,28 +3,31 @@ RSpec.configure do |config|
   REDIS_PID = "#{Rails.root}/tmp/pids/redis-test.pid"
   REDIS_CACHE_PATH = "#{Rails.root}/tmp/cache/"
-  config.before(:suite) do
-    redis_options = {
-      "daemonize"     => 'yes',
-      "pidfile"       => REDIS_PID,
-      "port"          => 9736,
-      "timeout"       => 300,
-      "save 900"      => 1,
-      "save 300"      => 1,
-      "save 60"       => 10000,
-      "dbfilename"    => "dump.rdb",
-      "dir"           => REDIS_CACHE_PATH,
-      "loglevel"      => "debug",
-      "logfile"       => "stdout",
-      "databases"     => 16
-    }.map { |k, v| "#{k} #{v}" }.join("\n")
-    `echo '#{redis_options}' | redis-server -`
-  end
+  unless ENV["TRAVIS"]
+    Resque.redis = 'localhost:9736'
+    config.before(:suite) do
+      redis_options = {
+        "daemonize"     => 'yes',
+        "pidfile"       => REDIS_PID,
+        "port"          => 9736,
+        "timeout"       => 300,
+        "save 900"      => 1,
+        "save 300"      => 1,
+        "save 60"       => 10000,
+        "dbfilename"    => "dump.rdb",
+        "dir"           => REDIS_CACHE_PATH,
+        "loglevel"      => "debug",
+        "logfile"       => "stdout",
+        "databases"     => 16
+      }.map { |k, v| "#{k} #{v}" }.join("\n")
+      `echo '#{redis_options}' | redis-server -`
+    end
-  config.after(:suite) do
-    %x{
-      cat #{REDIS_PID} | xargs kill -QUIT
-      rm -f #{REDIS_CACHE_PATH}dump.rdb
-    }
+    config.after(:suite) do
+      %x{
+        cat #{REDIS_PID} | xargs kill -QUIT
+        rm -f #{REDIS_CACHE_PATH}dump.rdb
+      }
+    end
   end
 end