recommender_api 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e15f137c185238a94cff4b12d9e2b9d8c14af32
-  data.tar.gz: 5dead20d915c2492d0dbf8b35f73b98e665bf365
+  metadata.gz: 48427bdda282011938492f69cfeb88c7f9c184c5
+  data.tar.gz: 2d3f295e271c1bfd0bfbcde674bd8288fcfa92a6
 SHA512:
-  metadata.gz: e1007962f79944aff9752e68f9f42bf1c517c9cfe8d447d0a8b68c4d5143c15aefc23103431790913f80d3c73f2ab7c42790cdc18cd5b7395f0fb9b425706418
-  data.tar.gz: 1f81396b4706cbfd08ce919c1b0533eae7a349bf6c163ecb4253a5ac5d3281de69773c6ce4425da6acf725e697bc18f0797f91d65a58d80dec134b44c4787f4d
+  metadata.gz: 39121436b6105b01d0b1ca93da4477d585fdea217a57cad077c0d0c25ae990f72335e3faafe4fae34bf33af18b31c9708b7cca97bea706d33243ad0ab0956732
+  data.tar.gz: 222dbc6ddab6fce6412f2202f044bf0b0d9815b250b190fe9e0a5e79cc89e04c75a5bc8e2494c75572e5b53d65fa9dabf974ff3e72301dc866af098b8389cdbe

data/lib/api/handler.rb

@@ -5,8 +5,8 @@ require 'dbAccessor'
 module Api
 class Handler
 
-  def self.create_account(param)
-    added = DbAccessor::Writer.write_object(param)  
+  def self.create_object(param)
+    added = DbAccessor::Writer.write_object(param)
     if added[:code] == 201
       true
     else
@@ -16,12 +16,11 @@ class Handler
 
   def self.connect(param, option)
     found = AuthManager::Finder.find_object?(param, option)
-    session_response = SessionManager::Handler.create_session(param, option)  if found
-    if session_response
-      ((session_response[:code] == 200) && found)
-    else
-      false
-    end
+    found ? SessionManager::Handler.create_session(param, option) : {code: 400, message: "User not connected"}
+  end
+
+  def self.condition_read(param)
+   DbAccessor::Reader.condition_select(param)
   end
 
   def self.valid_session(object, token, option)

data/lib/api/version.rb

@@ -1,3 +1,3 @@
 module Api
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/api/web.rb

@@ -4,83 +4,31 @@ require_relative 'handler'
 module Api
   class Web < Sinatra::Base
 
-  post '/apps' do
-    if create(params)
-      status 200
-      body ['Successfully created!']
-    else
-      status 400
-      body ['Sorry, an error occured']
-    end
-  end
-
 
-  post '/users' do
-    if create(params)
-      status 200
-      body ['Successfully created!']
-    else
-      status 400
-      body ['Sorry, an error occured']
+    post '/apps/connect' do
+      if connect(params)[:code] == 200
+        status 200
+        body ['Successfully logged!']
+      else
+        status 400
+        body ['Sorry, an error occured']
+      end
     end
-  end
-
-  post '/users/connect' do
-    if connect(params)
-      status 200
-      body ['Successfully logged!']
-    else
-      status 400
-      body ['Sorry, an error occured']
+    after do
+      response
     end
-  end
 
-  post '/apps/connect' do
-    if connect(params)
-      status 200
-      body ['Successfully logged!']
-    else
-      status 400
-      body ['Sorry, an error occured']
-    end
-  end
-  after do
-    response
-  end
+    private ################
 
-  private ################
-
-  def format_option(params)
-    option = {}
-    option = {user: true, app: false} if (params[:option][:user] == 'true')
-    option = {user: false, app: true} if (params[:option][:app] == 'true')
-    option
-  end
-
-  def format_object(params)
-    if params[:object][:model_name] == 'User'
-      login = params[:object][:content][:login]
-      password = params[:object][:content][:password]
-      firstname = params[:object][:content][:firstname]
-      lastname = params[:object][:content][:lastname]
-      email = params[:object][:content][:email]
-      gender = params[:object][:content][:gender]
-     object = {model_name: 'User',content: {login: login,password: password,firstname: firstname, lastname: lastname,email: email,gender: gender}} 
-    else
-      name = params[:object][:content][:name]
-      api_key = params[:object][:content][:api_key]
-      url = params[:object][:content][:url]
-      user_id = params[:object][:content][:user_id]
-      object = {model_name: 'Application',content: {name: name,api_key: api_key,url: url,user_id: user_id}}    
+    def format_option(params)
+      option = {}
+      option = {user: true, app: false} if (params[:option][:user] == 'true')
+      option = {user: false, app: true} if (params[:option][:app] == 'true')
+      option
     end
-  end
 
-  def create(params) 
-    Api::Handler.create_account(format_object(params))
-  end
-
-  def connect(params)
-    Api::Handler.connect(params[:object].to_json, format_option(params))
+    def connect(params)
+      Api::Handler.connect(params[:object].to_json, format_option(params))
+    end
   end
 end
-end

data/spec/handler_spec.rb

@@ -8,8 +8,9 @@ describe Api::Handler do
   let(:session_info) { {login: 'login', token: token} }
    nb = rand(1000)
   let(:a_user) {{model_name: 'User',content: {login: 'macoumba'+nb.to_s,password: 'passeraa',firstname: 'Ndeye Fatou', lastname: 'Dieng',email: 'macoumba'+nb.to_s+'@gmail.com',gender: 'M'}} }
+  let(:param_for_read) { {model_name: 'User', condition: {login: a_user[:content][:login]}} }
 
-  describe '#connect' do
+  describe '.connect' do
     before(:each) do
       AuthManager::Base.redis_del({list: 'users'})
       AuthManager::Base.redis_del({list: 'applications'})
@@ -19,44 +20,44 @@ describe Api::Handler do
     context 'When user connected' do
       it {
         swap_option_to('user')
-        expect(Api::Handler.connect(user.to_json, opt)).to be_true
+        expect(Api::Handler.connect(user.to_json, opt)[:code]).to eq(200)
       }
     end
     context 'When app connected' do
       it {
         swap_option_to('app')
         app[:api_key] = 'api_key'
-        expect(Api::Handler.connect(app.to_json, opt)).to be_true
+        expect(Api::Handler.connect(app.to_json, opt)[:code]).to eq(200)
       }
     end
     context 'When user fails to connect' do
       it {
         swap_option_to('user')
         user[:login] = 'not a login'
-        expect(Api::Handler.connect(user.to_json, opt)).to be_false
+        expect(Api::Handler.connect(user.to_json, opt)[:code]).to eq(400)
       }
     end
     context 'When app fails to connect' do
       it {
         swap_option_to('app')
         app[:api_key] = 'not an api_key'
-        expect(Api::Handler.connect(app.to_json, opt)).to be_false
+        expect(Api::Handler.connect(app.to_json, opt)[:code]).to eq(400)
       }
     end
   end
-  describe '#create_account' do
+  describe '.create_object' do
     context 'When user account created' do
-      it { 
-        expect(Api::Handler.create_account(a_user)).to be_true
+      it {
+        expect(Api::Handler.create_object(a_user)).to be_true
       }
     end
     context 'When user account not created' do
       it {
-        expect(Api::Handler.create_account(a_user)).to be_false
+        expect(Api::Handler.create_object(a_user)).to be_false
       }
     end
   end
-  describe '#valid_session' do
+  describe '.valid_session' do
     before(:each) do
       AuthManager::Base.redis_del({list: 'users'})
       AuthManager::Base.redis_del({list: 'applications_sessions'})
@@ -79,8 +80,20 @@ describe Api::Handler do
       }
     end
   end
+
+  describe '.condition_read' do
+    context 'Record found' do
+      it { expect(Api::Handler.condition_read(param_for_read)[:code]).to eq (200)}
+    end
+    context 'Record not found' do
+      it do
+        param_for_read[:condition][:login] = 'not a login'
+        expect(Api::Handler.condition_read(param_for_read)[:code]).to eq(404)
+      end
+    end
+  end
   #to do later
-  describe '#request' do
+  describe '.request' do
 
   end
 end

data/spec/spec_helper.rb

@@ -21,20 +21,10 @@ def parameter_for(object_type)
   end
 end
 
-def create_object_for(object_type)
-    nb = rand(1000)
-    api_key = UUID.generate
-    if object_type == 'app'
-      {object: {model_name: 'Application',content: {name: 'Axolot'+nb.to_s,api_key: api_key,url: 'http://www.wikimina'+nb.to_s+'.net',user_id: 3 }}}
-    else
-      {object:  {model_name: 'User',content: {login: 'nana'+nb.to_s,password: 'passeraa',firstname: 'Ndeye Fatou', lastname: 'Dieng',email: 'nana'+nb.to_s+'@gmail.com',gender: 'M'}} }
-    end
-end
-
 def bad_parameter_for(object_type)
   if object_type == 'user'
     {object: {login: 'not a login',password: 'not a password'}, option: {user: true,app: false} }
   else
-    {object: {api_key: 'not an api_key'}, option: {user: false,app: true} }
+    {object: {api_key: 'this is not an api_key'}, option: {user: false,app: true} }
   end
 end

data/spec/web_spec.rb

@@ -12,52 +12,10 @@ describe Api::Web do
 
   before(:all) do
     AuthManager::Base.redis_del({list: 'applications'})
-    AuthManager::Base.redis_del({ list: 'users' })
-    AuthManager::Base.redis_del({ list: 'users_sessions' })
     AuthManager::Base.redis_del({ list: 'applications_sessions' } )
-    AuthManager::Base.redis_sadd({list: 'users',object: {login: 'a login',password: 'a password'}})
     AuthManager::Base.redis_sadd({list: 'applications',object: {api_key: 'an api_key'}})
   end
 
-  context "POST '/apps'" do
-    app = create_object_for('app')
-    it "returns 200 when an object is created" do
-      post '/apps', app
-      expect(last_response.status).to eq(200)
-    end
-
-
-    it "returns 400 when the creation fails" do
-      post '/apps', app
-      expect(last_response.status).to eq(400)
-    end
-
-  end
-
-  context "POST '/users'" do
-    user = create_object_for('user')
-    it "returns 200 when a object is created" do
-      post '/users', user
-      expect(last_response.status).to eq(200)
-    end
-
-
-    it "returns 400 when the creation fails" do
-      post '/users', user
-      expect(last_response.status).to eq(400)
-    end
-  end
-
-  context 'When a user attemps to log in' do
-    it 'returns 200 code status for success' do
-      post '/users/connect', parameter_for('user')
-      expect(last_response.status).to eq(200)
-    end
-    it 'returns 400 code status for faillure' do
-      post '/users/connect', bad_parameter_for('user')
-      expect(last_response.status).to eq(400)
-    end
-  end
 
   context 'When an app attemps to log in' do
     it 'returns 200 code status for success' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: recommender_api
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - binette && atacraft
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-10 00:00:00.000000000 Z
+date: 2014-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler