Fix kaminari init

This commit is contained in:
Joerg Reichert 2018-02-18 23:26:30 +01:00
parent 6a5cb02656
commit 85d2ad5d57
4 changed files with 180 additions and 155 deletions

View file

@ -1,263 +1,268 @@
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
actionmailer (4.2.6) actionmailer (4.2.10)
actionpack (= 4.2.6) actionpack (= 4.2.10)
actionview (= 4.2.6) actionview (= 4.2.10)
activejob (= 4.2.6) activejob (= 4.2.10)
mail (~> 2.5, >= 2.5.4) mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5) rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.6) actionpack (4.2.10)
actionview (= 4.2.6) actionview (= 4.2.10)
activesupport (= 4.2.6) activesupport (= 4.2.10)
rack (~> 1.6) rack (~> 1.6)
rack-test (~> 0.6.2) rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5) rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2) rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (4.2.6) actionview (4.2.10)
activesupport (= 4.2.6) activesupport (= 4.2.10)
builder (~> 3.1) builder (~> 3.1)
erubis (~> 2.7.0) erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5) rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2) rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (4.2.6) activejob (4.2.10)
activesupport (= 4.2.6) activesupport (= 4.2.10)
globalid (>= 0.3.0) globalid (>= 0.3.0)
activemodel (4.2.6) activemodel (4.2.10)
activesupport (= 4.2.6) activesupport (= 4.2.10)
builder (~> 3.1) builder (~> 3.1)
activerecord (4.2.6) activerecord (4.2.10)
activemodel (= 4.2.6) activemodel (= 4.2.10)
activesupport (= 4.2.6) activesupport (= 4.2.10)
arel (~> 6.0) arel (~> 6.0)
activesupport (4.2.6) activesupport (4.2.10)
i18n (~> 0.7) i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1) minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4) thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1) tzinfo (~> 1.1)
addressable (2.4.0) addressable (2.5.2)
arel (6.0.3) public_suffix (>= 2.0.2, < 4.0)
awesome_print (1.6.1) arel (6.0.4)
builder (3.2.2) awesome_print (1.8.0)
capybara (2.7.1) builder (3.2.3)
capybara (2.13.0)
addressable addressable
mime-types (>= 1.16) mime-types (>= 1.16)
nokogiri (>= 1.3.3) nokogiri (>= 1.3.3)
rack (>= 1.0.0) rack (>= 1.0.0)
rack-test (>= 0.5.4) rack-test (>= 0.5.4)
xpath (~> 2.0) xpath (~> 2.0)
capybara-webkit (1.11.1) capybara-webkit (1.14.0)
capybara (>= 2.3.0, < 2.8.0) capybara (>= 2.3.0, < 2.14.0)
json json
coderay (1.1.1) coderay (1.1.2)
coffee-rails (4.1.1) coffee-rails (4.2.2)
coffee-script (>= 2.2.0) coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.1.x) railties (>= 4.0.0)
coffee-script (2.4.1) coffee-script (2.4.1)
coffee-script-source coffee-script-source
execjs execjs
coffee-script-source (1.10.0) coffee-script-source (1.12.2)
concurrent-ruby (1.0.2) concurrent-ruby (1.0.5)
coveralls (0.8.13) coveralls (0.8.21)
json (~> 1.8) json (>= 1.8, < 3)
simplecov (~> 0.11.0) simplecov (~> 0.14.1)
term-ansicolor (~> 1.3) term-ansicolor (~> 1.3)
thor (~> 0.19.1) thor (~> 0.19.4)
tins (~> 1.6.0) tins (~> 1.6)
database_cleaner (1.5.3) crass (1.0.3)
diff-lcs (1.2.5) database_cleaner (1.6.2)
diff-lcs (1.3)
docile (1.1.5) docile (1.1.5)
elasticsearch (1.0.17) elasticsearch (5.0.4)
elasticsearch-api (= 1.0.17) elasticsearch-api (= 5.0.4)
elasticsearch-transport (= 1.0.17) elasticsearch-transport (= 5.0.4)
elasticsearch-api (1.0.17) elasticsearch-api (5.0.4)
multi_json multi_json
elasticsearch-dsl (0.1.3) elasticsearch-dsl (0.1.5)
elasticsearch-model (0.1.8) elasticsearch-model (5.0.2)
activesupport (> 3) activesupport (> 3)
elasticsearch (> 0.4) elasticsearch (~> 5)
hashie hashie
elasticsearch-transport (1.0.17) elasticsearch-transport (5.0.4)
faraday faraday
multi_json multi_json
erubis (2.7.0) erubis (2.7.0)
execjs (2.6.0) execjs (2.7.0)
factory_girl (4.7.0) factory_girl (4.9.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
factory_girl_rails (4.7.0) factory_girl_rails (4.9.0)
factory_girl (~> 4.7.0) factory_girl (~> 4.9.0)
railties (>= 3.0.0) railties (>= 3.0.0)
faker (1.6.3) faker (1.8.5)
i18n (~> 0.5) i18n (~> 0.9.1)
faraday (0.9.2) faraday (0.13.1)
multipart-post (>= 1.2, < 3) multipart-post (>= 1.2, < 3)
foundation-rails (5.5.3.2) foundation-rails (5.5.3.2)
railties (>= 3.1.0) railties (>= 3.1.0)
sass (>= 3.3.0, < 3.5) sass (>= 3.3.0, < 3.5)
globalid (0.3.6) globalid (0.4.1)
activesupport (>= 4.1.0) activesupport (>= 4.2.0)
hashie (3.4.4) hashie (3.5.6)
i18n (0.7.0) i18n (0.9.1)
jquery-rails (4.1.1) concurrent-ruby (~> 1.0)
jquery-rails (4.3.1)
rails-dom-testing (>= 1, < 3) rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0) railties (>= 4.2.0)
thor (>= 0.14, < 2.0) thor (>= 0.14, < 2.0)
json (1.8.3) json (1.8.6)
kaminari (0.16.3) kaminari (1.1.1)
actionpack (>= 3.0.0) activesupport (>= 4.1.0)
activesupport (>= 3.0.0) kaminari-actionview (= 1.1.1)
kaminari-activerecord (= 1.1.1)
kaminari-core (= 1.1.1)
kaminari-actionview (1.1.1)
actionview
kaminari-core (= 1.1.1)
kaminari-activerecord (1.1.1)
activerecord
kaminari-core (= 1.1.1)
kaminari-core (1.1.1)
kaminari-i18n (0.4.0) kaminari-i18n (0.4.0)
kaminari kaminari
rails rails
launchy (2.4.3) launchy (2.4.3)
addressable (~> 2.3) addressable (~> 2.3)
loofah (2.0.3) loofah (2.1.1)
crass (~> 1.0.2)
nokogiri (>= 1.5.9) nokogiri (>= 1.5.9)
mail (2.6.4) mail (2.7.0)
mime-types (>= 1.16, < 4) mini_mime (>= 0.1.1)
method_source (0.8.2) method_source (0.9.0)
mime-types (3.0) mime-types (3.1)
mime-types-data (~> 3.2015) mime-types-data (~> 3.2015)
mime-types-data (3.2016.0221) mime-types-data (3.2016.0521)
mini_portile2 (2.0.0) mini_mime (1.0.0)
minitest (5.8.4) mini_portile2 (2.3.0)
multi_json (1.12.0) minitest (5.10.3)
multi_json (1.12.2)
multipart-post (2.0.0) multipart-post (2.0.0)
nokogiri (1.6.7.2) nokogiri (1.8.1)
mini_portile2 (~> 2.0.0.rc2) mini_portile2 (~> 2.3.0)
nokogiri (1.6.7.2-x64-mingw32) omniauth (1.7.1)
mini_portile2 (~> 2.0.0.rc2) hashie (>= 3.4.6, < 3.6.0)
omniauth (1.3.1) rack (>= 1.6.2, < 3)
hashie (>= 1.2, < 4)
rack (>= 1.0, < 3)
omniauth-browserid (0.0.1) omniauth-browserid (0.0.1)
faraday faraday
multi_json multi_json
omniauth (~> 1.0) omniauth (~> 1.0)
pry (0.10.3) pry (0.11.3)
coderay (~> 1.1.0) coderay (~> 1.1.0)
method_source (~> 0.8.1) method_source (~> 0.9.0)
slop (~> 3.4) pry-rails (0.3.6)
pry-rails (0.3.4) pry (>= 0.10.4)
pry (>= 0.9.10) public_suffix (3.0.1)
quiet_assets (1.1.0) quiet_assets (1.1.0)
railties (>= 3.1, < 5.0) railties (>= 3.1, < 5.0)
rack (1.6.4) rack (1.6.8)
rack-test (0.6.3) rack-test (0.6.3)
rack (>= 1.0) rack (>= 1.0)
rails (4.2.6) rails (4.2.10)
actionmailer (= 4.2.6) actionmailer (= 4.2.10)
actionpack (= 4.2.6) actionpack (= 4.2.10)
actionview (= 4.2.6) actionview (= 4.2.10)
activejob (= 4.2.6) activejob (= 4.2.10)
activemodel (= 4.2.6) activemodel (= 4.2.10)
activerecord (= 4.2.6) activerecord (= 4.2.10)
activesupport (= 4.2.6) activesupport (= 4.2.10)
bundler (>= 1.3.0, < 2.0) bundler (>= 1.3.0, < 2.0)
railties (= 4.2.6) railties (= 4.2.10)
sprockets-rails sprockets-rails
rails-deprecated_sanitizer (1.0.3) rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha) activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.7) rails-dom-testing (1.0.8)
activesupport (>= 4.2.0.beta, < 5.0) activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0) nokogiri (~> 1.6)
rails-deprecated_sanitizer (>= 1.0.1) rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.3) rails-html-sanitizer (1.0.3)
loofah (~> 2.0) loofah (~> 2.0)
rails-i18n (4.0.8) rails-i18n (4.0.9)
i18n (~> 0.7) i18n (~> 0.7)
railties (~> 4.0) railties (~> 4.0)
railties (4.2.6) railties (4.2.10)
actionpack (= 4.2.6) actionpack (= 4.2.10)
activesupport (= 4.2.6) activesupport (= 4.2.10)
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0) thor (>= 0.18.1, < 2.0)
rake (11.1.2) rake (12.3.0)
rdoc (4.2.2) rdoc (4.3.0)
json (~> 1.4) rspec-core (3.7.0)
rspec-core (3.4.4) rspec-support (~> 3.7.0)
rspec-support (~> 3.4.0) rspec-expectations (3.7.0)
rspec-expectations (3.4.0)
diff-lcs (>= 1.2.0, < 2.0) diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.4.0) rspec-support (~> 3.7.0)
rspec-mocks (3.4.1) rspec-mocks (3.7.0)
diff-lcs (>= 1.2.0, < 2.0) diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.4.0) rspec-support (~> 3.7.0)
rspec-rails (3.4.2) rspec-rails (3.7.2)
actionpack (>= 3.0, < 4.3) actionpack (>= 3.0)
activesupport (>= 3.0, < 4.3) activesupport (>= 3.0)
railties (>= 3.0, < 4.3) railties (>= 3.0)
rspec-core (~> 3.4.0) rspec-core (~> 3.7.0)
rspec-expectations (~> 3.4.0) rspec-expectations (~> 3.7.0)
rspec-mocks (~> 3.4.0) rspec-mocks (~> 3.7.0)
rspec-support (~> 3.4.0) rspec-support (~> 3.7.0)
rspec-support (3.4.1) rspec-support (3.7.0)
sass (3.4.22) sass (3.4.25)
sass-rails (5.0.4) sass-rails (5.0.7)
railties (>= 4.0.0, < 5.0) railties (>= 4.0.0, < 6)
sass (~> 3.1) sass (~> 3.1)
sprockets (>= 2.8, < 4.0) sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0) sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3) tilt (>= 1.1, < 3)
sdoc (0.4.1) sdoc (0.4.2)
json (~> 1.7, >= 1.7.7) json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0) rdoc (~> 4.0)
shoulda-matchers (3.1.1) shoulda-matchers (3.1.2)
activesupport (>= 4.0.0) activesupport (>= 4.0.0)
simplecov (0.11.2) simplecov (0.14.1)
docile (~> 1.1.0) docile (~> 1.1.0)
json (~> 1.8) json (>= 1.8, < 3)
simplecov-html (~> 0.10.0) simplecov-html (~> 0.10.0)
simplecov-html (0.10.0) simplecov-html (0.10.2)
slim (3.0.6) slim (3.0.9)
temple (~> 0.7.3) temple (>= 0.7.6, < 0.9)
tilt (>= 1.3.3, < 2.1) tilt (>= 1.3.3, < 2.1)
slim-rails (3.0.1) slim-rails (3.1.3)
actionmailer (>= 3.1, < 5.0) actionpack (>= 3.1)
actionpack (>= 3.1, < 5.0) railties (>= 3.1)
activesupport (>= 3.1, < 5.0)
railties (>= 3.1, < 5.0)
slim (~> 3.0) slim (~> 3.0)
slop (3.6.0) spring (2.0.2)
spring (1.7.1) activesupport (>= 4.2)
spring-commands-rspec (1.0.4) spring-commands-rspec (1.0.4)
spring (>= 0.9.1) spring (>= 0.9.1)
sprockets (3.6.0) sprockets (3.7.1)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
rack (> 1, < 3) rack (> 1, < 3)
sprockets-rails (3.0.4) sprockets-rails (3.2.1)
actionpack (>= 4.0) actionpack (>= 4.0)
activesupport (>= 4.0) activesupport (>= 4.0)
sprockets (>= 3.0.0) sprockets (>= 3.0.0)
sqlite3 (1.3.11) sqlite3 (1.3.13)
sqlite3 (1.3.11-x64-mingw32) temple (0.8.0)
temple (0.7.6) term-ansicolor (1.6.0)
term-ansicolor (1.3.2)
tins (~> 1.0) tins (~> 1.0)
test_after_commit (1.0.0) test_after_commit (1.1.0)
activerecord (>= 3.2) activerecord (>= 3.2)
thor (0.19.1) thor (0.19.4)
thread_safe (0.3.5) thread_safe (0.3.6)
tilt (2.0.2) tilt (2.0.8)
tins (1.6.0) tins (1.16.3)
turbolinks (2.5.3) turbolinks (5.0.1)
coffee-rails turbolinks-source (~> 5)
tzinfo (1.2.2) turbolinks-source (5.0.3)
tzinfo (1.2.4)
thread_safe (~> 0.1) thread_safe (~> 0.1)
tzinfo-data (1.2016.4) uglifier (4.0.1)
tzinfo (>= 1.0.0)
uglifier (3.0.0)
execjs (>= 0.3.0, < 3) execjs (>= 0.3.0, < 3)
validate_url (1.0.2) validate_url (1.0.2)
activemodel (>= 3.0.0) activemodel (>= 3.0.0)
addressable addressable
xpath (2.0.0) xpath (2.1.0)
nokogiri (~> 1.3) nokogiri (~> 1.3)
PLATFORMS PLATFORMS
ruby ruby
x64-mingw32
DEPENDENCIES DEPENDENCIES
awesome_print awesome_print
@ -299,4 +304,4 @@ DEPENDENCIES
validate_url validate_url
BUNDLED WITH BUNDLED WITH
1.11.2 1.16.0

View file

@ -9,5 +9,5 @@ Kaminari.configure do |config|
# config.param_name = :page # config.param_name = :page
end end
Kaminari::Hooks.init Kaminari::Hooks.init if defined?(Kaminari::Hooks)
Elasticsearch::Model::Response::Response.__send__ :include, Elasticsearch::Model::Response::Pagination::Kaminari Elasticsearch::Model::Response::Response.__send__ :include, Elasticsearch::Model::Response::Pagination::Kaminari

0
docker-entrypoint-es-plugins.sh Normal file → Executable file
View file

View file

@ -210,4 +210,24 @@ RSpec.feature "Basic search", type: :feature, elasticsearch: true do
expect(page).to have_content("0 Dokumente in der Datenbank") expect(page).to have_content("0 Dokumente in der Datenbank")
end end
scenario "Papers with reference id having slash is escaped" do
mainPaper = FactoryGirl.create(:paper, published_at: '2016-12-19T19:00:00',
name: "Opendata als default", reference: "VI-00768/14")
newPaper = FactoryGirl.create(:paper, published_at: '2016-12-23T12:00:00',
name: "Opendata als optional", reference: "VI-00768/14-ÄA-01")
Paper.__elasticsearch__.refresh_index!
visit search_path body: "leipzig", paper_search: {query: "default"}
expect(page).to have_content("1 Dokument in der Datenbank")
resultEntry = page.find("li.search-result", match: :first)
expect(resultEntry).to have_content(mainPaper.name)
resultSubEntry1 = resultEntry.find("li.current", match: :first)
linkName1 = getLinkName(mainPaper)
expect(resultSubEntry1).to have_link(linkName1, href: mainPaper.url)
resultSubEntries = resultEntry.find("ul").all("li")
linkName2 = getLinkName(newPaper)
expect(resultSubEntries[1]).to have_link(linkName2, href: newPaper.url)
end
end end