enju_leaf 1.1.0.rc5 → 1.1.0.rc6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (38) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/stylesheets/enju_leaf.css +1 -0
  3. data/app/assets/stylesheets/portlets.css +1 -1
  4. data/app/views/page/configuration.html.erb +2 -2
  5. data/db/migrate/20130221154434_add_additional_attributes_to_user.rb +1 -1
  6. data/lib/enju_leaf/user.rb +1 -1
  7. data/lib/enju_leaf/version.rb +1 -1
  8. data/lib/generators/enju_leaf/setup/setup_generator.rb +1 -0
  9. data/spec/dummy/db/test.sqlite3 +0 -0
  10. data/spec/dummy/solr/data/test/index/{_85.fdt → _9t.fdt} +0 -0
  11. data/spec/dummy/solr/data/test/index/{_85.fdx → _9t.fdx} +0 -0
  12. data/spec/dummy/solr/data/test/index/{_85.fnm → _9t.fnm} +0 -0
  13. data/spec/dummy/solr/data/test/index/{_85.frq → _9t.frq} +0 -0
  14. data/spec/dummy/solr/data/test/index/{_85.nrm → _9t.nrm} +0 -0
  15. data/spec/dummy/solr/data/test/index/{_85.prx → _9t.prx} +0 -0
  16. data/spec/dummy/solr/data/test/index/{_85.tii → _9t.tii} +0 -0
  17. data/spec/dummy/solr/data/test/index/{_85.tis → _9t.tis} +0 -0
  18. data/spec/dummy/solr/data/test/index/segments.gen +0 -0
  19. data/spec/dummy/solr/data/test/index/{segments_gd → segments_ju} +0 -0
  20. data/spec/dummy/tmp/cache/4F7/F90/default_role +0 -0
  21. data/spec/dummy/tmp/cache/ACB/B20/manifestation_search_total +0 -0
  22. data/spec/dummy/tmp/cache/assets/test/sprockets/13fe41fee1fe35b49d145bcc06610705 +0 -0
  23. data/spec/dummy/tmp/cache/assets/test/sprockets/16453aa846d172232cb70ea0ef5d25bb +0 -0
  24. data/spec/dummy/tmp/cache/assets/test/sprockets/1b984bdbd3204a51a82d0e01a1569e2d +0 -0
  25. data/spec/dummy/tmp/cache/assets/test/sprockets/1d1ea12f4657d43009075ba81a2ff949 +0 -0
  26. data/spec/dummy/tmp/cache/assets/test/sprockets/22c8941ab6dec8cd7b3f725e1989dc20 +0 -0
  27. data/spec/dummy/tmp/cache/assets/test/sprockets/2f5173deea6c795b8fdde723bb4b63af +0 -0
  28. data/spec/dummy/tmp/cache/assets/test/sprockets/357970feca3ac29060c1e3861e2c0953 +0 -0
  29. data/spec/dummy/tmp/cache/assets/test/sprockets/62899096da1a3e67660f3b88068be8c9 +0 -0
  30. data/spec/dummy/tmp/cache/assets/test/sprockets/65b2e4f67eab21b30217e29075f433b2 +0 -0
  31. data/spec/dummy/tmp/cache/assets/test/sprockets/87d24a3f43f175d4d17babe9203c79a7 +0 -0
  32. data/spec/dummy/tmp/cache/assets/test/sprockets/b9cc8f1cd929beaef586e5f42a2aa4c2 +0 -0
  33. data/spec/dummy/tmp/cache/assets/test/sprockets/cffd775d018f68ce5dba1ee0d951a994 +0 -0
  34. data/spec/dummy/tmp/cache/assets/test/sprockets/d771ace226fc8215a3572e0aa35bb0d6 +0 -0
  35. data/spec/dummy/tmp/cache/assets/test/sprockets/f7cbd26ba1d28d48de824f0e94586655 +0 -0
  36. data/vendor/assets/javascripts/jquery.cookie.js +17 -15
  37. data/vendor/assets/javascripts/jquery.ui.menubar.js +2 -2
  38. metadata +71 -29
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 7b0032f03556f2c3b81db5671266445857a49757
4
- data.tar.gz: a994936e4f3cb8f7aa3cae027356849ed6d3bb6e
3
+ metadata.gz: b137676d220bcff22051bdfa238390212832f47f
4
+ data.tar.gz: 81235f3da6c07be3da22c69b449a321da53ce619
5
5
  SHA512:
6
- metadata.gz: 8d5716be025b34ddde76e8b4e076c8a348c70f9412da4c2ca432a60b5bc8de4a8a1703b6e6838f6a0749acb64895d1c795d76ef82e680a30bf3ca08b0594448c
7
- data.tar.gz: b965671894536800cf0015e39f6941a30ef4a89dde62f0ced3c01a69912ddc02b4fb4946556eb003dde4ee2a5e6919ed554a753cd99867bb0bbea34b058d64ac
6
+ metadata.gz: e719fdbbdf23916905369f428758fd9f37895e2e60c5a817453518bd56f7d7fbf2777c7e2fa1e9ab4c76479f38d4d3b802cdf3b4eab7ce81fa9cace35f2b3d76
7
+ data.tar.gz: bebfd251dec2bf3d72a9a10e151edca5d013858a87a419f3dbb94b4af601aacba4605a14cef81aa2e7266f9ea8c2bd3b602368c15f81c3978cf9e5094b3bec5e
data/app/assets/stylesheets/enju_leaf.css CHANGED
@@ -9,5 +9,6 @@
9
9
  *= require jquery.ui.tabs
10
10
  *= require jquery.ui.menu
11
11
  *= require jquery.ui.menubar
12
+ *= require jquery.ui.datepicker
12
13
  *= require portlets
13
14
  */
data/app/assets/stylesheets/portlets.css CHANGED
@@ -1,4 +1,4 @@
1
- .column { width: 463px; min-height: 100px; float: left; padding-bottom: 0px; }
1
+ .column, .column-fixed { width: 463px; min-height: 100px; float: left; padding-bottom: 0px; }
2
2
  .portlet { margin: 0 11px 10px 0; }
3
3
  .portlet-header { margin: 0.3em; padding-bottom: 4px; padding-left: 0.2em; }
4
4
  .portlet-header .ui-icon { float: right; }
data/app/views/page/configuration.html.erb CHANGED
@@ -1,4 +1,4 @@
1
- <div class="column" id="col1">
1
+ <div class="column-fixed" id="col1">
2
2
  <div class="portlet" id="library">
3
3
  <h2 class="title"><%= t('activerecord.models.library') -%></h2>
4
4
  <div class="config_box">
@@ -71,7 +71,7 @@
71
71
  </div>
72
72
  </div>
73
73
 
74
- <div class="column" id="col2">
74
+ <div class="column-fixed" id="col2">
75
75
  <% if defined?(EnjuSubject) %>
76
76
  <div class="portlet" id="subject_and_classification">
77
77
  <h2 class="title"><%= t('page.subject_and_classification') -%></h2>
data/db/migrate/20130221154434_add_additional_attributes_to_user.rb CHANGED
@@ -12,7 +12,7 @@ class AddAdditionalAttributesToUser < ActiveRecord::Migration
12
12
  add_column :users, :note, :text
13
13
  add_column :users, :keyword_list, :text
14
14
 
15
- add_column :users, :failed_attempts, :integer
15
+ add_column :users, :failed_attempts, :integer, :default => 0
16
16
  add_column :users, :unlock_token, :string
17
17
  add_column :users, :locked_at, :datetime
18
18
 
data/lib/enju_leaf/user.rb CHANGED
@@ -64,7 +64,7 @@ module EnjuLeaf
64
64
 
65
65
  extend FriendlyId
66
66
  friendly_id :username
67
- has_paper_trail
67
+ #has_paper_trail
68
68
  normalize_attributes :username, :user_number #, :email
69
69
 
70
70
  searchable do
data/lib/enju_leaf/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module EnjuLeaf
2
- VERSION = "1.1.0.rc5"
2
+ VERSION = "1.1.0.rc6"
3
3
  end
data/lib/generators/enju_leaf/setup/setup_generator.rb CHANGED
@@ -44,6 +44,7 @@ EOS
44
44
  , :trackable, #:validatable,
45
45
  :lockable, :lock_strategy => :none, :unlock_strategy => :none
46
46
  enju_leaf_user_model
47
+ attr_accessible :username, :user_group_id, :user_number, :note
47
48
  EOS
48
49
  inject_into_class "app/controllers/application_controller.rb", ApplicationController do
49
50
  <<"EOS"
data/spec/dummy/db/test.sqlite3 CHANGED
Binary file
data/vendor/assets/javascripts/jquery.cookie.js CHANGED
@@ -17,27 +17,29 @@
17
17
 
18
18
  var pluses = /\+/g;
19
19
 
20
- function raw(s) {
21
- return s;
22
- }
23
-
24
- function decoded(s) {
20
+ function decode(s) {
21
+ if (config.raw) {
22
+ return s;
23
+ }
25
24
  return decodeURIComponent(s.replace(pluses, ' '));
26
25
  }
27
26
 
28
- function converted(s) {
27
+ function decodeAndParse(s) {
29
28
  if (s.indexOf('"') === 0) {
30
- // This is a quoted cookie as according to RFC2068, unescape
29
+ // This is a quoted cookie as according to RFC2068, unescape...
31
30
  s = s.slice(1, -1).replace(/\\"/g, '"').replace(/\\\\/g, '\\');
32
31
  }
32
+
33
+ s = decode(s);
34
+
33
35
  try {
34
36
  return config.json ? JSON.parse(s) : s;
35
- } catch(er) {}
37
+ } catch(e) {}
36
38
  }
37
39
 
38
40
  var config = $.cookie = function (key, value, options) {
39
41
 
40
- // write
42
+ // Write
41
43
  if (value !== undefined) {
42
44
  options = $.extend({}, config.defaults, options);
43
45
 
@@ -59,22 +61,21 @@
59
61
  ].join(''));
60
62
  }
61
63
 
62
- // read
63
- var decode = config.raw ? raw : decoded;
64
+ // Read
64
65
  var cookies = document.cookie.split('; ');
65
66
  var result = key ? undefined : {};
66
67
  for (var i = 0, l = cookies.length; i < l; i++) {
67
68
  var parts = cookies[i].split('=');
68
69
  var name = decode(parts.shift());
69
- var cookie = decode(parts.join('='));
70
+ var cookie = parts.join('=');
70
71
 
71
72
  if (key && key === name) {
72
- result = converted(cookie);
73
+ result = decodeAndParse(cookie);
73
74
  break;
74
75
  }
75
76
 
76
77
  if (!key) {
77
- result[name] = converted(cookie);
78
+ result[name] = decodeAndParse(cookie);
78
79
  }
79
80
  }
80
81
 
@@ -85,7 +86,8 @@
85
86
 
86
87
  $.removeCookie = function (key, options) {
87
88
  if ($.cookie(key) !== undefined) {
88
- $.cookie(key, '', $.extend(options, { expires: -1 }));
89
+ // Must not alter options, thus extending a fresh object...
90
+ $.cookie(key, '', $.extend({}, options, { expires: -1 }));
89
91
  return true;
90
92
  }
91
93
  return false;
data/vendor/assets/javascripts/jquery.ui.menubar.js CHANGED
@@ -209,12 +209,12 @@ $.widget( "ui.menubar", {
209
209
  .wrapInner( "<span class='ui-button-text'></span>" );
210
210
 
211
211
  this._on( anItem, {
212
- focus: function(){
212
+ focus: function( event ){
213
213
  anItem.attr( "tabIndex", 0 );
214
214
  anItem.addClass( "ui-state-focus" );
215
215
  event.preventDefault();
216
216
  },
217
- focusout: function(){
217
+ focusout: function( event ){
218
218
  anItem.attr( "tabIndex", -1 );
219
219
  this.lastFocused = anItem;
220
220
  anItem.removeClass( "ui-state-focus" );
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: enju_leaf
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.0.rc5
4
+ version: 1.1.0.rc6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Kosuke Tanabe
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2013-07-11 00:00:00.000000000 Z
11
+ date: 2013-08-30 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: enju_biblio
@@ -16,28 +16,28 @@ dependencies:
16
16
  requirements:
17
17
  - - ~>
18
18
  - !ruby/object:Gem::Version
19
- version: 0.1.0.pre44
19
+ version: 0.1.0.pre47
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - ~>
25
25
  - !ruby/object:Gem::Version
26
- version: 0.1.0.pre44
26
+ version: 0.1.0.pre47
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: enju_library
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - ~>
32
32
  - !ruby/object:Gem::Version
33
- version: 0.1.0.pre25
33
+ version: 0.1.0.pre27
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - ~>
39
39
  - !ruby/object:Gem::Version
40
- version: 0.1.0.pre25
40
+ version: 0.1.0.pre27
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: enju_manifestation_viewer
43
43
  requirement: !ruby/object:Gem::Requirement
@@ -112,16 +112,30 @@ dependencies:
112
112
  name: redis-rails
113
113
  requirement: !ruby/object:Gem::Requirement
114
114
  requirements:
115
- - - '>='
115
+ - - ~>
116
116
  - !ruby/object:Gem::Version
117
- version: '0'
117
+ version: '3.2'
118
118
  type: :runtime
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
121
121
  requirements:
122
- - - '>='
122
+ - - ~>
123
123
  - !ruby/object:Gem::Version
124
- version: '0'
124
+ version: '3.2'
125
+ - !ruby/object:Gem::Dependency
126
+ name: redis-store
127
+ requirement: !ruby/object:Gem::Requirement
128
+ requirements:
129
+ - - '='
130
+ - !ruby/object:Gem::Version
131
+ version: 1.1.3
132
+ type: :runtime
133
+ prerelease: false
134
+ version_requirements: !ruby/object:Gem::Requirement
135
+ requirements:
136
+ - - '='
137
+ - !ruby/object:Gem::Version
138
+ version: 1.1.3
125
139
  - !ruby/object:Gem::Dependency
126
140
  name: rails_autolink
127
141
  requirement: !ruby/object:Gem::Requirement
@@ -751,20 +765,34 @@ files:
751
765
  - spec/dummy/solr/conf/spellings.txt
752
766
  - spec/dummy/solr/conf/stopwords.txt
753
767
  - spec/dummy/solr/conf/synonyms.txt
754
- - spec/dummy/solr/data/test/index/_85.fdt
755
- - spec/dummy/solr/data/test/index/_85.fdx
756
- - spec/dummy/solr/data/test/index/_85.fnm
757
- - spec/dummy/solr/data/test/index/_85.frq
758
- - spec/dummy/solr/data/test/index/_85.nrm
759
- - spec/dummy/solr/data/test/index/_85.prx
760
- - spec/dummy/solr/data/test/index/_85.tii
761
- - spec/dummy/solr/data/test/index/_85.tis
768
+ - spec/dummy/solr/data/test/index/_9t.fdt
769
+ - spec/dummy/solr/data/test/index/_9t.fdx
770
+ - spec/dummy/solr/data/test/index/_9t.fnm
771
+ - spec/dummy/solr/data/test/index/_9t.frq
772
+ - spec/dummy/solr/data/test/index/_9t.nrm
773
+ - spec/dummy/solr/data/test/index/_9t.prx
774
+ - spec/dummy/solr/data/test/index/_9t.tii
775
+ - spec/dummy/solr/data/test/index/_9t.tis
762
776
  - spec/dummy/solr/data/test/index/segments.gen
763
- - spec/dummy/solr/data/test/index/segments_gd
777
+ - spec/dummy/solr/data/test/index/segments_ju
764
778
  - spec/dummy/solr/data/test/spellchecker/segments.gen
765
779
  - spec/dummy/solr/data/test/spellchecker/segments_1
766
780
  - spec/dummy/tmp/cache/4F7/F90/default_role
767
781
  - spec/dummy/tmp/cache/ACB/B20/manifestation_search_total
782
+ - spec/dummy/tmp/cache/assets/test/sprockets/13fe41fee1fe35b49d145bcc06610705
783
+ - spec/dummy/tmp/cache/assets/test/sprockets/16453aa846d172232cb70ea0ef5d25bb
784
+ - spec/dummy/tmp/cache/assets/test/sprockets/1b984bdbd3204a51a82d0e01a1569e2d
785
+ - spec/dummy/tmp/cache/assets/test/sprockets/1d1ea12f4657d43009075ba81a2ff949
786
+ - spec/dummy/tmp/cache/assets/test/sprockets/22c8941ab6dec8cd7b3f725e1989dc20
787
+ - spec/dummy/tmp/cache/assets/test/sprockets/2f5173deea6c795b8fdde723bb4b63af
788
+ - spec/dummy/tmp/cache/assets/test/sprockets/357970feca3ac29060c1e3861e2c0953
789
+ - spec/dummy/tmp/cache/assets/test/sprockets/62899096da1a3e67660f3b88068be8c9
790
+ - spec/dummy/tmp/cache/assets/test/sprockets/65b2e4f67eab21b30217e29075f433b2
791
+ - spec/dummy/tmp/cache/assets/test/sprockets/87d24a3f43f175d4d17babe9203c79a7
792
+ - spec/dummy/tmp/cache/assets/test/sprockets/b9cc8f1cd929beaef586e5f42a2aa4c2
793
+ - spec/dummy/tmp/cache/assets/test/sprockets/cffd775d018f68ce5dba1ee0d951a994
794
+ - spec/dummy/tmp/cache/assets/test/sprockets/d771ace226fc8215a3572e0aa35bb0d6
795
+ - spec/dummy/tmp/cache/assets/test/sprockets/f7cbd26ba1d28d48de824f0e94586655
768
796
  - spec/factories/agent.rb
769
797
  - spec/factories/agent_relationship.rb
770
798
  - spec/factories/agent_relationship_type.rb
@@ -879,7 +907,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
879
907
  version: 1.3.1
880
908
  requirements: []
881
909
  rubyforge_project:
882
- rubygems_version: 2.0.3
910
+ rubygems_version: 2.0.7
883
911
  signing_key:
884
912
  specification_version: 4
885
913
  summary: Next-L Enju Leaf
@@ -1051,20 +1079,34 @@ test_files:
1051
1079
  - spec/dummy/solr/conf/spellings.txt
1052
1080
  - spec/dummy/solr/conf/stopwords.txt
1053
1081
  - spec/dummy/solr/conf/synonyms.txt
1054
- - spec/dummy/solr/data/test/index/_85.fdt
1055
- - spec/dummy/solr/data/test/index/_85.fdx
1056
- - spec/dummy/solr/data/test/index/_85.fnm
1057
- - spec/dummy/solr/data/test/index/_85.frq
1058
- - spec/dummy/solr/data/test/index/_85.nrm
1059
- - spec/dummy/solr/data/test/index/_85.prx
1060
- - spec/dummy/solr/data/test/index/_85.tii
1061
- - spec/dummy/solr/data/test/index/_85.tis
1082
+ - spec/dummy/solr/data/test/index/_9t.fdt
1083
+ - spec/dummy/solr/data/test/index/_9t.fdx
1084
+ - spec/dummy/solr/data/test/index/_9t.fnm
1085
+ - spec/dummy/solr/data/test/index/_9t.frq
1086
+ - spec/dummy/solr/data/test/index/_9t.nrm
1087
+ - spec/dummy/solr/data/test/index/_9t.prx
1088
+ - spec/dummy/solr/data/test/index/_9t.tii
1089
+ - spec/dummy/solr/data/test/index/_9t.tis
1062
1090
  - spec/dummy/solr/data/test/index/segments.gen
1063
- - spec/dummy/solr/data/test/index/segments_gd
1091
+ - spec/dummy/solr/data/test/index/segments_ju
1064
1092
  - spec/dummy/solr/data/test/spellchecker/segments.gen
1065
1093
  - spec/dummy/solr/data/test/spellchecker/segments_1
1066
1094
  - spec/dummy/tmp/cache/4F7/F90/default_role
1067
1095
  - spec/dummy/tmp/cache/ACB/B20/manifestation_search_total
1096
+ - spec/dummy/tmp/cache/assets/test/sprockets/13fe41fee1fe35b49d145bcc06610705
1097
+ - spec/dummy/tmp/cache/assets/test/sprockets/16453aa846d172232cb70ea0ef5d25bb
1098
+ - spec/dummy/tmp/cache/assets/test/sprockets/1b984bdbd3204a51a82d0e01a1569e2d
1099
+ - spec/dummy/tmp/cache/assets/test/sprockets/1d1ea12f4657d43009075ba81a2ff949
1100
+ - spec/dummy/tmp/cache/assets/test/sprockets/22c8941ab6dec8cd7b3f725e1989dc20
1101
+ - spec/dummy/tmp/cache/assets/test/sprockets/2f5173deea6c795b8fdde723bb4b63af
1102
+ - spec/dummy/tmp/cache/assets/test/sprockets/357970feca3ac29060c1e3861e2c0953
1103
+ - spec/dummy/tmp/cache/assets/test/sprockets/62899096da1a3e67660f3b88068be8c9
1104
+ - spec/dummy/tmp/cache/assets/test/sprockets/65b2e4f67eab21b30217e29075f433b2
1105
+ - spec/dummy/tmp/cache/assets/test/sprockets/87d24a3f43f175d4d17babe9203c79a7
1106
+ - spec/dummy/tmp/cache/assets/test/sprockets/b9cc8f1cd929beaef586e5f42a2aa4c2
1107
+ - spec/dummy/tmp/cache/assets/test/sprockets/cffd775d018f68ce5dba1ee0d951a994
1108
+ - spec/dummy/tmp/cache/assets/test/sprockets/d771ace226fc8215a3572e0aa35bb0d6
1109
+ - spec/dummy/tmp/cache/assets/test/sprockets/f7cbd26ba1d28d48de824f0e94586655
1068
1110
  - spec/factories/agent.rb
1069
1111
  - spec/factories/agent_relationship.rb
1070
1112
  - spec/factories/agent_relationship_type.rb