enju_inter_library_loan 0.1.0.pre9 → 0.1.0.pre10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5deb9b18d8630ca992c8eb2e448888d0bf5b0629
-  data.tar.gz: 4d160cb5d4ce082978529002904bb570f25b10e9
+  metadata.gz: 16ad98df1ff527548599f101ff13ec69078f2960
+  data.tar.gz: 6faaceea2534561bb5de3b7ff471213a1cdbcaf1
 SHA512:
-  metadata.gz: c9895c852444c43a1379fd355f4f64ae3383c29b781770ab2db6b6a9062a4988f892183508f0f64acfd70b35fca3c1766fb5e98df12a30f634223bf6df609843
-  data.tar.gz: 3db2cc3479bc8667a0bad38cdf8233f81825bc07ad5cf629a9069e4ddee2fb0675bf18b76038c1d9adb8fed2e4d3cbc3ec1f704f47c9d77ea8849b5888e5ae63
+  metadata.gz: 80640f160466d2f6c893e7b2291e1bab8034350305cbcfe9b34ec59b8265f9cd09f4d2044c878ef61a14791abeac32f26018f8a34886e764a82cf70814bdfe4d
+  data.tar.gz: 0ef353d37ec37f50e36e3c19fdb5cf208d52b4145d40c5fd3a140c9cae89a8951e5ba0b83beb3cd18ad460e6a700e50ea4ea8c68c43a4de73c23acf1174d1e71

data/app/models/inter_library_loan.rb

@@ -1,95 +1,79 @@
 class InterLibraryLoan < ActiveRecord::Base
+  include Statesman::Adapters::ActiveRecordModel
   attr_accessible :item_id, :borrowing_library_id
-  scope :completed, where(:state => 'return_received')
-  #scope :processing, lambda {|item, borrowing_library| {:conditions => ['item_id = ? AND borrowing_library_id = ? AND state != ?', item.id, borrowing_library.id, 'return_received']}}
+  scope :completed, -> {in_state(:return_received)}
   scope :processing, lambda {|item, borrowing_library| {:conditions => ['item_id = ? AND borrowing_library_id = ?', item.id, borrowing_library.id]}}
 
-  belongs_to :item, :validate => true
+  belongs_to :item, validate: true
   #belongs_to :reserve
-  belongs_to :borrowing_library, :foreign_key => 'borrowing_library_id', :class_name => 'Library', :validate => true
+  belongs_to :borrowing_library, foreign_key: 'borrowing_library_id', class_name: 'Library', validate: true
 
   validates_presence_of :item_id, :borrowing_library_id
   validates_associated :item, :borrowing_library
-  validate :check_library, :on => :create
-
-  def check_library
-    if self.item and self.borrowing_library
-      unless InterLibraryLoan.processing(self.item, self.borrowing_library).blank?
-        errors.add(:borrowing_library)
-        errors.add(:item_identifier)
-      end
-    end
-  end
-
-  def self.per_page
-    10
-  end
+  validate :check_library, on: :create
 
   attr_accessor :item_identifier
 
-  state_machine :initial => :pending do
-    before_transition :pending => :requested, :do => :do_request
-    before_transition :requested => :shipped, :do => :ship
-    before_transition :shipped => :received, :do => :receive
-    before_transition :received => :return_shipped, :do => :return_ship
-    before_transition :return_shipped => :return_received, :do => :return_receive
-
-    event :sm_request do
-      transition :pending => :requested
-    end
+  paginates_per 10
 
-    event :sm_ship do
-      transition :requested => :shipped
-    end
+  def state_machine
+    InterLibraryLoanStateMachine.new(self, transition_class: InterLibraryLoanTransition)
+  end
 
-    event :sm_receive do
-      transition :shipped => :received
-    end
+  has_many :inter_library_loan_transitions
 
-    event :sm_return_ship do
-      transition :received => :return_shipped
-    end
+  delegate :can_transition_to?, :transition_to!, :transition_to, :current_state,
+    to: :state_machine
 
-    event :sm_return_receive do
-      transition :return_shipped => :return_received
+  def check_library
+    if item and borrowing_library
+      unless InterLibraryLoan.processing(item, borrowing_library).blank?
+        errors.add(:borrowing_library)
+        errors.add(:item_identifier)
+      end
     end
   end
 
   def do_request
     InterLibraryLoan.transaction do
-      self.item.update_attributes({:circulation_status => CirculationStatus.where(:name => 'Recalled').first})
-      self.update_attributes({:requested_at => Time.zone.now})
+      item.update_attributes({:circulation_status => CirculationStatus.where(:name => 'Recalled').first})
+      update_attributes({:requested_at => Time.zone.now})
     end
   end
 
   def ship
     InterLibraryLoan.transaction do
-      self.item.update_attributes({:circulation_status => CirculationStatus.where(:name => 'In Transit Between Library Locations').first})
-      self.update_attributes({:shipped_at => Time.zone.now})
+      item.update_attributes({:circulation_status => CirculationStatus.where(:name => 'In Transit Between Library Locations').first})
+      update_attributes({:shipped_at => Time.zone.now})
     end
   end
 
   def receive
     InterLibraryLoan.transaction do
-      self.item.update_attributes({:circulation_status => CirculationStatus.where(:name => 'In Process').first})
-      self.update_attributes({:received_at => Time.zone.now})
+      item.update_attributes({:circulation_status => CirculationStatus.where(:name => 'In Process').first})
+      update_attributes({:received_at => Time.zone.now})
     end
   end
 
   def return_ship
     InterLibraryLoan.transaction do
-      self.item.update_attributes({:circulation_status => CirculationStatus.where(:name => 'In Transit Between Library Locations').first})
-      self.update_attributes({:return_shipped_at => Time.zone.now})
+      item.update_attributes({:circulation_status => CirculationStatus.where(:name => 'In Transit Between Library Locations').first})
+      update_attributes({:return_shipped_at => Time.zone.now})
     end
   end
 
   def return_receive
     InterLibraryLoan.transaction do
       # TODO: 'Waiting To Be Reshelved'
-      self.item.update_attributes({:circulation_status => CirculationStatus.where(:name => 'Available On Shelf').first})
-      self.update_attributes({:return_received_at => Time.zone.now})
+      item.update_attributes({:circulation_status => CirculationStatus.where(:name => 'Available On Shelf').first})
+      update_attributes({:return_received_at => Time.zone.now})
     end
   end
+
+  private
+  def self.transition_class
+    InterLibraryLoanTransition
+  end
 end
 
 # == Schema Information
@@ -105,8 +89,6 @@ end
 #  return_shipped_at    :datetime
 #  return_received_at   :datetime
 #  deleted_at           :datetime
-#  state                :string(255)
 #  created_at           :datetime         not null
 #  updated_at           :datetime         not null
 #
-

data/app/models/inter_library_loan_state_machine.rb

@@ -0,0 +1,32 @@
+class InterLibraryLoanStateMachine
+  include Statesman::Machine
+
+  state :pending, initial: true
+  state :requested
+  state :shipped
+  state :received
+  state :return_shipped
+  state :return_received
+
+  transition from: :pending, to: :requested
+  transition from: :requested, to: :shipped
+  transition from: :shipped, to: :received
+  transition from: :received, to: :return_shipped
+  transition from: :return_shipped, to: :return_received
+
+  before_transition(to: :shipped) do |inter_library_loan|
+    inter_library_loan.ship
+  end
+
+  before_transition(to: :received) do |inter_library_loan|
+    inter_library_loan.do_receive
+  end
+
+  before_transition(to: :return_shipped) do |inter_library_loan|
+    inter_library_loan.do_return_ship
+  end
+
+  before_transition(to: :return_received) do |inter_library_loan|
+    inter_library_loan.do_return_receive
+  end
+end

data/app/models/inter_library_loan_transition.rb

@@ -0,0 +1,20 @@
+class InterLibraryLoanTransition < ActiveRecord::Base
+  include Statesman::Adapters::ActiveRecordTransition
+
+  
+  belongs_to :inter_library_loan, inverse_of: :inter_library_loan_transitions
+  attr_accessible :to_state, :sort_key, :metadata
+end
+
+# == Schema Information
+#
+# Table name: inter_library_loan_transitions
+#
+#  id                    :integer          not null, primary key
+#  to_state              :string(255)
+#  metadata              :text             default("{}")
+#  sort_key              :integer
+#  inter_library_loan_id :integer
+#  created_at            :datetime         not null
+#  updated_at            :datetime         not null
+#

data/db/migrate/148_create_inter_library_loans.rb

@@ -9,7 +9,6 @@ class CreateInterLibraryLoans < ActiveRecord::Migration
       t.timestamp :return_shipped_at
       t.timestamp :return_received_at
       t.timestamp :deleted_at
-      t.string :state
 
       t.timestamps
     end

data/db/migrate/20140607100507_create_inter_library_loan_transitions.rb

@@ -0,0 +1,14 @@
+class CreateInterLibraryLoanTransitions < ActiveRecord::Migration
+  def change
+    create_table :inter_library_loan_transitions do |t|
+      t.string :to_state
+      t.text :metadata, default: "{}"
+      t.integer :sort_key
+      t.integer :inter_library_loan_id
+      t.timestamps
+    end
+
+    add_index :inter_library_loan_transitions, :inter_library_loan_id
+    add_index :inter_library_loan_transitions, [:sort_key, :inter_library_loan_id], unique: true, name: "index_inter_library_loan_transitions_on_sort_key_and_loan_id"
+  end
+end

data/lib/enju_inter_library_loan/engine.rb

@@ -1,5 +1,5 @@
-require 'enju_seed'
-require 'state_machine'
+require 'enju_biblio'
+require 'enju_library'
 
 module EnjuInterLibraryLoan
   class Engine < ::Rails::Engine

data/lib/enju_inter_library_loan/version.rb

@@ -1,3 +1,3 @@
 module EnjuInterLibraryLoan
-  VERSION = "0.1.0.pre9"
+  VERSION = "0.1.0.pre10"
 end

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

@@ -7,21 +7,7 @@ class User < ActiveRecord::Base
   # Setup accessible (or protected) attributes for your model
   attr_accessible :email, :password, :password_confirmation, :remember_me
 
-  has_one :user_has_role
-  has_one :role, :through => :user_has_role
-  belongs_to :required_role, :class_name => 'Role', :foreign_key => 'required_role_id'
-  belongs_to :library, :validate => true
-
-  def has_role?(role_in_question)
-    return false unless role
-    return true if role.name == role_in_question
-    case role.name
-    when 'Administrator'
-      return true
-    when 'Librarian'
-      return true if role_in_question == 'User'
-    else
-      false
-    end
-  end
+  enju_leaf_user_model
+  enju_circulation_user_model
+  enju_message_user_model
 end

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

@@ -0,0 +1,3 @@
+Statesman.configure do
+  storage_adapter(Statesman::Adapters::ActiveRecord)
+end

data/spec/dummy/db/migrate/001_create_agents.rb

@@ -1,7 +1,6 @@
 class CreateAgents < ActiveRecord::Migration
   def change
     create_table :agents do |t|
-      t.integer :user_id
       t.string :last_name
       t.string :middle_name
       t.string :first_name
@@ -40,11 +39,9 @@ class CreateAgents < ActiveRecord::Migration
       t.text :note
       t.integer :required_role_id, :default => 1, :null => false
       t.integer :required_score, :default => 0, :null => false
-      t.string :state
       t.text :email
       t.text :url
     end
-    add_index :agents, :user_id, :unique => true
     add_index :agents, :language_id
     add_index :agents, :country_id
     add_index :agents, :required_role_id

data/spec/dummy/db/migrate/{20111201155513_add_devise_to_users.rb → 002_devise_create_users.rb}

@@ -1,6 +1,6 @@
-class AddDeviseToUsers < ActiveRecord::Migration
-  def self.up
-    change_table(:users) do |t|
+class DeviseCreateUsers < ActiveRecord::Migration
+  def change
+    create_table(:users) do |t|
       ## Database authenticatable
       t.string :email,              :null => false, :default => ""
       t.string :encrypted_password, :null => false, :default => ""
@@ -19,26 +19,28 @@ class AddDeviseToUsers < ActiveRecord::Migration
       t.string   :current_sign_in_ip
       t.string   :last_sign_in_ip
 
-      # t.encryptable
-      # t.confirmable
-      # t.lockable :lock_strategy => :failed_attempts, :unlock_strategy => :both
-      # t.token_authenticatable
+      ## Confirmable
+      # t.string   :confirmation_token
+      # t.datetime :confirmed_at
+      # t.datetime :confirmation_sent_at
+      # t.string   :unconfirmed_email # Only if using reconfirmable
 
