chute 2.0.2 → 2.1.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YjQ0MGVhMDdlODYyOTM3MjJmY2ZmZTdhMmE4ZDZkNDMyNjYxY2Q5OQ==
+  data.tar.gz: !binary |-
+    MzIzOTc0OGI0ZDEyOWY3YTI3N2IwZGY0YmFmM2FmNDI4MmM3ODAzYQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    MjE4N2NiNzA0YWEwNTcxZDAwZTU5NDM3M2MwOTkzMmJhYmJiMWQ4MmZhOGQw
+    MmY5MWYxNmY1NjE2ZjA3NDgxYzZiZDYxNTdlOWVjYTJmZGRkMTc4YjNiYzFm
+    N2E5MzI5MzRlMmVjMGQ0MjY5M2YwYzdkMDUwMTUyNGNhMmQzMGI=
+  data.tar.gz: !binary |-
+    ODAyOGU0ZjhmNDUxNTBhYTQzODk2YjhkNmQ2NjlhZTk4NmQ0ZDk1YTE0Mzc0
+    ZWQ5MmU5YzNlMTFiN2ExM2YyYWNjYmI1ODM2MDY2ZTZlY2JhY2VmNjI1NWU5
+    MWFiNmQzYjYwMDdhZjQ3ZmFjMzUyZDE4MTdmYWU4YTQ2Mzg4MDg=

data/CHANGELOG.md

@@ -0,0 +1,6 @@
+## 2.1.0 knight-kill (2013-08-11)
+
+### Features
+
+- **move asset**: add support for moving asset from one album to another
+- **copy asset**: add support for copying asset to another album

data/Gemfile

@@ -1,6 +1,7 @@
 source "http://rubygems.org"
 gem 'httparty'
 gem 'hashie'
+gem 'rest-client'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
@@ -8,11 +9,11 @@ group :development do
   gem "rspec", "~> 2.8.0"
   gem "rdoc", "~> 3.12"
   gem "bundler"
-  gem "jeweler", "~> 1.8.4"
+  gem "jeweler", "~> 1.8.6"
   gem "simplecov"
 end
 
 group :test do
   gem 'webmock'
-  gem 'vcr'
+  gem 'vcr' , "~> 2.5.0"
 end

data/Gemfile.lock

@@ -1,25 +1,57 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.3.2)
-    crack (0.3.1)
+    addressable (2.3.5)
+    builder (3.2.2)
+    crack (0.4.1)
+      safe_yaml (~> 0.9.0)
     diff-lcs (1.1.3)
+    faraday (0.8.8)
+      multipart-post (~> 1.2.0)
     git (1.2.5)
-    hashie (1.2.0)
-    httparty (0.9.0)
+    github_api (0.10.1)
+      addressable
+      faraday (~> 0.8.1)
+      hashie (>= 1.2)
+      multi_json (~> 1.4)
+      nokogiri (~> 1.5.2)
+      oauth2
+    hashie (2.0.5)
+    highline (1.6.19)
+    httparty (0.11.0)
       multi_json (~> 1.0)
-      multi_xml
-    jeweler (1.8.4)
+      multi_xml (>= 0.5.2)
+    httpauth (0.2.0)
+    jeweler (1.8.6)
+      builder
       bundler (~> 1.0)
       git (>= 1.2.5)
+      github_api (= 0.10.1)
+      highline (>= 1.6.15)
+      nokogiri (= 1.5.10)
       rake
       rdoc
-    json (1.7.6)
-    multi_json (1.5.0)
-    multi_xml (0.5.1)
-    rake (10.0.3)
-    rdoc (3.12)
+    json (1.8.0)
+    jwt (0.1.8)
+      multi_json (>= 1.5)
+    mime-types (1.23)
+    multi_json (1.7.9)
+    multi_xml (0.5.5)
+    multipart-post (1.2.0)
+    nokogiri (1.5.10)
+    oauth2 (0.9.2)
+      faraday (~> 0.8)
+      httpauth (~> 0.2)
+      jwt (~> 0.1.4)
+      multi_json (~> 1.0)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
+    rack (1.5.2)
+    rake (10.1.0)
+    rdoc (3.12.2)
       json (~> 1.4)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
     rspec (2.8.0)
       rspec-core (~> 2.8.0)
       rspec-expectations (~> 2.8.0)
@@ -28,14 +60,15 @@ GEM
     rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.8.0)
+    safe_yaml (0.9.5)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
-    vcr (2.2.5)
-    webmock (1.8.11)
+    vcr (2.5.0)
+    webmock (1.13.0)
       addressable (>= 2.2.7)
-      crack (>= 0.1.7)
+      crack (>= 0.3.2)
 
 PLATFORMS
   ruby
@@ -44,9 +77,10 @@ DEPENDENCIES
   bundler
   hashie
   httparty
-  jeweler (~> 1.8.4)
+  jeweler (~> 1.8.6)
   rdoc (~> 3.12)
+  rest-client
   rspec (~> 2.8.0)
   simplecov
-  vcr
+  vcr (~> 2.5.0)
   webmock

data/{LICENSE.txt → LICENSE.md}

@@ -1,4 +1,6 @@
-Copyright (c) 2012 Darko Grozdanovski
+# The MIT License (MIT)
+
+Copyright (c) 2012-2013 Chute Corporation <hello@getchute.com>, http://getchute.com
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,29 +1,28 @@
-CHUTE WRAPPER GEM
-==
+# Chute API V2 wrapper gem
 
-Development
---
+> Access [Chute API V2](https://api.getchute.com/v2) from Ruby.
 
-to build and install the gem locally on your system use:
 
-        rake install
-
-you can afterwards include it inside your rails app
+## How to use
 
+Install directly
 
-Running tests
---
+```sh
+gem install chute
+```
 
-to run the tests write
+or add to your Gemfile
 
+```ruby
+gem 'chute'
+```
 
-        bundle exec rspec
 
+### Configuration
 
-Configuration of the Gem Inside your config/ folder
---
+Create `config/initializers/chute.rb` and set your credentials (you can get them from [apps.getchute.com](http://apps.getchute.com).
 
-```
+```ruby
 Chute.configure do |config|
   config.app_id = YOUR_APP_ID
   config.app_secret = YOUR_APP_SECRET
@@ -32,15 +31,48 @@ end
 ```
 
 
+### Usage
+
 The parameters in the response are accessed as standard fields inside a class. Assuming `response` is the basic
-object containing the complete response you can access the id of the element by
+object containing the complete response you can access the id of an element by
 
-```
+```ruby
 response.data.id # if data is a single object
 response.data[0].id # if data is an array
 ```
 
 
-Responses are being recorded for reuse by using VCR
+## Development
+
+To build and install the gem locally on your system use:
+
+    rake install
+
+you can afterwards include it inside your rails app
+
+
+### Tests
+
+To be able to run tests you'll first need to create an authorization file with the following contents and save it as `spec/support/authorization.rb`
+
+```ruby
+shared_context "init credentials" do
+  before(:all) do
+    Chute.app_id = "508fc620018d162a070000d6"  # this is an app designated for API testing
+    Chute.app_secret = "2ee285c24d8ffa83145aba8834f29ca1644b293a76a49db59a037e7301a26119"
+    Chute.access_token = "fe5d08d828c1d4562e5d2a7bbbb76e7dfa1fbc0932467a7a710bec66935df654"
+  end
+end
+```
+
+Now you can run tests using rspec
+
+    bundle exec rspec
+
+
+Responses are recorded for reuse by VCR. If you need to re-run some of them remove the specific file from `spec/fixtures/`
+
+
+## License
 
-if you need to re-run some of them remove the specific one from `fixtures/`
+Copyright (c) 2012-2013 Chute Corporation. Released under the MIT License.

data/chute.gemspec

@@ -5,24 +5,24 @@
 
 Gem::Specification.new do |s|
   s.name = "chute"
-  s.version = "2.0.2"
+  s.version = "2.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Darko Grozdanovski", "Chris Burkhart", "Petr Bela"]
-  s.date = "2013-06-18"
+  s.date = "2013-08-12"
   s.description = "wrapper for the API for getchute.com"
   s.email = "support@gmail.com"
   s.extra_rdoc_files = [
-    "LICENSE.txt",
+    "LICENSE.md",
     "README.md"
   ]
   s.files = [
+    "CHANGELOG.md",
     "Gemfile",
     "Gemfile.lock",
-    "LICENSE.txt",
+    "LICENSE.md",
     "README.md",
     "Rakefile",
-    "VERSION",
     "chute.gemspec",
     "lib/chute.rb",
     "lib/chute/client.rb",
@@ -63,6 +63,7 @@ Gem::Specification.new do |s|
     "spec/fixtures/chute_cassettes/albums/albums_import_assets.yml",
     "spec/fixtures/chute_cassettes/albums/albums_import_assets_from_instagram_id.yml",
     "spec/fixtures/chute_cassettes/albums/albums_list.yml",
+    "spec/fixtures/chute_cassettes/albums/albums_move_copy_asset.yml",
     "spec/fixtures/chute_cassettes/albums/albums_stats.yml",
     "spec/fixtures/chute_cassettes/albums/albums_update.yml",
     "spec/fixtures/chute_cassettes/assets/assets_delete.yml",
@@ -71,6 +72,7 @@ Gem::Specification.new do |s|
     "spec/fixtures/chute_cassettes/assets/assets_import.yml",
     "spec/fixtures/chute_cassettes/assets/assets_list.yml",
     "spec/fixtures/chute_cassettes/assets/assets_update.yml",
+    "spec/fixtures/chute_cassettes/assets/assets_upload.yml",
     "spec/fixtures/chute_cassettes/comments/comments_create.yml",
     "spec/fixtures/chute_cassettes/comments/comments_list.yml",
     "spec/fixtures/chute_cassettes/flags/flags_methods.yml",
@@ -85,41 +87,46 @@ Gem::Specification.new do |s|
     "spec/fixtures/chute_cassettes/users/users_get.yml",
     "spec/fixtures/chute_cassettes/users/users_me.yml",
     "spec/fixtures/chute_cassettes/votes/votes_methods.yml",
-    "spec/spec_helper.rb"
+    "spec/fixtures/files/test_image.jpg",
+    "spec/spec_helper.rb",
+    "spec/support/file_helpers.rb"
   ]
   s.homepage = "https://github.com/chute/chute-sdk-2"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.25"
+  s.rubygems_version = "2.0.3"
   s.summary = "getchute API wrapper"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<httparty>, [">= 0"])
       s.add_runtime_dependency(%q<hashie>, [">= 0"])
+      s.add_runtime_dependency(%q<rest-client>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8.6"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
     else
       s.add_dependency(%q<httparty>, [">= 0"])
       s.add_dependency(%q<hashie>, [">= 0"])
+      s.add_dependency(%q<rest-client>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, [">= 0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.6"])
       s.add_dependency(%q<simplecov>, [">= 0"])
     end
   else
     s.add_dependency(%q<httparty>, [">= 0"])
     s.add_dependency(%q<hashie>, [">= 0"])
+    s.add_dependency(%q<rest-client>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.8.0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, [">= 0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.6"])
     s.add_dependency(%q<simplecov>, [">= 0"])
   end
 end

data/lib/chute.rb

@@ -1,4 +1,5 @@
 require "httparty"
+require "rest_client"
 
 Dir[File.dirname(__FILE__) + '/chute/**/*.rb'].each do |file|
   require file

data/lib/chute/configuration.rb

@@ -1,13 +1,14 @@
 module Chute
   module Configuration
 
-    VALID_CONNECTION_KEYS = [:api_endpoint, :auth_endpoint].freeze
+    VALID_CONNECTION_KEYS = [:api_endpoint, :auth_endpoint, :upload_endpoint].freeze
     VALID_OPTIONS_KEYS    = [:app_id, :app_secret, :access_token].freeze
     VALID_CONFIG_KEYS     = VALID_CONNECTION_KEYS + VALID_OPTIONS_KEYS
 
 
     DEFAULT_API_ENDPOINT    = 'https://api.getchute.com'
     DEFAULT_AUTH_ENDPOINT   = 'https://getchute.com/auth'
+    DEFAULT_UPLOAD_ENDPOINT = 'http://upload.getchute.com'
 
     DEFAULT_APP_ID          = 'app_id'
     DEFAULT_APP_SECRET      = 'app_secret'
@@ -30,6 +31,7 @@ module Chute
     def reset
       self.api_endpoint       = DEFAULT_API_ENDPOINT
       self.auth_endpoint      = DEFAULT_AUTH_ENDPOINT
+      self.upload_endpoint    = DEFAULT_UPLOAD_ENDPOINT
 
       self.app_id             = DEFAULT_APP_ID
       self.app_secret         = DEFAULT_APP_SECRET

data/lib/chute/v2/albums.rb

@@ -59,6 +59,16 @@ module Chute
           Chute::Client.post("/v2/albums/#{album_id}/remove_assets",:asset_ids => asset_ids)
         end
 
+        # Move asset from one album to another, preserving all asset's metadata
+        def move_asset(album_id, asset_id, to_album)
+          Chute::Client.post("/v2/albums/#{album_id}/assets/#{asset_id}/move/#{to_album}")
+        end
+
+        # Copy asset from one album to another, carrying over all asset's metadata
+        def copy_asset(album_id, asset_id, to_album)
+          Chute::Client.post("/v2/albums/#{album_id}/assets/#{asset_id}/copy/#{to_album}")
+        end
+
       end
     end
   end

data/lib/chute/v2/assets.rb

@@ -27,9 +27,14 @@ module Chute
           Chute::Client.get("/v2/assets/#{id}/geo")
         end
 
-        # TODO Implement on server: Asset Create
-        def upload(data)
-          Chute::Client.post("/v2/assets/upload", :urls => urls)
+        def upload(albumId, f)
+          response = RestClient::Request.execute(:url => "#{Chute.upload_endpoint}/v2/albums/#{albumId}/assets/upload", :method => :post,
+                                                 :payload => {
+                                                     :multipart => true,
+                                                     :filedata => f
+                                                 },:headers => {"Authorization" => "Bearer #{Chute.access_token}"}
+          )
+          Chute::Connection.parse(JSON.parse(response.body))
         end
 
         def import(urls, shortcuts)

data/lib/chute/version.rb

@@ -1,8 +1,8 @@
 module Chute
   module Version
     MAJOR = 2
-    MINOR = 0
-    PATCH = 2
+    MINOR = 1
+    PATCH = 0
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

data/spec/chute/client_spec.rb

@@ -31,6 +31,7 @@ describe Chute::Client do
         @config = {
             :api_endpoint => 'api',
             :auth_endpoint => 'auth',
+            :upload_endpoint => "upload",
             :app_id => 'id',
             :app_secret => 'secret',
             :access_token => 'token',

data/spec/chute/v2/albums_spec.rb

@@ -192,6 +192,31 @@ describe Chute::V2::Albums do
 
     end
 
+    describe "POST move and copy asset" do
+
+      let(:id) { Chute::V2::Albums.create({:name => "Created Album"}).data.id }
+      let(:to_album) { Chute::V2::Albums.create({:name => "Created Album"}).data.id }
+
+      before do
+        VCR.insert_cassette 'albums/albums_move_copy_asset', :record => :new_episodes
+      end
+      after do
+        VCR.eject_cassette
+      end
+
+      it "should be able to move asset to another album" do
+        response = Chute::V2::Albums.move_asset(id, 8765443, to_album)
+        response.should be_true
+      end
+
+
+      it "should be able to copy asset to another album" do
+        response = Chute::V2::Albums.copy_asset(id, 3452424, to_album)
+        response.should be_true
+      end      
+
+    end
+
     describe "POST to import Assets" do
 
       let(:id) { Chute::V2::Albums.create({:name => "Created Album"}).data.id }