cryptkeeper 0.2.6 → 0.2.7

data/README.rdoc

@@ -6,6 +6,10 @@ Rails gem for connecting to the Google Storage API
 
     gem install cryptkeeper
 
+Depending upon how your environment is set up, you may also need:
+
+    require 'crypt_keeper'
+
 == Usage
 
 So far:

data/Rakefile

@@ -13,7 +13,6 @@ Jeweler::Tasks.new do |gem|
 
   # Dependencies
   gem.add_dependency 'hpricot'
-  gem.add_dependency 'iconv'
   gem.add_dependency 'ruby-hmac'
 end
 

data/cryptkeeper.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cryptkeeper}
-  s.version = "0.2.6"
+  s.version = "0.2.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Adam Medeiros"]
-  s.date = %q{2011-02-20}
+  s.date = %q{2011-02-21}
   s.description = %q{Use cryptkeeper to talk to Google Storage}
   s.email = %q{adammede@gmail.com}
   s.extra_rdoc_files = [
@@ -36,16 +36,13 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<hpricot>, [">= 0"])
-      s.add_runtime_dependency(%q<iconv>, [">= 0"])
       s.add_runtime_dependency(%q<ruby-hmac>, [">= 0"])
     else
       s.add_dependency(%q<hpricot>, [">= 0"])
-      s.add_dependency(%q<iconv>, [">= 0"])
       s.add_dependency(%q<ruby-hmac>, [">= 0"])
     end
   else
     s.add_dependency(%q<hpricot>, [">= 0"])
-    s.add_dependency(%q<iconv>, [">= 0"])
     s.add_dependency(%q<ruby-hmac>, [">= 0"])
   end
 end

data/lib/buckets.rb

@@ -65,19 +65,20 @@ module Buckets
     path.gsub!(/[&]$/, '')
 
     hpr        = Hpricot(connection.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
-      }
+    hpr.search("contents").map do |el|
+      BucketMetaObject.new(
+          {
+              :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
 
   # Utils class
@@ -162,7 +163,7 @@ module Buckets
     end
 
     def copy_to(bucket_name, path=nil)
-      path = path.nil? ? "/#{URI.escape(@key)}" : "/#{URI.escape(path)}"
+      path = "/#{path.nil? ? URI.escape(@key) : URI.escape(path)}"
       connection.put(path, bucket_name, nil, {'x-goog-copy-source' => "#{@bucket_name}/#{URI.escape(@key)}"})
     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.6"
+  VERSION = "0.2.7"
 
   # :title: Connection
   # Author:: Adam R. Medeiros (AKA: ScaryThings)

data/lib/crypt_keeper_http.rb

@@ -1,5 +1,4 @@
 require 'net/http'
-require 'iconv'
 require 'hmac-sha1'
 require 'base64'
 class CryptKeeperHttp
@@ -19,9 +18,8 @@ class CryptKeeperHttp
   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)
+    utf8_message = message.unpack("C*").pack("U*")
+    utf8_key = @secret_key.unpack("C*").pack("U*")
     sha1 = HMAC::SHA1.digest(utf8_key, utf8_message)
     Base64.encode64(sha1).strip
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 6
-  version: 0.2.6
+  - 7
+  version: 0.2.7
 platform: ruby
 authors: 
 - Adam Medeiros
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-20 00:00:00 -08:00
+date: 2011-02-21 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -31,7 +31,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: iconv
+  name: ruby-hmac
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -43,19 +43,6 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: ruby-hmac
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id003
 description: Use cryptkeeper to talk to Google Storage
 email: adammede@gmail.com
 executables: []