enju_bookmark 0.0.8 → 0.0.9

data/app/controllers/bookmarks_controller.rb

@@ -41,7 +41,7 @@ class BookmarksController < ApplicationController
     @bookmarks = search.execute!.results
 
     respond_to do |format|
-      format.html # index.rhtml
+      format.html # index.html.erb
       format.json { render :json => @bookmarks }
     end
   end
@@ -50,7 +50,7 @@ class BookmarksController < ApplicationController
   # GET /bookmarks/1.json
   def show
     respond_to do |format|
-      format.html # show.rhtml
+      format.html # show.html.erb
       format.json { render :json => @bookmark }
     end
   end

data/config/locales/translation_ja.yml

@@ -13,6 +13,7 @@ ja:
       tag:
         name: 名前
         synonym: 同義語
+        taggings_count: タグ付けされた回数
       user:
         share_bookmarks: ブックマークを他の人物・団体と共有する
       library_group:

data/db/migrate/20081212151614_create_bookmark_stats.rb

@@ -10,5 +10,7 @@ class CreateBookmarkStats < ActiveRecord::Migration
 
       t.timestamps
     end
+
+    add_index :bookmark_stats, :state
   end
 end

data/lib/enju_bookmark/version.rb

@@ -1,3 +1,3 @@
 module EnjuBookmark
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

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

@@ -23,25 +23,16 @@ class Item < ActiveRecord::Base
   validates :manifestation_id, :presence => true, :on => :create
   validates_associated :circulation_status, :checkout_type
   validates_presence_of :circulation_status, :checkout_type
-  before_save :set_use_restriction
   searchable do
     integer :circulation_status_id
   end
-  attr_accessor :library_id, :manifestation_id, :use_restriction_id
+  accepts_nested_attributes_for :item_has_use_restriction
+  attr_accessor :library_id, :manifestation_id
 
   def set_circulation_status
     self.circulation_status = CirculationStatus.where(:name => 'In Process').first if self.circulation_status.nil?
   end
 
-  def set_use_restriction
-    if self.use_restriction_id
-      self.use_restriction = UseRestriction.where(:id => self.use_restriction_id).first
-    else
-      return if use_restriction
-      self.use_restriction = UseRestriction.where(:name => 'Limited Circulation, Normal Loan Period').first
-    end
-  end
-
   def checkout_status(user)
      user.user_group.user_group_has_checkout_types.where(:checkout_type_id => self.checkout_type.id).first
   end

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

@@ -92,10 +92,6 @@ Devise.setup do |config|
   # If true, extends the user's remember period when remembered via cookie.
   # config.extend_remember_period = false
 
-  # If true, uses the password salt as remember token. This should be turned
-  # to false if you are not using database authenticatable.
-  config.use_salt_as_remember_token = true
-
   # Options to be passed to the created cookie. For instance, you can set
   # :secure => true in order to force SSL only cookies.
   # config.cookie_options = {}

data/spec/dummy/db/migrate/20111201155513_add_devise_to_users.rb

@@ -1,19 +1,43 @@
 class AddDeviseToUsers < ActiveRecord::Migration
   def self.up
     change_table(:users) do |t|
-      t.database_authenticatable :null => false
-      t.recoverable
-      t.rememberable
-      t.trackable
+      ## Database authenticatable
+      t.string :email,              :null => false, :default => ""
+      t.string :encrypted_password, :null => false, :default => ""
 
-      # t.encryptable
-      # t.confirmable
-      # t.lockable :lock_strategy => :failed_attempts, :unlock_strategy => :both
-      # t.token_authenticatable
+      ## Recoverable
+      t.string   :reset_password_token
+      t.datetime :reset_password_sent_at
 
+      ## Rememberable
+      t.datetime :remember_created_at
 
-      # Uncomment below if timestamps were not included in your original model.
-      # t.timestamps
+      ## 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
+
+      ## Encryptable
+      t.string :password_salt
+
+      ## 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.datetime :deleted_at
     end
 
     add_index :users, :email #,                :unique => true

data/spec/dummy/db/schema.rb

@@ -35,6 +35,8 @@ ActiveRecord::Schema.define(:version => 20111231145823) do
     t.datetime "updated_at",   :null => false
   end
 
+  add_index "bookmark_stats", ["state"], :name => "index_bookmark_stats_on_state"
+
   create_table "bookmarks", :force => true do |t|
     t.integer  "user_id",          :null => false
     t.integer  "manifestation_id"
@@ -440,18 +442,28 @@ ActiveRecord::Schema.define(:version => 20111231145823) do
     t.string   "username"
     t.text     "note"
     t.string   "locale"
-    t.datetime "created_at",                                            :null => false
-    t.datetime "updated_at",                                            :null => false
-    t.string   "email",                                 :default => "", :null => false
-    t.string   "encrypted_password",     :limit => 128, :default => "", :null => false
+    t.datetime "created_at",                             :null => false
+    t.datetime "updated_at",                             :null => false
+    t.string   "email",                  :default => "", :null => false
+    t.string   "encrypted_password",     :default => "", :null => false
     t.string   "reset_password_token"
     t.datetime "reset_password_sent_at"
     t.datetime "remember_created_at"
-    t.integer  "sign_in_count",                         :default => 0
+    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"
+    t.string   "password_salt"
+    t.string   "confirmation_token"
+    t.datetime "confirmed_at"
+    t.datetime "confirmation_sent_at"
+    t.string   "unconfirmed_email"
+    t.integer  "failed_attempts",        :default => 0
+    t.string   "unlock_token"
+    t.datetime "locked_at"
+    t.string   "authentication_token"
+    t.datetime "deleted_at"
     t.boolean  "share_bookmarks"
   end
 

data/spec/fixtures/manifestations.yml

@@ -195,7 +195,7 @@ manifestation_00022:
 manifestation_00023: 
   carrier_type_id: 1
   isbn: 
-  created_at: 2008-04-17 00:34:01 +09:00
+  updated_at: 2008-04-17 00:34:01 +09:00
   original_title: "世界の美しい図書館集めてみた【第一弾】"
   price: 
   manifestation_identifier: 

data/spec/fixtures/use_restrictions.yml

@@ -5,78 +5,104 @@ use_restriction_00001:
   id: 1
   position: 1
   note: ""
+  created_at: <%= Time.zone.now %>
+  updated_at: <%= Time.zone.now %>
 use_restriction_00002: 
   name: In Library Use Only  
   display_name: In Library Use Only
   id: 2
   position: 2
   note: ""
+  created_at: <%= Time.zone.now %>
+  updated_at: <%= Time.zone.now %>
 use_restriction_00003: 
   name: Limited Circulation, Long Loan Period  
   display_name: Limited Circulation, Long Loan Period
   id: 3
   position: 3
   note: ""
+  created_at: <%= Time.zone.now %>
+  updated_at: <%= Time.zone.now %>
 use_restriction_00003: 
   name: Limited Circulation, Normal Loan Period  
   display_name: Limited Circulation, Normal Loan Period
   id: 4
   position: 4
   note: ""
+  created_at: <%= Time.zone.now %>
+  updated_at: <%= Time.zone.now %>
 use_restriction_00005: 
   name: Limited Circulation, Short Loan Period  
   display_name: Limited Circulation, Short Loan Period
   id: 5
   position: 5
   note: ""
+  created_at: <%= Time.zone.now %>
+  updated_at: <%= Time.zone.now %>
 use_restriction_00006: 
   name: No Reproduction  
   display_name: No Reproduction
   id: 6
   position: 6
   note: ""
+  created_at: <%= Time.zone.now %>
+  updated_at: <%= Time.zone.now %>
 use_restriction_00007: 
   name: Not For Loan  
   display_name: Not For Loan
   id: 7
   position: 7
   note: ""
+  created_at: <%= Time.zone.now %>
+  updated_at: <%= Time.zone.now %>
 use_restriction_00008: 
   name: Overnight Only  
   display_name: Overnight Only
   id: 8
   position: 8
   note: ""
+  created_at: <%= Time.zone.now %>
+  updated_at: <%= Time.zone.now %>
 use_restriction_00009: 
   name: Renewals Not Permitted  
   display_name: Renewals Not Permitted
   id: 9
   position: 9
   note: ""
+  created_at: <%= Time.zone.now %>
+  updated_at: <%= Time.zone.now %>
 use_restriction_00010: 
   name: Supervision Required  
   display_name: Supervision Required
   id: 10
   position: 10
   note: ""
+  created_at: <%= Time.zone.now %>
+  updated_at: <%= Time.zone.now %>
 use_restriction_00011: 
   name: Term Loan  
   display_name: Term Loan
   id: 11
   position: 11
   note: ""
+  created_at: <%= Time.zone.now %>
+  updated_at: <%= Time.zone.now %>
 use_restriction_00012: 
   name: Use Only In Controlled Access  
   display_name: Use Only In Controlled Access
   id: 12
   position: 12
   note: ""
+  created_at: <%= Time.zone.now %>
+  updated_at: <%= Time.zone.now %>
 use_restriction_00013: 
   name: User Signature Required  
   display_name: User Signature Required
   id: 13
   position: 13
   note: ""
+  created_at: <%= Time.zone.now %>
+  updated_at: <%= Time.zone.now %>
 
 # == Schema Information
 #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_bookmark
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-13 00:00:00.000000000 Z
+date: 2012-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70241606384020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70241606384020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: acts-as-taggable-on
-  requirement: &70241606382600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: '2.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70241606382600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &70241606381280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +53,15 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70241606381280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &70241606380340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70241606380340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &70241606379720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70241606379720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: state_machine
-  requirement: &70241606379100 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70241606379100
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: friendly_id
-  requirement: &70241606377980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +117,15 @@ dependencies:
         version: '4.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70241606377980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: attribute_normalizer
-  requirement: &70241606392760 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +133,15 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70241606392760
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: sunspot_rails
-  requirement: &70241606391520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +149,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70241606391520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sunspot_solr
-  requirement: &70241606390720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +165,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70241606390720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &70241606390300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,21 +181,31 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70241606390300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: acts_as_list
-  requirement: &70241606389700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: 0.1.6
   type: :runtime
   prerelease: false
-  version_requirements: *70241606389700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.6
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70241606389000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +213,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70241606389000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70241606388180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,21 +229,31 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70241606388180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
-  requirement: &70241606387220 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70241606387220
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sunspot-rails-tester
-  requirement: &70241606386600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,7 +261,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70241606386600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Purchase request management for Next-L Enju
 email:
 - tanabe@mwr.mediacom.keio.ac.jp
@@ -262,7 +342,6 @@ files:
 - spec/dummy/app/models/circulation_status.rb
 - spec/dummy/app/models/exemplify.rb
 - spec/dummy/app/models/item.rb
-- spec/dummy/app/models/item_has_use_restriction.rb
 - spec/dummy/app/models/language.rb
 - spec/dummy/app/models/library.rb
 - spec/dummy/app/models/library_group.rb
@@ -273,7 +352,6 @@ files:
 - spec/dummy/app/models/series_has_manifestation.rb
 - spec/dummy/app/models/series_statement.rb
 - spec/dummy/app/models/shelf.rb
-- spec/dummy/app/models/use_restriction.rb
 - spec/dummy/app/models/user.rb
 - spec/dummy/app/models/user_group.rb
 - spec/dummy/app/models/user_has_role.rb
@@ -301,7 +379,6 @@ files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
-- spec/dummy/db/development.sqlite3
 - spec/dummy/db/migrate/001_create_patrons.rb
 - spec/dummy/db/migrate/005_create_manifestations.rb
 - spec/dummy/db/migrate/006_create_items.rb
@@ -419,7 +496,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: enju_bookmark plugin
@@ -438,7 +515,6 @@ test_files:
 - spec/dummy/app/models/circulation_status.rb
 - spec/dummy/app/models/exemplify.rb
 - spec/dummy/app/models/item.rb
-- spec/dummy/app/models/item_has_use_restriction.rb
 - spec/dummy/app/models/language.rb
 - spec/dummy/app/models/library.rb
 - spec/dummy/app/models/library_group.rb
@@ -449,7 +525,6 @@ test_files:
 - spec/dummy/app/models/series_has_manifestation.rb
 - spec/dummy/app/models/series_statement.rb
 - spec/dummy/app/models/shelf.rb
-- spec/dummy/app/models/use_restriction.rb
 - spec/dummy/app/models/user.rb
 - spec/dummy/app/models/user_group.rb
 - spec/dummy/app/models/user_has_role.rb
@@ -477,7 +552,6 @@ test_files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
-- spec/dummy/db/development.sqlite3
 - spec/dummy/db/migrate/001_create_patrons.rb
 - spec/dummy/db/migrate/005_create_manifestations.rb
 - spec/dummy/db/migrate/006_create_items.rb

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

@@ -1,23 +0,0 @@
-class ItemHasUseRestriction < ActiveRecord::Base
-  belongs_to :item, :validate => true
-  belongs_to :use_restriction, :validate => true
-
-  def self.per_page
-    10
-  end
-
-  validates_associated :item, :use_restriction
-  validates_presence_of :item, :use_restriction
-end
-
-# == Schema Information
-#
-# Table name: item_has_use_restrictions
-#
-#  id                 :integer         not null, primary key
-#  item_id            :integer         not null
-#  use_restriction_id :integer         not null
-#  created_at         :datetime
-#  updated_at         :datetime
-#
-

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

@@ -1,22 +0,0 @@
-class UseRestriction < ActiveRecord::Base
-  include MasterModel
-  default_scope :order => 'position'
-  scope :available, where(:name => ['Not For Loan', 'Limited Circulation, Normal Loan Period'])
-  has_many :item_has_use_restrictions
-  has_many :items, :through => :item_has_use_restrictions
-  attr_protected :name
-end
-
-# == Schema Information
-#
-# Table name: use_restrictions
-#
-#  id           :integer         not null, primary key
-#  name         :string(255)     not null
-#  display_name :text
-#  note         :text
-#  position     :integer
-#  created_at   :datetime
-#  updated_at   :datetime
-#
-