client_api 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 883253d3ae47c4132a521511271f056c2f52e79f
-  data.tar.gz: aeb25348fd8139ae8e1a464d3e90761bd1d1863b
+  metadata.gz: a8e5d87f310ae57ea06b0282a36e015129420b48
+  data.tar.gz: 9f20f1165b4c16d1e27b9c64701acb2cc9f10a7f
 SHA512:
-  metadata.gz: e44e30edc44430b4f7505b03d09058162d0e1d98bc580a959620a0c5eb6e1c0d3b68937aa22b4fee294ee3440e28867d3c241c2e34c30079fb726bf20222b6b8
-  data.tar.gz: 8e7189827df613fccbe0c433ed873922af5bf5d014402a6614cfe13d5718226357325b42d1d32cfbedc7a04319e9b0815257f25172765ef031269b3e3055a204
+  metadata.gz: 812b9c852a358ffdb8e7ed164320e8b7b6472d03da1f4226f9d446872d2b828feef3a7442f42924387462d5ccc1d9152024fa90de9b4bca9dd2b83e64da6967d
+  data.tar.gz: 4c458de28d0639c77c12e48cd6ded1e32e317c482542c6e36846951cc221ff09effbf5c26edf86ebcc87a250a9d6238ab14b70c21cef01f73a282eee96f7a22d

data/lib/client_api/handler.rb

@@ -1,4 +1,5 @@
 require 'json'
+require 'redis'
 require 'rest-client'
 require_relative '../conf/conf_api'
 
@@ -10,8 +11,9 @@ class Handler
   end
 
   def self.load_data(params)
-    waited_keys = [:engine_name,:data]
-    if valid_reco_parameter(params,waited_keys)
+    waited_keys = [:engine_name,:data,:api_key,:token]
+    session = get_session_param(params[:api_key],params[:token])
+    if valid_reco_parameter(params,waited_keys) && valid_session(session)
       resp = invoke('/apps/load_data','POST',params)
       resp.code == 200 ? true : false
     else
@@ -20,8 +22,9 @@ class Handler
   end
 
   def self.similar_users(params)
-    waited_keys = [:engine_name,:api_key,:id,:nb_wanted]
-    if valid_reco_parameter(params,waited_keys) && valid_parameter_type?(params)
+    waited_keys = [:engine_name,:api_key,:id,:nb_wanted,:token]
+ session = get_session_param(params[:api_key],params[:token])
+    if valid_reco_parameter(params,waited_keys) && valid_parameter_type?(params) && valid_session(session)
       resp = invoke('/users/similar','POST',params)
       resp.code == 200 ? resp.body : false
     else
@@ -30,8 +33,9 @@ class Handler
   end
 
   def self.similar_items(params)
-    waited_keys = [:engine_name,:api_key,:id,:nb_wanted]
-    if valid_reco_parameter(params,waited_keys) && valid_parameter_type?(params)
+    waited_keys = [:engine_name,:api_key,:id,:nb_wanted,:token]
+ session = get_session_param(params[:api_key],params[:token])
+    if valid_reco_parameter(params,waited_keys) && valid_parameter_type?(params) && valid_session(session)
       resp = invoke('/items/similar','POST',params)
       resp.code == 200 ? resp.body : false
     else
@@ -40,8 +44,9 @@ class Handler
   end
 
   def self.recommend(params)
-    waited_keys = [:engine_name,:api_key,:id,:nb_wanted]
-    if valid_reco_parameter(params,waited_keys) && valid_parameter_type?(params)
+    waited_keys = [:engine_name,:api_key,:id,:nb_wanted,:token]
+ session = get_session_param(params[:api_key],params[:token])
+    if valid_reco_parameter(params,waited_keys) && valid_parameter_type?(params) && valid_session(session)
       resp = invoke('/users/recommend','POST',params)
       resp.code == 200 ? resp.body : false
     else
@@ -49,6 +54,11 @@ class Handler
     end
   end
 
+  def self.valid_session(param)
+    resp = invoke('/session/valid','GET',param)
+    resp.code == 200 ? true : false
+  end
+
   private #######################################
 
   def self.get_response(request,url,param)
@@ -56,6 +66,10 @@ class Handler
       response
   end
 
+  def self.get_session_param(api_key,token)
+    {object: {api_key: api_key}.to_json,token: token,option: {user: false,app: true}.to_json }
+  end
+
   def self.get_code(response)
     response.code
   end
@@ -181,7 +195,7 @@ class Handler
   def self.call_api(params,short_uri,rest_req,waited_keys)
    if validate(params,waited_keys)
      response = invoke(short_uri,rest_req,params)
-     get_code(response) == 200 ? true : false
+     response == 400 ? false : response
    else
      false
    end

