enju_circulation 0.0.71 → 0.1.0.pre

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: enju_circulation
 version: !ruby/object:Gem::Version
-  version: 0.0.71
-  prerelease: 
+  version: 0.1.0.pre
+  prerelease: 6
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-21 00:00:00.000000000 Z
+date: 2012-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -96,17 +96,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.24
+        version: 0.1.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.24
+        version: 0.1.12
 - !ruby/object:Gem::Dependency
   name: enju_event
   requirement: !ruby/object:Gem::Requirement
@@ -203,6 +203,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: enju_biblio
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.0.pre
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.0.pre
+- !ruby/object:Gem::Dependency
+  name: enju_library
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.0.pre
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.0.pre
 - !ruby/object:Gem::Dependency
   name: enju_export
   requirement: !ruby/object:Gem::Requirement
@@ -242,7 +274,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- app/controllers/accepts_controller.rb
 - app/controllers/baskets_controller.rb
 - app/controllers/carrier_type_has_checkout_types_controller.rb
 - app/controllers/checked_items_controller.rb
@@ -264,7 +295,6 @@ files:
 - app/controllers/user_group_has_checkout_types_controller.rb
 - app/controllers/user_reserve_stats_controller.rb
 - app/helpers/reserves_helper.rb
-- app/models/accept.rb
 - app/models/basket.rb
 - app/models/carrier_type_has_checkout_type.rb
 - app/models/checked_item.rb
@@ -446,7 +476,6 @@ files:
 - db/migrate/20110627122938_add_number_of_day_to_notify_overdue_to_user_group.rb
 - db/migrate/20111217234412_add_save_checkout_history_to_user.rb
 - db/migrate/20111218002349_add_checkout_icalendar_token_to_user.rb
-- db/migrate/20120319173203_create_accepts.rb
 - db/migrate/20120424103932_add_librarian_id_to_checked_item.rb
 - lib/enju_circulation/controller.rb
 - lib/enju_circulation/engine.rb
@@ -455,11 +484,11 @@ files:
 - lib/enju_circulation/user.rb
 - lib/enju_circulation/version.rb
 - lib/enju_circulation.rb
+- lib/generators/enju_circulation/views_generator.rb
 - lib/tasks/enju_circulation_tasks.rake
 - MIT-LICENSE
 - Rakefile
 - README.rdoc
-- spec/controllers/accepts_controller_spec.rb
 - spec/controllers/baskets_controller_spec.rb
 - spec/controllers/carrier_type_has_checkout_types_controller_spec.rb
 - spec/controllers/checked_items_controller_spec.rb
@@ -487,6 +516,7 @@ files:
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/mailers/notifier.rb
 - spec/dummy/app/models/ability.rb
+- spec/dummy/app/models/local_patron.rb
 - spec/dummy/app/models/role.rb
 - spec/dummy/app/models/user.rb
 - spec/dummy/app/models/user_group.rb
@@ -586,14 +616,6 @@ files:
 - spec/dummy/db/migrate/20120224094141_create_delayed_jobs.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
-- spec/dummy/lib/enju_leaf/calculate_stat.rb
-- spec/dummy/lib/enju_leaf/expire_editable_fragment.rb
-- spec/dummy/lib/enju_leaf/expire_fragment_cache.rb
-- spec/dummy/lib/enju_leaf/import_file.rb
-- spec/dummy/lib/enju_leaf/localized_name.rb
-- spec/dummy/lib/enju_leaf/master_model.rb
-- spec/dummy/lib/enju_leaf/url_validator.rb
-- spec/dummy/lib/enju_leaf.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -612,19 +634,10 @@ files:
 - spec/dummy/solr/conf/spellings.txt
 - spec/dummy/solr/conf/stopwords.txt
 - spec/dummy/solr/conf/synonyms.txt
-- spec/dummy/solr/data/test/index/_2r.fdt
-- spec/dummy/solr/data/test/index/_2r.fdx
-- spec/dummy/solr/data/test/index/_2r.fnm
-- spec/dummy/solr/data/test/index/_2r.frq
-- spec/dummy/solr/data/test/index/_2r.nrm
-- spec/dummy/solr/data/test/index/_2r.prx
-- spec/dummy/solr/data/test/index/_2r.tii
-- spec/dummy/solr/data/test/index/_2r.tis
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_6n
+- spec/dummy/solr/data/test/index/segments_1
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
-- spec/factories/accepts.rb
 - spec/factories/basket.rb
 - spec/factories/carrier_type.rb
 - spec/factories/carrier_type_has_checkout_type.rb
@@ -688,7 +701,6 @@ files:
 - spec/fixtures/user_has_roles.yml
 - spec/fixtures/user_reserve_stats.yml
 - spec/fixtures/users.yml
-- spec/models/accept_spec.rb
 - spec/models/basket_spec.rb
 - spec/models/carrier_type_has_checkout_type_spec.rb
 - spec/models/checked_item_spec.rb
@@ -709,17 +721,11 @@ files:
 - spec/models/user_checkout_stat_spec.rb
 - spec/models/user_group_has_checkout_type_spec.rb
 - spec/models/user_reserve_stat_spec.rb
-- spec/requests/accepts_spec.rb
-- spec/routing/accepts_routing_spec.rb
 - spec/routing/baskets_routing_spec.rb
 - spec/routing/checked_items_routing_spec.rb
 - spec/spec_helper.rb
 - spec/support/controller_macros.rb
 - spec/support/devise.rb
-- spec/views/accepts/edit.html.erb_spec.rb
-- spec/views/accepts/index.html.erb_spec.rb
-- spec/views/accepts/new.html.erb_spec.rb
-- spec/views/accepts/show.html.erb_spec.rb
 homepage: https://github.com/nabeta/enju_circulation
 licenses: []
 post_install_message: 
@@ -735,9 +741,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -745,7 +751,6 @@ signing_key:
 specification_version: 3
 summary: enju_circulation plugin
 test_files:
-- spec/controllers/accepts_controller_spec.rb
 - spec/controllers/baskets_controller_spec.rb
 - spec/controllers/carrier_type_has_checkout_types_controller_spec.rb
 - spec/controllers/checked_items_controller_spec.rb
@@ -773,6 +778,7 @@ test_files:
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/mailers/notifier.rb
 - spec/dummy/app/models/ability.rb
+- spec/dummy/app/models/local_patron.rb
 - spec/dummy/app/models/role.rb
 - spec/dummy/app/models/user.rb
 - spec/dummy/app/models/user_group.rb
@@ -872,14 +878,6 @@ test_files:
 - spec/dummy/db/migrate/20120224094141_create_delayed_jobs.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
-- spec/dummy/lib/enju_leaf/calculate_stat.rb
-- spec/dummy/lib/enju_leaf/expire_editable_fragment.rb
-- spec/dummy/lib/enju_leaf/expire_fragment_cache.rb
-- spec/dummy/lib/enju_leaf/import_file.rb
-- spec/dummy/lib/enju_leaf/localized_name.rb
-- spec/dummy/lib/enju_leaf/master_model.rb
-- spec/dummy/lib/enju_leaf/url_validator.rb
-- spec/dummy/lib/enju_leaf.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -898,19 +896,10 @@ test_files:
 - spec/dummy/solr/conf/spellings.txt
 - spec/dummy/solr/conf/stopwords.txt
 - spec/dummy/solr/conf/synonyms.txt
-- spec/dummy/solr/data/test/index/_2r.fdt
-- spec/dummy/solr/data/test/index/_2r.fdx
-- spec/dummy/solr/data/test/index/_2r.fnm
-- spec/dummy/solr/data/test/index/_2r.frq
-- spec/dummy/solr/data/test/index/_2r.nrm
-- spec/dummy/solr/data/test/index/_2r.prx
-- spec/dummy/solr/data/test/index/_2r.tii
-- spec/dummy/solr/data/test/index/_2r.tis
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_6n
+- spec/dummy/solr/data/test/index/segments_1
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
-- spec/factories/accepts.rb
 - spec/factories/basket.rb
 - spec/factories/carrier_type.rb
 - spec/factories/carrier_type_has_checkout_type.rb
@@ -974,7 +963,6 @@ test_files:
 - spec/fixtures/user_has_roles.yml
 - spec/fixtures/user_reserve_stats.yml
 - spec/fixtures/users.yml
-- spec/models/accept_spec.rb
 - spec/models/basket_spec.rb
 - spec/models/carrier_type_has_checkout_type_spec.rb
 - spec/models/checked_item_spec.rb
@@ -995,14 +983,8 @@ test_files:
 - spec/models/user_checkout_stat_spec.rb
 - spec/models/user_group_has_checkout_type_spec.rb
 - spec/models/user_reserve_stat_spec.rb
