imager 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d30bc7d9057f78efe90d633324e31852c4c5ca60
-  data.tar.gz: e7dbe1bf69a88703cde2c1e672c396543ba48ba7
+  metadata.gz: b207cc06a420c94e94e3dba7ba472d951071f02d
+  data.tar.gz: 6ce99f02a7183309cd0631debf8229caf1562f1a
 SHA512:
-  metadata.gz: e2d3700bf32ccbc0d3e930b8b9472f586b8a909652eff5d5f3f5dd327faf335dcc87bf47243facd0f783595da51210af4b3437da777c03b2ac7aee18ba88c06b
-  data.tar.gz: 2f5a859eb4cb534df31357ddf22510f8e8001f5d6735ef7010bb882851359224862843a731d14c3a02c027971054bc04152c31a25219625a46fff92de4e1f976
+  metadata.gz: 8e60bf378182a02855a9efd9b413b2df993c35f988a18858cbd4dfc4b358c180f7158787c3fb8b0313afbd68c1fcbc25ffd306ed10c6d71fbe169339b1ef609d
+  data.tar.gz: f290efc196700897687f378bce2c20171817d2d3a58a86334ed4a36fe5c3a62c02fad672e77f6d6d2947899fc13c1c0de87bbc494c45a75633443eacbcdc70f2

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+script: bundle exec rspec spec
+rvm:
+  - 2.0.0
+  - 1.9.3
+  - jruby-19mode # JRuby in 1.9 mode
+  - rbx-19mode

data/README.md

