recommender_api 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36c955fb73d46e02e901f2c6f4bc9920ec5eae86
-  data.tar.gz: dde2ce0a3e0246da73eb116cfde9ee592ca625db
+  metadata.gz: 2e15f137c185238a94cff4b12d9e2b9d8c14af32
+  data.tar.gz: 5dead20d915c2492d0dbf8b35f73b98e665bf365
 SHA512:
-  metadata.gz: be62a1890cc045758cada09fdf822b08054b93d51e0e786d2a051d3f039e654f7755ecdb97ab06e645ce64dec34a85125560c27f51d74c367a37329990fb8718
-  data.tar.gz: f577d22c95567cda3bee2588a8393290134a982e522e37b108342dc8d5e997bd58cb9b543a72494d6b11fbffbbfd1f32b4f82197ac85f7b4dcc6bc525189382a
+  metadata.gz: e1007962f79944aff9752e68f9f42bf1c517c9cfe8d447d0a8b68c4d5143c15aefc23103431790913f80d3c73f2ab7c42790cdc18cd5b7395f0fb9b425706418
+  data.tar.gz: 1f81396b4706cbfd08ce919c1b0533eae7a349bf6c163ecb4253a5ac5d3281de69773c6ce4425da6acf725e697bc18f0797f91d65a58d80dec134b44c4787f4d

data/api.gemspec

@@ -22,7 +22,8 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">= 2.0"
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "auth_manager"
+  spec.add_development_dependency "auth_manager" 
+  spec.add_development_dependency "dbAccessor"
   spec.add_development_dependency "redis"
   spec.add_development_dependency "uuid"
   spec.add_development_dependency "session_manager"
@@ -30,4 +31,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rack"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "rack-test"
+  spec.add_development_dependency "activerecord"
+  spec.add_development_dependency "pg"
 end

data/lib/api/handler.rb

@@ -1,13 +1,14 @@
 require 'auth_manager'
 require 'session_manager'
+require 'dbAccessor'
 
-class Api::Handler
+module Api
+class Handler
 
-  def self.create_account(param, option)
-    added = AuthManager::Adder.save?(param, option)
-    session_response = SessionManager::Handler.create_session(param, option) if added
-    if session_response
-      (session_response[:code] == 200) && added
+  def self.create_account(param)
+    added = DbAccessor::Writer.write_object(param)  
+    if added[:code] == 201
+      true
     else
       false
     end
@@ -45,3 +46,4 @@ class Api::Handler
   end
 
 end
+end

data/lib/api/version.rb

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

data/lib/api/web.rb

@@ -1,7 +1,8 @@
 require 'sinatra'
 require_relative 'handler'
 
-class Api::Web < Sinatra::Application
+module Api
+  class Web < Sinatra::Base
 
   post '/apps' do
     if create(params)
@@ -33,6 +34,7 @@ class Api::Web < Sinatra::Application
       body ['Sorry, an error occured']
     end
   end
+
   post '/apps/connect' do
     if connect(params)
       status 200
@@ -55,11 +57,30 @@ class Api::Web < Sinatra::Application
     option
   end
 
-  def create(params)
-    Api::Handler.create_account(params[:object].to_json, format_option(params))
+  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}}    
+    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))
   end
 end
+end

data/spec/handler_spec.rb

@@ -6,6 +6,9 @@ describe Api::Handler do
   let(:opt) { {user: true, app: false} }
   let(:token) { 'a token' }
   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'}} }
+
   describe '#connect' do
     before(:each) do
       AuthManager::Base.redis_del({list: 'users'})
@@ -42,23 +45,14 @@ describe Api::Handler do
     end
   end
   describe '#create_account' do
-    before(:each) do
-      AuthManager::Base.redis_del({list: 'users'})
-      AuthManager::Base.redis_del({list: 'applications'})
-    end
     context 'When user account created' do
-      it {
-        swap_option_to('user')
-        user[:login] = 'login'
-        expect(Api::Handler.create_account(user.to_json, opt)).to be_true
+      it { 
+        expect(Api::Handler.create_account(a_user)).to be_true
       }
     end
     context 'When user account not created' do
       it {
-        user[:login] = 'login'
-        swap_option_to('user')
-        expect(Api::Handler.create_account(user.to_json, opt)).to be_true
-        expect(Api::Handler.create_account(user.to_json, opt)).to be_false
+        expect(Api::Handler.create_account(a_user)).to be_false
       }
     end
   end

data/spec/spec_helper.rb

@@ -1,4 +1,7 @@
 require 'api'
+require 'uuid'
+
+
 
 def swap_option_to(list)
   if list == 'user'
@@ -18,6 +21,16 @@ 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} }

data/spec/test_sinatra.rb

@@ -0,0 +1,2 @@
+require_relative '../lib/api/web'
+Api::Web.run!

data/spec/web_spec.rb

@@ -15,32 +15,35 @@ describe Api::Web do
     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', parameter_for('app')
+      post '/apps', app
       expect(last_response.status).to eq(200)
     end
 
 
     it "returns 400 when the creation fails" do
-      post '/apps', parameter_for('app')
+      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', parameter_for('user')
+      post '/users', user
       expect(last_response.status).to eq(200)
     end
 
 
     it "returns 400 when the creation fails" do
-      post '/users', parameter_for('user')
+      post '/users', user
       expect(last_response.status).to eq(400)
     end
   end
@@ -61,6 +64,7 @@ describe Api::Web do
       post '/apps/connect', parameter_for('app')
       expect(last_response.status).to eq(200)
     end
+
     it 'returns 400 code status for faillure' do
       post '/apps/connect', bad_parameter_for('app')
       expect(last_response.status).to eq(400)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: recommender_api
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - binette && atacraft
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-28 00:00:00.000000000 Z
+date: 2014-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: dbAccessor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +164,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Entry point of the as a service plateform
 email:
 - atacraft@gmail.com, fabira90@gmail.com
@@ -171,6 +213,7 @@ files:
 - lib/api/web.rb
 - spec/handler_spec.rb
 - spec/spec_helper.rb
+- spec/test_sinatra.rb
 - spec/web_spec.rb
 homepage: ''
 licenses:
@@ -199,4 +242,5 @@ summary: Api for the recommender plateform
 test_files:
 - spec/handler_spec.rb
 - spec/spec_helper.rb
+- spec/test_sinatra.rb
 - spec/web_spec.rb