github-downloads 0.1.2 → 0.1.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    github-downloads (0.1.1)
+    github-downloads (0.1.3)
       highline
       hirb
       json
@@ -14,10 +14,10 @@ GEM
   specs:
     awesome_print (0.3.1)
     diff-lcs (1.1.2)
-    highline (1.6.2)
-    hirb (0.4.5)
+    highline (1.6.11)
+    hirb (0.6.2)
     json (1.5.3)
-    mime-types (1.16)
+    mime-types (1.18)
     mimic (0.4.1)
       json
       plist
@@ -28,7 +28,7 @@ GEM
     plist (3.1.0)
     rack (1.2.1)
     rake (0.9.2)
-    rest-client (1.6.3)
+    rest-client (1.6.7)
       mime-types (>= 1.16)
     rspec (2.5.0)
       rspec-core (~> 2.5.0)

data/Rakefile

@@ -11,7 +11,7 @@ task :default => :specs
 require "rubygems"
 require "rubygems/package_task"
 
-GEM_VERSION = "0.1.2"
+GEM_VERSION = "0.1.3"
 
 # This builds the actual gem. For details of what all these options
 # mean, and other ones you can add, check the documentation here:

data/lib/github/downloads.rb

@@ -1,65 +1,96 @@
 require 'ostruct'
 require 'mime/types'
 require 'github/client'
+require 'github/s3_uploader'
 
 module Github
   class Downloads
     attr_accessor :uploader
-    
+    attr_reader :last_response
+
     GITHUB_BASE_URL = "https://api.github.com"
-    
+
     def initialize(client, user, repos)
       @client = client
       @user = user
       @repos = repos
+      @last_response = nil
     end
-    
+
     def self.connect(user, password, repos)
       client = Client.connect(GITHUB_BASE_URL, user, password)
-      new(client, user, repos)
+      new(client, user, repos).tap do |downloader|
+        downloader.uploader = Github::S3Uploader.new # default uploader
+      end
     end
-    
+
     class UnexpectedResponse < StandardError
       attr_reader :response
-      
+
       def initialize(response)
         @response = response
       end
     end
-    
+
     def list
-      response = @client.get(downloads_resource_path)
-      
-      if response.success?
-        from_response_data(response.data)
+      @last_response = @client.get(downloads_resource_path)
+
+      if @last_response.success?
+        from_response_data(@last_response.data)
       else
-        raise UnexpectedResponse, response
+        raise UnexpectedResponse, @last_response
       end
     end
