cryptkeeper 0.2.4 → 0.2.5

data/README.rdoc

@@ -37,3 +37,16 @@ Creates 3 new picture files on my Desktop:
 Picture 1.png,
 Picture 2.png,
 Picture 3.png
+
+Add a new object to a bucket
+    new_bucket = keeper.create_bucket({:name => "adam_new_bucket3"})
+
+    data = File.open("/Users/user/Desktop/Picture 3.png", "rb")
+    new_bucket.add_object('Picture 5.png', data, 'image/png')
+
+    data = File.open("/Users/user/Desktop/text_file.txt", 'r')
+    new_bucket.add_object("myTextFile.txt", data) # if you don't specify a content type, binary/octet-stream is used
+
+Delete an object
+    keeper.bucket_meta_objects('adam_new_bucket3', {:prefix => 'Picture%205.png'}).first.delete
+

data/cryptkeeper.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cryptkeeper}
-  s.version = "0.2.4"
+  s.version = "0.2.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Adam Medeiros"]
-  s.date = %q{2011-02-15}
+  s.date = %q{2011-02-19}
   s.description = %q{Use cryptkeeper to talk to Google Storage}
   s.email = %q{adammede@gmail.com}
   s.extra_rdoc_files = [

data/lib/buckets.rb

@@ -1,16 +1,37 @@
 require 'hpricot'
+require 'digest/md5'
 module Buckets
+
+  # Bucket stuff
   # GET Service
   # lists all of the buckets that you own
   # return an array of Bucket objects
   def buckets
-    Hpricot(CryptKeeper::Connection.http_instance.get("/")).search("bucket").map do |el|
-      hsh = {
-          :name       => el.search("name").inner_html,
-          :created_at => el.search("creationdate").inner_html
-      }
-      Bucket.new(hsh)
+    find_buckets
+  end
+
+  def connection
+    CryptKeeper::Connection.http_instance
+  end
+
+  def create_bucket(*args)
+    options = args.last
+    connection.put("/", options[:name])
+    find_buckets(options)
+  end
+
+  def find_buckets(*args)
+    options = args.last
+    name = options[:name] if options.is_a? Hash
+    buckets = Hpricot(connection.get("/")).search("bucket").map do |el|
+      Bucket.new(
+          {
+              :name => el.search("name").inner_html,
+              :created_at => el.search("creationdate").inner_html
+          }
+      )
     end
+    name.nil? ? buckets : buckets.reject { |bucket| bucket.name != name }[0]
   end
 
   # GET Bucket
@@ -33,7 +54,7 @@ module Buckets
     path << "prefix=#{options[:prefix]}&" if !options[:prefix].nil?
     path.gsub!(/[&]$/, '')
 
-    hpr        = Hpricot(CryptKeeper::Connection.http_instance.get(path, bucket_name))
+    hpr        = Hpricot(connection.get(path, bucket_name))
     obj_hashes = hpr.search("contents").map do |el|
       {
           :bucket_name        => bucket_name,
@@ -49,13 +70,13 @@ module Buckets
     obj_hashes.map { |obj| BucketMetaObject.new(obj) }
   end
 
-  def create_bucket(*args)
-
+  class Utils
+    def connection
+      CryptKeeper::Connection.http_instance
+    end
   end
 
-
-
-  class Bucket
+  class Bucket < Utils
     attr_accessor :name, :created_at
 
     def initialize(*args)
@@ -65,16 +86,26 @@ module Buckets
       @created_at = options[:created_at]
     end
 
-    def create(*args)
-
+    def delete(options={})
+      connection.delete("/", @name)
     end
 
     def update(*args)
 
     end
+
+    def add_object(name, data, content_type='binary/octet-stream', *args)
+      data.rewind
+      additional_headers = {
+          'Content-MD5' => Base64.encode64(Digest::MD5.digest(data.read)).strip,
+          'Content-Type' => content_type
+      }
+      additional_headers.merge!(args.pop) if args.last.is_a? Hash
+      connection.put("/#{URI.escape(name)}", @name, data, additional_headers)
+    end
   end
 
-  class BucketMetaObject
+  class BucketMetaObject < Utils
     attr_accessor :properties,
                   :key, :last_modified, :e_tag, :size, :storage_class,
                   :owner_id, :owner_display_name,
@@ -97,7 +128,11 @@ module Buckets
     end
 
     def object!
-      CryptKeeper::Connection.http_instance.get("/#{URI.escape(@key)}", @bucket_name)
+      connection.get("/#{URI.escape(@key)}", @bucket_name)
+    end
+
+    def delete
+      connection.delete("/#{URI.escape(@key)}", @bucket_name)
     end
   end
 end

data/lib/crypt_keeper.rb

@@ -4,7 +4,7 @@ require ck_path + '/crypt_keeper_http.rb'
 require 'uri'
 
 module CryptKeeper
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
   class Connection
     @@http_instance = nil
     def self.http_instance

data/lib/crypt_keeper_http.rb

@@ -3,41 +3,88 @@ require 'iconv'
 require 'hmac-sha1'
 require 'base64'
 class CryptKeeperHttp
+
+  # Request Types
+  GET = "GET"
+  PUT = "PUT"
+  POST = "POST"
+  HEAD = "HEAD"
+  DELETE = "DELETE"
+
   def initialize(address, access_key, secret_key, signature_id)
-    @address      = address
-    @access_key   = access_key
-    @secret_key   = secret_key
+    @address = address
+    @access_key = access_key
+    @secret_key = secret_key
     @signature_id = signature_id
   end
 
   def signature(message)
-    ic_utf8      = Iconv.new('ascii//TRANSLIT//IGNORE', 'UTF-8')
+    ic_utf8 = Iconv.new('ascii//TRANSLIT//IGNORE', 'UTF-8')
     utf8_message = ic_utf8.iconv(message)
-    utf8_key     = ic_utf8.iconv(@secret_key)
-    sha1         = HMAC::SHA1.digest(utf8_key, utf8_message)
+    utf8_key = ic_utf8.iconv(@secret_key)
+    sha1 = HMAC::SHA1.digest(utf8_key, utf8_message)
     Base64.encode64(sha1).strip
   end
 
   def get(path, bucket_name='', additional_headers={})
+    request(GET, path, bucket_name, nil, additional_headers)
+  end
+
+  def put(path, bucket_name='', body=nil, additional_headers={})
+    request(PUT, path, bucket_name, body, additional_headers)
+  end
+
+  def delete(path, bucket_name, additional_headers={})
+    request(DELETE, path, bucket_name, nil, additional_headers)
+  end
+
+  def request(type, path, bucket_name='', body=nil, additional_headers={})
+    body.rewind if body && body.respond_to?(:rewind)
     bucket_name = "#{bucket_name}." if !bucket_name.empty?
-    res  = nil
-    time = Time.now.strftime("%a, %d %b %Y %H:%M:%S %z")
+
+    res = nil
     Net::HTTP.start(@address) do |http|
+      req = Net::HTTP.const_get(type.capitalize).new(path)
 
-      req = Net::HTTP::Get.new(path)
-      req.add_field('Host', "#{bucket_name}#{@address}")
+      content_md5 = ''
+      content_type = ''
 
       if !additional_headers.empty?
-        additional_headers.each { |k, v| req.add_field(k, v) }
+        additional_headers.each do |k, v|
+          req.add_field(k, v)
+          if type==PUT
+            case k
+              when 'Content-MD5'
+                content_md5 = v
+              when 'Content-Type'
+                content_type = v
+            end
+          end
+        end
+      end
+
+      content_length = 0
+      if body
+        if body.respond_to? :lstat
+          content_length = body.stat.size
+          req.body_stream = body
+        else
+          content_length = body.size
+          req.body = body
+        end
       end
 
+      time = Time.now.strftime("%a, %d %b %Y %H:%M:%S %z")
+
+      sig_path = !bucket_name.empty? ? "/#{bucket_name.gsub(/[\.]$/, path.gsub(/\?.*$/, ''))}" : "/"
+      req.add_field('Host', "#{bucket_name}#{@address}")
       req.add_field('Date', time)
-      req.add_field('Content-Length', 0)
-      sig = signature("GET\n\n\n#{time}\n#{!bucket_name.empty? ? "/#{bucket_name.gsub(/[\.]$/, path.gsub(/\?.*$/,''))}" : "/"}")
-      req.add_field('Authorization', "#{@signature_id} #{@access_key}:#{sig}")
+      req.add_field('Content-length', content_length)
+      sig = "#{type}\n#{content_md5}\n#{content_type}\n#{time}\n#{sig_path}"
+      req.add_field('Authorization', "#{@signature_id} #{@access_key}:#{signature(sig)}")
+
       res = http.request(req)
     end
-    return res.body if res
-    nil
+    res ? res.body : nil
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 4
-  version: 0.2.4
+  - 5
+  version: 0.2.5
 platform: ruby
 authors: 
 - Adam Medeiros
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-15 00:00:00 -08:00
+date: 2011-02-19 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency