querybuilder 0.9.2 → 0.9.3

data/History.txt

@@ -1,3 +1,8 @@
+== 0.9.3 2010-11-15
+
+* 1 Minor enhancement
+  * Fixed pagination bug when page count is 1.
+
 == 0.9.2 2010-10-06
 
 * 1 Minor enhancement

data/lib/query_builder/info.rb

@@ -1,3 +1,3 @@
 module QueryBuilder
-  VERSION = '0.9.2'
+  VERSION = '0.9.3'
 end

data/lib/query_builder/processor.rb

@@ -151,7 +151,7 @@ module QueryBuilder
 
         @context = opts.merge(:first => true, :last => true)
         @query = Query.new(self.class)
-        @query.main_class = @opts[:main_class] if @opts[:main_class]
+        @query.main_class = @opts[:main_class] || resolve_main_class(self.class.main_class)
         before_process
 
         process_all
@@ -572,7 +572,7 @@ module QueryBuilder
         context[:processing] = :paginate
         fld = process(paginate_fld)
         if fld && (page_size = @query.limit[/ LIMIT (\d+)/,1])
-          @query.page_size = [2, page_size.to_i].max
+          @query.page_size = [1, page_size.to_i].max
           @query.offset = " OFFSET #{insert_bind("((#{fld}.to_i > 0 ? #{fld}.to_i : 1)-1)*#{@query.page_size}")}"
           @query.pagination_key ||= paginate_fld.last
         else
@@ -613,7 +613,11 @@ module QueryBuilder
           value
         end
       end
-
+      
+      def resolve_main_class(class_name)
+        QueryBuilder.resolve_const(class_name)
+      end
+      
       def insert_bind(str)
         self.class.insert_bind(str)
       end
@@ -653,7 +657,7 @@ module QueryBuilder
           end
 
           @query.processor_class = processor.class
-          @query.main_class = QueryBuilder.resolve_const(processor.class.main_class)
+          @query.main_class = processor.resolve_main_class(processor.class.main_class)
           update_processor(processor)
         end
       end

data/querybuilder.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{querybuilder}
-  s.version = "0.9.2"
+  s.version = "0.9.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gaspard Bucher"]
-  s.date = %q{2010-10-06}
+  s.date = %q{2010-11-15}
   s.description = %q{QueryBuilder is an interpreter for the "pseudo sql" language. This language
     can be used for two purposes:
 
@@ -68,7 +68,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://zenadmin.org/524}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{QueryBuilder is an interpreter for the "pseudo sql" language.}
   s.test_files = [
     "test/database.rb",
@@ -85,7 +85,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rubyless>, [">= 0.7.0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<yamltest>, [">= 0.5.0"])

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: querybuilder
 version: !ruby/object:Gem::Version 
+  hash: 61
   prerelease: false
   segments: 
   - 0
   - 9
-  - 2
-  version: 0.9.2
+  - 3
+  version: 0.9.3
 platform: ruby
 authors: 
 - Gaspard Bucher
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-06 00:00:00 +02:00
+date: 2010-11-15 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rubyless
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         - 7
@@ -35,9 +38,11 @@ dependencies:
   name: shoulda
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -47,9 +52,11 @@ dependencies:
   name: yamltest
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 0
         - 5
@@ -124,23 +131,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: QueryBuilder is an interpreter for the "pseudo sql" language.