taps 0.2.8 → 0.2.9

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 8
+:patch: 9
 :major: 0
 :minor: 2

data/lib/taps/client_session.rb

@@ -41,7 +41,7 @@ class ClientSession
 	end
 
 	def open_session
-		uri = server['sessions'].post('', :taps_version => Taps.version)
+		uri = server['sessions'].post('', http_headers)
 		server[uri]
 	end
 
@@ -50,7 +50,7 @@ class ClientSession
 	end
 
 	def close_session
-		@session_resource.delete(:taps_version => Taps.version) if @session_resource
+		@session_resource.delete(http_headers) if @session_resource
 	end
 
 	def safe_url(url)
@@ -65,6 +65,10 @@ class ClientSession
 		safe_url(database_url)
 	end
 
+	def http_headers(extra = {})
+		{ :taps_version => Taps.compatible_version }.merge(extra)
+	end
+
 	def cmd_send
 		verify_server
 		cmd_send_schema
@@ -77,20 +81,20 @@ class ClientSession
 		puts "Sending indexes"
 
 		index_data = `#{File.dirname(__FILE__)}/../../bin/schema indexes #{database_url}`
-		session_resource['indexes'].post(index_data, :taps_version => Taps.version)
+		session_resource['indexes'].post(index_data, http_headers)
 	end
 
 	def cmd_send_schema
 		puts "Sending schema"
 
 		schema_data = `#{File.dirname(__FILE__)}/../../bin/schema dump #{database_url}`
-		session_resource['schema'].post(schema_data, :taps_version => Taps.version)
+		session_resource['schema'].post(schema_data, http_headers)
 	end
 
 	def cmd_send_reset_sequences
 		puts "Resetting sequences"
 
-		session_resource["reset_sequences"].post('', :taps_version => Taps.version)
+		session_resource["reset_sequences"].post('', http_headers)
 	end
 
 	def cmd_send_data
@@ -119,10 +123,9 @@ class ClientSession
 
 				chunksize = Taps::Utils.calculate_chunksize(chunksize) do
 					begin
-						session_resource["tables/#{table_name}"].post(gzip_data,
-							:taps_version => Taps.version,
+						session_resource["tables/#{table_name}"].post(gzip_data, http_headers({
 							:content_type => 'application/octet-stream',
-							:taps_checksum => Taps::Utils.checksum(gzip_data).to_s)
+							:taps_checksum => Taps::Utils.checksum(gzip_data).to_s}))
 					rescue RestClient::RequestFailed => e
 						# retry the same data, it got corrupted somehow.
 						if e.http_code == 412
@@ -146,6 +149,7 @@ class ClientSession
 		tables_with_counts = tables.inject({}) do |accum, table|
 			accum[table] = db[table].count
 			record_count += accum[table]
+			accum
 		end
 
 		[ tables_with_counts, record_count ]
@@ -196,7 +200,7 @@ class ClientSession
 	def fetch_table_rows(table_name, chunksize, offset)
 		response = nil
 		chunksize = Taps::Utils.calculate_chunksize(chunksize) do
-			response = session_resource["tables/#{table_name}/#{chunksize}?offset=#{offset}"].get(:taps_version => Taps.version)
+			response = session_resource["tables/#{table_name}/#{chunksize}?offset=#{offset}"].get(http_headers)
 		end
 		raise CorruptedData unless Taps::Utils.valid_data?(response.to_s, response.headers[:taps_checksum])
 
@@ -214,7 +218,7 @@ class ClientSession
 		retries = 0
 		max_retries = 1
 		begin
-			tables_with_counts = Marshal.load(session_resource['tables'].get(:taps_version => Taps.version))
+			tables_with_counts = Marshal.load(session_resource['tables'].get(http_headers))
 			record_count = tables_with_counts.values.inject(0) { |a,c| a += c }
 		rescue RestClient::Exception
 			retries += 1
@@ -229,7 +233,7 @@ class ClientSession
 	def cmd_receive_schema
 		puts "Receiving schema"
 
-		schema_data = session_resource['schema'].get(:taps_version => Taps.version)
+		schema_data = session_resource['schema'].get(http_headers)
 		output = Taps::Utils.load_schema(database_url, schema_data)
 		puts output if output
 	end
@@ -237,7 +241,7 @@ class ClientSession
 	def cmd_receive_indexes
 		puts "Receiving indexes"
 
-		index_data = session_resource['indexes'].get(:taps_version => Taps.version)
+		index_data = session_resource['indexes'].get(http_headers)
 
 		output = Taps::Utils.load_indexes(database_url, index_data)
 		puts output if output
@@ -256,10 +260,10 @@ class ClientSession
 
 	def verify_server
 		begin
-			server['/'].get(:taps_version => Taps.version)
+			server['/'].get(http_headers)
 		rescue RestClient::RequestFailed => e
 			if e.http_code == 417
-				puts "#{remote_url} is running a different version of taps."
+				puts "#{safe_remote_url} is running a different minor version of taps."
 				puts "#{e.response.body}"
 				exit(1)
 			else

data/lib/taps/config.rb

@@ -10,6 +10,10 @@ module Taps
 		"#{version_yml[:major]}.#{version_yml[:minor]}.#{version_yml[:patch]}"
 	end
 
+	def self.compatible_version
+		"#{version_yml[:major]}.#{version_yml[:minor]}"
+	end
+
 	class Config
 		class << self
 			attr_accessor :taps_database_url

data/lib/taps/server.rb

@@ -14,8 +14,9 @@ class Server < Sinatra::Default
 	end
 
 	before do
-		unless request.env['HTTP_TAPS_VERSION'] == Taps.version
-			halt 417, "Taps version #{Taps.version} is required for this server"
+		major, minor, patch = request.env['HTTP_TAPS_VERSION'].split('.') rescue []
+		unless "#{major}.#{minor}" == Taps.compatible_version
+			halt 417, "Taps v#{Taps.compatible_version}.x is required for this server"
 		end
 	end
 

data/spec/client_session_spec.rb

@@ -37,7 +37,7 @@ describe Taps::ClientSession do
 		@client.stubs(:server).returns(mock('server'))
 		@request = mock('request')
 		@client.server.expects(:[]).with('/').returns(@request)
-		@request.expects(:get).with({:taps_version => Taps.version})
+		@request.expects(:get).with({:taps_version => Taps.compatible_version})
 
 		lambda { @client.verify_server }.should.not.raise
 	end
@@ -62,7 +62,7 @@ describe Taps::ClientSession do
 	it "fetches remote tables info from taps server" do
 		@marshal_data = Marshal.dump({ :mytable => 2 })
 		@client.session_resource.stubs(:[]).with('tables').returns(mock('tables'))
-		@client.session_resource['tables'].stubs(:get).with(:taps_version => Taps.version).returns(@marshal_data)
+		@client.session_resource['tables'].stubs(:get).with(:taps_version => Taps.compatible_version).returns(@marshal_data)
 		@client.fetch_remote_tables_info.should == [ { :mytable => 2 }, 2 ]
 	end
 
@@ -73,7 +73,7 @@ describe Taps::ClientSession do
 
 		@response = mock('response')
 		@client.session_resource.stubs(:[]).with('tables/mytable/1000?offset=0').returns(mock('table resource'))
-		@client.session_resource['tables/mytable/1000?offset=0'].expects(:get).with(:taps_version => Taps.version).returns(@response)
+		@client.session_resource['tables/mytable/1000?offset=0'].expects(:get).with(:taps_version => Taps.compatible_version).returns(@response)
 		@response.stubs(:to_s).returns(@gzip_data)
 		@response.stubs(:headers).returns({ :taps_checksum => Taps::Utils.checksum(@gzip_data) })
 		@client.fetch_table_rows('mytable', 1000, 0).should == [ 1000, { :header => [:x, :y], :data => [[1, 2], [3, 4]] } ]

data/spec/server_spec.rb

@@ -21,7 +21,7 @@ describe Taps::Server do
 	end
 
 	it "verifies the client taps version" do
-		get('/', { }, { 'HTTP_AUTHORIZATION' => @auth_header, 'HTTP_TAPS_VERSION' => Taps.version })
+		get('/', { }, { 'HTTP_AUTHORIZATION' => @auth_header, 'HTTP_TAPS_VERSION' => Taps.compatible_version })
 		status.should == 200
 	end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: taps
 version: !ruby/object:Gem::Version 
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors: 
 - Ricardo Chimal, Jr.
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-16 00:00:00 -07:00
+date: 2009-03-18 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -84,21 +84,21 @@ extra_rdoc_files: []
 
 files: 
 - spec/base.rb
+- spec/schema_spec.rb
 - spec/utils_spec.rb
-- spec/server_spec.rb
 - spec/client_session_spec.rb
-- spec/schema_spec.rb
+- spec/server_spec.rb
 - lib/taps/db_session.rb
 - lib/taps/progress_bar.rb
-- lib/taps/server.rb
 - lib/taps/cli.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/client_session.rb
+- lib/taps/server.rb
 - lib/taps/utils.rb
-- lib/taps/config.rb
 - README.rdoc
 - LICENSE
 - VERSION.yml