@@ -4,6 +4,9 @@ Use with [ImagerServer](https://github.com/guilherme-otran/ImagerServer), a stor
 Check the test directory for know how the server works.
  You can save your images in other domain running ImagerServer.
 
+[![Build Status](https://travis-ci.org/guilherme-otran/Imager.png?branch=master)](https://travis-ci.org/guilherme-otran/Imager)
+[![Dependency Status](https://gemnasium.com/guilherme-otran/Imager.png)](https://gemnasium.com/guilherme-otran/Imager)
+
 ## Please contribute!
 A lot of the features are not implemented yet (except for the server)
 

data/imager.gemspec

@@ -21,6 +21,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency "webmock"
+  spec.add_development_dependency "vcr"
+  spec.add_development_dependency "turn"
   spec.add_dependency "httmultiparty", "~> 0.3.10"
   spec.add_dependency "json"
 end

data/lib/imager/server_client.rb

@@ -1,5 +1,7 @@
 require 'httmultiparty'
 
-class ServerClient
-  include HTTMultiParty
+module Imager
+  class ServerClient
+    include HTTMultiParty
+  end
 end

data/lib/imager/server_interface.rb

@@ -28,10 +28,10 @@ module Imager
     end
 
     def self.client
-      unless ServerClient.base_uri
-        ServerClient.base_uri Imager.base_uri + '/' + Imager.manager_path
+      unless Imager::ServerClient.base_uri
+        Imager::ServerClient.base_uri Imager.base_uri + '/' + Imager.manager_path
       end
-      ServerClient
+      Imager::ServerClient
     end
 
     private

data/lib/imager/version.rb

@@ -1,3 +1,3 @@
 module Imager
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/fixtures/imagerserver_cassettes/invalid_album_and_collection_post.yml

@@ -0,0 +1,52 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: http://dev.local/imagerserver/manager/post.php
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        BAhbClsHSSIPY29sbGVjdGlvbgY6BkVGSSIABjsAVFsHSSIKYWxidW0GOwBG
+        SSIABjsAVFsHSSIXc2l6ZXNbc2l6ZV1bd2lkdGhdBjsARmlpWwdJIglmaWxl
+        BjsARm86EUZha2VVcGxvYWRJTwg6F0BvcmlnaW5hbF9maWxlbmFtZUkiDmlt
+        YWdlLmpwZwY7AFQ6EkBjb250ZW50X3R5cGVJIh1hcHBsaWNhdGlvbi9vY3Rl
+        dC1zdHJlYW0GOwBUOgpAYm9keUkiApwB/9j/4AAQSkZJRgABAQEASABIAAD/
+        2wBDAAEBAQEBAQEBAQEBAQECAgMCAgICAgQDAwIDBQQFBQUEBAQFBgcGBQUH
+        BgQEBgkGBwgICAgIBQYJCgkICgcICAj/2wBDAQEBAQICAgQCAgQIBQQFCAgI
+        CAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgI
+        CAj/wAARCAMABAADASIAAhEBAxEB/8QAHwAAAAYDAQEBAAAAAAAAAAAABAUG
+        BwgJAgMKAQAL/8QAThAAAQMCBQIEAwYEBAQFAgENAQIDBAURAAYHEiETMQgi
+        QVEUYXEJFSMygZFCUqGxFjNiwQokctEXQ4Lh8JLxJTRTY6IYJrInNURzwqP/
+        xAAcAQABBQEBAQAAAAAAAAAAAAAFAQIDBAYABwj/xAA5EQABAwMDAgUCBQME
+        AwEBAQEBAgMRAAQhBRIxQVEGEyJhcYGRFDKhscHR4fAVI0LxBxZSMyQlQ//a
+        AAwDAQACEQMRAD8A468keHnMOpGaP/BvIFWydXM4VgY6DWVuY29kaW5nIgpD
+        UDg1MFsHSSIJYXV0aAY7AEYiJTYzY2IxNDE5YjlkNmNlNTVkNmFmNDEwMmRi
+        OGQzNjc5
+    headers:
+      Content-Type:
+      - multipart/form-data; boundary=-----------RubyMultipartPost
+      Content-Length:
+      - '382016'
+  response:
+    status:
+      code: 400
+      message: Bad Request
+    headers:
+      Date:
+      - Mon, 03 Jun 2013 03:28:24 GMT
+      Server:
+      - Apache/2.4.4 (Win32) OpenSSL/0.9.8y PHP/5.4.13
+      X-Powered-By:
+      - PHP/5.4.13
+      Connection:
+      - close
+      Content-Type:
+      - text/html; charset=UTF-8
+      Content-Length:
+      - '18'
+    body:
+      encoding: UTF-8
+      string: Invalid collection
+    http_version: 
+  recorded_at: Mon, 03 Jun 2013 03:28:24 GMT
+recorded_with: VCR 2.5.0

data/spec/fixtures/imagerserver_cassettes/no_image_delete.yml

@@ -0,0 +1,32 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: http://dev.local/imagerserver/manager/delete.php
+    body:
+      encoding: UTF-8
+      string: collection=test&album=1&file_id=non_existing_image&auth=89a623c5f2557f09332c90cfddc4725a
+    headers: {}
+  response:
+    status:
+      code: 400
+      message: Bad Request
+    headers:
+      Date:
+      - Mon, 03 Jun 2013 03:08:22 GMT
+      Server:
+      - Apache/2.4.4 (Win32) OpenSSL/0.9.8y PHP/5.4.13
+      X-Powered-By:
+      - PHP/5.4.13
+      Connection:
+      - close
+      Content-Type:
+      - text/html; charset=UTF-8
+      Content-Length:
+      - '16'
+    body:
+      encoding: UTF-8
+      string: Invalid file_id.
+    http_version: 
+  recorded_at: Mon, 03 Jun 2013 03:08:22 GMT
+recorded_with: VCR 2.5.0

data/spec/fixtures/imagerserver_cassettes/valid_delete.yml

@@ -0,0 +1,30 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: http://dev.local/imagerserver/manager/delete.php
+    body:
+      encoding: UTF-8
+      string: collection=test&album=1&file_id=image&auth=3ce2c42fcd1ad5ae91e58586fa49aed3
+    headers: {}
+  response:
+    status:
+      code: 204
+      message: No Content
+    headers:
+      Date:
+      - Mon, 03 Jun 2013 03:28:24 GMT
+      Server:
+      - Apache/2.4.4 (Win32) OpenSSL/0.9.8y PHP/5.4.13
+      X-Powered-By:
+      - PHP/5.4.13
+      Content-Type:
+      - text/html; charset=UTF-8
+      Content-Length:
+      - '0'
+    body:
+      encoding: UTF-8
+      string: ''
+    http_version: 
+  recorded_at: Mon, 03 Jun 2013 03:28:24 GMT
+recorded_with: VCR 2.5.0

data/spec/fixtures/imagerserver_cassettes/valid_post.yml

@@ -0,0 +1,50 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: http://dev.local/imagerserver/manager/post.php
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        BAhbClsHSSIPY29sbGVjdGlvbgY6BkVGSSIJdGVzdAY7AFRbB0kiCmFsYnVt
+        BjsARkkiBjEGOwBUWwdJIhhzaXplc1tzbWFsbF1bd2lkdGhdBjsARmlpWwdJ
+        IglmaWxlBjsARm86EUZha2VVcGxvYWRJTwg6F0BvcmlnaW5hbF9maWxlbmFt
+        ZUkiDmltYWdlLmpwZwY7AFQ6EkBjb250ZW50X3R5cGVJIh1hcHBsaWNhdGlv
+        bi9vY3RldC1zdHJlYW0GOwBUOgpAYm9keUkiApwB/9j/4AAQSkZJRgABAQEA
+        SABIAAD/2wBDAAEBAQEBAQEBAQEBAQECAgMCAgICAgQDAwIDBQQFBQUEBAQF
+        BgcGBQUHBgQEBgkGBwgICAgIBQYJCgkICgcICAj/2wBDAQEBAQICAgQCAgQI
+        BQQFCAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgI
+        CAgICAgICAj/wAARCAMABAADASIAAhEBAxEB/8QAHwAAAAYDAQEBAAAAAAAA
+        AAAABAUGBwgJAgMKAQAL/8QAThAAAQMCBQIEAwYEBAQFAgENAQIDBAURAAYH
+        EiETMQgiQVEUYXEJFSMygZFCUqGxFjNiwQokctEXQ4Lh8JLxJTRTY6IYJrIn
+        NURzwqP/xAAcAQABBQEBAQAAAAAAAAAAAAAFAQIDBAYABwj/xAA5EQABAwMD
+        AgUCBQMEAwEBAQEBAgMRAAQhBRIxQVEGEyJhcYGRFDKhscHR4fAVI0LxBxZS
+        MyQlQ//aAAwDAQACEQMRAD8A468keHnMOpGaP/BvIFWydXM4VgY6DWVuY29k
+        aW5nIgpDUDg1MFsHSSIJYXV0aAY7AEYiJTQwZDk3MDM4OWIyMzA5NDdkNTlm
+        OWExZTZlOTBhNzQ0
+    headers:
+      Content-Type:
+      - multipart/form-data; boundary=-----------RubyMultipartPost
+      Content-Length:
+      - '382022'
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Mon, 03 Jun 2013 03:28:23 GMT
+      Server:
+      - Apache/2.4.4 (Win32) OpenSSL/0.9.8y PHP/5.4.13
+      X-Powered-By:
+      - PHP/5.4.13
+      Content-Type:
+      - text/html; charset=UTF-8
+      Content-Length:
+      - '165'
+    body:
+      encoding: UTF-8
+      string: '{"collection":"test","album":"1","file_id":"image","accepted_sizes":["small"],"URIs":{"small":"http:\/\/dev.local\/imagerserver\/images\/test\/1\/image\/small.jpg"}}'
+    http_version: 
+  recorded_at: Mon, 03 Jun 2013 03:28:24 GMT
+recorded_with: VCR 2.5.0

data/spec/imager/server_interface_spec.rb

@@ -1,37 +1,56 @@
 require 'spec_helper'
-require 'debugger'
+
 describe Imager::ServerInterface do
   describe ".post" do
 
     context "when params are valid" do
       it "returns true" do
-        described_class.post("test", "1", "spec/image.jpg", small: { width: 100 }).should be_true
+        VCR.use_cassette('valid_post') do
+          described_class.post("test", "1", "spec/image.jpg", small: { width: 100 }).should be_true
+        end
       end
     end
 
-    context "when some param is not correct" do
+    context "when no image" do
       it "raises an error" do
+        # No request made here, because has no image
         expect {
           described_class.post("", "", "", size: { width: 100 })
         }.to raise_error Imager::ImagerError
       end
     end
+
+    context "when other params are wrong" do
+      it "raises an error" do
+        VCR.use_cassette('invalid_album_and_collection_post') do
+          expect {
+            described_class.post("", "", "spec/image.jpg", size: { width: 100 })
+          }.to raise_error Imager::ImagerError
+        end
+      end
+    end
   end
 
   describe ".delete" do
     context "valid params and existing image" do
 
       it "returns true" do
-        described_class.post("test", "1", "spec/image.jpg", small: { width: 100 })
-        described_class.delete("test", "1", "image").should be_true
+        VCR.use_cassette('valid_post') do
+          described_class.post("test", "1", "spec/image.jpg", small: { width: 100 })
+        end
+        VCR.use_cassette('valid_delete') do
+          described_class.delete("test", "1", "image").should be_true
+        end
       end
     end
 
     context "some invalid param" do
       it "raises an error" do
-        expect {
-          described_class.delete("test", "1", "non_existing_image")
-        }.to raise_error Imager::ImagerError
+        VCR.use_cassette('no_image_delete') do
+          expect {
+            described_class.delete("test", "1", "non_existing_image")
+          }.to raise_error Imager::ImagerError
+        end
       end
     end
   end

data/spec/spec_helper.rb

@@ -1,12 +1,36 @@
 require 'imager'
 
+#dependencies
+require 'minitest/autorun'
+require 'webmock/minitest'
+require 'vcr'
+require 'turn'
+
+# Hack for HTTMultiParty And VCR
+require 'support/httmultiparty'
+
 RSpec.configure do |c|
   c.before do
     Imager.configure do |c|
       c.base_uri        = "http://dev.local/imagerserver"
-      c.auth_code       = "f8cecac2459d83eb9c8c703663e349ddbeb82a76230c7ca5ffc8434cfaab"
+      c.auth_code       = "ABCDE"
       c.collection_path = "images"
       c.manager_path    = "manager"
     end
   end
+end
+
+Turn.config do |c|
+ # :outline  - turn's original case/test outline mode [default]
+ c.format  = :outline
+ # turn on invoke/execute tracing, enable full backtrace
+ c.trace   = true
+ # use humanized test names (works only with :outline format)
+ c.natural = true
+end
+
+#VCR config
+VCR.configure do |c|
+  c.cassette_library_dir = 'spec/fixtures/imagerserver_cassettes'
+  c.hook_into :webmock
 end

data/spec/support/httmultiparty.rb

@@ -0,0 +1,82 @@
+require 'webmock'
+require 'httmultiparty'
+
+class FakeUploadIO
+
+  attr_accessor :original_filename, :content_type, :body
+
+  def initialize(io)
+    io.rewind # make sure....
+
+    self.original_filename  = io.original_filename || File.basename(io.local_path)
+    self.content_type       = io.content_type
+    self.body               = io.read
+
+    io.rewind # ...we don't mess up with the io
+  end
+
+end
+
+module WebMock
+  module NetHTTPUtility
+
+    def self.request_signature_from_request(net_http, request, body = nil)
+      protocol = net_http.use_ssl? ? "https" : "http"
+
+      path = request.path
+      path = WebMock::Util::URI.heuristic_parse(request.path).request_uri if request.path =~ /^http/
+
+      if request["authorization"] =~ /^Basic /
+        userinfo = WebMock::Util::Headers.decode_userinfo_from_header(request["authorization"])
+        userinfo = WebMock::Util::URI.encode_unsafe_chars_in_userinfo(userinfo) + "@"
+      else
+        userinfo = ""
+      end
+
+      uri = "#{protocol}://#{userinfo}#{net_http.address}:#{net_http.port}#{path}"
+      method = request.method.downcase.to_sym
+
+      headers = Hash[*request.to_hash.map {|k,v| [k, v]}.inject([]) {|r,x| r + x}]
+
+      headers.reject! {|k,v| k =~ /[Aa]uthorization/ && v.first =~ /^Basic / } #we added it to url userinfo
+
+      # changes happen here
+      if body != nil && body.respond_to?(:read)
+        request.set_body_internal body.read
+      else
+        request.set_body_internal body
+      end
+
+     _body = request.respond_to?(:body_footprint) ? request.body_footprint : request.body
+
+      WebMock::RequestSignature.new(method, uri, :body => _body, :headers => headers)
+    end
+  end
+end
+
+module HTTMultiParty::Multipartable::Webmock
+
+  def body_footprint
+    return self.body if (!@_body.is_a? Array) && @_body.blank?
+
+    Marshal.dump(@_body.map do |key, _value|
+      _value = FakeUploadIO.new(_value) if _value.is_a?(UploadIO)
+      [key, _value]
+    end)
+  end
+
+  def body=(value)
+    if value.is_a?(Array)
+      @_body = value.dup # save it for later
+      super(value)
+    else
+      # does this case exist for real ? Never observed so far
+      puts "[httmultiparty] not an array !!! #{value.class}."
+      raise 'STOP'
+    end
+  end
+end
+
+class HTTMultiParty::MultipartPost < Net::HTTP::Post
+  include HTTMultiParty::Multipartable::Webmock
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imager
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Guilherme Otranto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-02 00:00:00.000000000 Z
+date: 2013-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,48 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: turn
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: httmultiparty
   requirement: !ruby/object:Gem::Requirement
@@ -88,6 +130,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -99,11 +142,16 @@ files:
 - lib/imager/server_client.rb
 - lib/imager/server_interface.rb
 - lib/imager/version.rb
+- spec/fixtures/imagerserver_cassettes/invalid_album_and_collection_post.yml
+- spec/fixtures/imagerserver_cassettes/no_image_delete.yml
+- spec/fixtures/imagerserver_cassettes/valid_delete.yml
+- spec/fixtures/imagerserver_cassettes/valid_post.yml
 - spec/image.jpg
 - spec/imager/link_helper_spec.rb
 - spec/imager/server_interface_spec.rb
 - spec/imager_spec.rb
 - spec/spec_helper.rb
+- spec/support/httmultiparty.rb
 homepage: https://github.com/guilherme-otran/Imager
 licenses:
 - MIT
@@ -129,8 +177,13 @@ signing_key:
 specification_version: 4
 summary: Imager Client API
 test_files:
+- spec/fixtures/imagerserver_cassettes/invalid_album_and_collection_post.yml
+- spec/fixtures/imagerserver_cassettes/no_image_delete.yml
+- spec/fixtures/imagerserver_cassettes/valid_delete.yml
+- spec/fixtures/imagerserver_cassettes/valid_post.yml
 - spec/image.jpg
 - spec/imager/link_helper_spec.rb
 - spec/imager/server_interface_spec.rb
 - spec/imager_spec.rb
 - spec/spec_helper.rb
+- spec/support/httmultiparty.rb