open_conference_ware 1.0.0.pre2 → 1.0.0.pre3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (60) hide show
  1. data.tar.gz.sig +0 -0
  2. data/.travis.yml +3 -0
  3. data/README.md +6 -4
  4. data/app/assets/javascripts/open_conference_ware/{persona.js → persona.js.erb} +1 -1
  5. data/app/assets/stylesheets/open_conference_ware/custom.css.scss +14 -18
  6. data/app/controllers/open_conference_ware/application_controller.rb +2 -2
  7. data/app/controllers/open_conference_ware/authentications_controller.rb +8 -0
  8. data/app/controllers/open_conference_ware/manage/events_controller.rb +2 -2
  9. data/app/controllers/open_conference_ware/proposals_controller.rb +1 -1
  10. data/app/helpers/open_conference_ware/snippets_helper.rb +1 -1
  11. data/app/helpers/open_conference_ware/user_favorites_helper.rb +8 -4
  12. data/app/mixins/open_conference_ware/settings_checkers_mixin.rb +1 -0
  13. data/app/models/open_conference_ware/event.rb +1 -8
  14. data/app/models/open_conference_ware/proposal.rb +54 -61
  15. data/app/models/open_conference_ware/snippet.rb +1 -6
  16. data/app/observers/open_conference_ware/cache_watcher.rb +3 -3
  17. data/app/views/layouts/open_conference_ware/_header.html.erb +3 -1
  18. data/app/views/open_conference_ware/422.html.erb +1 -1
  19. data/app/views/open_conference_ware/500.html.erb +1 -1
  20. data/app/views/open_conference_ware/proposals/_form.html.erb +5 -5
  21. data/app/views/open_conference_ware/proposals/_list.html.erb +4 -4
  22. data/app/views/open_conference_ware/proposals/_list_concise.html.erb +3 -3
  23. data/app/views/open_conference_ware/proposals/_sub_list.html.erb +2 -2
  24. data/app/views/open_conference_ware/proposals/_transition_control.html.erb +2 -2
  25. data/app/views/open_conference_ware/proposals/show.html.erb +33 -54
  26. data/db/migrate/20131203235216_create_open_conference_ware_comments.rb +1 -1
  27. data/db/migrate/20131203235418_create_open_conference_ware_events.rb +1 -2
  28. data/db/migrate/20131203235524_create_open_conference_ware_proposals.rb +5 -5
  29. data/db/migrate/20131203235723_create_open_conference_ware_rooms.rb +1 -1
  30. data/db/migrate/20131203235831_create_open_conference_ware_schedule_items.rb +2 -2
  31. data/db/migrate/20131203235934_create_open_conference_ware_session_types.rb +1 -1
  32. data/db/migrate/20131204000008_create_open_conference_ware_snippets.rb +1 -1
  33. data/db/migrate/20131204000048_create_open_conference_ware_taggings.rb +2 -2
  34. data/db/migrate/20131204000147_create_open_conference_ware_tracks.rb +1 -1
  35. data/db/migrate/20131204000355_create_proposals_users_join_table.rb +3 -0
  36. data/lib/generators/open_conference_ware/install/install_generator.rb +10 -0
  37. data/lib/generators/open_conference_ware/install/templates/config_initializer.rb +24 -2
  38. data/lib/generators/open_conference_ware/install/templates/secret_token.rb.erb +13 -0
  39. data/lib/generators/open_conference_ware/install/templates/secrets.yml.erb +18 -0
  40. data/lib/open_conference_ware.rb +10 -4
  41. data/lib/open_conference_ware/dependencies.rb +0 -1
  42. data/lib/open_conference_ware/version.rb +1 -1
  43. data/lib/tasks/open_conference_ware_tasks.rake +3 -2
  44. data/open_conference_ware.gemspec +0 -1
  45. data/spec/controllers/open_conference_ware/proposals_controller_spec.rb +5 -5
  46. data/spec/dummy/config/initializers/01_open_conference_ware.rb +24 -2
  47. data/spec/dummy/config/initializers/02_omniauth.rb +1 -1
  48. data/spec/dummy/config/initializers/secret_token.rb +2 -1
  49. data/spec/dummy/config/secrets.yml +18 -0
  50. data/spec/spec_helper_customizations.rb +2 -1
  51. data/spec/views/open_conference_ware/proposals/_transition_control.html.erb_spec.rb +2 -1
  52. data/spec/views/open_conference_ware/rooms/show.html.erb_spec.rb +1 -0
  53. data/spec/views/open_conference_ware/session_types/show.html.erb_spec.rb +1 -0
  54. data/spec/views/open_conference_ware/tracks/show.html.erb_spec.rb +1 -0
  55. data/util/transfer_schedule_items.rb +1 -1
  56. data/util/user_favorites_contention_report.rb +1 -1
  57. metadata +7 -22
  58. metadata.gz.sig +0 -0
  59. data/app/mixins/open_conference_ware/cache_lookups_mixin.rb +0 -128
  60. data/spec/integration/open_conference_ware/cache_lookups_mixin_spec.rb +0 -122
@@ -1,122 +0,0 @@
1
- require 'spec_helper'
2
-
3
- describe OpenConferenceWare::CacheLookupsMixin do
4
- before :each do
5
- Event.destroy_all if Event.count > 0
6
- User.destroy_all if User.count > 0
7
- end
8
-
9
- describe 'when enabled' do
10
- shared_examples_for 'overrides' do
11
- it 'should cache lookups if forced to' do
12
- ENV.should_receive(:[]).with('CACHELOOKUPS').and_return('1')
13
- Event.cache_lookups?.should == true
14
- end
15
-
16
- it 'should not cache lookups if forced not to' do
17
- ENV.should_receive(:[]).with('CACHELOOKUPS').and_return('0')
18
- Event.cache_lookups?.should == false
19
- end
20
- end
21
-
22
- describe 'and environment defaults to performing caching' do
23
- before do
24
- Rails.configuration.action_controller.stub(perform_caching: true)
25
- end
26
-
27
- it_should_behave_like 'overrides'
28
-
29
- it 'should cache lookups by default' do
30
- Event.cache_lookups?.should == true
31
- end
32
-
33
- end
34
-
35
- describe 'and environment defaults to not performing caching' do
36
- before do
37
- Rails.configuration.action_controller.stub(perform_caching: false)
38
- end
39
-
40
- it_should_behave_like 'overrides'
41
-
42
- it 'should not cache lookups by default' do
43
- Event.cache_lookups?.should == false
44
- end
45
- end
46
- end
47
-
48
- describe 'queries' do
49
- before :each do
50
- Event.stub(:cache_lookups? => true)
51
- OpenConferenceWare::CacheWatcher.expire
52
-
53
- @event1 = create :event
54
- @event2 = create :event
55
-
56
- @events = [@event1, @event2]
57
- @event = @event1
58
-
59
- OpenConferenceWare::CacheWatcher.expire
60
- end
61
-
62
- describe 'for single records' do
63
- it 'should write to cache' do
64
- Event.should_receive(:query_all).and_return(@events)
65
-
66
- Event.lookup(@event.slug).should == @event
67
- end
68
-
69
- it 'should read from cache' do
70
- Event.lookup(@event.slug).should == @event
71
- Event.should_not_receive(:query_all)
72
-
73
- Event.lookup(@event.slug).should == @event
74
- end
75
- end
76
-
77
- describe 'for all records' do
78
- it 'should write to cache' do
79
- Event.should_receive(:query_all).and_return(@events)
80
-
81
- Event.lookup.should == @events
82
- end
83
-
84
- it 'should read from cache' do
85
- Event.lookup.should == @events
86
- Event.should_not_receive(:query_all)
87
-
88
- Event.lookup.should == @events
89
- end
90
- end
91
-
92
- describe 'current event' do
93
- before do
94
- @event = create :event
95
- end
96
-
97
- describe 'when caching' do
98
- it 'should fetch from cache' do
99
- Event.should_receive(:cache_lookups?).and_return(true)
100
- Event.should_receive(:fetch_object).with('event_current').and_return(@event)
101
-
102
- Event.current.should == @event
103
- end
104
- end
105
-
106
- describe 'when not caching' do
107
- it 'should not fetch from cache' do
108
- Event.should_receive(:cache_lookups?).and_return(false)
109
- Event.should_receive(:current_by_settings).and_return(@event)
110
-
111
- Event.current.should == @event
112
- end
113
- end
114
- end
115
- end
116
-
117
- describe 'silo name' do
118
- it 'should be derived from class name' do
119
- Event.lookup_silo_name.should == 'OpenConferenceWare__Event_dict'
120
- end
121
- end
122
- end