data/lib/client_api/version.rb

@@ -1,3 +1,3 @@
 module ClientApi
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/handler_spec.rb

@@ -3,12 +3,17 @@ require_relative 'spec_helper'
 
 describe Handler do
   let(:app) {{ object: {api_key: 'an api_key'}.to_json, option: {user: false,app: true}.to_json }}
+  let(:app_session) {{object: {api_key: 'an api_key'}.to_json,token: "ncidjdojdojfdocv6777",option: {user: false,app: true}.to_json} }
   let(:redis) { Redis.current}
   let(:user) {{ object: {login: 'login',password: 'password'}, option: {user: true,app: false} }}
+  let(:fake_app_session) {{api_key: '926eb0b0-e99d-0131-7e06-080027ab4d7b',token: 'token1'} }
+ let(:fake_app_session2) {{api_key: '926eb0b0-e99d-0131-7e06-080027ab4d7b',token: 'token2'} }
 
    before (:each) do
       redis.del('applications')
       redis.del('users')
+      redis.sadd('applications',{api_key: 'an api_key'}.to_json)
+      redis.sadd('applications',{api_key: '926eb0b0-e99d-0131-7e06-080027ab4d7b'}.to_json)
    end
 
 
@@ -17,10 +22,13 @@ describe Handler do
    before (:each) do
       redis.sadd('applications',app[:object])
       redis.sadd('users',user[:object].to_json)
+      redis.sadd('applications_sessions',{api_key: 'an api_key',token: "ncidjdojdojfdocv6777"}.to_json)
+      redis.sadd('applications_sessions',fake_app_session.to_json)
+      redis.sadd('applications_sessions',fake_app_session2.to_json)
    end
 
     context "When an application attempts to log in" do
-      it { expect(Handler.connect_app(app)).to eq true }
+      it { expect(Handler.connect_app(app)).to be_a String }
     end
 
     context "When a inexistant app attemps to log in" do
@@ -32,7 +40,7 @@ describe Handler do
       it { expect(Handler.connect_app("coucou")).to eq false }
     end
 
-    context "When the parameter has not valid keys" do
+    context "When the parmeter has not valid keys" do
       invalid_param = {obj: {api_key: 'ap'}.to_json,opti: {user: false,app: true}.to_json}
       it { expect(Handler.connect_app(invalid_param)).to eq false }
     end
@@ -46,7 +54,7 @@ describe Handler do
       invalid_param = {object: {}.to_json,option: {user: false,app: true}.to_json}
       it { expect(Handler.connect_app(invalid_param)).to eq false }
 
-      invalid_param = {object: nil,option: nil}
+      invalid_param = {oject: nil,option: nil}
       it { expect(Handler.connect_app(invalid_param)).to eq false }
     end
 
@@ -85,7 +93,7 @@ describe Handler do
 
   describe '.load_data' do
     context "When data are successfully load" do
-      it {expect(Handler.load_data(params_to_load)).to eq true }
+     # it {expect(Handler.load_data(params_to_load)).to eq true }
     end
   end
 
@@ -137,4 +145,10 @@ describe Handler do
       it {expect(Handler.recommend(param)).to eq false }
     end
   end
+
+  describe '.valid_session' do
+    context "when app's session is found" do
+      it{expect(Handler.valid_session(app_session)).to eq true}
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -7,22 +7,22 @@ require 'json'
 def engine_data_sample
   engine_data = []
   engine_data << {customer_id: 1,item_id: 1,preference: 1}
-  100.times do
+  10.times do
     engine_data << {customer_id: rand(1..5),item_id: rand(1..10),preference: rand(1..5)}
   end
   engine_data
 end
 
 def params_user_based
-  {engine_name: 'eng869',api_key: '926eb0b0-e99d-0131-7e06-080027ab4d7b',id: 1,nb_wanted: 2}
+  {engine_name: 'eng869',api_key: '926eb0b0-e99d-0131-7e06-080027ab4d7b',token: 'token1',id: 1,nb_wanted: 2}
 end
 
 def params_item_based
-  {engine_name: 'eng111',api_key: '926eb0b0-e99d-0131-7e06-080027ab4d7b',id: 1,nb_wanted: 2}
+  {engine_name: 'eng111',api_key: '926eb0b0-e99d-0131-7e06-080027ab4d7b',token: 'token2',id: 1,nb_wanted: 2}
 end
 
 
 def params_to_load
-  {engine_name: 'eng111',data: engine_data_sample.to_json}
+  {engine_name: 'eng111',data: engine_data_sample.to_json,api_key: '926eb0b0-e99d-0131-7e06-080027ab4d7b',token: 'token2'}
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: client_api
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - 'fabira && atakem '
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-14 00:00:00.000000000 Z
+date: 2014-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler