From bb0226c07571184fed8a9e78dc9dc0a7cb1d0208 Mon Sep 17 00:00:00 2001
From: Akira Matsuda <ronnie@dio.jp>
Date: Tue, 4 Oct 2016 21:11:43 +0900
Subject: [PATCH] Move core code to kaminari-core gem

---
 .../app}/views/kaminari/_first_page.html.erb  |  0
 .../app}/views/kaminari/_first_page.html.haml |  0
 .../app}/views/kaminari/_first_page.html.slim |  0
 .../app}/views/kaminari/_gap.html.erb         |  0
 .../app}/views/kaminari/_gap.html.haml        |  0
 .../app}/views/kaminari/_gap.html.slim        |  0
 .../app}/views/kaminari/_last_page.html.erb   |  0
 .../app}/views/kaminari/_last_page.html.haml  |  0
 .../app}/views/kaminari/_last_page.html.slim  |  0
 .../app}/views/kaminari/_next_page.html.erb   |  0
 .../app}/views/kaminari/_next_page.html.haml  |  0
 .../app}/views/kaminari/_next_page.html.slim  |  0
 .../app}/views/kaminari/_page.html.erb        |  0
 .../app}/views/kaminari/_page.html.haml       |  0
 .../app}/views/kaminari/_page.html.slim       |  0
 .../app}/views/kaminari/_paginator.html.erb   |  0
 .../app}/views/kaminari/_paginator.html.haml  |  0
 .../app}/views/kaminari/_paginator.html.slim  |  0
 .../app}/views/kaminari/_prev_page.html.erb   |  0
 .../app}/views/kaminari/_prev_page.html.haml  |  0
 .../app}/views/kaminari/_prev_page.html.slim  |  0
 .../config}/locales/kaminari.yml              |  0
 .../generators/kaminari/config_generator.rb   |  0
 .../kaminari/templates/kaminari_config.rb     |  0
 .../generators/kaminari/views_generator.rb    |  0
 {lib => kaminari-core/lib}/kaminari/config.rb |  0
 kaminari-core/lib/kaminari/core.rb            | 45 ++++++++++++++++---
 {lib => kaminari-core/lib}/kaminari/engine.rb |  0
 .../lib}/kaminari/exceptions.rb               |  0
 .../lib}/kaminari/helpers/paginator.rb        |  0
 .../lib}/kaminari/helpers/tags.rb             |  0
 {lib => kaminari-core/lib}/kaminari/hooks.rb  |  0
 .../lib}/kaminari/models/array_extension.rb   |  0
 .../kaminari/models/configuration_methods.rb  |  0
 .../kaminari/models/page_scope_methods.rb     |  0
 .../lib}/kaminari/railtie.rb                  |  0
 lib/kaminari.rb                               | 41 +----------------
 37 files changed, 41 insertions(+), 45 deletions(-)
 rename {app => kaminari-core/app}/views/kaminari/_first_page.html.erb (100%)
 rename {app => kaminari-core/app}/views/kaminari/_first_page.html.haml (100%)
 rename {app => kaminari-core/app}/views/kaminari/_first_page.html.slim (100%)
 rename {app => kaminari-core/app}/views/kaminari/_gap.html.erb (100%)
 rename {app => kaminari-core/app}/views/kaminari/_gap.html.haml (100%)
 rename {app => kaminari-core/app}/views/kaminari/_gap.html.slim (100%)
 rename {app => kaminari-core/app}/views/kaminari/_last_page.html.erb (100%)
 rename {app => kaminari-core/app}/views/kaminari/_last_page.html.haml (100%)
 rename {app => kaminari-core/app}/views/kaminari/_last_page.html.slim (100%)
 rename {app => kaminari-core/app}/views/kaminari/_next_page.html.erb (100%)
 rename {app => kaminari-core/app}/views/kaminari/_next_page.html.haml (100%)
 rename {app => kaminari-core/app}/views/kaminari/_next_page.html.slim (100%)
 rename {app => kaminari-core/app}/views/kaminari/_page.html.erb (100%)
 rename {app => kaminari-core/app}/views/kaminari/_page.html.haml (100%)
 rename {app => kaminari-core/app}/views/kaminari/_page.html.slim (100%)
 rename {app => kaminari-core/app}/views/kaminari/_paginator.html.erb (100%)
 rename {app => kaminari-core/app}/views/kaminari/_paginator.html.haml (100%)
 rename {app => kaminari-core/app}/views/kaminari/_paginator.html.slim (100%)
 rename {app => kaminari-core/app}/views/kaminari/_prev_page.html.erb (100%)
 rename {app => kaminari-core/app}/views/kaminari/_prev_page.html.haml (100%)
 rename {app => kaminari-core/app}/views/kaminari/_prev_page.html.slim (100%)
 rename {config => kaminari-core/config}/locales/kaminari.yml (100%)
 rename {lib => kaminari-core/lib}/generators/kaminari/config_generator.rb (100%)
 rename {lib => kaminari-core/lib}/generators/kaminari/templates/kaminari_config.rb (100%)
 rename {lib => kaminari-core/lib}/generators/kaminari/views_generator.rb (100%)
 rename {lib => kaminari-core/lib}/kaminari/config.rb (100%)
 rename {lib => kaminari-core/lib}/kaminari/engine.rb (100%)
 rename {lib => kaminari-core/lib}/kaminari/exceptions.rb (100%)
 rename {lib => kaminari-core/lib}/kaminari/helpers/paginator.rb (100%)
 rename {lib => kaminari-core/lib}/kaminari/helpers/tags.rb (100%)
 rename {lib => kaminari-core/lib}/kaminari/hooks.rb (100%)
 rename {lib => kaminari-core/lib}/kaminari/models/array_extension.rb (100%)
 rename {lib => kaminari-core/lib}/kaminari/models/configuration_methods.rb (100%)
 rename {lib => kaminari-core/lib}/kaminari/models/page_scope_methods.rb (100%)
 rename {lib => kaminari-core/lib}/kaminari/railtie.rb (100%)

diff --git a/app/views/kaminari/_first_page.html.erb b/kaminari-core/app/views/kaminari/_first_page.html.erb
similarity index 100%
rename from app/views/kaminari/_first_page.html.erb
rename to kaminari-core/app/views/kaminari/_first_page.html.erb
diff --git a/app/views/kaminari/_first_page.html.haml b/kaminari-core/app/views/kaminari/_first_page.html.haml
similarity index 100%
rename from app/views/kaminari/_first_page.html.haml
rename to kaminari-core/app/views/kaminari/_first_page.html.haml
diff --git a/app/views/kaminari/_first_page.html.slim b/kaminari-core/app/views/kaminari/_first_page.html.slim
similarity index 100%
rename from app/views/kaminari/_first_page.html.slim
rename to kaminari-core/app/views/kaminari/_first_page.html.slim
diff --git a/app/views/kaminari/_gap.html.erb b/kaminari-core/app/views/kaminari/_gap.html.erb
similarity index 100%
rename from app/views/kaminari/_gap.html.erb
rename to kaminari-core/app/views/kaminari/_gap.html.erb
diff --git a/app/views/kaminari/_gap.html.haml b/kaminari-core/app/views/kaminari/_gap.html.haml
similarity index 100%
rename from app/views/kaminari/_gap.html.haml
rename to kaminari-core/app/views/kaminari/_gap.html.haml
diff --git a/app/views/kaminari/_gap.html.slim b/kaminari-core/app/views/kaminari/_gap.html.slim
similarity index 100%
rename from app/views/kaminari/_gap.html.slim
rename to kaminari-core/app/views/kaminari/_gap.html.slim
diff --git a/app/views/kaminari/_last_page.html.erb b/kaminari-core/app/views/kaminari/_last_page.html.erb
similarity index 100%
rename from app/views/kaminari/_last_page.html.erb
rename to kaminari-core/app/views/kaminari/_last_page.html.erb
diff --git a/app/views/kaminari/_last_page.html.haml b/kaminari-core/app/views/kaminari/_last_page.html.haml
similarity index 100%
rename from app/views/kaminari/_last_page.html.haml
rename to kaminari-core/app/views/kaminari/_last_page.html.haml
diff --git a/app/views/kaminari/_last_page.html.slim b/kaminari-core/app/views/kaminari/_last_page.html.slim
similarity index 100%
rename from app/views/kaminari/_last_page.html.slim
rename to kaminari-core/app/views/kaminari/_last_page.html.slim
diff --git a/app/views/kaminari/_next_page.html.erb b/kaminari-core/app/views/kaminari/_next_page.html.erb
similarity index 100%
rename from app/views/kaminari/_next_page.html.erb
rename to kaminari-core/app/views/kaminari/_next_page.html.erb
diff --git a/app/views/kaminari/_next_page.html.haml b/kaminari-core/app/views/kaminari/_next_page.html.haml
similarity index 100%
rename from app/views/kaminari/_next_page.html.haml
rename to kaminari-core/app/views/kaminari/_next_page.html.haml
diff --git a/app/views/kaminari/_next_page.html.slim b/kaminari-core/app/views/kaminari/_next_page.html.slim
similarity index 100%
rename from app/views/kaminari/_next_page.html.slim
rename to kaminari-core/app/views/kaminari/_next_page.html.slim
diff --git a/app/views/kaminari/_page.html.erb b/kaminari-core/app/views/kaminari/_page.html.erb
similarity index 100%
rename from app/views/kaminari/_page.html.erb
rename to kaminari-core/app/views/kaminari/_page.html.erb
diff --git a/app/views/kaminari/_page.html.haml b/kaminari-core/app/views/kaminari/_page.html.haml
similarity index 100%
rename from app/views/kaminari/_page.html.haml
rename to kaminari-core/app/views/kaminari/_page.html.haml
diff --git a/app/views/kaminari/_page.html.slim b/kaminari-core/app/views/kaminari/_page.html.slim
similarity index 100%
rename from app/views/kaminari/_page.html.slim
rename to kaminari-core/app/views/kaminari/_page.html.slim
diff --git a/app/views/kaminari/_paginator.html.erb b/kaminari-core/app/views/kaminari/_paginator.html.erb
similarity index 100%
rename from app/views/kaminari/_paginator.html.erb
rename to kaminari-core/app/views/kaminari/_paginator.html.erb
diff --git a/app/views/kaminari/_paginator.html.haml b/kaminari-core/app/views/kaminari/_paginator.html.haml
similarity index 100%
rename from app/views/kaminari/_paginator.html.haml
rename to kaminari-core/app/views/kaminari/_paginator.html.haml
diff --git a/app/views/kaminari/_paginator.html.slim b/kaminari-core/app/views/kaminari/_paginator.html.slim
similarity index 100%
rename from app/views/kaminari/_paginator.html.slim
rename to kaminari-core/app/views/kaminari/_paginator.html.slim
diff --git a/app/views/kaminari/_prev_page.html.erb b/kaminari-core/app/views/kaminari/_prev_page.html.erb
similarity index 100%
rename from app/views/kaminari/_prev_page.html.erb
rename to kaminari-core/app/views/kaminari/_prev_page.html.erb
diff --git a/app/views/kaminari/_prev_page.html.haml b/kaminari-core/app/views/kaminari/_prev_page.html.haml
similarity index 100%
rename from app/views/kaminari/_prev_page.html.haml
rename to kaminari-core/app/views/kaminari/_prev_page.html.haml
diff --git a/app/views/kaminari/_prev_page.html.slim b/kaminari-core/app/views/kaminari/_prev_page.html.slim
similarity index 100%
rename from app/views/kaminari/_prev_page.html.slim
rename to kaminari-core/app/views/kaminari/_prev_page.html.slim
diff --git a/config/locales/kaminari.yml b/kaminari-core/config/locales/kaminari.yml
similarity index 100%
rename from config/locales/kaminari.yml
rename to kaminari-core/config/locales/kaminari.yml
diff --git a/lib/generators/kaminari/config_generator.rb b/kaminari-core/lib/generators/kaminari/config_generator.rb
similarity index 100%
rename from lib/generators/kaminari/config_generator.rb
rename to kaminari-core/lib/generators/kaminari/config_generator.rb
diff --git a/lib/generators/kaminari/templates/kaminari_config.rb b/kaminari-core/lib/generators/kaminari/templates/kaminari_config.rb
similarity index 100%
rename from lib/generators/kaminari/templates/kaminari_config.rb
rename to kaminari-core/lib/generators/kaminari/templates/kaminari_config.rb
diff --git a/lib/generators/kaminari/views_generator.rb b/kaminari-core/lib/generators/kaminari/views_generator.rb
similarity index 100%
rename from lib/generators/kaminari/views_generator.rb
rename to kaminari-core/lib/generators/kaminari/views_generator.rb
diff --git a/lib/kaminari/config.rb b/kaminari-core/lib/kaminari/config.rb
similarity index 100%
rename from lib/kaminari/config.rb
rename to kaminari-core/lib/kaminari/config.rb
diff --git a/kaminari-core/lib/kaminari/core.rb b/kaminari-core/lib/kaminari/core.rb
index f5bc163..cf1fd9a 100644
--- a/kaminari-core/lib/kaminari/core.rb
+++ b/kaminari-core/lib/kaminari/core.rb
@@ -1,7 +1,42 @@
-require "kaminari/core/version"
-
 module Kaminari
