taps 0.2.11 → 0.2.12

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 11
+:patch: 12
 :major: 0
 :minor: 2

data/lib/taps/client_session.rb

@@ -118,8 +118,8 @@ class ClientSession
 		db.tables.each do |table_name|
 			table = db[table_name]
 			count = table.count
-			columns = table.columns
-			order = columns.include?(:id) ? :id : columns.first
+			primary_key = db.primary_key(table_name.to_sym)
+			order = primary_key ? [primary_key.to_sym] : table.columns
 			chunksize = self.default_chunksize
 
 			progress = ProgressBar.new(table_name.to_s, count)
@@ -128,7 +128,7 @@ class ClientSession
 			loop do
 				row_size = 0
 				chunksize = Taps::Utils.calculate_chunksize(chunksize) do |c|
-					rows = Taps::Utils.format_data(table.order(order).limit(c, offset).all)
+					rows = Taps::Utils.format_data(table.order(*order).limit(c, offset).all)
 					break if rows == { }
 
 					row_size = rows[:data].size

data/lib/taps/db_session.rb

@@ -1,3 +1,5 @@
+require 'thread'
+
 Sequel::Model.db = Sequel.connect(Taps::Config.taps_database_url)
 
 class DbSession < Sequel::Model
@@ -9,17 +11,51 @@ class DbSession < Sequel::Model
 		timestamp :last_access
 	end
 
+	@@connections = {}
+	@@mutex = Mutex.new
+
 	def connection
-		@@connections ||= {}
-		@@connections[key] ||= Sequel.connect(database_url)
+		@@mutex.synchronize {
+			conn =
+				if @@connections.key?(key)
+					@@connections[key].first
+				else
+					Sequel.connect(database_url)
+				end
+			@@connections[key] = [conn, Time.now]
+			return conn
+		}
 	end
 
 	def disconnect
-		if defined? @@connections and @@connections[key]
-			@@connections[key].disconnect
-			@@connections.delete key
-		end
+		@@mutex.synchronize {
+			if @@connections.key?(key)
+				conn, time = @@connections.delete(key)
+				conn.disconnect
+			end
+		}
 	end
+
+	# Removes connections that have not been accessed within the
+	# past thirty seconds.
+	def self.cleanup
+		@@mutex.synchronize {
+			now = Time.now
+			@@connections.each do |key, (conn, time)|
+				if now - time > 30
+					@@connections.delete(key)
+					conn.disconnect
+				end
+			end
+		}
+	end
+
+	Thread.new {
+		while true
+			sleep 30
+			cleanup
+		end
+	}.run
 end
 
 DbSession.create_table! unless DbSession.table_exists?

data/lib/taps/server.rb

@@ -117,9 +117,9 @@ class Server < Sinatra::Default
 
 		db = session.connection
 		table = db[params[:table].to_sym]
-		columns = table.columns
-		order = columns.include?(:id) ? :id : columns.first
-		raw_data = Marshal.dump(Taps::Utils.format_data(table.order(order).limit(chunk, offset).all))
+		primary_key = db.primary_key(params[:table].to_sym)
+		order = primary_key ? [primary_key.to_sym] : table.columns
+		raw_data = Marshal.dump(Taps::Utils.format_data(table.order(*order).limit(chunk, offset).all))
 		gzip_data = Taps::Utils.gzip(raw_data)
 		response['Taps-Checksum'] = Taps::Utils.checksum(gzip_data).to_s
 		response['Content-Type'] = "application/octet-stream"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: taps
 version: !ruby/object:Gem::Version 
-  version: 0.2.11
+  version: 0.2.12
 platform: ruby
 authors: 
 - Ricardo Chimal, Jr.
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-23 00:00:00 -07:00
+date: 2009-03-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -88,17 +88,17 @@ files:
 - spec/server_spec.rb
 - spec/client_session_spec.rb
 - spec/utils_spec.rb
-- lib/taps/db_session.rb
 - lib/taps/progress_bar.rb
 - lib/taps/client_session.rb
+- lib/taps/server.rb
+- lib/taps/utils.rb
 - lib/taps/adapter_hacks.rb
 - lib/taps/adapter_hacks/invalid_text_limit.rb
 - lib/taps/adapter_hacks/non_rails_schema_dump.rb
 - lib/taps/schema.rb
 - lib/taps/config.rb
 - lib/taps/cli.rb
-- lib/taps/server.rb
-- lib/taps/utils.rb
+- lib/taps/db_session.rb
 - README.rdoc
 - LICENSE
 - VERSION.yml