enju_circulation 0.0.46 → 0.0.47

data/app/controllers/baskets_controller.rb

@@ -0,0 +1,110 @@
+class BasketsController < ApplicationController
+  load_and_authorize_resource
+  cache_sweeper :circulation_sweeper, :only => [:create, :update, :destroy]
+
+  # GET /baskets
+  # GET /baskets.json
+  def index
+    if current_user.has_role?('Librarian')
+     @baskets = Basket.page(params[:page])
+    else
+      redirect_to new_basket_url
+      return
+    end
+
+    respond_to do |format|
+      format.html # index.html.erb
+      format.json { render :json => @baskets }
+    end
+  end
+
+  # GET /baskets/1
+  # GET /baskets/1.json
+  def show
+    respond_to do |format|
+      format.html # show.html.erb
+      format.json { render :json => @basket }
+    end
+  end
+
+  # GET /baskets/new
+  # GET /baskets/new.json
+  def new
+    @basket = Basket.new
+    @basket.user_number = params[:user_number]
+
+    respond_to do |format|
+      format.html # new.html.erb
+      format.json { render :json => @basket }
+    end
+  end
+
+  # GET /baskets/1/edit
+  def edit
+  end
+
+  # POST /baskets
+  # POST /baskets.json
+  def create
+    @basket = Basket.new
+    @user = User.where(:user_number => params[:basket][:user_number]).first rescue nil
+    if @user
+      if @user.user_number?
+        @basket.user = @user
+      end
+    end
+
+    respond_to do |format|
+      if @basket.save
+        format.html { redirect_to new_basket_checked_item_url(@basket), :notice => t('controller.successfully_created', :model => t('activerecord.models.basket')) }
+        format.json { render :json => @basket, :status => :created, :location => @basket }
+      else
+        format.html { render :action => "new" }
+        format.json { render :json => @basket.errors, :status => :unprocessable_entity }
+      end
+    end
+  end
+
+  # PUT /baskets/1
+  # PUT /baskets/1.json
+  def update
+    librarian = current_user
+    begin
+      unless @basket.basket_checkout(librarian)
+        redirect_to new_basket_checked_item_url(@basket)
+        return
+      end
+    rescue ActiveRecord::RecordInvalid
+      flash[:message] = t('checked_item.already_checked_out_try_again')
+      @basket.checked_items.delete_all
+      redirect_to new_basket_checked_item_url(@basket)
+      return
+    end
+
+    #@checkout_count = @basket.user.checkouts.count
+    respond_to do |format|
+      #if @basket.update_attributes({})
+      if @basket.save(:validate => false)
+        # 貸出完了時
+        format.html { redirect_to user_checkouts_url(@basket.user), :notice => t('basket.checkout_completed') }
+        format.json { head :no_content }
+      else
+        format.html { redirect_to basket_checked_items_url(@basket) }
+        format.json { render :json => @basket.errors, :status => :unprocessable_entity }
+      end
+    end
+
+  end
+
+  # DELETE /baskets/1
+  # DELETE /baskets/1.json
+  def destroy
+    @basket.destroy
+
+    respond_to do |format|
+      #format.html { redirect_to(user_baskets_url(@user)) }
+      format.html { redirect_to user_checkouts_url(@basket.user) }
+      format.json { head :no_content }
+    end
+  end
+end

data/lib/enju_circulation/version.rb

@@ -1,3 +1,3 @@
 module EnjuCirculation
-  VERSION = "0.0.46"
+  VERSION = "0.0.47"
 end

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

