empresaula-api 0.0.1 → 0.0.2

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

@@ -1,3 +1,4 @@
+require_relative '../resource/session'
 require_relative '../resource/user'
 
 module Empresaula
@@ -10,17 +11,21 @@ module Empresaula
           end
         end
 
+        def current_session
+          @current_session ||= find_session_from_cookies
+        end
+
         # Sets the current user
         #
         def current_user
-          @current_user ||= find_from_cookies
+          current_session.user if current_session
         end
 
         private
 
-        def find_from_cookies
+        def find_session_from_cookies
           if cookies[:empresaula_session].present?
-            Empresaula::API::Resource::User.find_by_session_id(
+            Empresaula::API::Resource::Session.find(
               cookies[:empresaula_session])
           end
         end

data/lib/empresaula-api/resource/base.rb

@@ -4,6 +4,15 @@ module Empresaula
   module API
     module Resource
       class Base < ActiveResource::Base
+        class << self
+          def headers
+            @headers ||= {}
+            if superclass.respond_to?(:headers)
+              @headers = superclass.headers.merge(@headers)
+            end
+            @headers
+          end
+        end
         self.format = :json
       end
     end

data/lib/empresaula-api/resource/session.rb

@@ -0,0 +1,10 @@
+require_relative 'base'
+
+module Empresaula
+  module API
+    module Resource
+      class Session < Base
+      end
+    end
+  end
+end

data/lib/empresaula-api/resource/user.rb

@@ -4,9 +4,6 @@ module Empresaula
   module API
     module Resource
       class User < Base
-        def self.find_by_session_id(session_id)
-          User.new(get(session_id))
-        end
       end
     end
   end

data/lib/empresaula-api/test_helpers/user.rb

@@ -1,3 +1,4 @@
+require 'empresaula-api/config'
 require 'empresaula-api/resource/user'
 require 'active_resource'
 require 'json'
@@ -6,19 +7,41 @@ module Empresaula
   module API
     module TestHelpers
       module User
+
         def mock_current_user(user)
           cookies = Capybara.current_session.driver.browser.current_session.instance_variable_get(:@rack_mock_session).cookie_jar
           cookies[:empresaula_session] = 'qwertyuiop123456789'
-          ActiveResource::HttpMock.respond_to do |mock|
-            mock.get "/api/users/qwertyuiop123456789.json", {},
-              user.to_json
-          end
+          add_mock '/api/users/qwertyuiop123456789.json', user
+          mock_user user
+          @current_user = Empresaula::API::Resource::User.find(user[:id])
+        end
+
+        def current_user
+          @current_user
         end
 
         def mock_user(user)
+          add_mock "/api/users/#{user[:id]}.json", user
+        end
+
+        def add_mock(url, object, method = 'get')
+          @_mocks ||= {}
+          @_mocks[url] = {method: method, object: object}
+          perform_mocks!
+        end
+
+        def mocks
+          @_mocks || {}
+        end
+
+        def perform_mocks!
+          ActiveResource::HttpMock.reset!
           ActiveResource::HttpMock.respond_to do |mock|
-            mock.get "/api/users/#{user[:id]}.json", {},
-              user.to_json
+            mocks.each do |k, v|
+              mock.send(v[:method], k,
+                        {"X-SecretToken"=>Empresaula::API.config.secret_token},
+                        v[:object].to_json)
+            end
           end
         end
       end

data/lib/empresaula-api/version.rb

@@ -1,5 +1,5 @@
 module Empresaula
   module API
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

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

@@ -15,19 +15,34 @@ module Empresaula::API::Controller
     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)
+      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'}}}
+        ActiveResource::HttpMock.respond_to do |mock|
+          mock.get '/api/sessions/session-secret.json', {},
+            session.to_json
+        end
         empresaula_session.stubs(present?: true)
-        Empresaula::API::Resource::User.expects(:find_by_session_id).
-          with(empresaula_session)
-        subject.current_user
+        subject.current_user.name.must_equal "Jonah"
       end
     end
   end

data/test/empresaula-api/resource/session_test.rb

@@ -0,0 +1,31 @@
+require_relative '../../test_helper'
+require 'empresaula-api/resource/session'
+
+module Empresaula::API::Resource
+  describe Session do
+    before do
+      Session.site = "http://fakehost/api"
+    end
+    describe ".find_by_session_id" do
+      let(:session) do
+        {
+          session: {
+            user: {
+              name: 'James'
+            }
+          }
+        }
+      end
+      before do
+        ActiveResource::HttpMock.respond_to do |mock|
+          mock.get '/api/sessions/session_key.json', {},
+            session.to_json
+        end
+      end
+      it "builds a new user given a session id" do
+        session = Session.find("session_key")
+        session.user.name.must_equal "James"
+      end
+    end
+  end
+end

data/test/empresaula-api/resource/user_test.rb

@@ -12,12 +12,12 @@ module Empresaula::API::Resource
       end
       before do
         ActiveResource::HttpMock.respond_to do |mock|
-          mock.get '/api/users/session_key.json', {},
+          mock.get '/api/users/id.json', {},
             user.to_json
         end
       end
       it "builds a new user given a session id" do
-        user = User.find_by_session_id("session_key")
+        user = User.find("id")
         user.id.must_equal 1
         user.name.must_equal "James"
       end

data/test/empresaula-api/test_helpers/user_test.rb

@@ -11,6 +11,10 @@ module Empresaula::API::TestHelpers
     describe "#mock_user" do
       before do
         Empresaula::API::Resource::User.site = "http://fake/api"
+        Empresaula::API::config.secret_token = 'secret'
+      end
+      after do
+        Empresaula::API::config.secret_token = nil
       end
       it "mocks a particular user" do
         subject.mock_user({id: 1, name: "James"})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: empresaula-api
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-01 00:00:00.000000000 Z
+date: 2011-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
-  requirement: &70309093422200 !ruby/object:Gem::Requirement
+  requirement: &70214754650080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70309093422200
+  version_requirements: *70214754650080
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &70309093421720 !ruby/object:Gem::Requirement
+  requirement: &70214754649500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70309093421720
+  version_requirements: *70214754649500
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70309093421160 !ruby/object:Gem::Requirement
+  requirement: &70214754648880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70309093421160
+  version_requirements: *70214754648880
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70309093420700 !ruby/object:Gem::Requirement
+  requirement: &70214754648440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70309093420700
+  version_requirements: *70214754648440
 description: Ruby wrapper for interacting with Empresaula's API
 email:
 - info@codegram.com
@@ -74,12 +74,14 @@ files:
 - lib/empresaula-api/controller/authentication.rb
 - lib/empresaula-api/resource.rb
 - lib/empresaula-api/resource/base.rb
+- lib/empresaula-api/resource/session.rb
 - lib/empresaula-api/resource/user.rb
 - lib/empresaula-api/test_helpers.rb
 - lib/empresaula-api/test_helpers/user.rb
 - lib/empresaula-api/version.rb
 - test/empresaula-api/config_test.rb
 - test/empresaula-api/controller/authentication_test.rb
+- test/empresaula-api/resource/session_test.rb
 - test/empresaula-api/resource/user_test.rb
 - test/empresaula-api/test_helpers/user_test.rb
 - test/test_helper.rb
@@ -110,6 +112,7 @@ summary: Ruby wrapper for interacting with Empresaula's API
 test_files:
 - test/empresaula-api/config_test.rb
 - test/empresaula-api/controller/authentication_test.rb
+- test/empresaula-api/resource/session_test.rb
 - test/empresaula-api/resource/user_test.rb
 - test/empresaula-api/test_helpers/user_test.rb
 - test/test_helper.rb