enju_bookmark 0.0.19 → 0.0.20

data/app/models/bookmark_sweeper.rb

@@ -1,5 +1,6 @@
 class BookmarkSweeper < ActionController::Caching::Sweeper
   include ExpireEditableFragment
+  include ExpireTagCloud
   observe Bookmark, Tag
 
   def after_save(record)

data/app/views/bookmark_stat_has_manifestations/index.html.erb

@@ -16,7 +16,7 @@
     <td><%= bookmark_stat_has_manifestation.bookmarks_count -%></td>
     <td><%= link_to t('page.show'), bookmark_stat_has_manifestation -%></td>
     <td><%= link_to t('page.edit'), edit_bookmark_stat_has_manifestation_path(bookmark_stat_has_manifestation) -%></td>
-    <td><%= link_to t('page.destroy'), bookmark_stat_has_manifestation, :confirm => t('page.are_you_sure'), :method => :delete -%></td>
+    <td><%= link_to t('page.destroy'), bookmark_stat_has_manifestation, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%></td>
   </tr>
 <%- end -%>
 </table>

data/app/views/bookmark_stats/index.html.erb

@@ -18,7 +18,7 @@
     <td>
       <%= link_to t('page.show'), bookmark_stat -%>
       <%= link_to t('page.edit'), edit_bookmark_stat_path(bookmark_stat) -%>
-      <%= link_to t('page.destroy'), bookmark_stat, :confirm => t('page.are_you_sure'), :method => :delete -%>
+      <%= link_to t('page.destroy'), bookmark_stat, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
     </td>
   </tr>
 <%- end -%>

data/app/views/bookmarks/_index.html.erb

@@ -29,7 +29,7 @@
     <td>
       <%- if can? :destroy, bookmark -%>
         <%= link_to t('page.show'), bookmark_path(bookmark) -%>
-        <%= link_to t('page.destroy'), bookmark_path(bookmark), :confirm => t('page.are_you_sure'), :method => :delete -%>
+        <%= link_to t('page.destroy'), bookmark_path(bookmark), :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
       <%- end -%>
     </td>
   </tr>

data/app/views/bookmarks/_index_user.html.erb

@@ -31,7 +31,7 @@
     <td><%= l(bookmark.created_at) -%></td>
     <td>
       <%- if can? :destroy, bookmark -%>
-        <%= link_to t('page.destroy'), bookmark, :confirm => t('page.are_you_sure'), :method => :delete -%>
+        <%= link_to t('page.destroy'), bookmark, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
       <%- end -%>
     </td>
   </tr>

data/app/views/bookmarks/show.html.erb

@@ -46,7 +46,7 @@
 <div id="submenu" class="ui-corner-all">
   <ul>
     <li><%= link_to t('page.edit'),edit_bookmark_path(@bookmark) -%></li>
-    <li><%= link_to t('page.destroy'), @bookmark, :confirm => t('page.are_you_sure'), :method => :delete -%></li>
+    <li><%= link_to t('page.destroy'), @bookmark, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%></li>
     <li><%= link_to t('page.back_to', :model => t('activerecord.models.manifestation')), @bookmark.manifestation -%></li>
     <li><%= link_to t('page.back'), bookmarks_url -%></li>
   </ul>

data/lib/enju_bookmark.rb

@@ -1,7 +1,7 @@
 require "enju_bookmark/engine"
-require "enju_bookmark/url_validator"
 require "enju_bookmark/bookmark_url"
-require "enju_bookmark/master_model"
+require "enju_bookmark/calculate_stat"
+require "enju_bookmark/expire_tag_cloud"
 
 module EnjuBookmark
 end

data/lib/enju_bookmark/calculate_stat.rb

@@ -0,0 +1,30 @@
+module CalculateStat
+
+  def self.included(base)
+    base.extend ClassMethods
+    base.send :include, InstanceMethods
+    base.class_eval do
+      validates_presence_of :start_date, :end_date
+      validate :check_date
+    end
+  end
+
+  module ClassMethods
+    def calculate_stat
+      self.not_calculated.each do |stat|
+        stat.aasm_calculate!
+      end
+    end
+  end
+
+  module InstanceMethods
+    def check_date
+      if self.start_date and self.end_date
+        if self.start_date >= self.end_date
+          errors.add(:start_date)
+          errors.add(:end_date)
+        end
+      end
+    end
+  end
+end

data/lib/enju_bookmark/expire_tag_cloud.rb

@@ -0,0 +1,10 @@
+module ExpireTagCloud
+  def expire_tag_cloud(bookmark)
+    I18n.available_locales.each do |locale|
+      Role.all_cache.each do |role|
+        expire_fragment(:controller => :tags, :action => :index, :page => 'user_tag_cloud', :user_id => bookmark.user.username, :locale => locale, :role => role.name, :user_id => nil)
+        expire_fragment(:controller => :tags, :action => :index, :page => 'public_tag_cloud', :locale => locale, :role => role.name, :user_id => nil)
+      end
+    end
+  end
+end

data/lib/enju_bookmark/version.rb

@@ -1,3 +1,3 @@
 module EnjuBookmark
-  VERSION = "0.0.19"
+  VERSION = "0.0.20"
 end

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

@@ -1,4 +1,22 @@
 class UserHasRole < ActiveRecord::Base
+  attr_accessible :user_id, :role_id
+  attr_accessible :user_id, :role_id, :as => :admin
   belongs_to :user
   belongs_to :role
+  accepts_nested_attributes_for :role
+
+#  validates_uniqueness_of :role_id, :scope => :user_id
+#  validates_presence_of :role_id, :user_id
 end
+
+# == Schema Information
+#
+# Table name: user_has_roles
+#
+#  id         :integer         not null, primary key
+#  user_id    :integer
+#  role_id    :integer
+#  created_at :datetime
+#  updated_at :datetime
+#
+

data/spec/dummy/config/application.rb

@@ -45,3 +45,6 @@ end
 
 require 'enju_circulation'
 require 'enju_leaf'
+require 'enju_biblio'
+require 'enju_library'
+require 'enju_manifestation_viewer'

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

@@ -3,4 +3,3 @@
 # Add new mime types for use in respond_to blocks:
 # Mime::Type.register "text/richtext", :rtf
 # Mime::Type.register_alias "text/html", :iphone
-Mime::Type.register_alias "text/html", :mobile

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/005_create_manifestations.rb

@@ -1,5 +1,5 @@
 class CreateManifestations < ActiveRecord::Migration
-  def self.up
+  def change
     create_table :manifestations do |t|
       t.text :original_title, :null => false
       t.text :title_alternative
@@ -16,9 +16,9 @@ class CreateManifestations < ActiveRecord::Migration
       t.integer :extent_id, :default => 1, :null => false
       t.integer :start_page
       t.integer :end_page
-      t.decimal :height
-      t.decimal :width
-      t.decimal :depth
+      t.integer :height
+      t.integer :width
+      t.integer :depth
       t.string :isbn
       t.string :isbn10
       t.string :wrong_isbn
@@ -27,20 +27,12 @@ class CreateManifestations < ActiveRecord::Migration
       t.string :oclc_number
       t.string :issn
       t.integer :price # TODO: 通貨単位
-      #t.text :filename
-      #t.string :content_type
-      #t.integer :size
       t.text :fulltext
       t.string :volume_number_list
       t.string :issue_number_list
       t.string :serial_number_list
       t.integer :edition
       t.text :note
-      t.integer :produces_count, :default => 0, :null => false
-      t.integer :exemplifies_count, :default => 0, :null => false
-      t.integer :embodies_count, :default => 0, :null => false
-      t.integer :exemplifies_count, :default => 0, :null => false
-      t.integer :work_has_subjects_count, :default => 0, :null => false
       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
@@ -61,8 +53,4 @@ class CreateManifestations < ActiveRecord::Migration
     add_index :manifestations, :manifestation_identifier
     add_index :manifestations, :updated_at
   end
-
-  def self.down
-    drop_table :manifestations
-  end
 end

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

@@ -1,5 +1,5 @@
 class CreateItems < ActiveRecord::Migration
-  def self.up
+  def change
     create_table :items do |t|
       #t.integer :manifestation_id
       t.string :call_number
@@ -9,11 +9,7 @@ class CreateItems < ActiveRecord::Migration
       t.timestamps
       t.datetime :deleted_at
       t.integer :shelf_id, :default => 1, :null => false
-      t.integer :basket_id
       t.boolean :include_supplements, :default => false, :null => false
-      t.integer :checkouts_count, :default => 0, :null => false
-      t.integer :owns_count, :default => 0, :null => false
-      t.integer :resource_has_subjects_count, :default => 0, :null => false
       t.text :note
       t.string :url
       t.integer :price
@@ -29,8 +25,4 @@ class CreateItems < ActiveRecord::Migration
     add_index :items, :item_identifier
     add_index :items, :required_role_id
   end
-
-  def self.down
-    drop_table :items
-  end
 end

data/spec/dummy/db/migrate/012_create_owns.rb

@@ -0,0 +1,12 @@
+class CreateOwns < ActiveRecord::Migration
+  def change
+    create_table :owns do |t|
+      t.references :patron, :null => false
+      t.references :item, :null => false
+      t.integer :position
+      t.timestamps
+    end
+    add_index :owns, :patron_id
+    add_index :owns, :item_id
+  end
+end

data/spec/dummy/db/migrate/015_create_creates.rb

@@ -0,0 +1,12 @@
+class CreateCreates < ActiveRecord::Migration
+  def change
+    create_table :creates do |t|
+      t.references :patron, :null => false
+      t.references :work, :null => false
+      t.integer :position
+      t.timestamps
+    end
+    add_index :creates, :patron_id
+    add_index :creates, :work_id
+  end
+end

data/spec/dummy/db/migrate/047_create_produces.rb

@@ -0,0 +1,12 @@
+class CreateProduces < ActiveRecord::Migration
+  def change
+    create_table :produces do |t|
+      t.references :patron, :null => false
+      t.references :manifestation, :null => false
+      t.integer :position
+      t.timestamps
+    end
+    add_index :produces, :patron_id
+    add_index :produces, :manifestation_id
+  end
+end

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

@@ -1,7 +1,6 @@
 class CreateLibraries < ActiveRecord::Migration
-  def self.up
+  def change
     create_table :libraries do |t|
-      t.references :patron, :polymorphic => true
       t.string :name, :null => false
       t.text :display_name
       t.string :short_display_name, :null => false
@@ -23,12 +22,7 @@ class CreateLibraries < ActiveRecord::Migration
       t.timestamps
       t.datetime :deleted_at
     end
-    add_index :libraries, :patron_id, :unique => true
     add_index :libraries, :library_group_id
     add_index :libraries, :name, :unique => true
   end
-
-  def self.down
-    drop_table :libraries
-  end
 end

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

@@ -1,5 +1,5 @@
 class CreateShelves < ActiveRecord::Migration
-  def self.up
+  def change
     create_table :shelves do |t|
       t.string :name, :null => false
       t.text :display_name
@@ -12,8 +12,4 @@ class CreateShelves < ActiveRecord::Migration
     end
     add_index :shelves, :library_id
   end
-
-  def self.down
-    drop_table :shelves
-  end
 end

data/spec/dummy/db/migrate/073_create_carrier_types.rb

@@ -1,5 +1,5 @@
 class CreateCarrierTypes < ActiveRecord::Migration
-  def self.up
+  def change
     create_table :carrier_types do |t|
       t.string :name, :null => false
       t.text :display_name
@@ -8,8 +8,4 @@ class CreateCarrierTypes < ActiveRecord::Migration
       t.timestamps
     end
   end
-
-  def self.down
-    drop_table :carrier_types
-  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,5 +1,5 @@
 class CreateLibraryGroups < ActiveRecord::Migration
-  def self.up
+  def change
     create_table :library_groups do |t|
       t.string :name, :null => false
       t.text :display_name
@@ -11,15 +11,10 @@ class CreateLibraryGroups < ActiveRecord::Migration
       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.timestamps
     end
     add_index :library_groups, :short_name
   end
-
-  def self.down
-    drop_table :library_groups
-  end
 end

data/spec/dummy/db/migrate/112_create_frequencies.rb

@@ -0,0 +1,12 @@
+class CreateFrequencies < ActiveRecord::Migration
+  def change
+    create_table :frequencies 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/117_create_form_of_works.rb

@@ -0,0 +1,12 @@
+class CreateFormOfWorks < ActiveRecord::Migration
+  def change
+    create_table :form_of_works 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/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