enju_event 0.0.26 → 0.0.27

Sign up to get free protection for your applications and to get access to all the features.
Files changed (47) hide show
  1. data/app/controllers/calendar_controller.rb +1 -1
  2. data/app/controllers/events_controller.rb +1 -1
  3. data/lib/enju_event/version.rb +1 -1
  4. data/spec/dummy/db/development.sqlite3 +0 -0
  5. data/spec/dummy/db/test.sqlite3 +0 -0
  6. data/spec/dummy/private/system/event_import_files/event_imports/000/000/001/original/event_import_file_sample1.tsv +5 -0
  7. data/spec/dummy/private/system/event_import_files/event_imports/000/000/001/original/event_import_file_sample2.tsv +3 -0
  8. data/spec/dummy/solr/data/test/index/_5l.fdt +0 -0
  9. data/spec/dummy/solr/data/test/index/_5l.fdx +0 -0
  10. data/spec/dummy/solr/data/test/index/_5l.fnm +4 -0
  11. data/spec/dummy/solr/data/test/index/_5l.frq +0 -0
  12. data/spec/dummy/solr/data/test/index/_5l.nrm +1 -0
  13. data/spec/dummy/solr/data/test/index/_5l.prx +0 -0
  14. data/spec/dummy/solr/data/test/index/{_u.tii → _5l.tii} +0 -0
  15. data/spec/dummy/solr/data/test/index/_5l.tis +0 -0
  16. data/spec/dummy/solr/data/test/index/_5l_1.del +0 -0
  17. data/spec/dummy/solr/data/test/index/{_v.fdt → _5m.fdt} +0 -0
  18. data/spec/dummy/solr/data/test/index/{_v.fdx → _5m.fdx} +0 -0
  19. data/spec/dummy/solr/data/test/index/{_v.fnm → _5m.fnm} +0 -0
  20. data/spec/dummy/solr/data/test/index/{_v.frq → _5m.frq} +0 -0
  21. data/spec/dummy/solr/data/test/index/{_v.nrm → _5m.nrm} +0 -0
  22. data/spec/dummy/solr/data/test/index/{_v.prx → _5m.prx} +0 -0
  23. data/spec/dummy/solr/data/test/index/{_v.tii → _5m.tii} +0 -0
  24. data/spec/dummy/solr/data/test/index/_5m.tis +0 -0
  25. data/spec/dummy/solr/data/test/index/{_v_1.del → _5m_1.del} +0 -0
  26. data/spec/dummy/solr/data/test/index/{_w.fdt → _5n.fdt} +0 -0
  27. data/spec/dummy/solr/data/test/index/{_w.fdx → _5n.fdx} +0 -0
  28. data/spec/dummy/solr/data/test/index/{_w.fnm → _5n.fnm} +0 -0
  29. data/spec/dummy/solr/data/test/index/{_w.frq → _5n.frq} +0 -0
  30. data/spec/dummy/solr/data/test/index/{_w.nrm → _5n.nrm} +0 -0
  31. data/spec/dummy/solr/data/test/index/{_w.prx → _5n.prx} +0 -0
  32. data/spec/dummy/solr/data/test/index/{_w.tii → _5n.tii} +0 -0
  33. data/spec/dummy/solr/data/test/index/_5n.tis +0 -0
  34. data/spec/dummy/solr/data/test/index/segments.gen +0 -0
  35. data/spec/dummy/solr/data/test/index/{segments_v → segments_6l} +0 -0
  36. data/spec/dummy/solr/data/test/spellchecker/segments_1 +0 -0
  37. metadata +62 -56
  38. data/spec/dummy/solr/data/test/index/_u.fdt +0 -0
  39. data/spec/dummy/solr/data/test/index/_u.fdx +0 -0
  40. data/spec/dummy/solr/data/test/index/_u.fnm +0 -4
  41. data/spec/dummy/solr/data/test/index/_u.frq +0 -1
  42. data/spec/dummy/solr/data/test/index/_u.nrm +0 -1
  43. data/spec/dummy/solr/data/test/index/_u.prx +0 -0
  44. data/spec/dummy/solr/data/test/index/_u.tis +0 -0
  45. data/spec/dummy/solr/data/test/index/_u_1.del +0 -0
  46. data/spec/dummy/solr/data/test/index/_v.tis +0 -0
  47. data/spec/dummy/solr/data/test/index/_w.tis +0 -0
data/app/controllers/calendar_controller.rb CHANGED
@@ -23,7 +23,7 @@ class CalendarController < ApplicationController
23
23
  date = Time.zone.local(params[:year].to_i, params[:month].to_i, params[:day].to_i) rescue Time.zone.now
24
24
  date_string = date.strftime('%Y/%m/%d')
25
25
  if Event.search do
26
- with(:start_at).less_than date
26
+ with(:start_at).less_than_or_equal_to date
27
27
  with(:end_at).greater_than date
28
28
  end.results.empty?
29
29
  redirect_to new_event_path(:date => date_string)
data/app/controllers/events_controller.rb CHANGED
@@ -26,7 +26,7 @@ class EventsController < ApplicationController
26
26
  with(:library_id).equal_to library.id if library
27
27
  #with(:tag).equal_to tag
28
28
  if date
29
- with(:start_at).less_than Time.zone.parse(date)
29
+ with(:start_at).less_than_or_equal_to Time.zone.parse(date)
30
30
  with(:end_at).greater_than Time.zone.parse(date)
31
31
  end
32
32
  case mode
data/lib/enju_event/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module EnjuEvent
2
- VERSION = "0.0.26"
2
+ VERSION = "0.0.27"
3
3
  end
data/spec/dummy/db/test.sqlite3 CHANGED
Binary file
data/spec/dummy/private/system/event_import_files/event_imports/000/000/001/original/event_import_file_sample1.tsv ADDED
@@ -0,0 +1,5 @@
1
+ "name" "category" "library_shortname" "start_at" "end_at" "dummy"
2
+ "イベント名" "カテゴリ。休館日の場合はclosed" "図書館名" "開始日" "終了日" "インポート省略"
3
+ "hogehoge" "おはなし会" "kamata" "2009-04-01" "2009-04-03"
4
+ "hogehoge" "hachioji"
5
+ "休館日" "closed" "kamata" "2011-04-01" "2011-04-03"
data/spec/dummy/private/system/event_import_files/event_imports/000/000/001/original/event_import_file_sample2.tsv ADDED
@@ -0,0 +1,3 @@
1
+ "name" "library_shortname" "start_at" "end_at"
2
+ "���{��̍Â���" "kamata" "2011-03-26" "2011-03-27"
3
+ "���{��̍Â���2" "kamata" "2011-03-26" "2011-03-27"
data/spec/dummy/solr/data/test/index/_5l.fnm ADDED
@@ -0,0 +1,4 @@
1
+ ����idtype
2
+ class_name library_id_i created_at_d updated_at_d
3
+ start_at_dend_at_d name_text note_textname_s library_s
4
+ position_idisplay_name_text address_text
data/spec/dummy/solr/data/test/index/_5l.nrm ADDED
@@ -0,0 +1 @@
1
+ NRM�xxvx|u||v||ut�u��||||||||||||||y||||||||||�|
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: enju_event
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.26
4
+ version: 0.0.27
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-07-02 00:00:00.000000000 Z
12
+ date: 2012-07-21 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rails
@@ -390,6 +390,7 @@ files:
390
390
  - spec/dummy/config/locales/en.yml
391
391
  - spec/dummy/config/routes.rb
392
392
  - spec/dummy/config.ru
393
+ - spec/dummy/db/development.sqlite3
393
394
  - spec/dummy/db/migrate/001_create_patrons.rb
394
395
  - spec/dummy/db/migrate/005_create_manifestations.rb
395
396
  - spec/dummy/db/migrate/006_create_items.rb
@@ -479,6 +480,8 @@ files:
479
480
  - spec/dummy/db/migrate/20120602141129_add_edit_mode_to_patron_import_file.rb
480
481
  - spec/dummy/db/schema.rb
481
482
  - spec/dummy/db/test.sqlite3
483
+ - spec/dummy/private/system/event_import_files/event_imports/000/000/001/original/event_import_file_sample1.tsv
484
+ - spec/dummy/private/system/event_import_files/event_imports/000/000/001/original/event_import_file_sample2.tsv
482
485
  - spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_destroy_file.tsv
483
486
  - spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_import_file_sample1.tsv
484
487
  - spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_import_file_sample2.tsv
@@ -503,34 +506,34 @@ files:
503
506
  - spec/dummy/solr/conf/spellings.txt
504
507
  - spec/dummy/solr/conf/stopwords.txt
505
508
  - spec/dummy/solr/conf/synonyms.txt