@@ -0,0 +1,40 @@
+# -*- encoding: utf-8 -*-
+class UserGroup < ActiveRecord::Base
+  attr_accessible :name, :display_name, :note, :valid_period_for_new_user,
+    :expired_at, :number_of_day_to_notify_overdue,
+    :number_of_day_to_notify_overdue,
+    :number_of_day_to_notify_due_date,
+    :number_of_time_to_notify_overdue
+
+  include MasterModel
+  default_scope :order => "user_groups.position"
+  has_many :users
+
+  validates_numericality_of :valid_period_for_new_user,
+    :greater_than_or_equal_to => 0,
+    :allow_blank => true
+
+  def self.per_page
+    10
+  end
+end
+
+# == Schema Information
+#
+# Table name: user_groups
+#
+#  id                               :integer         not null, primary key
+#  name                             :string(255)
+#  display_name                     :text
+#  note                             :text
+#  position                         :integer
+#  created_at                       :datetime
+#  updated_at                       :datetime
+#  deleted_at                       :datetime
+#  valid_period_for_new_user        :integer         default(0), not null
+#  expired_at                       :datetime
+#  number_of_day_to_notify_overdue  :integer         default(1), not null
+#  number_of_day_to_notify_due_date :integer         default(7), not null
+#  number_of_time_to_notify_overdue :integer         default(3), not null
+#
+

data/spec/dummy/db/schema.rb

@@ -678,10 +678,10 @@ ActiveRecord::Schema.define(:version => 20120424103932) do
     t.string   "user_number"
     t.integer  "library_id"
     t.datetime "locked_at"
-    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.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"
@@ -690,7 +690,7 @@ ActiveRecord::Schema.define(:version => 20120424103932) do
     t.datetime "last_sign_in_at"
     t.string   "current_sign_in_ip"
     t.string   "last_sign_in_ip"
-    t.boolean  "save_checkout_history"
+    t.boolean  "save_checkout_history",    :default => false, :null => false
     t.string   "checkout_icalendar_token"
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_circulation
 version: !ruby/object:Gem::Version
-  version: 0.0.46
+  version: 0.0.47
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-28 00:00:00.000000000 Z
+date: 2012-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -322,6 +322,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- app/controllers/baskets_controller.rb
 - app/controllers/carrier_type_has_checkout_types_controller.rb
 - app/controllers/checked_items_controller.rb
 - app/controllers/checkins_controller.rb
@@ -572,6 +573,7 @@ files:
 - spec/dummy/app/models/role.rb
 - spec/dummy/app/models/shelf.rb
 - spec/dummy/app/models/user.rb
+- spec/dummy/app/models/user_group.rb
 - spec/dummy/app/models/user_has_role.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/app/views/page/403.html.erb
@@ -601,7 +603,6 @@ files:
 - spec/dummy/config/locales/ja.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
@@ -650,7 +651,6 @@ files:
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/dummy/Rakefile
-- spec/dummy/README.rdoc
 - spec/dummy/script/delayed_job
 - spec/dummy/script/rails
 - spec/dummy/solr/conf/admin-extra.html
@@ -821,6 +821,7 @@ test_files:
 - spec/dummy/app/models/role.rb
 - spec/dummy/app/models/shelf.rb
 - spec/dummy/app/models/user.rb
+- spec/dummy/app/models/user_group.rb
 - spec/dummy/app/models/user_has_role.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/app/views/page/403.html.erb
@@ -850,7 +851,6 @@ test_files:
 - spec/dummy/config/locales/ja.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
@@ -899,7 +899,6 @@ test_files:
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/dummy/Rakefile
-- spec/dummy/README.rdoc
 - spec/dummy/script/delayed_job
 - spec/dummy/script/rails
 - spec/dummy/solr/conf/admin-extra.html

data/spec/dummy/README.rdoc