+      ## Lockable
+      # t.integer  :failed_attempts, :default => 0 # Only if lock strategy is :failed_attempts
+      # t.string   :unlock_token # Only if unlock strategy is :email or :both
+      # t.datetime :locked_at
 
-      # Uncomment below if timestamps were not included in your original model.
-      # t.timestamps
+      ## Token authenticatable
+      # t.string :authentication_token
+
+
+      t.timestamps
     end
 
-    add_index :users, :email #,                :unique => true
+    add_index :users, :email,                :unique => true
     add_index :users, :reset_password_token, :unique => true
     # add_index :users, :confirmation_token,   :unique => true
     # add_index :users, :unlock_token,         :unique => true
     # add_index :users, :authentication_token, :unique => true
   end
-
-  def self.down
-    # By default, we don't want to make any assumption about how to roll back a migration when your
-    # model already existed. Please edit below which fields you would like to remove in this migration.
-    raise ActiveRecord::IrreversibleMigration
-  end
 end

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

@@ -29,7 +29,6 @@ class CreateManifestations < ActiveRecord::Migration
       t.boolean :repository_content, :default => false, :null => false
       t.integer :lock_version, :default => 0, :null => false
       t.integer :required_role_id, :default => 1, :null => false
-      t.string :state
       t.integer :required_score, :default => 0, :null => false
       t.integer :frequency_id, :default => 1, :null => false
       t.boolean :subscription_master, :default => false, :null => false

data/spec/dummy/db/migrate/006_create_items.rb

@@ -1,7 +1,6 @@
 class CreateItems < ActiveRecord::Migration
   def change
     create_table :items do |t|
-      #t.integer :manifestation_id
       t.string :call_number
       t.string :item_identifier
       t.timestamps
@@ -13,10 +12,8 @@ class CreateItems < ActiveRecord::Migration
       t.integer :price
       t.integer :lock_version, :default => 0, :null => false
       t.integer :required_role_id, :default => 1, :null => false
-      t.string :state
       t.integer :required_score, :default => 0, :null => false
     end
-    #add_index :items, :manifestation_id
     add_index :items, :shelf_id
     add_index :items, :item_identifier
     add_index :items, :required_role_id

data/spec/dummy/db/migrate/035_create_reserves.rb

@@ -10,8 +10,7 @@ class CreateReserves < ActiveRecord::Migration
       t.datetime :canceled_at
       t.datetime :expired_at
       t.datetime :deleted_at
-      t.string :state
-      t.boolean :expiration_notice_to_agent, :default => false
+      t.boolean :expiration_notice_to_patron, :default => false
       t.boolean :expiration_notice_to_library, :default => false
     end
 

data/spec/dummy/db/migrate/041_create_roles.rb

@@ -0,0 +1,13 @@
+class CreateRoles < ActiveRecord::Migration
+  def change
+    create_table "roles" do |t|
+      t.column :name, :string, :null => false
+      t.column :display_name, :string
+      t.column :note, :text
+      t.column :created_at, :datetime
+      t.column :updated_at, :datetime
+      t.integer :score, :default => 0, :null => false
+      t.integer :position
+    end
+  end
+end

data/spec/dummy/db/migrate/077_create_user_groups.rb

@@ -1,16 +1,12 @@
 class CreateUserGroups < ActiveRecord::Migration
-  def self.up
+  def change
     create_table :user_groups do |t|
-      t.string :name, :string, :not_null => true
-      t.text :display_name, :string
+      t.string :name, :not_null => true
+      t.text :display_name
       t.text :note
       t.integer :position
       t.timestamps
       t.datetime :deleted_at
     end
   end
-
-  def self.down
-    drop_table :user_groups
-  end
 end

data/spec/dummy/db/migrate/080_create_library_groups.rb

@@ -4,7 +4,6 @@ class CreateLibraryGroups < ActiveRecord::Migration
       t.string :name, :null => false
       t.text :display_name
       t.string :short_name, :null => false
-      t.string :email
       t.text :my_networks
       t.text :login_banner
       t.text :note

data/spec/dummy/db/migrate/20081006090811_create_subscriptions.rb

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