go-on-rails 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4885ebf7ebb9df3a3c2941dd88966f28384975a1
-  data.tar.gz: 71d6fca3d339378f36105063de928ed2f3620d0a
+  metadata.gz: a24ab99957a404da499992b20120d30c163c5925
+  data.tar.gz: 5009bffa97b30a0bef1209ab1b1b12bd5ec727fa
 SHA512:
-  metadata.gz: 86055cbc92c586e8c1764f392f2bc1ca895faee9b3b0933a3c88c87ea58199bdabfd2b24853a55a9b6b46b51f7bb316e470c9d3004cac3d29b344b4f46390154
-  data.tar.gz: a835298ceea075195217320032977be3530b1dad25aa1233f72ba34d33553e64ed581bdaa248f4c692b3d69b2c325730bd6edd81af92339d9afe930f79b8ae27
+  metadata.gz: 411466805ddf6f18e0797127a25cb30a9458bf5d3143b5fa3a8de2dadafd6ceeb6d385968ed96be02804ca311b73912dca0da3e1f02a329fa8548e272e47dcd6
+  data.tar.gz: 40ddc1ef5a221c2141820ded808ec501e8064df288c92dec7c45ee75b385e91811ed2e2e04409d745144c570ccbd57e8c7a112ef6b6c7e0e849aa117908b4f6a

data/README.md

@@ -23,7 +23,7 @@ Here's a simple [example(tutorial)](https://github.com/goonr/example_simple) sho
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'go-on-rails', '~> 0.1.4'
+gem 'go-on-rails', '~> 0.1.6'
 ```
 
 And then execute:
@@ -101,6 +101,7 @@ And the gem is still under development, so there're a lot of known issues.
   - [x] format(string only)
   - [x] numericality(partially)
   - [ ] other validations
+- [x] Pagination(details see [wiki](https://github.com/goonr/go-on-rails/wiki/Pagination))
 - [ ] Callbacks
 - [ ] Transactions
 

data/lib/generators/gor/templates/gor_model.go.erb

@@ -155,34 +155,37 @@ func (_p *<%= @model_name %>Page) buildIdRestrict(direction string) (idStr strin
 	case "previous":
 		if strings.ToLower(_p.Order["id"]) == "desc" {
 			idStr += "id > ? "
-			idParams = append(_p.WhereParams, _p.FirstId)
+			idParams = append(idParams, _p.FirstId)
 		} else {
 			idStr += "id < ? "
-			idParams = append(_p.WhereParams, _p.FirstId)
+			idParams = append(idParams, _p.FirstId)
 		}
 	case "current":
 		// trick to make Where function work
 		if _p.PageNum == 0 && _p.FirstId == 0 && _p.LastId == 0 {
 			idStr += "id > ? "
-			idParams = append(_p.WhereParams, 0)
+			idParams = append(idParams, 0)
 		} else {
 			if strings.ToLower(_p.Order["id"]) == "desc" {
 				idStr += "id <= ? AND id >= ? "
-				idParams = append(_p.WhereParams, _p.FirstId, _p.LastId)
+				idParams = append(idParams, _p.FirstId, _p.LastId)
 			} else {
 				idStr += "id >= ? AND id <= ? "
-				idParams = append(_p.WhereParams, _p.FirstId, _p.LastId)
+				idParams = append(idParams, _p.FirstId, _p.LastId)
 			}
 		}
 	case "next":
 		if strings.ToLower(_p.Order["id"]) == "desc" {
 			idStr += "id < ? "
-			idParams = append(_p.WhereParams, _p.LastId)
+			idParams = append(idParams, _p.LastId)
 		} else {
 			idStr += "id > ? "
-			idParams = append(_p.WhereParams, _p.LastId)
+			idParams = append(idParams, _p.LastId)
 		}
 	}
+	if _p.WhereString != "" {
+		idStr = " AND " + idStr
+	}
 	return
 }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: go-on-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - B1nj0y