xfrtuc 0.0.3 → 0.0.4

data/.ruby-version

@@ -1 +1 @@
-2.1.2
+1.9.3-p484

data/Gemfile

@@ -1,4 +1,6 @@
 source 'https://rubygems.org'
 
+ruby '1.9.3'
+
 # Specify your gem's dependencies in xfrtuc.gemspec
 gemspec

data/Gemfile.lock

@@ -1,21 +1,19 @@
 PATH
   remote: .
   specs:
-    xfrtuc (0.0.2)
+    xfrtuc (0.0.3)
       rest-client (~> 1.6)
 
 GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.2.5)
-    json (1.8.1)
-    mime-types (1.25.1)
+    mime-types (2.3)
+    netrc (0.7.7)
     rack (1.5.2)
-    rdoc (4.1.1)
-      json (~> 1.4)
-    rest-client (1.6.8)
-      mime-types (~> 1.16)
-      rdoc (>= 2.4.2)
+    rest-client (1.7.2)
+      mime-types (>= 1.16, < 3.0)
+      netrc (~> 0.7)
     rspec (3.0.0)
       rspec-core (~> 3.0.0)
       rspec-expectations (~> 3.0.0)

data/lib/xfrtuc/version.rb

@@ -0,0 +1,3 @@
+module Xfrtuc
+  VERSION = "0.0.4"
+end

data/lib/xfrtuc.rb

@@ -2,12 +2,10 @@ require 'json'
 require 'rest_client'
 
 module Xfrtuc
-  VERSION = "0.0.3"
-
   class Client
     attr_reader :base_url
 
-    def initialize(username, password, base_url: 'https://transferatu.heroku.com')
+    def initialize(username, password, base_url='https://transferatu.heroku.com')
       @base_url = base_url
       @username = username
       @password = password
@@ -31,7 +29,7 @@ module Xfrtuc
         @group_client ||= Xfrtuc::Group.new(self)
       else
         self.class.new(@username, @password,
-                       base_url: @base_url + "/groups/#{URI.encode(name)}")
+                       @base_url + "/groups/#{URI.encode(name)}")
       end
     end
 
@@ -39,7 +37,7 @@ module Xfrtuc
       JSON.parse(@resource[path].get(params))
     end
 
-    def post(path, data)
+    def post(path, data={})
       JSON.parse(@resource[path].post(JSON.generate(data)))
     end
 
@@ -81,7 +79,11 @@ module Xfrtuc
   class Transfer < ApiEndpoint
     def initialize(client); super; end
 
-    def info(id, verbose: false)
+    def info(id, opts={})
+      verbose = opts.delete(:verbose) || false
+      unless opts.empty?
+        raise ArgumentError, "Unsupported option(s): #{opts.keys}"
+      end
       client.get("/transfers/#{id}", params: { verbose: verbose })
     end
 
@@ -89,8 +91,18 @@ module Xfrtuc
       client.get("/transfers")
     end
 
-    def create(from_type:, from_url:, from_name: nil,
-               to_type:, to_url:, to_name: nil, opts: {})
+    def create(opts)
+      from_type = opts.fetch :from_type
+      from_url = opts.fetch :from_url
+      to_type = opts.fetch :to_type
+      to_url = opts.fetch :to_url
+      [ :from_type, :from_url, :to_type, :to_url ].each { |key| opts.delete key }
+      from_name = opts.delete :from_name
+      to_name = opts.delete :to_name
+      unless opts.empty?
+        raise ArgumentError, "Unsupported option(s): #{opts.keys}"
+      end
+
       client.post("/transfers",
                   from_type: from_type,
                   from_url: from_url,
@@ -103,6 +115,14 @@ module Xfrtuc
     def delete(id)
       client.delete("/transfers/#{URI.encode(id)}")
     end
+
+    def cancel(id)
+      client.post("/transfers/#{URI.encode(id)}/actions/cancel")
+    end
+
+    def public_url(id, opts={})
+      client.post("/transfers/#{URI.encode(id)}/actions/public-url", opts)
+    end
   end
 
   class Schedule < ApiEndpoint
@@ -116,8 +136,17 @@ module Xfrtuc
       client.get("/schedules")
     end
 
-    def create(name:, callback_url:, hour:,
-               days: Date::DAYNAMES, timezone: 'UTC')
+    def create(opts)
+      name = opts.fetch :name
+      callback_url = opts.fetch :callback_url
+      hour = opts.fetch :hour
+      days = opts.fetch(:days, Date::DAYNAMES)
+      timezone = opts.fetch(:timezone, 'UTC')
+      [ :name, :callback_url, :hour, :days, :timezone ].each { |key| opts.delete key }
+      unless opts.empty?
+        raise ArgumentError, "Unsupported option(s): #{opts.keys}"
+      end
+
       client.post("/schedules",
                   name: name,
                   callback_url: callback_url,

data/spec/spec_helper.rb

@@ -4,6 +4,10 @@
 # loaded once.
 #
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+
+require 'bundler'
+require 'xfrtuc'
+
 RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
   config.filter_run :focus

data/spec/xfrtuc_spec.rb

@@ -1,3 +1,4 @@
+require 'securerandom'
 require 'spec_helper'
 require 'sham_rack'
 
@@ -84,7 +85,7 @@ module Xfrtuc
       end
     end
 
-    def get_transfer(group_name, xfer_id, verbose: false)
+    def get_transfer(group_name, xfer_id, verbose=false)
       group = @groups.find { |g| g[:name] == group_name }
       if group.nil?
         [404, headers, []]
@@ -127,6 +128,33 @@ module Xfrtuc
       end
     end
 
+    def take_transfer_action(action, args, group_name, xfer_id)
+      unless @transfers.has_key? group_name
+        return [404, headers, []]
+      end
+      xfer = @transfers[group_name].find { |item| item[:uuid] == xfer_id }
+      if xfer.nil?
+        return [404, headers, []]
+      else
+        case action
+        when 'cancel' then
+          now = Time.now
+          xfer[:canceled_at] = now
+          return [201, headers, [ { canceled_at: now }.to_json ]]
+        when 'public-url' then
+          expires_at = if args.has_key? 'ttl'
+                         Time.now + args['ttl'].to_i
+                       else
+                         Time.now + (10 * 60)
+                       end
+          url = "https://example.com/backup/#{xfer[:uuid]}"
+          return [201, headers, [ { url: url, expires_at: expires_at }.to_json ]]
+        else
+          return [404, headers, []]
+        end
+      end
+    end
+
     def add_schedule(group_name, schedule)
       unless @schedules.has_key? group_name
         return [404, headers, []]
@@ -185,6 +213,8 @@ module Xfrtuc
         return [401, headers, ["Not authorized"]]
       end
       case path(env)
+      when %r{/groups/[^/]+/transfers/[^/]+/actions} then
+        transfers_actions_endpoint(env)
       when %r{/groups/[^/]+/transfers} then
         transfers_endpoint(env)
       when %r{/groups/[^/]+/schedules} then
@@ -196,6 +226,20 @@ module Xfrtuc
       end
     end
 
+    def transfers_actions_endpoint(env)
+      path = path(env)
+      group_name, xfer_id, action =
+        path.match(%r{\A/groups/(.*)/transfers/(.*)/actions/(.*)\z}) && [$1, $2, $3]
+      verb = verb(env)
+      if verb == 'POST'
+        body = body(env)
+        args = JSON.parse(body) unless body.empty?
+        take_transfer_action(action, args, group_name, xfer_id)
+      else
+        [405, headers, []]
+      end
+    end
+
     def transfers_endpoint(env)
       path = path(env)
       group_name, xfer_id = path.match(%r{\A/groups/(.*)/transfers(?:/(.*))?\z}) && [$1, $2]
@@ -216,7 +260,7 @@ module Xfrtuc
         if xfer_id.nil?
           list_transfers(group_name)
         else
-          get_transfer(group_name, xfer_id, verbose: params(env)['verbose'] == 'true')
+          get_transfer(group_name, xfer_id, params(env)['verbose'] == 'true')
         end
       else
         [405, headers, []]
@@ -348,7 +392,7 @@ module Xfrtuc
     let(:user)        { User.new(username, password) }
     let(:fakesferatu) { FakeTransferatu.new(user) }
     let(:host)        { 'transferatu.example.com' }
-    let(:client)      { Client.new(username, password, base_url: "https://#{host}") }
+    let(:client)      { Client.new(username, password, "https://#{host}") }
 
     before do
       ShamRack.mount(fakesferatu, host, 443)
@@ -482,6 +526,40 @@ module Xfrtuc
           expect(fakesferatu.last_transfer(g)).to be_nil
         end
       end
+
+      describe "#cancel" do
+        before do
+          fakesferatu.add_transfer(g, Hash[xfer_data.map { |k, v| [k.to_s, v] }])
+        end
+
+        it "cancels the given transfer" do
+          id = fakesferatu.last_transfer(g)[:uuid]
+          before = Time.now
+          cancel_data = client.group(g).transfer.cancel(id)
+          canceled_at = Time.parse(cancel_data["canceled_at"])
+          expect(canceled_at).to be_within(60).of(before)
+        end
+      end
+
+      describe "#public_url" do
+        before do
+          fakesferatu.add_transfer(g, Hash[xfer_data.map { |k, v| [k.to_s, v] }])
+        end
+
+        it "provides a public url for the given transfer" do
+          id = fakesferatu.last_transfer(g)[:uuid]
+          url_data = client.group(g).transfer.public_url(id)
+          expect { URI.parse(url_data["url"]) }.not_to raise_error
+        end
+
+        it "supports an optional ttl parameter" do
+          id = fakesferatu.last_transfer(g)[:uuid]
+          before = Time.now
+          url_data = client.group(g).transfer.public_url(id, ttl: 5 * 60)
+          expires_at = Time.parse(url_data["expires_at"])
+          expect(expires_at).to be_within(60).of(before + (5 * 60))
+        end
+      end
     end
 
     describe Schedule do

data/xfrtuc.gemspec

@@ -1,4 +1,4 @@
-require_relative 'lib/xfrtuc'
+require File.expand_path('../lib/xfrtuc/version', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.authors       = ["Maciek Sakrejda"]

metadata

@@ -1,55 +1,62 @@
 --- !ruby/object:Gem::Specification
 name: xfrtuc
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
+  prerelease: 
 platform: ruby
 authors:
 - Maciek Sakrejda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-03 00:00:00.000000000 Z
+date: 2014-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: sham_rack
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 description: Transferatu client
@@ -59,39 +66,40 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".ruby-version"
+- .ruby-version
 - Gemfile
 - Gemfile.lock
 - LICENSE
 - lib/xfrtuc.rb
+- lib/xfrtuc/version.rb
 - spec/spec_helper.rb
 - spec/xfrtuc_spec.rb
 - xfrtuc.gemspec
 homepage: https://github.com/heroku/xfrtuc
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
-summary: 'Transferatu client: see https://github.com/heroku/transferatu'
+specification_version: 3
+summary: ! 'Transferatu client: see https://github.com/heroku/transferatu'
 test_files:
 - spec/spec_helper.rb
 - spec/xfrtuc_spec.rb
-has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 8d8ad3039270c13e25ec3a1754077fa7e1bd9978
-  data.tar.gz: 8bd0b2b28529b16194059c6b57822a9dac24a98c
-SHA512:
-  metadata.gz: 12eb85112d36a301c4f9a1340e4f800d1c8b86853381562ce9435d713380af313762e9b8009bd3f202bbea614424a8126f79f486c803fde7739901cc159402b8
-  data.tar.gz: bba43317d78bd508d9c3ecc2de3ad015eeb2e79805bf107ff467ad94fdb453f7e174418b4feaf4f52edd918100182336db3fc1a7eee09c167976c7358cbc3734