enju_library 0.1.0.pre8 → 0.1.0.pre9

data/app/models/library.rb

@@ -29,7 +29,7 @@ class Library < ActiveRecord::Base
   validates_uniqueness_of :short_display_name, :case_sensitive => false
   validates_uniqueness_of :isil, :allow_blank => true
   validates :display_name, :uniqueness => true
-  validates :name, :format => {:with => /\A[a-z][0-9a-z\-_]{1,254}\z/}
+  validates :name, :format => {:with => /\A[a-z][0-9a-z\-_]{1,253}[0-9a-z]\Z/}
   validates :isil, :format => {:with => /\A[A-Za-z]{1,4}-[A-Za-z0-9\/:\-]{2,11}\z/}, :allow_blank => true
   after_validation :geocode, :if => :address_changed?
   after_create :create_shelf

data/app/models/shelf.rb

@@ -9,7 +9,7 @@ class Shelf < ActiveRecord::Base
   validates_associated :library
   validates_presence_of :library
   validates_uniqueness_of :display_name, :scope => :library_id
-  validates :name, :format => {:with => /\A[a-z][0-9a-z\-_]{1,254}\z/}
+  validates :name, :format => {:with => /\A[a-z][0-9a-z\-_]{1,253}[0-9a-z]\Z/}
 
   acts_as_list :scope => :library
 

data/app/views/accepts/_list.html.erb

@@ -28,4 +28,4 @@
   <%- end -%>
 </table>
 
-<%= javascript_tag("$('#accept_item_identifier').focus()") -%>
+<%= javascript_tag("$(function(){$('#accept_item_identifier').focus()})") %>

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

@@ -35,8 +35,8 @@
       </td>
     </tr>
   <%- end -%>
-  </table>
-  <%= javascript_tag("$('#accept_item_identifier').focus()") -%>
+</table>
+  <%= javascript_tag("$(function(){$('#accept_item_identifier').focus()})") %>
 
   <%= paginate(@accepts) %>
 </div>

data/config/locales/en.yml

@@ -11,6 +11,7 @@ en:
       subscription: Subscription
       request_status_type: Request status type
       request_type: Request type
+      search_engine: Search engine
 
     attributes:
       library:
@@ -84,3 +85,12 @@ en:
         display_name: Display name
         note: Note
         position: Position
+      search_engine:
+        name: Name
+        url: URL
+        base_url: Base URL
+        http_method: HTTP method
+        query_param: Query param
+        additional_param: Additional param
+        note: Note
+        position: Position

data/config/locales/ja.yml

@@ -11,6 +11,7 @@ ja:
       subscription: 購読
       request_status_type: 依頼の状態の種類
       request_type: 依頼の種類
+      search_engine: 検索エンジン
 
     attributes:
       library:
@@ -84,3 +85,12 @@ ja:
         display_name: 表示名
         note: 注記
         position: 位置
+      search_engine:
+        name: 名前
+        url: URL
+        base_url: ベースURL
+        http_method: HTTPメソッド
+        query_param: クエリパラメータ
+        additional_param: 追加のパラメータ
+        note: 注記
+        position: 位置

data/lib/enju_library/version.rb

@@ -1,3 +1,3 @@
 module EnjuLibrary
-  VERSION = "0.1.0.pre8"
+  VERSION = "0.1.0.pre9"
 end

data/spec/spec_helper.rb

@@ -39,8 +39,6 @@ RSpec.configure do |config|
 
   config.extend ControllerMacros, :type => :controller
 
-  config.extend VCR::RSpec::Macros
-
   $original_sunspot_session = Sunspot.session
 
   config.before do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_library
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre8
+  version: 0.1.0.pre9
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-22 00:00:00.000000000 Z
+date: 2013-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: enju_core
@@ -194,7 +194,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre16
+        version: 0.1.0.pre17
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -202,7 +202,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre16
+        version: 0.1.0.pre17
 - !ruby/object:Gem::Dependency
   name: enju_event
   requirement: !ruby/object:Gem::Requirement
@@ -226,7 +226,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre10
+        version: 0.1.0.pre11
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -234,7 +234,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre10
+        version: 0.1.0.pre11
 - !ruby/object:Gem::Dependency
   name: enju_inter_library_loan
   requirement: !ruby/object:Gem::Requirement
@@ -645,7 +645,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -760201052934905345
+      hash: -1686721777698721466
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: