fog-external 0.0.1 → 0.0.2

data/.gitignore

@@ -2,4 +2,3 @@
 .bundle
 Gemfile.lock
 pkg/*
-examples/ernie.pid

data/examples/ernie.conf

@@ -1,4 +1,4 @@
 [{module, fog},
  {type, external},
- {command, "ruby examples/fog.rb"},
+ {command, "sh examples/handler.sh"},
  {count, 1}].

data/examples/example.rb

@@ -1,11 +1,13 @@
+# WARNING: Running this file will access /tmp/ernie.pid, /tmp/ernie.log and /tmp/fog-bertrpc-handler.
+# Make sure you are not using any of these paths.
 require 'rubygems'
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'fog/external/storage'
-require "bertrpc"
+require 'fog/external/backend/bertrpc'
 
-ROOT = '/tmp/fog-external-example-root'
 Dir.chdir File.join(File.dirname(__FILE__), '..')
 
+ROOT = '/tmp/fog-bertrpc-handler'
 Dir.mkdir(ROOT) unless File.exists?(ROOT)
 
 def run(cmd)
@@ -14,23 +16,50 @@ def run(cmd)
 end
 
 puts "Starting ernie on localhost:8000"
-run "ernie -d -c examples/ernie.conf -P examples/ernie.pid -a /tmp/ernie.log"
+run "ernie -d -c examples/ernie.conf -P /tmp/ernie.pid -a /tmp/ernie.log"
 
 puts "Ernie running."
 
+begin
+
 storage = Fog::Storage.new({
   :provider   => 'External',
-  :delegate   => BERTRPC::Service.new('localhost', 8000).call.fog
+  :delegate   => Fog::External::Backend::Bertrpc.new('localhost', 8000)
 })
 
 puts "Known directories: "
 puts storage.directories.all.inspect
 
-puts "Creating directory mydir/ ..."
-puts storage.directories.create(key: 'mydir').save
+print "Creating directory mydir/ ..."
+dir = storage.directories.new(key: 'mydir')
+puts dir.save
+
+puts "Known directories: "
+puts storage.directories.all.inspect
+
+print "Creating mydir/test.txt with content 'ohai' ..."
+f = dir.files.new(key: 'test.txt')
+f.body = 'ohai'
+if f.save
+  puts "done."
+else
+  puts "error."
+end
+
+print "Contents of mydir/test.txt: "
+f = storage.directories.get('/').files.get('mydir/test.txt')
+puts f.body
+
+puts "Destroying mydir/test.txt"
+f.destroy
+
+puts "Destroying mydir/"
+dir.destroy
 
 puts "Known directories: "
 puts storage.directories.all.inspect
 
-puts "Stopping ernie on localhost:8000"
-run "kill `cat examples/ernie.pid`"
+ensure
+  puts "Stopping ernie on localhost:8000"
+  run "kill `cat /tmp/ernie.pid`"
+end

data/examples/handler.sh

@@ -0,0 +1,2 @@
+#!sh
+exec ruby -Ilib -rfog/external/backend/local -e 'Fog::External::Backend::Local.act_as_ernie_handler!'

data/fog-external.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fog-external"
-  s.version     = "0.0.1"
+  s.version     = "0.0.2"
   s.authors     = ["Jonas Schneider"]
   s.email       = ["mail@jonasschneider.com"]
   s.homepage    = ""

data/lib/fog/external/backend/bertrpc.rb

@@ -0,0 +1,36 @@
+require "bertrpc"
+
+module Fog
+  module External
+    module Backend
+      
+      class Bertrpc
+        def initialize(host, port)
+          @service = BERTRPC::Service.new(host, port)
+          @module = @service.call.fog
+        end
+        
+        METHODS = %w(create_directory list_directories get_directory destroy_directory list_files head_file get_file destroy_file save_file)
+        
+        METHODS.each do |m|
+          define_method m do |*args|
+            @module.send m, *args
+          end
+        end
+      
+        def get_file(key)
+          res = @module.get_file(key)
+          res[:body] = Base64.decode64(res[:body])
+          res
+        end
+        
+        def save_file(key, body)
+          body = Base64.encode64(body)
+          @module.save_file(key, body)
+        end
+      end
+      
+    end
+  end
+end
+      

data/lib/fog/external/backend/local.rb

@@ -0,0 +1,137 @@
+require "fileutils"
+
+module Fog
+  module External
+    module Backend
+      
+      class Local
+        def self.act_as_ernie_handler!(root = '/tmp/fog-bertrpc-handler')
+          require 'ernie'
+          instance = self.new(root)
+          
+          mod = Module.new do
+            instance.methods.each do |m|
+              define_method m do |*args|
+                instance.send m, *args
+              end
+            end
+          end
+          
+          Ernie.expose(:fog, mod)
+        end
+        
+        def initialize(root)
+          @root = root
+        end
+        
+        def create_directory(key)
+          if ::File.directory?(path_to(key))
+            false
+          else
+            Dir.mkdir path_to(key)
+          end
+        end
+        
+        def list_directories
+          data = Dir.entries(@root).select do |entry|
+            entry[0...1] != '.' && ::File.directory?(path_to(entry))
+          end.map do |entry|
+            {:key => entry}
+          end
+        end
+        
+        def get_directory(key)
+          if ::File.directory?(path_to(key))
+            { key: key }
+          else
+            nil
+          end
+        end
+        
+        def destroy_directory(key)
+          if ::File.directory?(path_to(key))
+            Dir.rmdir(path_to(key))
+            true
+          else
+            false
+          end
+        end
+        
+        
+        def list_files(dir_key)
+          data = nil
+          Dir.chdir(path_to(dir_key)) do
+            data = Dir.glob('**/*').reject do |file|
+              ::File.directory?(file)
+            end.map do |key|
+              path = path_to(key)
+              {
+                :content_length => ::File.size(path),
+                :key            => key,
+                :last_modified  => ::File.mtime(path)
+              }
+            end
+          end
+          data
+        end
+        
+        def head_file(key)
+          path = path_to(key)
+          if ::File.exists?(path)
+            {
+              :content_length => ::File.size(path),
+              :key            => key,
+              :last_modified  => ::File.mtime(path)
+            }
+          else
+            nil
+          end
+        end
+        
+        def get_file(key)
+          path = path_to(key)
+          if ::File.exists?(path)
+            {
+              :content_length => ::File.size(path),
+              :key            => key,
+              :last_modified  => ::File.mtime(path),
+              :body           => ::File.read(path)
+            }
+          else
+            nil
+          end
+        end
+        
+        def destroy_file(key)
+          path = path_to(key)
+          
+          if ::File.exists?(path)
+            ::File.delete(path)
+            true
+          else
+            false
+          end
+        end
+        
+        def save_file(key, body)
+          path = path_to(key)
+          
+          ::FileUtils.mkdir_p(File.dirname(path))
+          
+          file = ::File.new(path, 'wb')
+          file.write(body)
+          file.close
+          
+          ::File.mtime(path)
+        end
+        
+        private
+        
+        def path_to(entry)
+          ::File.join(@root, entry)
+        end
+      end
+      
+    end
+  end
+end

