digitsend 0.0.2 → 0.0.3

data/lib/digitsend/version.rb

@@ -1,3 +1,3 @@
 module Digitsend
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/digitsend.rb

@@ -20,73 +20,105 @@ module DigitSend
     end
   end
 
+  class Client
+    class <<self
+      def call(path, params)
+        http = Net::HTTP.new(Config.host, Config.port)
+        http.use_ssl = Config.use_ssl
+
+        response = http.post path, params && params.to_json,
+          'Content-Type' => 'application/json',
+          'Accept' => 'application/vnd.digitsend.v1',
+          'Authorization' => %Q[Token token="#{Config.api_token}"]
+
+        response.body.empty? ? nil : JSON.parse(response.body)
+      end
+
+      def upload_s3_file(filename, data)
+         response = create_s3_file(filename)
+
+         upload_to_s3 \
+           URI.parse(response["url"]),
+           response["fields"],
+           stream_for_data(filename, data)
+
+         response["uuid"]
+      end
+
+      private
+
+        def create_s3_file(name)
+          Client.call '/api/s3_files', s3_file: { name: name }
+        end
+
+        def upload_to_s3(url, fields, stream)
+          req = Net::HTTP::Post::Multipart.new \
+            url.to_s,
+            fields.merge("file" => UploadIO.new(stream, "binary/octet-stream"))
+
+          n = Net::HTTP.new(url.host, url.port)
+          n.use_ssl = true
+          n.verify_mode = OpenSSL::SSL::VERIFY_NONE
+
+          n.start do |http|
+            http.request(req)
+          end
+        end
+
+        def stream_for_data(filename, data)
+          if data.nil?
+            File.open(filename, "r")
+          elsif data.is_a?(String)
+            StringIO.new(data)
+          else
+            data
+          end
+        end
+    end
+  end
+
   class Message
     def initialize
       @attachments = []
-      yield self
     end
 
     def self.send(&block)
-      new(&block).send
+      new.tap { |m| yield(m) }.send
     end
 
     attr_accessor :to, :cc, :subject, :body
 
-    def add_file(path)
-      @attachments << path
+    def add_file(filename, data = nil)
+      @attachments << [ filename, data ]
     end
 
     def send
-      api_call :post, '/api/messages', message: {
+      Client.call '/api/messages', message: {
         to: to,
         cc: cc,
         subject: subject,
         body: body,
-        s3_file_uuids: @attachments.collect { |path| s3_file_uuid(path) }
+        s3_file_uuids: s3_file_uuids
       }
     end
 
     private
 
-      def s3_file_uuid(path)
-         response = create_s3_file(File.basename(path))
-         upload_to_s3(path, URI.parse(response["url"]), response["fields"])
-         update_s3_file(response["uuid"])
-         response["uuid"]
-      end
-
-      def create_s3_file(name)
-        api_call :post, '/api/s3_files', s3_file: { name: name }
-      end
-
-      def upload_to_s3(path, url, fields)
-        req = Net::HTTP::Post::Multipart.new \
-          url.to_s,
-          fields.merge("file" => UploadIO.new(File.open(path), "binary/octet-stream", path))
-
-        n = Net::HTTP.new(url.host, url.port)
-        n.use_ssl = true
-        n.verify_mode = OpenSSL::SSL::VERIFY_NONE
-
-        n.start do |http|
-          http.request(req)
+      def s3_file_uuids
+        @attachments.collect do |filename, data|
+          Client.upload_s3_file(filename, data)
         end
       end
+  end
 
-      def update_s3_file(uuid)
-        api_call :put, "/api/s3_files/#{uuid}", nil
-      end
-
-      def api_call(verb, path, params)
-        http = Net::HTTP.new(Config.host, Config.port)
-        http.use_ssl = Config.use_ssl
+  class Repository
+    def self.upload(repo_name, path, filename, data)
+      uuid = Client.upload_s3_file(filename, data)
 
-        response = http.send verb, path, params && params.to_json,
-          'Content-Type' => 'application/json',
-          'Accept' => 'application/vnd.digitsend.v1',
-          'Authorization' => %Q[Token token="#{Config.api_token}"]
-
-        response.body.empty? ? nil : JSON.parse(response.body)
-      end
+      Client.call '/api/files/versions',
+        repo_name: repo_name,
+        path: path,
+        repo_file_version: { s3_file_uuid: uuid }
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: digitsend
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-29 00:00:00.000000000 Z
+date: 2012-08-31 00:00:00.000000000 Z
 dependencies: []
 description: client library for DigitSend.
 email: