enju_message 0.1.14.pre9 → 0.1.14.pre10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02a1cae4b9213d73460fd217952044bd0927e09b
-  data.tar.gz: 9110f24a1c7d924470b0d85817db0b62e9410130
+  metadata.gz: 10a4be314ce274452de8e18e40ec20a5774da96a
+  data.tar.gz: 9e8071d4fe863f3482f72157894b696d8dc149c0
 SHA512:
-  metadata.gz: 42e043db562178f4282666cecdf736f00dce2ebb6d68e85fb86d6755d9f4ebc1a6ce1ec4a966d9fe13418641fdf39db37aaec3690183545c6ef91169e45e1e84
-  data.tar.gz: eb19ba49de1db2575a5f1677bf3cdfa31bb264b7156190b236943e55d66c650e01a79c90e2096bdd261fd3917c23feacd005c0d5238a13b91abe8edf8b307427
+  metadata.gz: b450fcb44ad5062b5771765e5359f703420045289b005a65c9ee885c199e6ec287f449598cb1c70de9ba6b05fc803caa8ff523c237b7470c4ccab8b9eef8f2c4
+  data.tar.gz: baac98bb78f2187a7e381936e87f51d69d62917dbae7417fb87967fcc4dff41494228de34cc5ec82e2f7f1a8850938864776d5816b3ab77211ba085c8122e7bc

data/app/models/message_request.rb

@@ -48,7 +48,7 @@ class MessageRequest < ActiveRecord::Base
       end
       self.sent_at = Time.zone.now
       save(:validate => false)
-      if ['reservation_expired_for_patron', 'reservation_expired_for_patron'].include?(self.message_template.status)
+      if ['reservation_expired_for_patron', 'reservation_expired_for_patron'].include?(message_template.status)
         self.receiver.reserves.each do |reserve|
           reserve.expiration_notice_to_patron = true
           reserve.save(:validate => false)
@@ -64,10 +64,10 @@ class MessageRequest < ActiveRecord::Base
 
   def save_message_body(options = {})
     options = {
-      :receiver => self.receiver,
-      :locale => self.receiver.locale
+      :receiver => receiver,
+      :locale => receiver.locale
     }.merge(options)
-    self.update_attributes!({:body => self.message_template.embed_body(options)})
+    self.update_attributes!({:body => message_template.embed_body(options)})
   end
 
   def self.send_messages

data/lib/enju_message/version.rb

@@ -1,3 +1,3 @@
 module EnjuMessage
-  VERSION = "0.1.14.pre9"
+  VERSION = "0.1.14.pre10"
 end

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

@@ -1,46 +1,13 @@
 class User < ActiveRecord::Base
   # Include default devise modules. Others available are:
   # :token_authenticatable, :encryptable, :confirmable, :lockable, :timeoutable and :omniauthable
-  devise :database_authenticatable, :registerable,
-         :recoverable, :rememberable, :trackable, :validatable
+  devise :database_authenticatable, #:registerable,
+         :recoverable, :rememberable, :trackable, #:validatable,
+         :lockable, :lock_strategy => :none, :unlock_strategy => :none
 
   # 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
-  has_one :patron
-  belongs_to :user_group
-  belongs_to :required_role, :class_name => 'Role', :foreign_key => 'required_role_id'
-  before_create :set_role_and_patron
-
+  enju_leaf_user_model
   enju_message_user_model
-
-  extend FriendlyId
-  friendly_id :username
-
-  def set_role_and_patron
-    self.required_role = Role.where(:name => 'Librarian').first
-    self.locale = I18n.default_locale.to_s
-    unless self.patron
-      self.patron = Patron.create(:full_name => self.username) if self.username
-    end
-  end
-
-  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
-
-  def full_name
-    username
-  end
 end

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

@@ -1,5 +1,5 @@
 class CreatePatrons < ActiveRecord::Migration
-  def self.up
+  def change
     create_table :patrons do |t|
       t.integer :user_id
       t.string :last_name
@@ -38,11 +38,6 @@ class CreatePatrons < ActiveRecord::Migration
       t.integer :patron_type_id, :default => 1, :null => false
       t.integer :lock_version, :default => 0, :null => false
       t.text :note
