upmin-admin 0.0.35 → 0.0.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0c8d68abb451f5831fbe063e4f9ade6e8d8a72d
-  data.tar.gz: f7f0fff524caa40d2fa487512bf9a705d695a608
+  metadata.gz: 624f8d82fe35b9b2beaf577a9115af31380775e1
+  data.tar.gz: 8959a5ad247ef6f45269f39c47d05c86f0568160
 SHA512:
-  metadata.gz: adebbe8d04337d1612dab1c9cc5ab287130a6313ebda77dad45f8da4e8f6ec68f149ce9223a18fdbb8ffeea2149c6eb455e5665c67e7f697da5fba632c1b29a1
-  data.tar.gz: 00c81d5332a73c15fc52eaa1e4a3b7f4b0278c3bcc06f97e03e97c986a9da81ddb7bee9660dee1cfc8c590fff3b5809243898ea2702f6b0b5319d09f4d43da75
+  metadata.gz: 8de8d264827f29492fa267912af3433f6293f87baecb8ab80245e7d7eef4411b7ebed3a0ff25ac5dc77c446fc2ec3a69e47bdc7bfb7232655ec718ad8b048dcc
+  data.tar.gz: 045b24b856b4ba093bfeaba8794e4e2b77861ad6c4686f46c8fe3d0634cb461de023c5a8b711245a69a719a1593e585be023833d8662ded73a2aa283bf66e759

data/app/controllers/upmin/models_controller.rb

@@ -5,6 +5,8 @@ module Upmin
     before_filter :set_klass, only: [:show, :update, :search, :action]
     before_filter :set_model, only: [:show, :update, :action]
 
+    before_filter :set_page, only: [:search]
+
     before_filter :set_method, only: [:action]
     before_filter :set_arguments, only: [:action]
 
@@ -43,7 +45,7 @@ module Upmin
 
     def search
       @q = @klass.ransack(params[:q])
-      @results = @q.result(distinct: true)
+      @results = @q.result(distinct: true).page(@page).per(30)
     end
 
     def action
@@ -77,6 +79,10 @@ module Upmin
         @arguments = arguments.select{|k, v| !v.empty? }
       end
 
+      def set_page
+        @page = params[:page] || 0
+      end
+
       # TODO(jon): Figure out a better way to do transforms that is easy to extend.
       def transform(transforms, key, value)
         split = transforms[key].split('#')

data/app/views/upmin/models/search.html.haml

@@ -3,7 +3,10 @@
     .col-md-8
       -# TODO(jon): Add pagination w/ search results
       = up_search_results(@q, @results)
-
+      %br
+      = paginate @results
+      %br
+      %br
     .col-md-4
       -# TODO(jon): Implement up_search_box
       = up_search_box(@klass)

data/lib/upmin.rb

@@ -1,18 +1,2 @@
-require "upmin/engine"
-
-require "upmin/klass"
-require "upmin/model"
-
-# Monkey patch code into rails
-require "upmin/railties/active_record"
-require "upmin/railties/render"
-require "upmin/railties/render_helpers"
-require "upmin/railtie"
-
-# gems and stuff we use
-require "ransack"
-require "haml"
-require "sass-rails"
-
 module Upmin
 end

data/lib/upmin/admin.rb

@@ -0,0 +1,22 @@
+require "upmin"
+require "upmin/engine"
+
+require "upmin/klass"
+require "upmin/model"
+
+# Monkey patch code into rails
+require "upmin/railties/active_record"
+require "upmin/railties/render"
+require "upmin/railties/render_helpers"
+require "upmin/railtie"
+
+# gems and stuff we use
+require "ransack"
+require "haml"
+require "sass-rails"
+require "kaminari"
+
+module Upmin
+  module Admin
+  end
+end

data/lib/upmin/version.rb

@@ -1,3 +1,3 @@
 module Upmin
-  VERSION = "0.0.35"
+  VERSION = "0.0.36"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: upmin-admin
 version: !ruby/object:Gem::Version
-  version: 0.0.35
+  version: 0.0.36
 platform: ruby
 authors:
 - Jon Calhoun
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: kaminari
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
@@ -129,6 +143,7 @@ files:
 - lib/tasks/accordive_rails_tasks.rake
 - lib/tasks/upmin_tasks.rake
 - lib/upmin.rb
+- lib/upmin/admin.rb
 - lib/upmin/engine.rb
 - lib/upmin/klass.rb
 - lib/upmin/model.rb