about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2011-11-05 01:59:27 +0000
committerEric Wong <normalperson@yhbt.net>2011-11-05 01:59:27 +0000
commitd6b2624ed1f4502d499dad93ee44a716b5c56f08 (patch)
treefda544feac7b7188809baa5f08145ed4ae63a25e
parent37c6ee5d64d2cbdc739b4f4afcf55b3762234392 (diff)
downloadmogilefs-client-d6b2624ed1f4502d499dad93ee44a716b5c56f08.tar.gz
rename httpfile => http_file
Should be easier to read this way
-rw-r--r--Manifest.txt2
-rw-r--r--lib/mogilefs.rb2
-rw-r--r--lib/mogilefs/http_file.rb (renamed from lib/mogilefs/httpfile.rb)0
-rw-r--r--lib/mogilefs/mogilefs.rb10
4 files changed, 7 insertions, 7 deletions
diff --git a/Manifest.txt b/Manifest.txt
index 2426585..2413ce7 100644
--- a/Manifest.txt
+++ b/Manifest.txt
@@ -11,7 +11,7 @@ lib/mogilefs/admin.rb
 lib/mogilefs/backend.rb
 lib/mogilefs/bigfile.rb
 lib/mogilefs/client.rb
-lib/mogilefs/httpfile.rb
+lib/mogilefs/http_file.rb
 lib/mogilefs/mogilefs.rb
 lib/mogilefs/mysql.rb
 lib/mogilefs/pool.rb
diff --git a/lib/mogilefs.rb b/lib/mogilefs.rb
index 02075bb..00f3ab7 100644
--- a/lib/mogilefs.rb
+++ b/lib/mogilefs.rb
@@ -33,7 +33,7 @@ module MogileFS
 end
 
 require 'mogilefs/backend'
-require 'mogilefs/httpfile'
+require 'mogilefs/http_file'
 require 'mogilefs/client'
 require 'mogilefs/bigfile'
 require 'mogilefs/mogilefs'
diff --git a/lib/mogilefs/httpfile.rb b/lib/mogilefs/http_file.rb
index 22692e7..22692e7 100644
--- a/lib/mogilefs/httpfile.rb
+++ b/lib/mogilefs/http_file.rb
diff --git a/lib/mogilefs/mogilefs.rb b/lib/mogilefs/mogilefs.rb
index 267c896..d17d6ec 100644
--- a/lib/mogilefs/mogilefs.rb
+++ b/lib/mogilefs/mogilefs.rb
@@ -111,14 +111,14 @@ class MogileFS::MogileFS < MogileFS::Client
     when nil, '' then
       raise MogileFS::EmptyPathError
     when /^http:\/\// then
-      httpfile = MogileFS::HTTPFile.new(dests, bytes)
-      yield httpfile
-      rv = httpfile.commit
+      http_file = MogileFS::HTTPFile.new(dests, bytes)
+      yield http_file
+      rv = http_file.commit
       @backend.create_close(:fid => res['fid'],
-                            :devid => httpfile.devid,
+                            :devid => http_file.devid,
                             :domain => @domain,
                             :key => key,
-                            :path => httpfile.uri.to_s,
+                            :path => http_file.uri.to_s,
                             :size => rv)
       rv
     else