-      t.integer :creates_count, :default => 0, :null => false
-      t.integer :realizes_count, :default => 0, :null => false
-      t.integer :produces_count, :default => 0, :null => false
-      t.integer :owns_count, :default => 0, :null => false
-      #t.integer :resource_has_subjects_count, :default => 0, :null => false
       t.integer :required_role_id, :default => 1, :null => false
       t.integer :required_score, :default => 0, :null => false
       t.string :state
@@ -55,8 +50,4 @@ class CreatePatrons < ActiveRecord::Migration
     add_index :patrons, :required_role_id
     add_index :patrons, :full_name
   end
-
-  def self.down
-    drop_table :patrons
-  end
 end

data/spec/dummy/db/migrate/059_create_libraries.rb

@@ -0,0 +1,28 @@
+class CreateLibraries < ActiveRecord::Migration
+  def change
+    create_table :libraries do |t|
+      t.string :name, :null => false
+      t.text :display_name
+      t.string :short_display_name, :null => false
+      t.string :zip_code
+      t.text :street
+      t.text :locality
+      t.text :region
+      t.string :telephone_number_1
+      t.string :telephone_number_2
+      t.string :fax_number
+      t.text :note
+      t.integer :call_number_rows, :default => 1, :null => false
+      t.string :call_number_delimiter, :default => "|", :null => false
+      t.integer :library_group_id, :default => 1, :null => false
+      t.integer :users_count, :default => 0, :null => false
+      t.integer :position
+      t.integer :country_id
+
+      t.timestamps
+      t.datetime :deleted_at
+    end
+    add_index :libraries, :library_group_id
+    add_index :libraries, :name, :unique => true
+  end
+end

data/spec/dummy/db/migrate/069_create_shelves.rb

@@ -0,0 +1,15 @@
+class CreateShelves < ActiveRecord::Migration
+  def change
+    create_table :shelves do |t|
+      t.string :name, :null => false
+      t.text :display_name
+      t.text :note
+      t.integer :library_id, :default => 1, :null => false
+      t.integer :items_count, :default => 0, :null => false
+      t.integer :position
+      t.timestamps
+      t.datetime :deleted_at
+    end
+    add_index :shelves, :library_id
+  end
+end

data/spec/dummy/db/migrate/{20111201163342_create_user_groups.rb → 077_create_user_groups.rb}

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

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

@@ -1,25 +1,18 @@
 class CreateLibraryGroups < ActiveRecord::Migration
-  def self.up
+  def change
     create_table :library_groups do |t|
       t.string :name, :null => false
       t.text :display_name
       t.string :short_name, :null => false
       t.string :email
       t.text :my_networks
-      t.boolean :use_dsbl, :default => false, :null => false
-      t.text :dsbl_list
       t.text :login_banner
       t.text :note
-      t.integer :valid_period_for_new_user, :default => 365, :null => false
-      t.boolean :post_to_union_catalog, :default => false, :null => false
       t.integer :country_id
+      t.integer :position
 
       t.timestamps
     end
     add_index :library_groups, :short_name
   end
-
-  def self.down
-    drop_table :library_groups
-  end
 end

data/spec/dummy/db/migrate/120_create_baskets.rb

@@ -0,0 +1,12 @@
+class CreateBaskets < ActiveRecord::Migration
+  def change
+    create_table :baskets do |t|
+      t.integer :user_id
+      t.text :note
+      t.integer :lock_version, :default => 0, :null => false
+
+      t.timestamps
+    end
+    add_index :baskets, :user_id
+  end
+end

data/spec/dummy/db/migrate/124_create_bookstores.rb

@@ -0,0 +1,17 @@
+class CreateBookstores < ActiveRecord::Migration
+  def change
+    create_table :bookstores do |t|
+      t.text :name, :null => false
+      t.string :zip_code
+      t.text :address
+      t.text :note
+      t.string :telephone_number
+      t.string :fax_number
+      t.string :url
+      t.integer :position
+      t.datetime :deleted_at
+
+      t.timestamps
+    end
+  end
+end

data/spec/dummy/db/migrate/130_create_request_status_types.rb

@@ -0,0 +1,12 @@
+class CreateRequestStatusTypes < ActiveRecord::Migration
+  def change
+    create_table :request_status_types do |t|
+      t.string :name, :null => false
+      t.text :display_name
+      t.text :note
+      t.integer :position
+
+      t.timestamps
+    end
+  end
+end

data/spec/dummy/db/migrate/131_create_request_types.rb

@@ -0,0 +1,12 @@
+class CreateRequestTypes < ActiveRecord::Migration
+  def change
+    create_table :request_types do |t|
+      t.string :name, :null => false
+      t.text :display_name
+      t.text :note
+      t.integer :position
+
+      t.timestamps
+    end
+  end
+end

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

data/spec/dummy/db/migrate/20081006093246_create_subscribes.rb

@@ -0,0 +1,14 @@
+class CreateSubscribes < ActiveRecord::Migration
+  def change
+    create_table :subscribes do |t|
+      t.integer :subscription_id, :null => false
+      t.integer :work_id, :null => false
+      t.datetime :start_at, :null => false
+      t.datetime :end_at, :null => false
+
+      t.timestamps
+    end
+    add_index :subscribes, :subscription_id
+    add_index :subscribes, :work_id
+  end
+end

data/spec/dummy/db/migrate/20081023092436_create_search_engines.rb

@@ -0,0 +1,17 @@
+class CreateSearchEngines < ActiveRecord::Migration
+  def change
+    create_table :search_engines do |t|
+      t.string :name, :null => false
+      t.text :display_name
+      t.string :url, :null => false
+      t.text :base_url, :null => false
+      t.text :http_method, :null => false
+      t.text :query_param, :null => false
+      t.text :additional_param
+      t.text :note
+      t.integer :position
+
+      t.timestamps
+    end
+  end
+end

data/spec/dummy/db/migrate/20081025083323_create_countries.rb

@@ -0,0 +1,28 @@
+class CreateCountries < ActiveRecord::Migration
+
+  # ISO 3166 is the International Standard for country codes.
+  #
+  # ISO 3166-1:2006 Codes for the representation of names of countries and their subdivisions - Part 1: 
+  # Country codes which is what most users know as ISO's country codes. First published in 1974, it is has since 
+  # then become one of the world's most popular and most widely used standard solution for coding country names. 
+  # It contains a two-letter code which is recommended as the general purpose code, a three-letter code which has 
+  # better mnenomic properties and a numeric-3 code which can be useful if script independence of the codes is important.
+  #
+  # http://www.iso.org/iso/country_codes/background_on_iso_3166/what_is_iso_3166.htm
+
+  def change
+    create_table :countries do |t|
+      t.string :name,         :size => 80, :null => false
+      t.text :display_name
+      t.string :alpha_2,      :size => 2
+      t.string :alpha_3,      :size => 3
+      t.string :numeric_3, :size => 3
+      t.text :note
+      t.integer :position
+    end
+    add_index :countries, :name
+    add_index :countries, :alpha_2
+    add_index :countries, :alpha_3
+    add_index :countries, :numeric_3
+  end
+end

data/spec/dummy/db/migrate/20091202124834_create_versions.rb

@@ -0,0 +1,18 @@
+class CreateVersions < ActiveRecord::Migration
+  def self.up
+    create_table :versions do |t|
+      t.string   :item_type, :null => false
+      t.integer  :item_id,   :null => false
+      t.string   :event,     :null => false
+      t.string   :whodunnit
+      t.text     :object
+      t.datetime :created_at
+    end
+    add_index :versions, [:item_type, :item_id]
+  end
+
+  def self.down
+    remove_index :versions, [:item_type, :item_id]
+    drop_table :versions
+  end
+end

data/spec/dummy/db/migrate/20100314190054_add_opening_hour_to_library.rb

@@ -0,0 +1,9 @@
+class AddOpeningHourToLibrary < ActiveRecord::Migration
+  def self.up
+    add_column :libraries, :opening_hour, :text
+  end
+
+  def self.down
+    remove_column :libraries, :opening_hour
+  end
+end

data/spec/dummy/db/migrate/20110301121550_add_birth_date_and_death_date_to_patron.rb

@@ -0,0 +1,11 @@
+class AddBirthDateAndDeathDateToPatron < ActiveRecord::Migration
+  def self.up
+    add_column :patrons, :birth_date, :string
+    add_column :patrons, :death_date, :string
+  end
+
+  def self.down
+    remove_column :patrons, :death_date
+    remove_column :patrons, :birth_date
+  end
+end

data/spec/dummy/db/migrate/20110318183304_add_valid_period_for_new_user_to_user_group.rb

@@ -0,0 +1,11 @@
+class AddValidPeriodForNewUserToUserGroup < ActiveRecord::Migration
+  def self.up
+    add_column :user_groups, :valid_period_for_new_user, :integer, :default => 0, :null => false
+    add_column :user_groups, :expired_at, :timestamp
+  end
+
+  def self.down
+    remove_column :user_groups, :valid_period_for_new_user
+    remove_column :user_groups, :expired_at
+  end
+end

data/spec/dummy/db/migrate/20111201155456_devise_create_users.rb

@@ -0,0 +1,46 @@
+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 => ""
+
+      ## Recoverable
+      t.string   :reset_password_token
+      t.datetime :reset_password_sent_at
+
+      ## Rememberable
+      t.datetime :remember_created_at
+
+      ## Trackable
+      t.integer  :sign_in_count, :default => 0
+      t.datetime :current_sign_in_at
+      t.datetime :last_sign_in_at
+      t.string   :current_sign_in_ip
+      t.string   :last_sign_in_ip
+
+      ## 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
+
+      ## Token authenticatable
+      # t.string :authentication_token
+
+
+      t.timestamps
+    end
+
+    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
+end

data/spec/dummy/db/migrate/20120105074911_add_isil_to_library.rb

@@ -0,0 +1,5 @@
+class AddIsilToLibrary < ActiveRecord::Migration
+  def change
+    add_column :libraries, :isil, :string
+  end
+end

data/spec/dummy/db/migrate/20120129014038_create_budget_types.rb

@@ -0,0 +1,12 @@
+class CreateBudgetTypes < ActiveRecord::Migration
+  def change
+    create_table :budget_types do |t|
+      t.string :name
+      t.text :display_name
+      t.text :note
+      t.integer :position
+
+      t.timestamps
+    end
+  end
+end

data/spec/dummy/db/migrate/20120319173203_create_accepts.rb

@@ -0,0 +1,14 @@
+class CreateAccepts < ActiveRecord::Migration
+  def change
+    create_table :accepts do |t|
+      t.integer :basket_id
+      t.integer :item_id
+      t.integer :librarian_id
+
+      t.timestamps
+    end
+
+    add_index :accepts, :basket_id
+    add_index :accepts, :item_id
+  end
+end

data/spec/dummy/db/migrate/20120510140958_add_closed_to_shelf.rb

@@ -0,0 +1,5 @@
+class AddClosedToShelf < ActiveRecord::Migration
+  def change
+    add_column :shelves, :closed, :boolean, :default => false, :null => false
+  end
+end

data/spec/dummy/db/migrate/20130221154434_add_additional_attributes_to_user.rb

@@ -0,0 +1,26 @@
+class AddAdditionalAttributesToUser < ActiveRecord::Migration
+  def change
+    add_column :users, :username, :string
+    add_column :users, :user_number, :string
+    add_column :users, :state, :string
+    add_column :users, :locale, :string
+    add_column :users, :deleted_at, :datetime
+    add_column :users, :expired_at, :datetime
+    add_column :users, :library_id, :integer, :default => 1, :null => false
+    add_column :users, :required_role_id, :integer, :default => 1, :null => false
+    add_column :users, :user_group_id, :integer, :default => 1, :null => false
+    add_column :users, :note, :text
+    add_column :users, :keyword_list, :text
+
+    add_column :users, :failed_attempts, :integer
+    add_column :users, :unlock_token, :string
+    add_column :users, :locked_at, :datetime
+
+    add_column :users, :confirmed_at, :datetime
+
+    add_index :users, :username, :unique => true
+    add_index :users, :user_group_id
+    add_index :users, :user_number, :unique => true
+    add_index :users, :unlock_token,         :unique => true
+  end
+end

data/spec/dummy/db/migrate/20130412083556_add_latitude_and_longitude_to_library.rb

@@ -0,0 +1,6 @@
+class AddLatitudeAndLongitudeToLibrary < ActiveRecord::Migration
+  def change
+    add_column :libraries, :latitude, :float
+    add_column :libraries, :longitude, :float
+  end
+end