flex 0.4.1 → 0.4.2

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/lib/flex/template/base.rb

@@ -20,9 +20,10 @@ module Flex
         vars[:type]  = vars[:type].join(',')  if vars[:type].is_a?(Array)
         if vars[:page]
           vars[:params] ||= {}
+          vars[:params][:size] ||= vars[:size] || 10
           page = vars[:page].to_i
           page = 1 unless page > 0
-          vars[:params][:from] = ((page - 1) * vars[:params][:size] || vars[:size] || 10).ceil
+          vars[:params][:from] = ((page - 1) * vars[:params][:size]).ceil
         end
         vars
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flex
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-17 00:00:00.000000000 Z
+date: 2013-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70216038459320 !ruby/object:Gem::Requirement
+  requirement: &70261802510500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.3.4
   type: :runtime
   prerelease: false
-  version_requirements: *70216038459320
+  version_requirements: *70261802510500
 - !ruby/object:Gem::Dependency
   name: progressbar
-  requirement: &70216038457800 !ruby/object:Gem::Requirement
+  requirement: &70261802508900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.11.0
   type: :runtime
   prerelease: false
-  version_requirements: *70216038457800
+  version_requirements: *70261802508900
 - !ruby/object:Gem::Dependency
   name: prompter
-  requirement: &70216038456340 !ruby/object:Gem::Requirement
+  requirement: &70261802507520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *70216038456340
+  version_requirements: *70261802507520
 - !ruby/object:Gem::Dependency
   name: irt
-  requirement: &70216038455840 !ruby/object:Gem::Requirement
+  requirement: &70261802506900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.2.10
   type: :development
   prerelease: false
-  version_requirements: *70216038455840
+  version_requirements: *70261802506900
 - !ruby/object:Gem::Dependency
   name: patron
-  requirement: &70216038454960 !ruby/object:Gem::Requirement
+  requirement: &70261802506120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.4.18
   type: :development
   prerelease: false
-  version_requirements: *70216038454960
+  version_requirements: *70261802506120
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70216038454300 !ruby/object:Gem::Requirement
+  requirement: &70261802505360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +76,7 @@ dependencies:
         version: 1.6.7
   type: :development
   prerelease: false
-  version_requirements: *70216038454300
+  version_requirements: *70261802505360
 description: ! 'Flex is an innovative ruby client for ElasticSearch. With Flex your
   code will be clean, easy to write and read, and very short: "poetic-short". Flex
   is fast and efficient, easy to use and customize, and offers ActiveRecord, Mongoid