@@ -1,261 +0,0 @@
-== Welcome to Rails
-
-Rails is a web-application framework that includes everything needed to create
-database-backed web applications according to the Model-View-Control pattern.
-
-This pattern splits the view (also called the presentation) into "dumb"
-templates that are primarily responsible for inserting pre-built data in between
-HTML tags. The model contains the "smart" domain objects (such as Account,
-Product, Person, Post) that holds all the business logic and knows how to
-persist themselves to a database. The controller handles the incoming requests
-(such as Save New Account, Update Product, Show Post) by manipulating the model
-and directing data to the view.
-
-In Rails, the model is handled by what's called an object-relational mapping
-layer entitled Active Record. This layer allows you to present the data from
-database rows as objects and embellish these data objects with business logic
-methods. You can read more about Active Record in
-link:files/vendor/rails/activerecord/README.html.
-
-The controller and view are handled by the Action Pack, which handles both
-layers by its two parts: Action View and Action Controller. These two layers
-are bundled in a single package due to their heavy interdependence. This is
-unlike the relationship between the Active Record and Action Pack that is much
-more separate. Each of these packages can be used independently outside of
-Rails. You can read more about Action Pack in
-link:files/vendor/rails/actionpack/README.html.
-
-
-== Getting Started
-
-1. At the command prompt, create a new Rails application:
-       <tt>rails new myapp</tt> (where <tt>myapp</tt> is the application name)
-
-2. Change directory to <tt>myapp</tt> and start the web server:
-       <tt>cd myapp; rails server</tt> (run with --help for options)
-
-3. Go to http://localhost:3000/ and you'll see:
-       "Welcome aboard: You're riding Ruby on Rails!"
-
-4. Follow the guidelines to start developing your application. You can find
-the following resources handy:
-
-* The Getting Started Guide: http://guides.rubyonrails.org/getting_started.html
-* Ruby on Rails Tutorial Book: http://www.railstutorial.org/
-
-
-== Debugging Rails
-
-Sometimes your application goes wrong. Fortunately there are a lot of tools that
-will help you debug it and get it back on the rails.
-
-First area to check is the application log files. Have "tail -f" commands
-running on the server.log and development.log. Rails will automatically display
-debugging and runtime information to these files. Debugging info will also be
-shown in the browser on requests from 127.0.0.1.
-
-You can also log your own messages directly into the log file from your code
-using the Ruby logger class from inside your controllers. Example:
-
-  class WeblogController < ActionController::Base
-    def destroy
-      @weblog = Weblog.find(params[:id])
-      @weblog.destroy
-      logger.info("#{Time.now} Destroyed Weblog ID ##{@weblog.id}!")
-    end
-  end
-
-The result will be a message in your log file along the lines of:
-
-  Mon Oct 08 14:22:29 +1000 2007 Destroyed Weblog ID #1!
-
-More information on how to use the logger is at http://www.ruby-doc.org/core/
-
-Also, Ruby documentation can be found at http://www.ruby-lang.org/. There are
-several books available online as well:
-
-* Programming Ruby: http://www.ruby-doc.org/docs/ProgrammingRuby/ (Pickaxe)
-* Learn to Program: http://pine.fm/LearnToProgram/ (a beginners guide)
-
-These two books will bring you up to speed on the Ruby language and also on
-programming in general.
-
-
-== Debugger
-
-Debugger support is available through the debugger command when you start your
-Mongrel or WEBrick server with --debugger. This means that you can break out of
-execution at any point in the code, investigate and change the model, and then,
-resume execution! You need to install ruby-debug to run the server in debugging
-mode. With gems, use <tt>sudo gem install ruby-debug</tt>. Example:
-
-  class WeblogController < ActionController::Base
-    def index
-      @posts = Post.all
-      debugger
-    end
-  end
-
-So the controller will accept the action, run the first line, then present you
-with a IRB prompt in the server window. Here you can do things like:
-
-  >> @posts.inspect
-  => "[#<Post:0x14a6be8
-          @attributes={"title"=>nil, "body"=>nil, "id"=>"1"}>,
-       #<Post:0x14a6620
-          @attributes={"title"=>"Rails", "body"=>"Only ten..", "id"=>"2"}>]"
-  >> @posts.first.title = "hello from a debugger"
-  => "hello from a debugger"
-
-...and even better, you can examine how your runtime objects actually work:
-
-  >> f = @posts.first
-  => #<Post:0x13630c4 @attributes={"title"=>nil, "body"=>nil, "id"=>"1"}>
-  >> f.
-  Display all 152 possibilities? (y or n)
-
-Finally, when you're ready to resume execution, you can enter "cont".
-
-
-== Console
-
-The console is a Ruby shell, which allows you to interact with your
-application's domain model. Here you'll have all parts of the application
-configured, just like it is when the application is running. You can inspect
-domain models, change values, and save to the database. Starting the script
-without arguments will launch it in the development environment.
-
-To start the console, run <tt>rails console</tt> from the application
-directory.
-
-Options:
-
-* Passing the <tt>-s, --sandbox</tt> argument will rollback any modifications
-  made to the database.
-* Passing an environment name as an argument will load the corresponding
-  environment. Example: <tt>rails console production</tt>.
-
-To reload your controllers and models after launching the console run
-<tt>reload!</tt>
-
-More information about irb can be found at:
-link:http://www.rubycentral.org/pickaxe/irb.html
-
-
-== dbconsole
-
-You can go to the command line of your database directly through <tt>rails
-dbconsole</tt>. You would be connected to the database with the credentials
-defined in database.yml. Starting the script without arguments will connect you
-to the development database. Passing an argument will connect you to a different
-database, like <tt>rails dbconsole production</tt>. Currently works for MySQL,
-PostgreSQL and SQLite 3.
-
-== Description of Contents
-
-The default directory structure of a generated Ruby on Rails application:
-
-  |-- app
-  |   |-- assets
-  |       |-- images
-  |       |-- javascripts
-  |       `-- stylesheets
-  |   |-- controllers
-  |   |-- helpers
-  |   |-- mailers
-  |   |-- models
-  |   `-- views
-  |       `-- layouts
-  |-- config
-  |   |-- environments
-  |   |-- initializers
-  |   `-- locales
-  |-- db
-  |-- doc
-  |-- lib
-  |   `-- tasks
-  |-- log
-  |-- public
-  |-- script
-  |-- test
-  |   |-- fixtures
-  |   |-- functional
-  |   |-- integration
-  |   |-- performance
-  |   `-- unit
-  |-- tmp
-  |   |-- cache
-  |   |-- pids
-  |   |-- sessions
-  |   `-- sockets
-  `-- vendor
-      |-- assets
-          `-- stylesheets
-      `-- plugins
-
-app
-  Holds all the code that's specific to this particular application.
-
-app/assets
-  Contains subdirectories for images, stylesheets, and JavaScript files.
-
-app/controllers
-  Holds controllers that should be named like weblogs_controller.rb for
-  automated URL mapping. All controllers should descend from
-  ApplicationController which itself descends from ActionController::Base.
-
-app/models
-  Holds models that should be named like post.rb. Models descend from
-  ActiveRecord::Base by default.
-
-app/views
-  Holds the template files for the view that should be named like
-  weblogs/index.html.erb for the WeblogsController#index action. All views use
-  eRuby syntax by default.
-
-app/views/layouts
-  Holds the template files for layouts to be used with views. This models the
-  common header/footer method of wrapping views. In your views, define a layout
-  using the <tt>layout :default</tt> and create a file named default.html.erb.
-  Inside default.html.erb, call <% yield %> to render the view using this
-  layout.
-
-app/helpers
-  Holds view helpers that should be named like weblogs_helper.rb. These are
-  generated for you automatically when using generators for controllers.
-  Helpers can be used to wrap functionality for your views into methods.
-
-config
-  Configuration files for the Rails environment, the routing map, the database,
-  and other dependencies.
-
-db
-  Contains the database schema in schema.rb. db/migrate contains all the
-  sequence of Migrations for your schema.
-
-doc
-  This directory is where your application documentation will be stored when
-  generated using <tt>rake doc:app</tt>
-
-lib
-  Application specific libraries. Basically, any kind of custom code that
-  doesn't belong under controllers, models, or helpers. This directory is in
-  the load path.
-
-public
-  The directory available for the web server. Also contains the dispatchers and the
-  default HTML files. This should be set as the DOCUMENT_ROOT of your web
-  server.
-
-script
-  Helper scripts for automation and generation.
-
-test
-  Unit and functional tests along with fixtures. When using the rails generate
-  command, template test files will be generated for you and placed in this
-  directory.
-
-vendor
-  External libraries that the application depends on. Also includes the plugins
-  subdirectory. If the app has frozen rails, those gems also go here, under
-  vendor/rails/. This directory is in the load path.