enju_library 0.1.0.pre23 → 0.1.0.pre24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc0f565fb05cba18a838a9aa3c465341a2d68fe0
-  data.tar.gz: 08482b85035b6ace6d5f45ac7ab00d1919579ea3
+  metadata.gz: e6723c43444e6660f0a87e011dfc92df5726c58c
+  data.tar.gz: 2c982f76bdd247dfe019ea8b51d5937c63c0ffe5
 SHA512:
-  metadata.gz: 0df5be79bea0879d653485a28d608f0ff6b330203ab2a8654f5a15eef5c0517de7bb46331a4ae1e07d2600f2dae06388c501e3e4d789bd753f370390a97d14c9
-  data.tar.gz: 066983bb03b05842aa22ed0b5aa7b1611e114bb87fbb277ba8b4d4ea4a6e14a55dbef4dc25f4a8918f0d82abaf582903b331bf97198d5b878a5acdc75ab4524a
+  metadata.gz: 79e5337ba90731e5caf63a29232c41972f6297606b70edf15fbc2dee7e7d99b6aac8617d34f49ea577cfb222a3fbe5bfc7424bce9b761093634b5ef0792c3ae5
+  data.tar.gz: 526ee0ff546daf9bcfc9c9814136d83753d5e9b113ea48b390ebfaecebcb7274748ad7642ffaa04f99fe3136016cee9e57a0c1aba1c90e6b85fc018c15da0a70

data/app/controllers/search_engines_controller.rb

@@ -12,6 +12,6 @@ class SearchEnginesController < InheritedResources::Base
   end
 
   def index
-    @search_engines = @search_engines.page(params[:page])
+    @search_engines = SearchEngine.page(params[:page])
   end
 end

data/app/models/library.rb

@@ -120,6 +120,9 @@ end
 #  created_at            :datetime         not null
 #  updated_at            :datetime         not null
 #  deleted_at            :datetime
+#  opening_hour          :text
 #  isil                  :string(255)
+#  latitude              :float
+#  longitude             :float
 #
 

data/lib/enju_library/version.rb

@@ -1,3 +1,3 @@
 module EnjuLibrary
-  VERSION = "0.1.0.pre23"
+  VERSION = "0.1.0.pre24"
 end

data/spec/controllers/accepts_controller_spec.rb

@@ -66,11 +66,6 @@ describe AcceptsController do
         get :show, :id => accept.id
         assigns(:accept).should eq(accept)
       end
-
-      it "should not show missing accept" do
-        get :show, :id => 'missing'
-        response.should be_missing
-      end
     end
 
     describe "When logged in as Librarian" do
@@ -257,11 +252,6 @@ describe AcceptsController do
         delete :destroy, :id => @accept.id
         response.should redirect_to(accepts_url)
       end
-
-      it "should not destroy missing accept" do
-        delete :destroy, :id => 'missing'
-        response.should be_missing
-      end
     end
 
     describe "When logged in as Librarian" do

data/spec/controllers/libraries_controller_spec.rb

@@ -57,12 +57,6 @@ describe LibrariesController do
         get :show, :id => 1
         assigns(:library).should eq(libraries(:library_00001))
       end
-
-      it "assigns nil as @library if id is missing" do
-        get :show, :id => 'missing'
-        assigns(:library).should be_nil
-        response.should be_missing
-      end
     end
 
     describe "When logged in as Librarian" do

data/spec/dummy/app/controllers/application_controller.rb

@@ -1,59 +1,6 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
-
-  rescue_from CanCan::AccessDenied, :with => :render_403
-  rescue_from ActiveRecord::RecordNotFound, :with => :render_404
-
+  enju_leaf
   enju_biblio
   enju_library
-
-  private
-  def render_403
-    return if performed?
-    if user_signed_in?
-      respond_to do |format|
-        format.html {render :template => 'page/403', :status => 403}
-        format.xml {render :template => 'page/403', :status => 403}
-        format.json
-      end
-    else
-      respond_to do |format|
-        format.html {redirect_to new_user_session_url}
-        format.xml {render :template => 'page/403', :status => 403}
-        format.json
-      end
-    end
-  end
-
-  def render_404
-    return if performed?
-    respond_to do |format|
-      format.html {render :template => 'page/404', :status => 404}
-      format.mobile {render :template => 'page/404', :status => 404}
-      format.xml {render :template => 'page/404', :status => 404}
-      format.json
-    end
-  end
-
-  def access_denied
-    raise CanCan::AccessDenied
-  end
-
-  #def current_ability
-  #  @current_ability ||= Ability.new(current_user, request.remote_ip.split('%')[0])
-  #end
-
-  def solr_commit
-    Sunspot.commit
-  end
-
-  def move_position(resource, direction, redirect = true)
-    if ['higher', 'lower'].include?(direction)
-      resource.send("move_#{direction}")
-      if redirect
-        redirect_to url_for(:controller => resource.class.to_s.pluralize.underscore)
-        return
-      end
-    end
-  end
 end

data/spec/dummy/config/application.rb

@@ -4,8 +4,6 @@ require 'rails/all'
 
 Bundler.require
 require "enju_library"
-require "enju_event"
-require "enju_inter_library_loan"
 
 module Dummy
   class Application < Rails::Application
@@ -56,8 +54,8 @@ module Dummy
   end
 end
 
+require 'enju_leaf'
 require 'enju_biblio'
 require 'enju_circulation'
-require 'enju_manifestation_viewer'
-require 'mobylette'
-require 'redcarpet'
+require "enju_event"
+require "enju_inter_library_loan"

data/spec/fixtures/libraries.yml

@@ -94,6 +94,9 @@ library_00004:
 #  created_at            :datetime         not null
 #  updated_at            :datetime         not null
 #  deleted_at            :datetime
+#  opening_hour          :text
 #  isil                  :string(255)
+#  latitude              :float
+#  longitude             :float
 #
 

data/spec/models/library_spec.rb

@@ -39,6 +39,9 @@ end
 #  created_at            :datetime         not null
 #  updated_at            :datetime         not null
 #  deleted_at            :datetime
+#  opening_hour          :text
 #  isil                  :string(255)
+#  latitude              :float
+#  longitude             :float
 #
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_library
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre23
+  version: 0.1.0.pre24
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-14 00:00:00.000000000 Z
+date: 2013-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: enju_core
@@ -136,48 +136,62 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: enju_leaf
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0.rc2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0.rc2
 - !ruby/object:Gem::Dependency
   name: enju_ndl
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre23
+        version: 0.1.0.pre24
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre23
+        version: 0.1.0.pre24
 - !ruby/object:Gem::Dependency
   name: enju_manifestation_viewer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre9
+        version: 0.1.0.pre11
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre9
+        version: 0.1.0.pre11
 - !ruby/object:Gem::Dependency
   name: enju_biblio
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre40
+        version: 0.1.0.pre41
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre40
+        version: 0.1.0.pre41
 - !ruby/object:Gem::Dependency
   name: enju_event
   requirement: !ruby/object:Gem::Requirement
@@ -198,14 +212,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre25
+        version: 0.1.0.pre27
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre25
+        version: 0.1.0.pre27
 - !ruby/object:Gem::Dependency
   name: enju_inter_library_loan
   requirement: !ruby/object:Gem::Requirement
@@ -437,11 +451,8 @@ files:
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/models/ability.rb
-- spec/dummy/app/models/role.rb
 - spec/dummy/app/models/setting.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
 - spec/dummy/app/views/page/403.mobile.erb
