sequel_plus 0.2.0 → 0.3.0

data/README.md

@@ -1,9 +1,8 @@
 # sequel_plus
 
-This library starts the collection of plugins and extensions I have assembled for the Ruby Sequel library.  
-The library is in very early infancy stage, so there's not much presently, but what's here is fully covered
-in specs and tested and used in production-level deployments already.
-  
+This library contains a growing collection of plugins and extensions I have assembled for the Ruby Sequel library.  
+The library is in its infancy stage with new things being added and updated semi-frequently.  Even so, 
+what's here is fully covered in specs and tested and used in production-level deployments already.
 
 ### Currently, sequel_plus contains:
 * plugin for Trees to mimic the Rails acts_as_tree plugin.
@@ -47,12 +46,15 @@ This gem is released to gemcutter.  Rubyforge is not utilized.
     # Specific rows and columns
     File.open("nodes.txt", "w"){|file| DB[:nodes].filter(:id < 5).select(:id, :name).export(file)}
 
+	# Using pagination extension (for very large datasets)
+    File.open("nodes.txt", "w"){|file| DB[:nodes].export(file, :paginate => true, :page_size => 1000)}
+	
 ## Use Rake Tasks
 
-Several rake tasks are made available simply by including the "tasks/sequel" per below: 
+Several rake tasks are made available simply by requiring "tasks/sequel" in your Rakefile 
+(or loaded rake scripts) per below: 
 
 	require 'sequel'
-	require 'sequel_plus'
 	require 'tasks/sequel'
 
 	task :environment do
@@ -68,26 +70,34 @@ Several rake tasks are made available simply by including the "tasks/sequel" per
 
 Example tasks that are available:
 
-* rake db:desc[table]              # Displays schema of table
-* rake db:fields[table]            # Displays simple list of fields of table in sorted order
-* rake db:migrate                  # Migrate the database through scripts in db/migrate and update db/schema.rb by in...
-* rake db:migrate:down[step]       # Reverts to previous schema version.
-* rake db:migrate:new[table,verb]  # Creates a new migrate script.
-* rake db:migrate:redo             # Rollbacks the database one migration and re-migrates up.
-* rake db:migrate:up[version]      # Runs the "up" for a given migration VERSION.
-* rake db:reset                    # Drops all tables and recreates the schema from db/schema.rb
-* rake db:rollback                 # Rolls the schema back to the previous version.
-* rake db:schema:drop              # drops the schema, using schema.rb
-* rake db:schema:dump              # Dumps the schema to db/schema.db
-* rake db:schema:load              # loads the schema from db/schema.rb
-* rake db:schema:version           # Returns current schema version
-* rake db:show[table]              # Displays content of table or lists all tables
-* rake db:tables                   # Displays a list of tables in the database
-
-These tasks will expect migrations to be in db/migration that is based off the folder your Rakefile resides in.  If you wish to change the location of the "db" folder, simply declare :environment task and set APP_ROOT folder to be something other than the folder the Rakefile is residing in.
+* rake sq:desc[table]              # Displays schema of table
+* rake sq:fields[table]            # Displays simple list of fields of table in sorted order
+* rake sq:migrate                  # Migrate the database through scripts in db/migrate and update db/schema.rb by in...
+* rake sq:migrate:down[step]       # Reverts to previous schema version.
+* rake sq:migrate:new[table,verb]  # Creates a new migrate script.
+* rake sq:migrate:redo             # Rollbacks the database one migration and re-migrates up.
+* rake sq:migrate:up[version]      # Runs the "up" for a given migration VERSION.
+* rake sq:reset                    # Drops all tables and recreates the schema from db/schema.rb
+* rake sq:rollback                 # Rolls the schema back to the previous version.
+* rake sq:schema:drop              # drops the schema, using schema.rb
+* rake sq:schema:dump              # Dumps the schema to db/schema.db
+* rake sq:schema:load              # loads the schema from db/schema.rb
+* rake sq:schema:version           # Returns current schema version
+* rake sq:show[table]              # Displays content of table or lists all tables
+* rake sq:tables                   # Displays a list of tables in the database
+
+These tasks will expect migrations to be in db/migration that is based off the folder your Rakefile resides in.  If you wish to change the location of the "db" folder, simply declare :environment task and set SEQUEL_PLUS_APP_ROOT constant to be something other than the folder the Rakefile is residing in.
+
+The rake tasks were constructed to fairly independent of the project environment they're injected into.  To avoid name space collision, 
+the "db" namespace has been deprecated and the "sq" namespace adopted as of 0.2.0.
 
 # Note on Patches/Pull Requests
  
+0.2.0
+* top-level namespace changed from "db" to "sq"
+* designed and tested to work seamlessly with Padrino and Ramaze projects
+	
+0.1.5
 * This release adds rake tasks
 * last release adds an export facility to the Sequel::Dataset
 

data/lib/extensions/export.rb

@@ -13,9 +13,14 @@
 module Sequel
   class Dataset
     def export(fd = $stdout, options = {})
+
       opts[:delimiter]  = options[:delimiter] || "\t"
       opts[:quote_char] = options[:quote_char] || ''
       opts[:headers]    = options[:headers] != false
+      opts[:paginate]   = options[:paginate] || false
+      opts[:page_size]  = options[:page_size] || 5000
+      
+      Sequel.extension :pagination if opts[:paginate]
 
       Sequel::Export::Writer.new(fd, self, opts).output
     end
@@ -29,25 +34,18 @@ module Sequel
         @dataset = dataset
         @options = options
       end
-    
-      def output 
-        first_row = @dataset.first
-        return unless first_row
-        
-        quot = @options[:quote_char]
-        @columns ||= first_row.keys.sort_by{|x|x.to_s}
 
