enju_resource_merge 0.1.0.pre9 → 0.1.0.pre10

Sign up to get free protection for your applications and to get access to all the features.
Files changed (10) hide show
  1. checksums.yaml +4 -4
  2. data/app/views/agents/{_index_patron_merge_list.html.erb → _index_agent_merge_list.html.erb} +1 -1
  3. data/lib/enju_resource_merge/engine.rb +1 -1
  4. data/lib/enju_resource_merge/version.rb +1 -1
  5. data/spec/dummy/db/schema.rb +1 -1
  6. data/spec/dummy/db/test.sqlite3 +0 -0
  7. data/spec/factories/user.rb +1 -1
  8. data/spec/fixtures/user_groups.yml +1 -1
  9. metadata +47 -35
  10. data/spec/dummy/db/development.sqlite3 +0 -0
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: e47afb8b2e11ff96b96d300eddc87edb8b5b9179
4
- data.tar.gz: b301768abbc7d58cbacfd925406e757e395ac1be
3
+ metadata.gz: 8b85823eb179490a7aca14fc3cef6e05ab546415
4
+ data.tar.gz: c6da1a423e8ac76142b1509fce96b88fc180fe66
5
5
  SHA512:
6
- metadata.gz: e2450ac0db2a0b6ab0bc9b50f8d57004942edcbf4444f9daa92ca08f41e2194ec8375dd5df9257ac6243fa1f033a578ec534efcbdd171de8c81c3eed309b78e3
7
- data.tar.gz: 52e5bfae9d52ac0fb10264b929d5ae42225b4841385390db944d37b51e5ef5a1bc9790401bf1758bb1954da79456957c5b64b4d3d2e2f972698826e62d857a26
6
+ metadata.gz: 6664e80d10b7008ca1cd3136993a8277060972702a075218c8ac612b42d0afe1609c05a0195b6c4cf778500f9eb2454561454c4baf7aefb5ec81c921e6e22837
7
+ data.tar.gz: ca17c0c07a5d5ec81658a68a5e36b0d755a835692a323e5b8ba6a72b23d1f86d38c183bb43a7476017bcbc08decff3aeacfa663de75d2975328715aefc6b822c
data/app/views/agents/{_index_patron_merge_list.html.erb → _index_agent_merge_list.html.erb} RENAMED
@@ -20,7 +20,7 @@
20
20
  <th><%= t('activerecord.attributes.agent.full_name') -%></th>
21
21
  <th><%= t('activerecord.models.agent_type') -%></th>
22
22
  <th><%= t('activerecord.attributes.agent.date_of_birth') -%></th>
23
- <th id="edit_icons"></th>
23
+ <th></th>
24
24
  </tr>
25
25
 
26
26
  <%- @agents.each do |agent| -%>
data/lib/enju_resource_merge/engine.rb CHANGED
@@ -1,4 +1,4 @@
1
- require 'enju_core'
1
+ require 'enju_seed'
2
2
  require 'inherited_resources'
3
3
  require 'dynamic_form'
4
4
 
data/lib/enju_resource_merge/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module EnjuResourceMerge
2
- VERSION = "0.1.0.pre9"
2
+ VERSION = "0.1.0.pre10"
3
3
  end
data/spec/dummy/db/schema.rb CHANGED
@@ -369,8 +369,8 @@ ActiveRecord::Schema.define(:version => 20130421164124) do
369
369
  t.datetime "created_at", :null => false
370
370
  t.datetime "updated_at", :null => false
371
371
  t.datetime "deleted_at"
372
- t.string "isil"
373
372
  t.text "opening_hour"
373
+ t.string "isil"
374
374
  t.float "latitude"
375
375
  t.float "longitude"
376
376
  end
data/spec/dummy/db/test.sqlite3 CHANGED
Binary file
data/spec/factories/user.rb CHANGED
@@ -42,7 +42,7 @@ FactoryGirl.define do
42
42
  f.library_id{FactoryGirl.create(:library).id}
43
43
  f.password 'userpassword'
44
44
  f.password_confirmation 'userpassword'
45
- f.user_group_id{UserGroup.where(:name => '(not specified)').first.id}
45
+ f.user_group_id{UserGroup.where(:name => 'not_specified').first.id}
46
46
  f.required_role_id{Role.find_by_name('User').id}
47
47
  f.locale 'ja'
48
48
  f.sequence(:user_number){|n| "user_number_#{n}"}
data/spec/fixtures/user_groups.yml CHANGED
@@ -1,6 +1,6 @@
1
1
  ---
2
2
  user_group_00001:
3
- name: (not specified)
3
+ name: not_specified
4
4
  display_name: (not specified)
5
5
  updated_at: 2007-12-13 21:00:51.564542 +09:00
6
6
  id: 1
metadata CHANGED
@@ -1,106 +1,123 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: enju_resource_merge
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.0.pre9
4
+ version: 0.1.0.pre10
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-10-22 00:00:00.000000000 Z
11
+ date: 2014-06-07 00:00:00.000000000 Z
12
12
  dependencies:
13
+ - !ruby/object:Gem::Dependency
14
+ name: enju_seed
15
+ requirement: !ruby/object:Gem::Requirement
16
+ requirements:
17
+ - - "~>"
18
+ - !ruby/object:Gem::Version
19
+ version: 0.1.1.pre9
20
+ type: :runtime
21
+ prerelease: false
22
+ version_requirements: !ruby/object:Gem::Requirement
23
+ requirements:
24
+ - - "~>"
25
+ - !ruby/object:Gem::Version
26
+ version: 0.1.1.pre9
13
27
  - !ruby/object:Gem::Dependency
14
28
  name: enju_biblio
15
29
  requirement: !ruby/object:Gem::Requirement
16
30
  requirements:
17
- - - ~>
31
+ - - "~>"
18
32
  - !ruby/object:Gem::Version
19
- version: 0.1.0.pre47
33
+ version: 0.1.0.pre52
20
34
  type: :runtime
21
35
  prerelease: false
22
36
  version_requirements: !ruby/object:Gem::Requirement
23
37
  requirements:
24
- - - ~>
38
+ - - "~>"
25
39
  - !ruby/object:Gem::Version
26
- version: 0.1.0.pre47
40
+ version: 0.1.0.pre52
27
41
  - !ruby/object:Gem::Dependency
28
42
  name: sqlite3
29
43
  requirement: !ruby/object:Gem::Requirement
30
44
  requirements:
31
- - - '>='
45
+ - - ">="
32
46
  - !ruby/object:Gem::Version
33
47
  version: '0'
34
48
  type: :development
35
49
  prerelease: false
36
50
  version_requirements: !ruby/object:Gem::Requirement
37
51
  requirements:
38
- - - '>='
52
+ - - ">="
39
53
  - !ruby/object:Gem::Version
40
54
  version: '0'
41
55
  - !ruby/object:Gem::Dependency
42
56
  name: rspec-rails
43
57
  requirement: !ruby/object:Gem::Requirement
44
58
  requirements:
45
- - - '>='
59
+ - - '='
46
60
  - !ruby/object:Gem::Version
47
- version: '0'
61
+ version: '2.99'
48
62
  type: :development
49
63
  prerelease: false
50
64
  version_requirements: !ruby/object:Gem::Requirement
51
65
  requirements:
52
- - - '>='
66
+ - - '='
53
67
  - !ruby/object:Gem::Version
54
- version: '0'
68
+ version: '2.99'
55
69
  - !ruby/object:Gem::Dependency
56
70
  name: factory_girl_rails
57
71
  requirement: !ruby/object:Gem::Requirement
58
72
  requirements:
59
- - - '>='
73
+ - - ">="
60
74
  - !ruby/object:Gem::Version
61
75
  version: '0'
62
76
  type: :development
63
77
  prerelease: false
64
78
  version_requirements: !ruby/object:Gem::Requirement
65
79
  requirements:
66
- - - '>='
80
+ - - ">="
67
81
  - !ruby/object:Gem::Version
68
82
  version: '0'
69
83
  - !ruby/object:Gem::Dependency
70
84
  name: sunspot_solr
71
85
  requirement: !ruby/object:Gem::Requirement
72
86
  requirements:
73
- - - ~>
87
+ - - "~>"
74
88
  - !ruby/object:Gem::Version
75
- version: 2.0.0
89
+ version: '2.1'
76
90
  type: :development
77
91
  prerelease: false
78
92
  version_requirements: !ruby/object:Gem::Requirement
79
93
  requirements:
80
- - - ~>
94
+ - - "~>"
81
95
  - !ruby/object:Gem::Version
82
- version: 2.0.0
96
+ version: '2.1'
83
97
  - !ruby/object:Gem::Dependency
84
98
  name: enju_leaf
85
99
  requirement: !ruby/object:Gem::Requirement
86
100
  requirements:
87
- - - ~>
101
+ - - "~>"
88
102
  - !ruby/object:Gem::Version
89
- version: 1.1.0.rc6
103
+ version: 1.1.0.rc9
90
104
  type: :development
91
105
  prerelease: false
92
106
  version_requirements: !ruby/object:Gem::Requirement
93
107
  requirements:
94
- - - ~>
108
+ - - "~>"
95
109
  - !ruby/object:Gem::Version
96
- version: 1.1.0.rc6
110
+ version: 1.1.0.rc9
97
111
  description: Merge resource records for Next-L Enju
98
112
  email:
99
- - tanabe@mwr.mediacom.keio.ac.jp
113
+ - nabeta@fastmail.fm
100
114
  executables: []
101
115
  extensions: []
102
116
  extra_rdoc_files: []
103
117
  files:
118
+ - MIT-LICENSE
119
+ - README.rdoc
120
+ - Rakefile
104
121
  - app/controllers/agent_merge_lists_controller.rb
105
122
  - app/controllers/agent_merges_controller.rb
106
123
  - app/controllers/series_statement_merge_lists_controller.rb
@@ -119,7 +136,7 @@ files:
119
136
  - app/views/agent_merges/index.html.erb
120
137
  - app/views/agent_merges/new.html.erb
121
138
  - app/views/agent_merges/show.html.erb
122
- - app/views/agents/_index_patron_merge_list.html.erb
139
+ - app/views/agents/_index_agent_merge_list.html.erb
123
140
  - app/views/series_statement_merge_lists/_form.html.erb
124
141
  - app/views/series_statement_merge_lists/edit.html.erb
125
142
  - app/views/series_statement_merge_lists/index.html.erb
@@ -137,17 +154,15 @@ files:
137
154
  - db/migrate/134_create_agent_merge_lists.rb
138
155
  - db/migrate/20110627034940_create_series_statement_merge_lists.rb
139
156
  - db/migrate/20110627035057_create_series_statement_merges.rb
157
+ - lib/enju_resource_merge.rb
140
158
  - lib/enju_resource_merge/engine.rb
141
159
  - lib/enju_resource_merge/version.rb
142
- - lib/enju_resource_merge.rb
143
160
  - lib/tasks/enju_resource_merge_tasks.rake
144
- - MIT-LICENSE
145
- - Rakefile
146
- - README.rdoc
147
161
  - spec/controllers/agent_merge_lists_controller_spec.rb
148
162
  - spec/controllers/agent_merges_controller_spec.rb
149
163
  - spec/controllers/series_statement_merge_lists_controller_spec.rb
150
164
  - spec/controllers/series_statement_merges_controller_spec.rb
165
+ - spec/dummy/Rakefile
151
166
  - spec/dummy/app/assets/javascripts/application.js
152
167
  - spec/dummy/app/assets/stylesheets/application.css
153
168
  - spec/dummy/app/controllers/application_controller.rb
@@ -162,6 +177,7 @@ files:
162
177
  - spec/dummy/app/views/page/404.html.erb
163
178
  - spec/dummy/app/views/page/404.mobile.erb
164
179
  - spec/dummy/app/views/page/404.xml.erb
180
+ - spec/dummy/config.ru
165
181
  - spec/dummy/config/application.rb
166
182
  - spec/dummy/config/application.yml
167
183
  - spec/dummy/config/boot.rb
@@ -179,8 +195,6 @@ files:
179
195
  - spec/dummy/config/initializers/wrap_parameters.rb
180
196
  - spec/dummy/config/locales/en.yml
181
197
  - spec/dummy/config/routes.rb
182
- - spec/dummy/config.ru
183
- - spec/dummy/db/development.sqlite3
184
198
  - spec/dummy/db/migrate/001_create_agents.rb
185
199
  - spec/dummy/db/migrate/005_create_manifestations.rb
186
200
  - spec/dummy/db/migrate/006_create_items.rb
@@ -285,7 +299,6 @@ files:
285
299
  - spec/dummy/public/422.html
286
300
  - spec/dummy/public/500.html
287
301
  - spec/dummy/public/favicon.ico
288
- - spec/dummy/Rakefile
289
302
  - spec/dummy/script/rails
290
303
  - spec/enju_resource_merge_test.rb
291
304
  - spec/factories/agent.rb
@@ -343,17 +356,17 @@ require_paths:
343
356
  - lib
344
357
  required_ruby_version: !ruby/object:Gem::Requirement
345
358
  requirements:
346
- - - '>='
359
+ - - ">="
347
360
  - !ruby/object:Gem::Version
348
361
  version: '0'
349
362
  required_rubygems_version: !ruby/object:Gem::Requirement
350
363
  requirements:
351
- - - '>'
364
+ - - ">"
352
365
  - !ruby/object:Gem::Version
353
366
  version: 1.3.1
354
367
  requirements: []
355
368
  rubyforge_project:
356
- rubygems_version: 2.1.3
369
+ rubygems_version: 2.2.2
357
370
  signing_key:
358
371
  specification_version: 4
359
372
  summary: enju_resource_merge plugin
@@ -394,7 +407,6 @@ test_files:
394
407
  - spec/dummy/config/locales/en.yml
395
408
  - spec/dummy/config/routes.rb
396
409
  - spec/dummy/config.ru
397
- - spec/dummy/db/development.sqlite3
398
410
  - spec/dummy/db/migrate/001_create_agents.rb
399
411
  - spec/dummy/db/migrate/005_create_manifestations.rb
400
412
  - spec/dummy/db/migrate/006_create_items.rb
data/spec/dummy/db/development.sqlite3 DELETED
Binary file