@@ -549,16 +560,16 @@ 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/_ga.fdt
-- spec/dummy/solr/data/test/index/_ga.fdx
-- spec/dummy/solr/data/test/index/_ga.fnm
-- spec/dummy/solr/data/test/index/_ga.frq
-- spec/dummy/solr/data/test/index/_ga.nrm
-- spec/dummy/solr/data/test/index/_ga.prx
-- spec/dummy/solr/data/test/index/_ga.tii
-- spec/dummy/solr/data/test/index/_ga.tis
+- spec/dummy/solr/data/test/index/_h4.fdt
+- spec/dummy/solr/data/test/index/_h4.fdx
+- spec/dummy/solr/data/test/index/_h4.fnm
+- spec/dummy/solr/data/test/index/_h4.frq
+- spec/dummy/solr/data/test/index/_h4.nrm
+- spec/dummy/solr/data/test/index/_h4.prx
+- spec/dummy/solr/data/test/index/_h4.tii
+- spec/dummy/solr/data/test/index/_h4.tis
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_123
+- spec/dummy/solr/data/test/index/segments_140
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/dummy/tmp/cache/4AD/470/country_all
@@ -648,7 +659,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: enju_library plugin
@@ -669,11 +680,8 @@ test_files:
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/models/ability.rb
-- spec/dummy/app/models/role.rb
 - spec/dummy/app/models/setting.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
 - spec/dummy/app/views/page/403.mobile.erb
@@ -781,16 +789,16 @@ 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/_ga.fdt
-- spec/dummy/solr/data/test/index/_ga.fdx
-- spec/dummy/solr/data/test/index/_ga.fnm
-- spec/dummy/solr/data/test/index/_ga.frq
-- spec/dummy/solr/data/test/index/_ga.nrm
-- spec/dummy/solr/data/test/index/_ga.prx
-- spec/dummy/solr/data/test/index/_ga.tii
-- spec/dummy/solr/data/test/index/_ga.tis
+- spec/dummy/solr/data/test/index/_h4.fdt
+- spec/dummy/solr/data/test/index/_h4.fdx
+- spec/dummy/solr/data/test/index/_h4.fnm
+- spec/dummy/solr/data/test/index/_h4.frq
+- spec/dummy/solr/data/test/index/_h4.nrm
+- spec/dummy/solr/data/test/index/_h4.prx
+- spec/dummy/solr/data/test/index/_h4.tii
+- spec/dummy/solr/data/test/index/_h4.tis
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_123
+- spec/dummy/solr/data/test/index/segments_140
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/dummy/tmp/cache/4AD/470/country_all

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

@@ -1,46 +0,0 @@
-class Role < ActiveRecord::Base
-  include MasterModel
-  default_scope :order => "roles.position"
-  has_many :user_has_roles
-  has_many :users, :through => :user_has_roles
-  after_save :clear_all_cache
-  after_destroy :clear_all_cache
-
-  extend FriendlyId
-  friendly_id :name
-
-  def localized_name
-    display_name.localize
-  end
-
-  def self.all_cache
-    if Rails.env == 'production'
-      Rails.cache.fetch('role_all'){Role.select(:name).all}
-    else
-      Role.select(:name)
-    end
-  end
-
-  def clear_all_cache
-    Rails.cache.delete('role_all')
-  end
-
-  def self.default_role
-    Rails.cache.fetch('default_role'){Role.find('Guest')}
-  end
-end
-
-# == Schema Information
-#
-# Table name: roles
-#
-#  id           :integer         not null, primary key
-#  name         :string(255)     not null
-#  display_name :string(255)
-#  note         :text
-#  created_at   :datetime
-#  updated_at   :datetime
-#  score        :integer         default(0), not null
-#  position     :integer
-#
-

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

@@ -1,40 +0,0 @@
-# -*- 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/app/models/user_has_role.rb

@@ -1,5 +0,0 @@
-class UserHasRole < ActiveRecord::Base
-  attr_accessible :user_id, :role_id
-  belongs_to :user
-  belongs_to :role
-end