empresaula-api 0.0.2.1 → 0.0.2.2

data/lib/empresaula-api/controller/authentication.rb

@@ -11,23 +11,15 @@ module Empresaula
           end
         end
 
-        def current_session
-          @current_session ||= find_session_from_cookies
-        end
-
         # Sets the current user
         #
         def current_user
-          current_session.user if current_session
-        end
-
-        private
-
-        def find_session_from_cookies
-          if cookies[:empresaula_session].present?
-            Empresaula::API::Resource::Session.find(
-              cookies[:empresaula_session])
-          end
+          @current_user ||= Proc.new do
+            if session["warden.user.user.key"]
+              user_id = session["warden.user.user.key"].flatten[1]
+              Empresaula::API::Resource::User.find(user_id)
+            end
+          end.call
         end
       end
     end

data/lib/empresaula-api/version.rb

@@ -1,5 +1,5 @@
 module Empresaula
   module API
-    VERSION = "0.0.2.1"
+    VERSION = "0.0.2.2"
   end
 end

data/test/empresaula-api/controller/authentication_test.rb

@@ -8,40 +8,25 @@ module Empresaula::API::Controller
       Class.new do
         def self.helper_method(*args); end;
         include Authentication
-        def cookies
-          @cookies ||= {}
+        def session
+          {}
         end
       end.new
     end
     before do
-      subject.cookies[:empresaula_session] = empresaula_session
       Empresaula::API::Resource::Base.site = "http://fakehost/api"
     end
-    let(:empresaula_session) do
-      stub(present?: false, to_s: 'session-secret')
-    end
-    describe "#current_session" do
-      it "returns nil if no cookie set" do
-        subject.current_session.must_equal nil
-      end
-      it "returns an user if a cookie is found" do
-        empresaula_session.stubs(present?: true)
-        Empresaula::API::Resource::Session.expects(:find).
-          with(empresaula_session)
-        subject.current_session
-      end
-    end
     describe "#current_user" do
       it "returns nil if no cookie set" do
         subject.current_user.must_equal nil
       end
       it "returns an user if a cookie is found" do
-        session = {session: {user: {name: 'Jonah'}}}
+        subject.stubs(session: {'warden.user.user.key' => [nil, 2]})
+        user = {user: {name: 'Jonah'}}
         ActiveResource::HttpMock.respond_to do |mock|
-          mock.get '/api/sessions/session-secret.json', {},
-            session.to_json
+          mock.get '/api/users/2.json', {},
+            user.to_json
         end
-        empresaula_session.stubs(present?: true)
         subject.current_user.name.must_equal "Jonah"
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: empresaula-api
 version: !ruby/object:Gem::Version
-  version: 0.0.2.1
+  version: 0.0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
-  requirement: &70214629310140 !ruby/object:Gem::Requirement
+  requirement: &70296342449920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70214629310140
+  version_requirements: *70296342449920
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &70214629309660 !ruby/object:Gem::Requirement
+  requirement: &70296342449160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70214629309660
+  version_requirements: *70296342449160
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70214629309040 !ruby/object:Gem::Requirement
+  requirement: &70296342448540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70214629309040
+  version_requirements: *70296342448540
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70214629308580 !ruby/object:Gem::Requirement
+  requirement: &70296342448100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70214629308580
+  version_requirements: *70296342448100
 description: Ruby wrapper for interacting with Empresaula's API
 email:
 - info@codegram.com