-- spec/requests/accepts_spec.rb
-- spec/routing/accepts_routing_spec.rb
 - spec/routing/baskets_routing_spec.rb
 - spec/routing/checked_items_routing_spec.rb
 - spec/spec_helper.rb
 - spec/support/controller_macros.rb
 - spec/support/devise.rb
-- spec/views/accepts/edit.html.erb_spec.rb
-- spec/views/accepts/index.html.erb_spec.rb
-- spec/views/accepts/new.html.erb_spec.rb
-- spec/views/accepts/show.html.erb_spec.rb

data/app/controllers/accepts_controller.rb

@@ -1,83 +0,0 @@
-class AcceptsController < InheritedResources::Base
-  load_and_authorize_resource :except => :index
-  authorize_resource :only => :index
-  respond_to :html, :json
-  before_filter :get_basket, :only => [:index, :create]
-
-  # GET /accepts
-  # GET /accepts.json
-  def index
-    if params[:format] == 'csv'
-      @accepts = Accept.order('accepts.created_at DESC').paginate(:page => params[:page], :per_page => 65534)
-    else
-      if params[:accept]
-        @query = params[:accept][:item_identifier].to_s.strip
-        item = Item.where(:item_identifier => @query).first if @query.present?
-      end
-
-      if item
-        @accepts = Accept.order('accepts.created_at DESC').where(:item_id => item.id).paginate(:page => params[:page])
-      else
-        if @basket
-          @accepts = @basket.accepts.paginate(:page => params[:page])
-        else
-          @accepts = Accept.paginate(:page => params[:page])
-        end
-      end
-    end
-
-    respond_to do |format|
-      format.html # index.html.erb
-      format.json { render :json => @accepts }
-      format.js { @accept = Accept.new }
-      format.csv
-    end
-  end
-
-  # GET /new
-  # GET /new.json
-  def new
-    @basket = Basket.new
-    @basket.user = current_user
-    @basket.save!
-    @accept = Accept.new
-    @accepts = []
-
-    respond_to do |format|
-      format.html # new.html.erb
-      format.json { render :json => @patron }
-    end
-  end
-
-  # POST /accepts
-  # POST /accepts.json
-  def create
-    unless @basket
-      access_denied; return
-    end
-    @accept.basket = @basket
-    @accept.librarian = current_user
-
-    flash[:message] = ''
-    if @accept.item_identifier.blank?
-      flash[:message] << t('accept.enter_item_identifier') if @accept.item_identifier.blank?
-    else
-      item = Item.where(:item_identifier => @accept.item_identifier.to_s.strip).first
-    end
-    @accept.item = item
-
-    respond_to do |format|
-      if @accept.save
-        flash[:message] << t('accept.successfully_accepted', :model => t('activerecord.models.accept'))
-        format.html { redirect_to basket_accepts_url(@basket) }
-        format.json { render :json => @accept, :status => :created, :location => @accept }
-        format.js { redirect_to basket_accepts_url(@basket, :format => :js) }
-      else
-        @accepts = @basket.accepts.paginate(:page => params[:page])
-        format.html { render :action => "index" }
-        format.json { render :json => @accept.errors, :status => :unprocessable_entity }
-        format.js { render :action => "index" }
-      end
-    end
-  end
-end

data/app/models/accept.rb

@@ -1,36 +0,0 @@
-class Accept < ActiveRecord::Base
-  attr_accessible :item_identifier, :librarian_id, :item_id
-  default_scope :order => 'accepts.id DESC'
-  belongs_to :basket
-  belongs_to :item
-  belongs_to :librarian, :class_name => 'User'
-
-  validates_uniqueness_of :item_id, :message => I18n.t('accept.already_accepted')
-  validates_presence_of :item_id, :message => I18n.t('accept.item_not_found')
-  validates_presence_of :basket_id
-
-  before_save :accept!, :on => :create
-
-  attr_accessor :item_identifier
-
-  def self.per_page
-    10
-  end
-
-  def accept!
-    item.circulation_status = CirculationStatus.where(:name => 'Available On Shelf').first
-    item.save(:validate => false)
-  end
-end
-# == Schema Information
-#
-# Table name: accepts
-#
-#  id           :integer         not null, primary key
-#  basket_id    :integer
-#  item_id      :integer
-#  librarian_id :integer
-#  created_at   :datetime        not null
-#  updated_at   :datetime        not null
-#
-

data/db/migrate/20120319173203_create_accepts.rb

@@ -1,14 +0,0 @@
-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