yql-query 1.0.1 → 1.1.0

data/Readme.md

@@ -74,6 +74,7 @@ The full list of methods available:
     truncate(10)
     unique('format')
     sanitize('description')
+    remote(10, 30) # remote limits and offsets
 
 Refer to the [documentation](http://rdoc.info/gems/yql-query) for complete usage and more examples.
 

data/lib/yql_query/builder.rb

@@ -9,17 +9,19 @@ module YqlQuery
     # @param
     def initialize(options={})
       self.query = Query.new
-      self.query.table      = options.delete(:table)
-      self.query.limit      = options.delete(:limit)
-      self.query.offset     = options.delete(:offset)
-      self.query.select     = options.delete(:select)
-      self.query.conditions = options.delete(:conditions) || []
-      self.query.uses       = options.delete(:uses) || []
-      self.query.tail       = options.delete(:tail)
-      self.query.truncate   = options.delete(:truncate)
-      self.query.reverse    = options.delete(:reverse)
-      self.query.unique     = options.delete(:unique)
-      self.query.sanitize   = options.delete(:sanitize)
+      self.query.table          = options.delete(:table)
+      self.query.limit          = options.delete(:limit)
+      self.query.offset         = options.delete(:offset)
+      self.query.select         = options.delete(:select)
+      self.query.conditions     = options.delete(:conditions) || []
+      self.query.uses           = options.delete(:uses) || []
+      self.query.tail           = options.delete(:tail)
+      self.query.truncate       = options.delete(:truncate)
+      self.query.reverse        = options.delete(:reverse)
+      self.query.unique         = options.delete(:unique)
+      self.query.sanitize       = options.delete(:sanitize)
+      self.query.remote_limit   = options.delete(:remote_limit)
+      self.query.remote_offset  = options.delete(:remote_offset)
     end
 
     # Assigns the table for the query being constructed
@@ -57,6 +59,21 @@ module YqlQuery
       self
     end
 
+    # Assigns the remote limit for the query being constructed
+    #
+    # @param [Object] remote_limit The remote limit for the query.
+    # @param [optional, Object] remote_offset The remote offset for the query
+    # @return [YqlQuery::Builder] YqlQuery::Builder instance reflecting the remote limit assigned.
+    #
+    # @example The remote limit may be passed as either a string or fixnum:
+    #   base = Builder.new.remote_limit(5)
+    #   base = Builder.new.remote_limit('5')
+    def remote(remote_limit, remote_offset=0)
+      self.query.remote_limit = remote_limit
+      self.query.remote_offset = remote_offset
+      self
+    end
+
     # Assigns the columns to select for the query being constructed
     #
     # @param [Object] select The select arguments for the query.

data/lib/yql_query/query.rb

@@ -4,7 +4,7 @@ module YqlQuery
   class Query
     attr_accessor :table, :limit, :offset, :select, :uses, :conditions
     attr_accessor :sort, :tail, :truncate, :reverse, :unique, :sanitize
-    attr_accessor :sort_descending
+    attr_accessor :sort_descending, :remote_limit, :remote_offset
 
     def initialize
       self.conditions = []
@@ -33,6 +33,13 @@ module YqlQuery
         end
         stmt << " from "
         stmt << @table if @table
+        if @remote_offset && @remote_limit
+          stmt << '('
+          if @remote_offset.to_i > 0
+            stmt << "#{@remote_offset},"
+          end
+          stmt << "#{@remote_limit})"
+        end
         stmt
       end
 

data/lib/yql_query/version.rb

@@ -1,4 +1,4 @@
 module YqlQuery
   # The version of the gem
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

data/spec/yql_query_builder_spec.rb

@@ -38,6 +38,23 @@ describe YqlQuery::Builder do
     end
   end
 
+  describe "#remote()" do
+    it "should set the limit" do
+      @builder.remote(5)
+      @builder.query.remote_limit.should == 5
+    end
+
+    it "should set the limit and offset" do
+      @builder.remote(5, 10)
+      @builder.query.remote_limit.should == 5
+      @builder.query.remote_offset.should == 10
+    end
+
+    it "should return the builder" do
+      @builder.remote(5).should be_kind_of(YqlQuery::Builder)
+    end
+  end
+
   describe "#select()" do
     it "should set the select" do
       @builder.select('name')
@@ -276,6 +293,16 @@ describe YqlQuery::Builder do
       @builder.to_s.should == "select * from music.artists where name = 'John' offset 15"
     end
 
+    it "should generate the right query when given a remote limit and offset" do
+      @builder.conditions("name = 'John'").remote(5)
+      @builder.to_s.should == "select * from music.artists(5) where name = 'John'"
+    end
+
+    it "should generate the right query when given a remote limit" do
+      @builder.conditions("name = 'John'").remote(5,15)
+      @builder.to_s.should == "select * from music.artists(15,5) where name = 'John'"
+    end
+
     it "should generate the right query when given a select" do
       @builder.conditions("name = 'John'").select('Title, First Name, Email')
       @builder.to_s.should == "select Title, First Name, Email from music.artists where name = 'John'"

metadata

@@ -2,7 +2,7 @@
 name: yql-query
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors: 
 - Steve Agalloco
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-22 00:00:00 -05:00
+date: 2011-02-27 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency