cryptkeeper 0.2.1 → 0.2.2

data/cryptkeeper.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cryptkeeper}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Adam Medeiros"]
-  s.date = %q{2011-02-14}
+  s.date = %q{2011-02-15}
   s.description = %q{Use cryptkeeper to talk to Google Storage}
   s.email = %q{adammede@gmail.com}
   s.extra_rdoc_files = [
@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
     "cryptkeeper.gemspec",
     "lib/buckets.rb",
     "lib/crypt_keeper.rb",
+    "lib/crypt_keeper_http.rb",
     "lib/objects.rb"
   ]
   s.homepage = %q{http://github.com/adamthedeveloper/cryptkeeper}

data/lib/buckets.rb

@@ -1,52 +1,67 @@
+require 'hpricot'
 module Buckets
   # GET Service
   # lists all of the buckets that you own
   # return an array of Bucket objects
   def buckets
-    res = nil
-    time = request_time
-    Net::HTTP.start(@host[:address]) do |http|
-
-      req = Net::HTTP::Get.new("/")
-      req.add_field('Host', @host[:address])
-      req.add_field('Date', time)
-      req.add_field('Content-Length',0)
-
-      sig = signature("GET\n\n\n#{time}\n/")
-
-      req.add_field('Authorization', "#{@signature_id} #{@access_key}:#{sig}")
-      res = http.request(req)
-    end
-
-    hpr = Hpricot(res.body)
-    bucket_hashes = hpr.search("bucket").map do |el|
-      {
-        :name => el.search("name").inner_html,
-        :created_at => el.search("creationdate").inner_html
+    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)
     end
-
-    bucket_hashes.collect { |h| Bucket.new(h) }
   end
 
   # GET Bucket
   # lists the contents of a bucket or retrieves the ACLs that are
   # applied to a bucket.
-  # return a Bucket object
-  def bucket(*args)
+  # return an array of BucketObjects
+  def bucket_meta_objects(bucket_name, *args)
+    options = {
+        :delimeter => nil,
+        :marker    => nil,
+        :max_keys  => nil,
+        :prefix    => nil
+    }
+    options.merge!(args.pop) if args.last.is_a? Hash
+
+    path = "/?"
+    path << "delimeter=#{options[:delimeter]}&" if !options[:delimeter].nil?
+    path << "marker=#{options[:marker]}&" if !options[:marker].nil?
+    path << "max-keys=#{options[:max_keys]}&" if !options[:max_keys].nil?
+    path << "prefix=#{options[:prefix]}&" if !options[:prefix].nil?
+    path.gsub!(/[&]$/, '')
 
+    hpr        = Hpricot(CryptKeeper::Connection.http_instance.get(path, bucket_name))
+    obj_hashes = hpr.search("contents").map do |el|
+      {
+          :bucket_name        => bucket_name,
+          :key                => el.search("key").inner_html,
+          :last_modified      => el.search("lastmodified").inner_html,
+          :e_tag              => el.search("etag").inner_html,
+          :size               => el.search("size").inner_html,
+          :storage_class      => el.search("storageclass").inner_html,
+          :owner_id           => el.search("id").inner_html,
+          :owner_display_name => el.search("displayname").inner_html
+      }
+    end
+    obj_hashes.map { |obj| BucketMetaObject.new(obj) }
   end
 
   def create_bucket(*args)
-    
+
   end
 
+
+
   class Bucket
     attr_accessor :name, :created_at
+
     def initialize(*args)
       options = {}
       options.merge!(args.pop) if args.last.is_a? Hash
-      @name = options[:name]
+      @name       = options[:name]
       @created_at = options[:created_at]
     end
 
@@ -57,9 +72,32 @@ module Buckets
     def update(*args)
 
     end
+  end
+
+  class BucketMetaObject
+    attr_accessor :properties,
+                  :key, :last_modified, :e_tag, :size, :storage_class,
+                  :owner_id, :owner_display_name,
+                  :bucket_name
+
+    def initialize(*args)
+      @properties         = args.first
+      @bucket_name        = @properties[:bucket_name]
+      @key                = @properties[:key]
+      @last_modified      = @properties[:last_modified]
+      @e_tag              = @properties[:e_tag]
+      @size               = @properties[:size]
+      @storage_class      = @properties[:storage_class]
+      @owner_id           = @properties[:owner_id]
+      @owner_display_name = @properties[:owner_display_name]
+    end
 
-    def destroy
+    def object
+      @object ||= object!
+    end
 
+    def object!
+      CryptKeeper::Connection.http_instance.get("/#{URI.escape(@key)}", @bucket_name)
     end
   end
 end

data/lib/crypt_keeper.rb

@@ -1,47 +1,31 @@
-require Dir.pwd << '/lib/buckets.rb'
-require Dir.pwd << '/lib/objects.rb'
-require 'net/http'
-require 'iconv'
-require 'hmac-sha1'
-require 'base64'
+ck_path = File.expand_path(File.dirname(__FILE__))
+require ck_path + '/buckets.rb'
+require ck_path + '/crypt_keeper_http.rb'
 require 'uri'
-require 'hpricot'
 
 module CryptKeeper
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
   class Connection
+    @@http_instance = nil
+    def self.http_instance
+      @@http_instance
+    end
     def initialize(*args)
       options = {
           :signature_identifier => "GOOG1",
-          :host => "commondatastorage.googleapis.com",
-          :port => "80"
+          :host                 => "commondatastorage.googleapis.com",
+          :port                 => "80"
       }
 
       options.merge!(args.pop) if args.last.kind_of? Hash
-
-      @access_key   = options[:access_key]
-      @secret_key   = options[:secret_key]
+      @host = options[:host]
+      @access_key = options[:access_key]
+      @secret_key = options[:secret_key]
       @signature_id = options[:signature_identifier]
-      @host = {
-          :address => options[:host],
-          :port => options[:port]
-      }
-      @ic_utf8      = Iconv.new('ascii//TRANSLIT//IGNORE', 'UTF-8')
-    end
-
-    def signature(message)
-      utf8_message = @ic_utf8.iconv(message)
-      utf8_key     = @ic_utf8.iconv(@secret_key)
-      sha1         = HMAC::SHA1.digest(utf8_key, utf8_message)
-      Base64.encode64(sha1).strip
-    end
-
-    def request_time
-      Time.now.strftime("%a, %d %b %Y %H:%M:%S %z")
+      @@http_instance = CryptKeeperHttp.new(@host, @access_key, @secret_key, @signature_id)
     end
 
     include Buckets
-    include Objects
   end
 
 end

data/lib/crypt_keeper_http.rb

@@ -0,0 +1,43 @@
+require 'net/http'
+require 'iconv'
+require 'hmac-sha1'
+require 'base64'
+class CryptKeeperHttp
+  def initialize(address, access_key, secret_key, signature_id)
+    @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')
+    utf8_message = ic_utf8.iconv(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={})
+    bucket_name = "#{bucket_name}." if !bucket_name.empty?
+    res  = nil
+    time = Time.now.strftime("%a, %d %b %Y %H:%M:%S %z")
+    Net::HTTP.start(@address) do |http|
+
+      req = Net::HTTP::Get.new(path)
+      req.add_field('Host', "#{bucket_name}#{@address}")
+
+      if !additional_headers.empty?
+        additional_headers.each { |k, v| req.add_field(k, v) }
+      end
+
+      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}")
+      res = http.request(req)
+    end
+    return res.body if res
+    nil
+  end
+end

data/lib/objects.rb

@@ -1,3 +0,0 @@
-module Objects
-
-end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Adam Medeiros
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-14 00:00:00 -08:00
+date: 2011-02-15 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -71,6 +71,7 @@ files:
 - cryptkeeper.gemspec
 - lib/buckets.rb
 - lib/crypt_keeper.rb
+- lib/crypt_keeper_http.rb
 - lib/objects.rb
 has_rdoc: true
 homepage: http://github.com/adamthedeveloper/cryptkeeper