-    
-    def create(file_path, description = "")
-      response = @client.post(downloads_resource_path, {
+
+    def create(file_path, description = "", options={})
+      delete(:name => File.basename(file_path)) if options[:overwrite]
+      
+      @last_response = @client.post(downloads_resource_path, {
         :name         => File.basename(file_path),
         :description  => description,
         :content_type => MIME::Types.type_for(file_path)[0] || MIME::Types["application/octet-stream"][0],
         :size         => File.size?(file_path)
       })
-      
-      if response.success?
-        uploader.upload(File.expand_path(file_path), response.data)
+
+      if @last_response.success?
+        uploader.upload(File.expand_path(file_path), @last_response.data)
       end
     end
-    
+
+    def delete(options={})
+      if download_id = options[:id]
+        delete_download_with_id(download_id)
+      elsif file_name = options[:name]
+        download = list.find { |download| download.name == file_name }
+        delete_download_with_id(download.download_id) if download
+      else
+        raise "Either :id or :name should be specified"
+      end
+    end
+
     private
-    
+
+    def delete_download_with_id(id)
+      @last_response = @client.delete("#{downloads_resource_path}/#{id}")
+      @last_response.success?
+    end
+
     def downloads_resource_path
       "/repos/#{@user}/#{@repos}/downloads"
     end
-    
+
     def from_response_data(data)
-      data.map { |hash| Download.new(hash) }
+      data.map do |hash|
+        # OpenStruct doesn't like :id attributes
+        Download.new(with_swapped_key(hash, "id", "download_id"))
+      end
     end
     
+    def with_swapped_key(hash, old_key, new_key)
+      hash[new_key] = hash[old_key]
+      hash
+    end
+
     class Download < OpenStruct
     end
   end

data/lib/github/downloads_controller.rb

@@ -73,9 +73,7 @@ module Github
         password = lookup_or_prompt_for_password(params[:user])
       end
       
-      @github ||= Github::Downloads.connect(params[:user], password, params[:repos]).tap do |gh|
-        gh.uploader = Github::S3Uploader.new
-      end
+      @github ||= Github::Downloads.connect(params[:user], password, params[:repos])
     end
     
     def lookup_or_prompt_for_password(user)

data/lib/github/s3_uploader.rb

@@ -4,7 +4,7 @@ module Github
   class S3Uploader 
     def upload(path, metadata)
       response = RestClient.post(metadata["s3_url"], [
-        ["key", "#{metadata["prefix"]}#{metadata["name"]}"],
+        ["key", "#{metadata["path"]}"],
         ["acl", metadata["acl"]],
         ["success_action_status", 201],
         ["Filename", metadata["name"]],

data/spec/github_download_spec.rb

@@ -19,7 +19,7 @@ describe "Github::Downloads" do
         {
           "url" => "https://api.github.com/repos/octocat/Hello-World/downloads/1",
           "html_url" => "https://github.com/repos/octocat/Hello-World/downloads/filename",
-          "id" => 1,
+          "id" => 123,
           "name" => "file.zip",
           "description" => "The latest release",
           "size" => 1024,
@@ -28,12 +28,20 @@ describe "Github::Downloads" do
       ])
       @downloads.list.size.should == 1
       @downloads.list.first.description.should == "The latest release"
+      @downloads.list.first.download_id.should == 123
     end
     
     it "raises if the response is not successful" do
       @client.stubs(:get).with("/repos/username/somerepo/downloads").returns unsuccessful_response
       proc { @downloads.list }.should raise_error(Github::Downloads::UnexpectedResponse)
     end
+    
+    it "stores the last response" do
+      expected_response = successful_response_with([])
+      @client.stubs(:get).with("/repos/username/somerepo/downloads").returns expected_response
+      @downloads.list
+      @downloads.last_response.should == expected_response
+    end
   end
   
   describe "#upload" do
@@ -72,6 +80,57 @@ describe "Github::Downloads" do
       @downloads.create("fixtures/textfile.txt", "an example file").should be_false
     end
     
+    it "stores the last response" do
+      expected_response = successful_response_with("upload data")
+      @client.stubs(:post).returns expected_response
+      @uploader.stubs(:upload).returns true
+      @downloads.create("fixtures/textfile.txt", "an example file")
+      @downloads.last_response.should == expected_response
+    end
+    
+    it "attempts to delete the file first if :overwrite is specified" do
+      @downloads.expects(:delete).with(:name => "textfile.txt")
+      @client.stubs(:post).returns successful_response_with("upload data")
+      @uploader.stubs(:upload).returns true
+      @downloads.create("fixtures/textfile.txt", "an example file", :overwrite => true)
+    end
+    
+  end
+  
+  describe "#delete" do
+    
+    it "sends a DELETE request to the download's resource when provided with an ID" do
+      @client.expects(:delete).with("/repos/username/somerepo/downloads/123").returns(successful_response_with([]))
+      @downloads.delete(:id => 123)
+    end
+    
+    it "looks up the ID of the download before deletion when provided with a name" do
+      @client.stubs(:get).with("/repos/username/somerepo/downloads").returns successful_response_with([
+        {"id" => 1, "name" => "file.zip"},
+        {"id" => 2, "name" => "other_file.zip"},
+        {"id" => 3, "name" => "some_file.txt"},
+        {"id" => 4, "name" => "file.mp3"}
+      ])
+      @client.expects(:delete).with("/repos/username/somerepo/downloads/3").returns(successful_response_with([]))
+      @downloads.delete(:name => "some_file.txt")
+    end
+    
+    it "returns true for a successful deletion" do
+      @client.stubs(:delete).with("/repos/username/somerepo/downloads/123").returns(successful_response_with([]))
+      @downloads.delete(:id => 123).should be_true
+    end
+    
+    it "stores the last response" do
+      expected_response = successful_response_with([])
+      @client.stubs(:delete).with("/repos/username/somerepo/downloads/123").returns expected_response
+      @downloads.delete(:id => 123)
+      @downloads.last_response.should == expected_response
+    end
+    
+    it "raises if :name or :id is not provided" do
+      proc{ @downloads.delete }.should raise_error
+    end
+    
   end
   
   private

metadata

@@ -1,171 +1,133 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: github-downloads
-version: !ruby/object:Gem::Version 
-  hash: 31
+version: !ruby/object:Gem::Version
+  version: 0.1.3
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 2
-  version: 0.1.2
 platform: ruby
-authors: 
+authors:
 - Luke Redpath
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-02 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-03-26 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rest-client
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70102415004520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *70102415004520
+- !ruby/object:Gem::Dependency
   name: json
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &70102415003520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *70102415003520
+- !ruby/object:Gem::Dependency
   name: simpleconsole
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &70102415000660 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *70102415000660
+- !ruby/object:Gem::Dependency
   name: hirb
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &70102414999020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *70102414999020
+- !ruby/object:Gem::Dependency
   name: mime-types
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &70102415054660 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *70102415054660
+- !ruby/object:Gem::Dependency
   name: highline
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: &70102415053040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *70102415053040
+- !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: &70102415052180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id007
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *70102415052180
+- !ruby/object:Gem::Dependency
   name: mocha
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  requirement: &70102415051500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id008
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *70102415051500
+- !ruby/object:Gem::Dependency
   name: mimic
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  requirement: &70102415050560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id009
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *70102415050560
+- !ruby/object:Gem::Dependency
   name: awesome_print
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  requirement: &70102415049580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id010
+  prerelease: false
+  version_requirements: *70102415049580
 description: 
 email: luke@lukeredpath.co.uk
-executables: 
+executables:
 - github-downloads
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - Gemfile
 - Gemfile.lock
 - Rakefile
@@ -182,36 +144,29 @@ files:
 - lib/github.rb
 homepage: http://lukeredpath.co.uk
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -2923225652763402578
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Manages downloads for your Github projects
 test_files: []
-