506
- - spec/dummy/solr/data/test/index/_u.fdt
507
- - spec/dummy/solr/data/test/index/_u.fdx
508
- - spec/dummy/solr/data/test/index/_u.fnm
509
- - spec/dummy/solr/data/test/index/_u.frq
510
- - spec/dummy/solr/data/test/index/_u.nrm
511
- - spec/dummy/solr/data/test/index/_u.prx
512
- - spec/dummy/solr/data/test/index/_u.tii
513
- - spec/dummy/solr/data/test/index/_u.tis
514
- - spec/dummy/solr/data/test/index/_u_1.del
515
- - spec/dummy/solr/data/test/index/_v.fdt
516
- - spec/dummy/solr/data/test/index/_v.fdx
517
- - spec/dummy/solr/data/test/index/_v.fnm
518
- - spec/dummy/solr/data/test/index/_v.frq
519
- - spec/dummy/solr/data/test/index/_v.nrm
520
- - spec/dummy/solr/data/test/index/_v.prx
521
- - spec/dummy/solr/data/test/index/_v.tii
522
- - spec/dummy/solr/data/test/index/_v.tis
523
- - spec/dummy/solr/data/test/index/_v_1.del
524
- - spec/dummy/solr/data/test/index/_w.fdt
525
- - spec/dummy/solr/data/test/index/_w.fdx
526
- - spec/dummy/solr/data/test/index/_w.fnm
527
- - spec/dummy/solr/data/test/index/_w.frq
528
- - spec/dummy/solr/data/test/index/_w.nrm
529
- - spec/dummy/solr/data/test/index/_w.prx
530
- - spec/dummy/solr/data/test/index/_w.tii
531
- - spec/dummy/solr/data/test/index/_w.tis
509
+ - spec/dummy/solr/data/test/index/_5l.fdt
510
+ - spec/dummy/solr/data/test/index/_5l.fdx
511
+ - spec/dummy/solr/data/test/index/_5l.fnm
512
+ - spec/dummy/solr/data/test/index/_5l.frq
513
+ - spec/dummy/solr/data/test/index/_5l.nrm
514
+ - spec/dummy/solr/data/test/index/_5l.prx
515
+ - spec/dummy/solr/data/test/index/_5l.tii
516
+ - spec/dummy/solr/data/test/index/_5l.tis
517
+ - spec/dummy/solr/data/test/index/_5l_1.del
518
+ - spec/dummy/solr/data/test/index/_5m.fdt
519
+ - spec/dummy/solr/data/test/index/_5m.fdx
520
+ - spec/dummy/solr/data/test/index/_5m.fnm
521
+ - spec/dummy/solr/data/test/index/_5m.frq
522
+ - spec/dummy/solr/data/test/index/_5m.nrm
523
+ - spec/dummy/solr/data/test/index/_5m.prx
524
+ - spec/dummy/solr/data/test/index/_5m.tii
525
+ - spec/dummy/solr/data/test/index/_5m.tis
526
+ - spec/dummy/solr/data/test/index/_5m_1.del
527
+ - spec/dummy/solr/data/test/index/_5n.fdt
528
+ - spec/dummy/solr/data/test/index/_5n.fdx
529
+ - spec/dummy/solr/data/test/index/_5n.fnm
530
+ - spec/dummy/solr/data/test/index/_5n.frq
531
+ - spec/dummy/solr/data/test/index/_5n.nrm
532
+ - spec/dummy/solr/data/test/index/_5n.prx
533
+ - spec/dummy/solr/data/test/index/_5n.tii
534
+ - spec/dummy/solr/data/test/index/_5n.tis
532
535
  - spec/dummy/solr/data/test/index/segments.gen
533
- - spec/dummy/solr/data/test/index/segments_v
536
+ - spec/dummy/solr/data/test/index/segments_6l
534
537
  - spec/dummy/solr/data/test/spellchecker/segments.gen
535
538
  - spec/dummy/solr/data/test/spellchecker/segments_1
536
539
  - spec/factories/country.rb
@@ -628,6 +631,7 @@ test_files:
628
631
  - spec/dummy/config/locales/en.yml
629
632
  - spec/dummy/config/routes.rb
630
633
  - spec/dummy/config.ru
634
+ - spec/dummy/db/development.sqlite3
631
635
  - spec/dummy/db/migrate/001_create_patrons.rb
632
636
  - spec/dummy/db/migrate/005_create_manifestations.rb
633
637
  - spec/dummy/db/migrate/006_create_items.rb
@@ -717,6 +721,8 @@ test_files:
717
721
  - spec/dummy/db/migrate/20120602141129_add_edit_mode_to_patron_import_file.rb
718
722
  - spec/dummy/db/schema.rb
719
723
  - spec/dummy/db/test.sqlite3
724
+ - spec/dummy/private/system/event_import_files/event_imports/000/000/001/original/event_import_file_sample1.tsv
725
+ - spec/dummy/private/system/event_import_files/event_imports/000/000/001/original/event_import_file_sample2.tsv
720
726
  - spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_destroy_file.tsv
721
727
  - spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_import_file_sample1.tsv
722
728
  - spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_import_file_sample2.tsv
@@ -741,34 +747,34 @@ test_files:
741
747
  - spec/dummy/solr/conf/spellings.txt
742
748
  - spec/dummy/solr/conf/stopwords.txt
743
749
  - spec/dummy/solr/conf/synonyms.txt
744
- - spec/dummy/solr/data/test/index/_u.fdt
745
- - spec/dummy/solr/data/test/index/_u.fdx
746
- - spec/dummy/solr/data/test/index/_u.fnm
747
- - spec/dummy/solr/data/test/index/_u.frq
748
- - spec/dummy/solr/data/test/index/_u.nrm
749
- - spec/dummy/solr/data/test/index/_u.prx
750
- - spec/dummy/solr/data/test/index/_u.tii
751
- - spec/dummy/solr/data/test/index/_u.tis
752
- - spec/dummy/solr/data/test/index/_u_1.del
753
- - spec/dummy/solr/data/test/index/_v.fdt
754
- - spec/dummy/solr/data/test/index/_v.fdx
755
- - spec/dummy/solr/data/test/index/_v.fnm
756
- - spec/dummy/solr/data/test/index/_v.frq
757
- - spec/dummy/solr/data/test/index/_v.nrm
758
- - spec/dummy/solr/data/test/index/_v.prx
759
- - spec/dummy/solr/data/test/index/_v.tii
760
- - spec/dummy/solr/data/test/index/_v.tis
761
- - spec/dummy/solr/data/test/index/_v_1.del
762
- - spec/dummy/solr/data/test/index/_w.fdt
763
- - spec/dummy/solr/data/test/index/_w.fdx
764
- - spec/dummy/solr/data/test/index/_w.fnm
765
- - spec/dummy/solr/data/test/index/_w.frq
766
- - spec/dummy/solr/data/test/index/_w.nrm
767
- - spec/dummy/solr/data/test/index/_w.prx
768
- - spec/dummy/solr/data/test/index/_w.tii
769
- - spec/dummy/solr/data/test/index/_w.tis
750
+ - spec/dummy/solr/data/test/index/_5l.fdt
751
+ - spec/dummy/solr/data/test/index/_5l.fdx
752
+ - spec/dummy/solr/data/test/index/_5l.fnm
753
+ - spec/dummy/solr/data/test/index/_5l.frq
754
+ - spec/dummy/solr/data/test/index/_5l.nrm
755
+ - spec/dummy/solr/data/test/index/_5l.prx
756
+ - spec/dummy/solr/data/test/index/_5l.tii
757
+ - spec/dummy/solr/data/test/index/_5l.tis
758
+ - spec/dummy/solr/data/test/index/_5l_1.del
759
+ - spec/dummy/solr/data/test/index/_5m.fdt
760
+ - spec/dummy/solr/data/test/index/_5m.fdx
761
+ - spec/dummy/solr/data/test/index/_5m.fnm
762
+ - spec/dummy/solr/data/test/index/_5m.frq
763
+ - spec/dummy/solr/data/test/index/_5m.nrm
764
+ - spec/dummy/solr/data/test/index/_5m.prx
765
+ - spec/dummy/solr/data/test/index/_5m.tii
766
+ - spec/dummy/solr/data/test/index/_5m.tis
767
+ - spec/dummy/solr/data/test/index/_5m_1.del
768
+ - spec/dummy/solr/data/test/index/_5n.fdt
769
+ - spec/dummy/solr/data/test/index/_5n.fdx
770
+ - spec/dummy/solr/data/test/index/_5n.fnm
771
+ - spec/dummy/solr/data/test/index/_5n.frq
772
+ - spec/dummy/solr/data/test/index/_5n.nrm
773
+ - spec/dummy/solr/data/test/index/_5n.prx
774
+ - spec/dummy/solr/data/test/index/_5n.tii
775
+ - spec/dummy/solr/data/test/index/_5n.tis
770
776
  - spec/dummy/solr/data/test/index/segments.gen
771
- - spec/dummy/solr/data/test/index/segments_v
777
+ - spec/dummy/solr/data/test/index/segments_6l
772
778
  - spec/dummy/solr/data/test/spellchecker/segments.gen
773
779
  - spec/dummy/solr/data/test/spellchecker/segments_1
774
780
  - spec/factories/country.rb
data/spec/dummy/solr/data/test/index/_u.fnm DELETED
@@ -1,4 +0,0 @@
1
- ����idtype
2
- class_name created_at_d updated_at_drequired_role_id_ipatron_type_id_i name_text
3
- position_idisplay_name_text address_text library_id_i
4
- start_at_dend_at_dname_s library_s
data/spec/dummy/solr/data/test/index/_u.frq DELETED
@@ -1 +0,0 @@
1
- 
data/spec/dummy/solr/data/test/index/_u.nrm DELETED
@@ -1 +0,0 @@
1
- NRM�|v||||y|||�|