sheep 0.1.0 → 0.1.1

data/lib/sheep.rb

@@ -14,10 +14,8 @@ module Sheep
 
     def connection
       @connection ||= Apis::Connection.new(:uri => 'http://api-tuppy-com.heroku.com/') do
-        response do
-          use Apis::Middleware::Response::Json
-          use Sheep::ErrorResponse
-        end
+        use Sheep::ErrorResponse
+        use Apis::Middleware::Response::Json
       end
     end
   end

data/lib/sheep/error.rb

@@ -10,17 +10,18 @@ module Sheep
       @app = app
     end
 
-    def call(response)
-      case response.status
+    def call(env)
+      status, headers, body = @app.call(env)
+      case status
       when 200, 201, 301, 302
-        @app.call(response) if @app
       when 400
-        raise Sheep::BadRequest.new(response.body['error'] || response.body['errors'])
+        raise Sheep::BadRequest.new(body['error'] || body['errors'])
       when 404
         raise Sheep::NotFound
       else
-        raise Sheep::UnknownError.new(response)
+        raise Sheep::UnknownError.new(body)
       end
+      return status, headers, body
     end
   end
 end

data/lib/sheep/user.rb

@@ -2,22 +2,22 @@ module Sheep
   class User
     class << self
       def find(id)
-        new(Sheep.connection.get("/v1/users/#{id}").body['user'])
+        new(Sheep.connection.get("/v1/users/#{id}")[2]['user'])
       end
 
       def create(attributes)
-        response = Sheep.connection.post('/v1/users') do |request|
+        status, headers, body = Sheep.connection.post('/v1/users') do |request|
           request.params = { :user => attributes }
           request.params['client_id'] = Sheep.client_id
           request.params['client_secret'] = Sheep.client_secret
         end
         # TODO: refactor this to use Authorized when it will be finished
-        Sheep.access_token = response.body['access_token']
-        new(Sheep.connection.get(response.headers['Location']).body['user'])
+        Sheep.access_token = body['access_token']
+        new(Sheep.connection.get(headers['Location'])[2]['user'])
       end
 
       def authorize!(username, password)
-        response = Sheep.connection.post('/v1/oauth/access_token') do |request|
+        status, headers, body = Sheep.connection.post('/v1/oauth/access_token') do |request|
           request.params['username'] = username
           request.params['password'] = password
           request.params['client_id'] = Sheep.client_id
@@ -25,15 +25,13 @@ module Sheep
           request.params['grant_type'] = 'password'
         end
         # TODO: access_token should be in user object, not global
-        Sheep.access_token = response.body['access_token']
+        Sheep.access_token = body['access_token']
       end
     end
 
     def activities
-      response = Sheep.connection.get('/v1/activities') do |request|
-        request.headers['Authorization'] = "Bearer #{Sheep.access_token}"
-      end
-      response.body.map do |activity|
+      status, headers, body = Sheep.connection.get('/v1/activities', {}, {'Authorization' => "Bearer #{Sheep.access_token}"})
+      body.map do |activity|
         Sheep::Activity.new(activity['activity'])
       end
     end

data/lib/sheep/version.rb

@@ -1,3 +1,3 @@
 module Sheep
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/sheep.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec', '>= 2.5'
   s.add_development_dependency 'rack-test'
   s.add_development_dependency 'sinatra'
-  s.add_dependency 'apis', '>= 0.3'
+  s.add_dependency 'apis', '>= 0.5.1.pre1'
   s.add_dependency 'multi_json'
   s.add_dependency 'yajl-ruby'
 end

metadata

@@ -2,7 +2,7 @@
 name: sheep
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - "Marjan Krekoten' (\xD0\x9C\xD0\xB0\xD1\x80'\xD1\x8F\xD0\xBD \xD0\x9A\xD1\x80\xD0\xB5\xD0\xBA\xD0\xBE\xD1\x82\xD0\xB5\xD0\xBD\xD1\x8C)"
@@ -53,7 +53,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0.3"
+        version: 0.5.1.pre1
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency