snapshot-ruby 0.2.1 → 0.3.0

data/lib/snapshot/connection.rb

@@ -1,4 +1,8 @@
+require 'base64'
+require 'openssl'
+require 'restclient'
 require 'uri'
+require 'time'
 
 module Snapshot
   class Connection
@@ -22,19 +26,38 @@ module Snapshot
       end
     end
     
-    # Returns an authenticated RestClient::Resource
-    # 
-    def resource
-      @resource ||= RestClient::Resource.new(self.url, {
-        :user => self.access_key,
-        :password => self.secret_key
-      })
+    def delete(path)
+      request(:delete, path)
     end
     
+    def get(path)
+      request(:get, path)
+    end
+
+    def post(path, payload={})
+      request(:post, path, payload)
+    end
+
     # Returns a URL to Snapshot for the connection
     #
     def url
-      "http://#{domain}/"
+      "http://#{domain}"
+    end
+    
+  private
+    
+    def request(method, path, payload = nil)
+      date = Time.now.httpdate
+      
+      sha1 = OpenSSL::Digest::Digest.new('sha1')
+      message = "#{method.to_s.upcase}\n#{path}\n#{date}"
+      digest = Base64.encode64(OpenSSL::HMAC.digest(sha1, secret_key, message))
+      
+      headers = { authorization: "HMAC #{access_key}:#{digest}", date: date }
+      
+      params = { method: method, url: "#{url}#{path}", headers: headers }
+      params[:payload] = payload unless payload.nil?
+      RestClient::Request.execute(params)
     end
   end
 end

data/lib/snapshot/image.rb

@@ -1,5 +1,4 @@
 require 'json'
-require 'rest_client'
 
 module Snapshot
   class Image
@@ -27,7 +26,7 @@ module Snapshot
       #
       def create(file)
         file = File.open(file) if file.is_a?(String)
-        result = Snapshot.connection.resource.post(:file => file)
+        result = Snapshot.connection.post('/', file: file)
         info = JSON.parse(result)['file']
         
         self.new.tap do |img|
@@ -65,7 +64,7 @@ module Snapshot
       #   Snapshot::Image.find('a45af9b9e6ebab9c685faef4e72e7a14f3e24e1a')
       #
       def find(id)
-        result = Snapshot.connection.resource["#{id}"].get
+        result = Snapshot.connection.get("/#{id}")
         info = JSON.parse(result)
         
         self.new.tap do |img|
@@ -90,7 +89,7 @@ module Snapshot
     #   img.destroy
     #
     def destroy
-      Snapshot.connection.resource["#{id}"].delete
+      Snapshot.connection.delete("/#{id}")
       true
     rescue RestClient::ResourceNotFound
       nil

data/lib/snapshot/token.rb

@@ -0,0 +1,19 @@
+module Snapshot
+  class Token
+    attr_accessor :expires_in, :token
+    
+    def self.create
+      result = Snapshot.connection.post('/token')
+      info = JSON.parse(result)
+      
+      self.new.tap do |t|
+        t.expires_in = info['expires_in']
+        t.token      = info['token']
+      end
+    end
+    
+    def to_s
+      token
+    end
+  end
+end

data/lib/snapshot/url.rb

@@ -10,7 +10,7 @@ module Snapshot
     end
     
     def method_missing(processor, *options)
-      @options << [processor.to_s, options]
+      @options << [":#{processor}", options]
     end
     
     def to_s

data/lib/snapshot/version.rb

@@ -1,3 +1,3 @@
 module Snapshot
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 end

data/lib/snapshot.rb

@@ -1,5 +1,6 @@
 require 'snapshot/connection'
 require 'snapshot/image'
+require 'snapshot/token'
 require 'snapshot/url'
 require 'snapshot/version'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: snapshot-ruby
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,52 +9,72 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-05 00:00:00.000000000 Z
+date: 2013-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70118439875340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.6.5
   type: :runtime
   prerelease: false
-  version_requirements: *70118439875340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.6.5
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70118439874500 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *70118439874500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.6.7
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70118439873700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70118439873700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70118439866760 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 2.4.0
   type: :development
   prerelease: false
-  version_requirements: *70118439866760
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.4.0
 description: Snap is a very simple image storage and processing services for developers.
 email:
 - jeremy@jeremyboles.com
@@ -64,6 +84,7 @@ extra_rdoc_files: []
 files:
 - lib/snapshot/connection.rb
 - lib/snapshot/image.rb
+- lib/snapshot/token.rb
 - lib/snapshot/url.rb
 - lib/snapshot/version.rb
 - lib/snapshot.rb
@@ -88,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.7
 requirements: []
 rubyforge_project: snapshot-ruby
-rubygems_version: 1.8.11
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Ruby wrapper for storing and manipulating images via Snapshot.