data/lib/fog/external/models/storage/file.rb

@@ -1,4 +1,5 @@
 require 'fog/core/model'
+require "base64"
 
 module Fog
   module Storage
@@ -55,8 +56,8 @@ module Fog
   
         def save
           requires :body, :directory, :key
-          
-          if res = connection.remote.save_file(full_key, body)
+          body_string = body.respond_to?(:read) ? body.read : body
+          if res = connection.remote.save_file(full_key, body_string)
             merge_attributes(
               :content_length => Fog::Storage.get_body_size(body),
               :last_modified  => res

data/lib/fog/external/models/storage/files.rb

@@ -28,8 +28,9 @@ module Fog
         
         def head(id) # hackish!
           requires :directory
-          real_key = file_key(id)
-          if data = connection.remote.list_files(directory.key).detect{|c|c[:key] == real_key}
+          
+          data = connection.remote.head_file(file_key(id))
+          if data
             new(data)
           else
             nil

data/spec/fog/external/backend/bertrpc_spec.rb

@@ -0,0 +1,12 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper'))
+require 'fog/external/backend/bertrpc'
+
+describe "Fog::External::Backend::Bertrpc" do
+  let(:backend) { Fog::External::Backend::Bertrpc.new 'localhost', 8000 }
+  
+  %w(create_directory list_directories get_directory destroy_directory list_files head_file get_file destroy_file save_file).each do |m|
+    it "responds to #{m}" do
+      backend.should respond_to(m)
+    end
+  end
+end

data/spec/fog/external/backend/local_spec.rb

@@ -0,0 +1,12 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper'))
+require 'fog/external/backend/local'
+
+describe "Fog::External::Backend::Local" do
+  let(:backend) { Fog::External::Backend::Local.new '/tmp' }
+  
+  %w(create_directory list_directories get_directory destroy_directory list_files head_file get_file destroy_file save_file).each do |m|
+    it "responds to #{m}" do
+      backend.should respond_to(m)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-external
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-12-03 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &76776280 !ruby/object:Gem::Requirement
+  requirement: &72799370 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76776280
+  version_requirements: *72799370
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &76776070 !ruby/object:Gem::Requirement
+  requirement: &72799160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76776070
+  version_requirements: *72799160
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &76775860 !ruby/object:Gem::Requirement
+  requirement: &72798950 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *76775860
+  version_requirements: *72798950
 description: Use a custom backend (such as BERTRPC) with Fog:Storage.
 email:
 - mail@jonasschneider.com
@@ -59,15 +59,19 @@ files:
 - Watchrfile
 - examples/ernie.conf
 - examples/example.rb
-- examples/fog.rb
+- examples/handler.sh
 - fog-external.gemspec
 - lib/fog-external.rb
+- lib/fog/external/backend/bertrpc.rb
+- lib/fog/external/backend/local.rb
 - lib/fog/external/models/storage/directories.rb
 - lib/fog/external/models/storage/directory.rb
 - lib/fog/external/models/storage/file.rb
 - lib/fog/external/models/storage/files.rb
 - lib/fog/external/storage.rb
 - spec/boot.rb
+- spec/fog/external/backend/bertrpc_spec.rb
+- spec/fog/external/backend/local_spec.rb
 - spec/fog/external/storage_spec.rb
 - spec/service_mock.rb
 - spec/spec_helper.rb
@@ -97,6 +101,8 @@ specification_version: 3
 summary: Fog::Storage with a consistent API
 test_files:
 - spec/boot.rb
+- spec/fog/external/backend/bertrpc_spec.rb
+- spec/fog/external/backend/local_spec.rb
 - spec/fog/external/storage_spec.rb
 - spec/service_mock.rb
 - spec/spec_helper.rb

data/examples/fog.rb

@@ -1,102 +0,0 @@
-require 'ernie'
-ROOT = '/tmp/fog-external-example-root'
-# ported from Fog's Local storage
-
-module Fog
-  def create_directory(key)
-    if ::File.directory?(path_to(key))
-      false
-    else
-      Dir.mkdir path_to(key)
-    end
-  end
-  
-  def list_directories
-    data = Dir.entries(ROOT).select do |entry|
-      entry[0...1] != '.' && ::File.directory?(path_to(entry))
-    end.map do |entry|
-      {:key => entry}
-    end
-  end
-  
-  def get_directory(key)
-    if ::File.directory?(path_to(key))
-      { key: key }
-    else
-      nil
-    end
-  end
-  
-  def destroy_directory(key)
-    if ::File.directory?(path_to(key))
-      Dir.rmdir(path_to(key))
-      true
-    else
-      false
-    end
-  end
-  
-  
-  def list_files(dir_key)
-    Dir.chdir(path_to(dir_key)) do
-      data = Dir.glob('**/*').reject do |file|
-        ::File.directory?(file)
-      end.map do |key|
-        path = file_path(key)
-        {
-          :content_length => ::File.size(path),
-          :key            => key,
-          :last_modified  => ::File.mtime(path)
-        }
-      end
-    end
-    data
-  end
-  
-  def get_file(key)
-    path = path_to(key)
-    if ::File.exists?(path)
-      {
-        :content_length => ::File.size(path),
-        :key            => key,
-        :last_modified  => ::File.mtime(path),
-        :body           => ::File.read(path)
-      }
-    else
-      nil
-    end
-  end
-  
-  def destroy_file(key)
-    path = path_to(key)
-    
-    if ::File.exists?(path)
-      ::File.delete(path)
-      true
-    else
-      false
-    end
-  end
-  
-  def save_file(key, body)
-    file = ::File.new(path, 'wb')
-    if body.is_a?(String)
-      file.write(body)
-    else
-      file.write(body.read)
-    end
-    file.close
-    
-    ::File.mtime(path)
-  rescue
-    false
-  end
-  
-  private
-  
-  def path_to(entry)
-    ::File.join(ROOT, entry)
-  end
-end
-
-Ernie.expose(:fog, Fog)