-        if @options[:headers] == true
-          @file.puts @columns.map{|col| "#{quot}#{col}#{quot}"}.join(@options[:delimiter])
-        end
-        
-        @dataset.each do |row| 
+      def export_data(ds)
+        quot = @options[:quote_char]
+        ds.each do |row| 
           data = @columns.map do |col|
             case row[col]
             when Date then 
               "#{quot}#{row[col].strftime('%Y-%m-%d')}#{quot}"
-            when DateTime, Time then 
+            when DateTime then
               "#{quot}#{row[col].localtime.strftime('%Y-%m-%dT%H:%M%Z')}#{quot}"
+            when Time then 
+              "#{quot}#{row[col].localtime.strftime('%H:%M%Z')}#{quot}"
             when Float, BigDecimal then 
               row[col].to_f
             when BigDecimal, Bignum, Fixnum then 
@@ -59,6 +57,24 @@ module Sequel
           @file.puts data.join(@options[:delimiter])
         end
       end
+      
+      def output 
+        first_row = @dataset.first
+        return unless first_row
+        
+        quot = @options[:quote_char]
+        @columns ||= first_row.keys.sort_by{|x|x.to_s}
+
+        if @options[:headers] == true
+          @file.puts @columns.map{|col| "#{quot}#{col}#{quot}"}.join(@options[:delimiter])
+        end
+
+        if @options[:paginate]
+          @dataset.each_page(@options[:page_size]){|paged_ds| export_data paged_ds}
+        else
+          export_data @dataset
+        end
+      end
 
       def build_row(row) 
         quot = @options[:quote_char] 

data/lib/sequel_tree.rb

@@ -60,8 +60,8 @@ module Sequel
         #
         #   subchild1.ancestors # => [child1, root]
         def descendants
-          nodes = self.children
-          nodes.each{|child| nodes + child.descendants}
+          nodes = self.children.dup
+          nodes.each{|child| nodes.concat(child.descendants)}
           nodes 
         end
 

data/lib/tasks/{databases.rake → sequel.rake}

@@ -40,16 +40,22 @@ namespace :sq do
 
   desc "Displays schema of table"
   task :desc, [:table] => :load_config do |t, args|
-    def o(value, size = 25)
-      "%#{-1*size}s" % value.to_s
-    end
     unless args[:table]
       Rake::Task["sq:tables"].invoke
     else
       puts '==[' << args.table << ']' << '=' * (80 - args.table.size - 4)
       DB.schema(args.table.to_sym).each_with_index do |col, i|
-       name, info = col
-       puts "#{o i+1, -3}: #{o name}:#{o info[:type], 15}:#{o info[:db_type], 15}:#{' not null ' unless info[:allow_null]} #{' pk ' if info[:primary_key]} #{' default: ' << info[:default].to_s if info[:default]}"
+        name, info = col
+        values = [
+          "%3s:" % (i + 1),
+          (" %-12s:" % "#{info[:db_type]}#{('(' + info[:max_chars].to_s + ')') if info[:max_chars]}"),
+          ("%15s:" % info[:type]),
+          "%-25s: " % name,
+          (' not null ' unless info[:allow_null]),
+          (' pk ' if info[:primary_key]),
+          (" default: %s" % info[:default] if info[:default]),
+          ]
+        puts values.join
       end
       puts '-' * 80
       indexes = DB.indexes(args.table.to_sym)
@@ -58,7 +64,7 @@ namespace :sq do
       else
         indexes.each_with_index do |idx, i|
           name, attrs = idx
-          puts '  ' << o(name, 28) << ": unique? " << o(attrs[:unique] ? 'yes' : 'no', 6) << ': ' << attrs[:columns].join(', ')
+          puts '  ' << "%-28s" % name << ": unique? " << "%-6s" % (attrs[:unique] ? 'yes' : 'no') << ': ' << attrs[:columns].join(', ')
         end
       end
       puts '=' * 80

data/test/test_export.rb

@@ -116,6 +116,27 @@ id	name	parent_id	position
 9,"five","",5
 10,"four","",4
 11,"five.one",9,1
+12,"two.three",2,3
+      TEXT
+    end
+
+    it "should export paginated data with comma delimiter" do 
+      mem_stream = StringIO.new("", "w+")
+      DB[:nodes].export(mem_stream, :quote_char => '"', :delimiter => ',', :paginate => true, :page_size => 2)
+      mem_stream.pos = 0
+      mem_stream.read.should == <<-TEXT
+"id","name","parent_id","position"
+1,"one","",1
+2,"two","",2
+3,"three","",3
+4,"two.one",2,1
+5,"two.two",2,2
+6,"two.two.one",5,1
+7,"one.two",1,2
+8,"one.one",1,1
+9,"five","",5
+10,"four","",4
+11,"five.one",9,1
 12,"two.three",2,3
       TEXT
     end

data/test/test_sequel_tree.rb

@@ -71,7 +71,7 @@ module SequelTreeTest
     it "should find all descendants of a node" do 
       two = Node.find(:id => 2)
       two.name.should == "two"
-      two.descendants.map{|m| m[:id]}.should == [4, 5, 12]
+      two.descendants.map{|m| m[:id]}.should == [4, 5, 12, 6]
     end
   
     it "should find all ancestors of a node" do 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Michael Lang
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-04 00:00:00 -04:00
+date: 2010-12-21 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -61,7 +61,7 @@ files:
 - lib/extensions/export.rb
 - lib/sequel_plus.rb
 - lib/sequel_tree.rb
-- lib/tasks/databases.rake
+- lib/tasks/sequel.rake
 - lib/tasks/sequel.rb
 - test/helper.rb
 - test/test_export.rb