baza 0.0.32 → 0.0.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29581ed5677e51c2208d9d6084fa5a49afc40dc9
-  data.tar.gz: 92362dc85f0d2593a4f14ed119d4d0d6e33989a4
+  metadata.gz: 1636cb2175a8d3d441067544e5ab2236cffdaf59
+  data.tar.gz: b435a6ca05bf3a7f0240f0e5bd726a6714c2afaf
 SHA512:
-  metadata.gz: b5277487bb87290cd3512b916d531cc8a9a0d3806349c9f83b122fccef6fb3804abdc5ed9aae837e617c4d6df4b4ac7d6941de1627f112f621bd8e1f4bfaa821
-  data.tar.gz: 78dacdfc195b83d5d982176fa7465dc217bd57bdd36d5e9260c9a3c95dad5e62ad0a3f7ae938fd8599f1f4d4f4064c90246453c9b04172cded58a3ede3a75737
+  metadata.gz: 33ba5182cf87b242e63f700b75d35698ee7a166d41988ac066a50579c899d1f044f057cf4ed7883443693316e7cdf79dfa3b0ecdd7c988815492b91bfbe4f8d5
+  data.tar.gz: ac1b0ce883e7096a806de147e6baa56be67249b3a1890a453072f3dcb22fc508a446320972d8ff8ed11fa4d1f03d17e7d293d3d8b5cb032b97d7275762aca43c

data/.ruby-version

@@ -1 +1 @@
-2.3.5
+2.3.6

data/VERSION

@@ -1 +1 @@
-0.0.32
+0.0.33

data/baza.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: baza 0.0.32 ruby lib
+# stub: baza 0.0.33 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "baza".freeze
-  s.version = "0.0.32"
+  s.version = "0.0.33"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Kasper Johansen".freeze]
-  s.date = "2018-03-28"
+  s.date = "2018-04-26"
   s.description = "A database abstraction layer, model framework and database framework.".freeze
   s.email = "kj@gfish.com".freeze
   s.extra_rdoc_files = [
@@ -202,7 +202,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/kaspernj/baza".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "2.5.2.1".freeze
+  s.rubygems_version = "2.6.13".freeze
   s.summary = "A database abstraction layer, model framework and database framework.".freeze
 
   if s.respond_to? :specification_version then

data/lib/baza/sql_queries/select.rb

@@ -11,14 +11,13 @@ class Baza::SqlQueries::Select
 
   def count
     @count = true
+    query.fetch.fetch(:count).to_i
+  ensure
+    @count = false
+  end
 
-    begin
-      result = query.fetch.fetch(:count).to_i
-    ensure
-      @count = false
-    end
-
-    result
+  def current_page
+    @page || 1
   end
 
   def select(arg)
@@ -51,6 +50,11 @@ class Baza::SqlQueries::Select
     self
   end
 
+  def page(number)
+    @page = number.try(:to_i) || 1
+    self
+  end
+
   def per_page(number)
     @per_page = number
     self
@@ -75,6 +79,7 @@ class Baza::SqlQueries::Select
   end
 
   def total_pages
+    @per_page ||= 30
     per_page_value = @per_page
     (count.to_f / per_page_value.to_f).ceil
   end
@@ -184,9 +189,14 @@ private
   end
 
   def limit_sql
-    if @limit
-      sql = "LIMIT #{@db.sqlval(@limit)}"
-      sql << ", #{@db.sqlval(@offset)}" if @offset
+    unless @count
+      if @page
+        @per_page ||= 30
+        sql = "LIMIT #{@db.sqlval(@per_page)} OFFSET #{@per_page * (current_page - 1)}"
+      elsif @limit
+        sql = "LIMIT #{@db.sqlval(@limit)}"
+        sql << ", #{@db.sqlval(@offset)}" if @offset
+      end
     end
 
     sql

data/spec/info_mysql2_example.rb

@@ -1,4 +1,4 @@
-class Baza::InfoMysql
+class Baza::InfoMysql2
   attr_reader :db
 
   def initialize(args = {})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: baza
 version: !ruby/object:Gem::Version
-  version: 0.0.32
+  version: 0.0.33
 platform: ruby
 authors:
 - Kasper Johansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-28 00:00:00.000000000 Z
+date: 2018-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: array_enumerator
@@ -512,7 +512,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A database abstraction layer, model framework and database framework.