enju_circulation 0.1.0.pre43 → 0.1.0.pre44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4bd67e533865caf062b4396baf60d67d64f9f133
-  data.tar.gz: ca369f0c8c15284522d53e5d1cc4686b4bd662f1
+  metadata.gz: 7648a074cc898144643cbab96d3d664d760506b1
+  data.tar.gz: b2d9ab19bc015b1a6ce2044d28c26b07c0bf09e0
 SHA512:
-  metadata.gz: b6d93c4ae87ceed122f09ad53499cb704ec96e7d20f27a76016323d064637afb2cff21809c2d7296486f76c7e8e8f4f5f45b36de26778e42580dd522617e8fe9
-  data.tar.gz: 7ed5126b94034df8862a78083b9c17d00be4c9afbf54d69602ea5a35eaadb80838c706748c8d0966771f107bb47be9c93c4416d45c5798cb19f022072c5abf45
+  metadata.gz: 87471784b3d21d517f770c328ec7023e1ddb96259631e39c169abb55bbbbd727c9d7f5152be2e725defab7ac543291da3461d58b1638dab789cce0573feff73c
+  data.tar.gz: e8e8113309203a392ecf14227769265f678ffe98091a18272c93ede1258029f510dd8c55a1dd6f2982a2e464f649093ae57d9a68fcd16263a853dd72ea9a622e

data/app/controllers/reserves_controller.rb

@@ -75,10 +75,10 @@ class ReservesController < ApplicationController
     end
 
     begin
-      reserved_to = Time.zone.parse(params[:reserved_to])
-      @reserved_to = params[:reserved_to].to_s.strip
+      reserved_until = Time.zone.parse(params[:reserved_until])
+      @reserved_until = params[:reserved_until].to_s.strip
     rescue
-      reserved_to = nil
+      reserved_until = nil
     end
 
     if params[:state].present?
@@ -90,8 +90,8 @@ class ReservesController < ApplicationController
       if reserved_from
         with(:created_at).greater_than_or_equal_to reserved_from.beginning_of_day
       end
-      if reserved_to
-        with(:created_at).less_than reserved_to.tomorrow.beginning_of_day
+      if reserved_until
+        with(:created_at).less_than reserved_until.tomorrow.beginning_of_day
       end
       order_by sort_column, order
       with(:state).equal_to state if state

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

@@ -10,7 +10,7 @@
     <br />
     <%= t('activerecord.attributes.reserve.created_at') %>:
     <%= t('reserve.reserved_from') %> <%= text_field_tag 'reserved_from', @reserved_from, {class: 'date_field', placeholder: "#{t('page.example')}: 2012-04-12"} -%>
-    <%= t('reserve.reserved_to') %> <%= text_field_tag 'reserved_to', @reserved_to, {class: 'date_field', placeholder: "#{t('page.example')}: 2012-05-11"} -%>
+    <%= t('reserve.reserved_until') %> <%= text_field_tag 'reserved_until', @reserved_until, {class: 'date_field', placeholder: "#{t('page.example')}: 2012-05-11"} -%>
     <%= submit_tag t('page.search') -%>
   </p>
 <%- end -%>

data/lib/enju_circulation/version.rb

@@ -1,3 +1,3 @@
 module EnjuCirculation
-  VERSION = "0.1.0.pre43"
+  VERSION = "0.1.0.pre44"
 end

data/lib/tasks/reserve.rb

@@ -1,5 +1,5 @@
 def update_reserve
   Reserve.find_each do |reserve|
-    ReserveTransition.create(reserve_id: 1, sort_key: 0, to_state: reserve.state)
+    ReserveTransition.first_or_create(reserve_id: 1, sort_key: 0, to_state: reserve.state)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_circulation
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre43
+  version: 0.1.0.pre44
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-28 00:00:00.000000000 Z
+date: 2015-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: enju_biblio
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.17.pre24
+        version: 0.1.17.pre25
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.17.pre24
+        version: 0.1.17.pre25
 - !ruby/object:Gem::Dependency
   name: enju_leaf
   requirement: !ruby/object:Gem::Requirement
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: mobylette
   requirement: !ruby/object:Gem::Requirement
@@ -234,6 +234,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Circulation management for Next-L Enju
 email:
 - nabeta@fastmail.fm