-  module Core
-    # Your code goes here...
-  end
+end
+
+# load Rails/Railtie
+begin
+  require 'rails'
+rescue LoadError
+  #do nothing
+end
+
+$stderr.puts <<-EOC if !defined?(::Rails::Railtie) && !defined?(Sinatra) && !defined?(Grape)
+warning: no framework detected.
+
+Your Gemfile might not be configured properly.
+---- e.g. ----
+Rails:
+    gem 'kaminari'
+
+Sinatra/Padrino:
+    gem 'kaminari-sinatra'
+
+Grape:
+    gem 'kaminari-grape'
+
+EOC
+
+# load Kaminari components
+require 'kaminari/config'
+require 'kaminari/exceptions'
+require 'kaminari/helpers/paginator'
+require 'kaminari/models/page_scope_methods'
+require 'kaminari/models/configuration_methods'
+require 'kaminari/hooks'
+
+require 'kaminari/actionview'
+require 'kaminari/activerecord'
+
+# if not using Railtie, call `Kaminari::Hooks.init` directly
+if defined? ::Rails::Railtie
+  require 'kaminari/railtie'
+  require 'kaminari/engine'
 end
diff --git a/lib/kaminari/engine.rb b/kaminari-core/lib/kaminari/engine.rb
similarity index 100%
rename from lib/kaminari/engine.rb
rename to kaminari-core/lib/kaminari/engine.rb
diff --git a/lib/kaminari/exceptions.rb b/kaminari-core/lib/kaminari/exceptions.rb
similarity index 100%
rename from lib/kaminari/exceptions.rb
rename to kaminari-core/lib/kaminari/exceptions.rb
diff --git a/lib/kaminari/helpers/paginator.rb b/kaminari-core/lib/kaminari/helpers/paginator.rb
similarity index 100%
rename from lib/kaminari/helpers/paginator.rb
rename to kaminari-core/lib/kaminari/helpers/paginator.rb
diff --git a/lib/kaminari/helpers/tags.rb b/kaminari-core/lib/kaminari/helpers/tags.rb
similarity index 100%
rename from lib/kaminari/helpers/tags.rb
rename to kaminari-core/lib/kaminari/helpers/tags.rb
diff --git a/lib/kaminari/hooks.rb b/kaminari-core/lib/kaminari/hooks.rb
similarity index 100%
rename from lib/kaminari/hooks.rb
rename to kaminari-core/lib/kaminari/hooks.rb
diff --git a/lib/kaminari/models/array_extension.rb b/kaminari-core/lib/kaminari/models/array_extension.rb
similarity index 100%
rename from lib/kaminari/models/array_extension.rb
rename to kaminari-core/lib/kaminari/models/array_extension.rb
diff --git a/lib/kaminari/models/configuration_methods.rb b/kaminari-core/lib/kaminari/models/configuration_methods.rb
similarity index 100%
rename from lib/kaminari/models/configuration_methods.rb
rename to kaminari-core/lib/kaminari/models/configuration_methods.rb
diff --git a/lib/kaminari/models/page_scope_methods.rb b/kaminari-core/lib/kaminari/models/page_scope_methods.rb
similarity index 100%
rename from lib/kaminari/models/page_scope_methods.rb
rename to kaminari-core/lib/kaminari/models/page_scope_methods.rb
diff --git a/lib/kaminari/railtie.rb b/kaminari-core/lib/kaminari/railtie.rb
similarity index 100%
rename from lib/kaminari/railtie.rb
rename to kaminari-core/lib/kaminari/railtie.rb
diff --git a/lib/kaminari.rb b/lib/kaminari.rb
index cf1fd9a..4b9d912 100644
--- a/lib/kaminari.rb
+++ b/lib/kaminari.rb
@@ -1,42 +1,3 @@
-module Kaminari
-end
-
-# load Rails/Railtie
-begin
-  require 'rails'
-rescue LoadError
-  #do nothing
-end
-
-$stderr.puts <<-EOC if !defined?(::Rails::Railtie) && !defined?(Sinatra) && !defined?(Grape)
-warning: no framework detected.
-
-Your Gemfile might not be configured properly.
----- e.g. ----
-Rails:
-    gem 'kaminari'
-
-Sinatra/Padrino:
-    gem 'kaminari-sinatra'
-
-Grape:
-    gem 'kaminari-grape'
-
-EOC
-
-# load Kaminari components
-require 'kaminari/config'
-require 'kaminari/exceptions'
-require 'kaminari/helpers/paginator'
-require 'kaminari/models/page_scope_methods'
-require 'kaminari/models/configuration_methods'
-require 'kaminari/hooks'
-
+require 'kaminari/core'
 require 'kaminari/actionview'
 require 'kaminari/activerecord'
-
-# if not using Railtie, call `Kaminari::Hooks.init` directly
-if defined? ::Rails::Railtie
-  require 'kaminari/railtie'
-  require 'kaminari/engine'
-end