dbAccessor 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81b5c788930e7f1eb49c7dabf748020bb49551b1
-  data.tar.gz: 28707829eb2eeda2982a270f082966972df3701c
+  metadata.gz: 701e6d4e9ab5ce11aae92b954dc447a8201ab0b4
+  data.tar.gz: ca327af2f7c65250a2f5ab25c1a18178ce3b05fd
 SHA512:
-  metadata.gz: b945c8d58e369547feea8724af0c273058999ddfaeda20c602df4437e8a2203ae88c6a9059ca644f6b161923f9ee7e792f1de71b0950b7361b8581850db8e39f
-  data.tar.gz: 3d35f1926f11995b97c655d52593187ce60aa2cefccc9cbcbf7dab053aa05e2ba39eee167eba938ec1192c7522b7adc00a21c637210c9cea76e60c3d3d9b000d
+  metadata.gz: bdb5d7952f1c4f661b4ccf626b6662d9e8a008cc8217d696c9d73bce406c61912446194861e74fc69d85134d0928c3b6e85e0b40e76dca2d52e1c739c8c1b744
+  data.tar.gz: f61092eba402b8ac33e5120b461e6a4f51ffabec79c5c40af2a0fd3daa9ee244e754e99312a3c5b1828d3e92e3b3c7ff3584b17b69c726cc56da078327a564b1

data/.rspec

@@ -1,2 +1,2 @@
---format nested
+--format d
 --color

data/Gemfile

@@ -1,5 +1,6 @@
 source 'https://rubygems.org'
 gem "autotest"
+gem 'rspec-autotest'
 gem "autotest-fsevent"
 gem "autotest-growl"
 gem "ZenTest"

data/dbAccessor.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">= 1.9"
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "uuid", "~> 2.3", ">= 2.3.7"
-  spec.add_development_dependency "rspec", "~> 2.6"
+  spec.add_development_dependency "rspec"
   spec.add_development_dependency "activerecord", "~> 4.1", ">= 4.1.1"
   spec.add_development_dependency "rake", "~> 10.3", ">= 10.3.2"
   spec.add_development_dependency "pg", "~> 0.17", ">= 0.17.1"

data/lib/dbAccessor/base.rb

@@ -62,7 +62,7 @@ module Db_Accessor
       engine_columns      = [:id,:name,:engine_conf,:application_id]
       engine_data_columns = [:id,:customer_id,:item_id,:preference,:engine_id]
       app_columns         = [:id,:name,:api_key,:url,:user_id]
-      user_columns        = [:id,:login,:password,:firstname,:lastname,:gender,:email]
+      user_columns        = [:id,:login,:password,:firstname,:lastname,:gender,:email, :admin]
 
       keys = content.keys
       if model_name == "User"

data/lib/dbAccessor/deleter/deleter.rb

@@ -17,40 +17,10 @@ class DbAccessor::Deleter < Db_Accessor::Base
     end
   end
 
-
-  def self.delete_by_id(given_param)
-    waited_keys = [:model_name,:id]
-    if validate(given_param,waited_keys) && validate_id(given_param[:id])
-	  model_name = get_model_name(given_param)
-	  objects = model_name.find(given_param[:id])
-	  objects.each do |o|
-        o.deleted=true
-	    o.save
-	  end
-	  return_response(200,"success")
-    else
-      return_response(400,"Not deleted")
-    end
-  end
-
   def self.validate(param,waited_keys)
       param.is_a?(Hash) && valid_keys?(param,waited_keys) && !validate_argument(param) && is_model?(param[:model_name])
   end
 
-  def self.validate_id(param)
-    if param.is_a?(Array)
-      param.each do |v|
-        if !(v.is_a?(Fixnum))
-          return false
-          break
-        end
-      end
-    else
-      return false
-    end
-    return true
-  end
-
   def self.valid_condition?(param)
     condition = param[:condition]
     model_name = param[:model_name]

data/lib/dbAccessor/updater/updater.rb

@@ -7,7 +7,7 @@ class DbAccessor::Updater < Db_Accessor::Base
   def self.update_by_id(given_object)
     waited_keys = [:model_name,:attributes]
     if validate(given_object,waited_keys) && valid_attributes_pattern?(given_object[:model_name],given_object[:attributes])
-	   get_model_name(given_object).update(get_attributes(given_object).keys,get_attributes(given_object).values)
+	   var = get_model_name(given_object).update(get_attributes(given_object).keys,get_attributes(given_object).values)
 	  return_response(200,"Succesfully updated")
 	else
       return_response(400,"Not updated")

data/lib/dbAccessor/version.rb

@@ -1,3 +1,3 @@
 module DbAccessor
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/spec/deleter_spec.rb

@@ -3,11 +3,25 @@ require_relative 'spec_helper'
 describe DbAccessor::Deleter do
 
   describe ".delete_all" do
-    given_param = { model_name: "User",condition: {id: 3}}
+    nb = rand(1000)
+    api_key = UUID.new.generate
+    let(:app) { {model_name: 'Application',content: {name: 'desert'+nb.to_s,api_key: api_key,url: 'http://www.desert'+nb.to_s+'.com',user_id: 2}} }
+  let(:user) { {model_name: 'User',content: {login: 'diakhoumpa'+nb.to_s,password: 'passeraa',firstname: 'Ndeye Fatou', lastname: 'Dieng',email: 'diakhouumpa'+nb.to_s+'@gmail.com',gender: 'M'}} }
     context "when the object is deleted" do
-      it {expect((DbAccessor::Deleter.delete_all(given_param))[:code]).to eq 200 }
-
-      it {expect((DbAccessor::Deleter.delete_all({model_name: "Application",condition: {name: 'Wikia'}}))[:code]).to eq 200 }
+      before(:each) do
+        DbAccessor::Writer.write_object(app)
+        DbAccessor::Writer.write_object(user)
+      end
+      it do
+        found_id = DbAccessor::Reader.simple_select( { model_name: 'User', action_on: 'first' } )[:message].id
+        given_param = { model_name: "User", condition: { id: found_id }}
+        expect((DbAccessor::Deleter.delete_all(given_param))[:code]).to eq 200
+      end
+
+      it do
+        found_id = DbAccessor::Reader.simple_select( { model_name: 'Application', action_on: 'first' } )[:message].id
+        expect((DbAccessor::Deleter.delete_all({model_name: "Application",condition: { id: found_id }}))[:code]).to eq 200
+      end
 
       it {expect((DbAccessor::Deleter.delete_all({model_name: "User",condition: {login: 'fabira',password: 'passera'}}))[:code]).to eq 200 }
     end
@@ -50,41 +64,4 @@ describe DbAccessor::Deleter do
     end
 
   end
-
-  describe ".delete_by_id" do
-    context "when the object find by id is deleted" do
-      given_param={model_name: "Application", id: [4]}
-      it {expect((DbAccessor::Deleter.delete_by_id(given_param))[:code]).to eq 200 }
-
-      given_param={model_name: "User", id: [4]}
-      it {expect((DbAccessor::Deleter.delete_by_id(given_param))[:code]).to eq 200 }
-    end
-
-    context "when the id's format is invalid" do
-      given_param={model_name: "User", id: "coucou"}
-      it {expect((DbAccessor::Deleter.delete_by_id(given_param))[:code]).to eq 400 }
-    end
-
-
-    context "when one or many parameters are empty or nil" do
-      given_param={model_name: "User", id: nil}
-      it {expect((DbAccessor::Deleter.delete_by_id(given_param))[:code]).to eq 400 }
-    end
-
-    context "when the model name is invalid" do
-      given_param={model_name: "U3466", id: [1,2,3]}
-      it {expect((DbAccessor::Deleter.delete_by_id(given_param))[:code]).to eq 400 }
-    end
-
-    context "when parameter's keys are invalid" do
-      given_param={model_name: "User", i: [1,2] }
-      it {expect((DbAccessor::Deleter.delete_by_id(given_param))[:code]).to eq 400 }
-      given_param = {model: "Application",id: [3]}
-      it {expect((DbAccessor::Deleter.delete_by_id(given_param))[:code]).to eq 400 }
-    end
-
-    context "when the parameter is nil" do
-      it {expect((DbAccessor::Deleter.delete_by_id(nil))[:code]).to eq 400 }
-    end
-  end
 end

data/spec/feed/dbTest/migration/create_table_actions.rb

@@ -13,7 +13,5 @@ class CreateActions < ActiveRecord::Migration
   end
 end
 
-CreateActions.down
-
-
-
+CreateActions.down if ActiveRecord::Base.connection.table_exists? 'actions'
+CreateActions.up

data/spec/feed/dbTest/migration/create_table_applications.rb

@@ -10,12 +10,12 @@ class CreateApplications < ActiveRecord::Migration
       a.timestamps
     end
     add_index :applications, :user_id
-  end 
-  
+  end
+
   def self.down
     drop_table :applications
   end
 end
 
+CreateApplications.down if ActiveRecord::Base.connection.table_exists? 'applications'
 CreateApplications.up
-

data/spec/feed/dbTest/migration/create_table_assignments.rb

@@ -16,4 +16,4 @@ class CreateAssignments < ActiveRecord::Migration
   end
 end
 
-CreateAssignments.down
+CreateAssignments.down if ActiveRecord::Base.connection.table_exists? 'assignments'

data/spec/feed/dbTest/migration/create_table_engine_data.rb

@@ -15,5 +15,5 @@ class CreateEngineData < ActiveRecord::Migration
   end
 
 end
-CreateEngineData.down
+CreateEngineData.down if ActiveRecord::Base.connection.table_exists? 'engine_data'
 CreateEngineData.up

data/spec/feed/dbTest/migration/create_table_engines.rb

@@ -4,6 +4,7 @@ class CreateEngines < ActiveRecord::Migration
         e.string     :name
         e.column     :engine_conf, :json
         e.integer    :application_id
+        e.boolean    :deleted, :default => false
         e.timestamps
       end
       add_index :engines, :application_id
@@ -15,5 +16,5 @@ class CreateEngines < ActiveRecord::Migration
 
 end
 
-CreateEngines.down
+CreateEngines.down if ActiveRecord::Base.connection.table_exists? 'engines'
 CreateEngines.up

data/spec/feed/dbTest/migration/create_table_users.rb

@@ -9,14 +9,16 @@ class CreateUsers < ActiveRecord::Migration
       u.string  :lastname
       u.string  :gender
       u.string  :email
+      u.boolean :admin, default: false
       u.boolean :deleted, :default => false
       u.timestamps
     end
-  end 
-  
+  end
+
   def self.down
     drop_table :users
   end
 end
 
+CreateUsers.down if ActiveRecord::Base.connection.table_exists? 'users'
 CreateUsers.up

data/spec/feed/resources/do_migration.rb

@@ -5,5 +5,3 @@ require_relative '../dbTest/migration/create_table_engines'
 require_relative '../dbTest/migration/create_table_engine_data'
 require_relative '../dbTest/migration/create_table_actions'
 require_relative '../dbTest/migration/create_table_assignments'
-
-

data/spec/reader_spec.rb

@@ -2,6 +2,16 @@ require_relative 'spec_helper'
 
 
 describe DbAccessor::Reader do
+  nb = rand(50)
+
+  api_key = UUID.new.generate
+  let(:app) { {model_name: 'Application',content: {name: 'desert'+nb.to_s,api_key: api_key,url: 'http://www.desert'+nb.to_s+'.com',user_id: 1}} }
+  let(:user) { {model_name: 'User',content: {login: 'diakhoumpa'+nb.to_s,password: 'passeraa',firstname: 'Ndeye Fatou', lastname: 'Dieng',email: 'diakhouumpa'+nb.to_s+'@gmail.com',gender: 'M'}} }
+
+  before :each do
+    DbAccessor::Writer.write_object(app)
+    DbAccessor::Writer.write_object(user)
+  end
 
   describe ".simple_select" do
     context "when all model's items are found" do
@@ -28,7 +38,10 @@ describe DbAccessor::Reader do
   describe ".condition_select" do
 
     context "when it reads one or many items on table with a condition" do
-      it {expect((DbAccessor::Reader.condition_select({model_name: "User" , condition: {login: "modou"}}))[:code]).to eq 200 }
+      it do
+        found_login = DbAccessor::Reader.simple_select( { model_name: 'User', action_on: 'first' } )[:message].login
+        expect((DbAccessor::Reader.condition_select({model_name: "User" , condition: { login: found_login }}))[:code]).to eq 200
+      end
 	end
 
     context "when the condition is not satisfied" do
@@ -71,7 +84,7 @@ describe DbAccessor::Reader do
   describe ".linked_models_select" do
 
     context "when it reads models on model with a condition" do
-      it {expect((DbAccessor::Reader.linked_models_select({model_name: "User", condition: { id: 2}, models: "applications"}))[:code]).to eq 200 }
+      it {expect((DbAccessor::Reader.linked_models_select({model_name: "User", condition: { id: 1}, models: "applications"}))[:code]).to eq 200 }
 	end
 
     context "when a parameter is empty or empty" do

data/spec/updater_spec.rb

@@ -9,15 +9,22 @@ describe DbAccessor::Updater do
   describe ".update_by_id" do
 
 	context "updates one or many users by id" do
-	  param = {model_name: "User",attributes: { 149 => {login: "mamadouPouye"}} }
+    DbAccessor::Writer.write_object({model_name: 'User',content: {login: 'diakhoumpa'+nb.to_s,password: 'passeraa',firstname: 'Ndeye Fatou', lastname: 'Dieng',email: 'diakhouumpa'+nb.to_s+'@gmail.com',gender: 'M'}})
+    found_id = DbAccessor::Reader.simple_select( { model_name: 'User', action_on: 'first' } )[:message].id
+	  param = {model_name: "User",attributes: { found_id => {login: "mamadouPouye"}} }
 	  it {expect((DbAccessor::Updater.update_by_id(param))[:code]).to eq 200 }
 	end
 
 	context "updates one or many applications by id" do
-	  param = {model_name: "Application",attributes: {15 => {api_key: UUID.new.generate}} }
+    api_key = UUID.new.generate
+    DbAccessor::Writer.write_object({model_name: 'Application',content: {name: 'desert'+nb.to_s,api_key: api_key,url: 'http://www.desert'+nb.to_s+'.com',user_id: 1}})
+    found_id = DbAccessor::Reader.simple_select( { model_name: 'Application', action_on: 'first' } )[:message].id
+	  param = {model_name: "Application",attributes: {found_id => {api_key: UUID.new.generate}} }
 	  it {expect((DbAccessor::Updater.update_by_id(param))[:code]).to eq 200 }
 
-	  param = {model_name: "Engine",attributes: {1 => {engine_conf: {similarity_metric: 'similarity_metric',reco_algo: 'reco_algo',neighborhood: 'neighborhood'}.to_json} } }
+    DbAccessor::Writer.write_object({model_name: 'Engine',content: {name: 'engine'+nb.to_s,engine_conf: {action: ['LIKE','SHARE'],score: [2,5],algorithm: 'Person',type: 'UserBased', neighborhood: 5 }.to_json ,application_id: 1}})
+    found_id = DbAccessor::Reader.simple_select( { model_name: 'Engine', action_on: 'first' } )[:message].id
+	  param = {model_name: "Engine",attributes: { found_id => {engine_conf: {similarity_metric: 'similarity_metric',reco_algo: 'reco_algo',neighborhood: 'neighborhood'}.to_json} } }
 	  it {expect((DbAccessor::Updater.update_by_id(param))[:code]).to eq 200 }
 	end
 
@@ -80,8 +87,13 @@ describe DbAccessor::Updater do
   end
 
     context "when all model objects that satisfy the condition are updated" do
-	  condition={login: 'modou'}
-	  it {expect((DbAccessor::Updater.update_all_objects(parameter,condition))[:code]).to eq 200 }
+	  it do
+      Redis.current.del('users')
+      parameter={model_name:  "User", attributes: {password: "password#{nb}"}}
+      found_login = DbAccessor::Reader.simple_select( { model_name: 'User', action_on: 'last' } )[:message].login
+      condition = { login: found_login }
+      expect((DbAccessor::Updater.update_all_objects(parameter,condition))[:code]).to eq 200
+    end
 	end
 
     context "when model's attributes are not correct" do

data/spec/writer_spec.rb

@@ -10,14 +10,22 @@ describe DbAccessor::Writer do
 
   let(:app) { {model_name: 'Application',content: {name: 'desert'+nb.to_s,api_key: api_key,url: 'http://www.desert'+nb.to_s+'.com',user_id: 2}} }
 
-  let(:engine) { {model_name: 'Engine',content: {name: 'engine'+nb.to_s,engine_conf: {action: ['LIKE','SHARE'],score: [2,5],algorithm: 'Person',type: 'UserBased', neighborhood: 5 }.to_json ,application_id: 2}} }
-
-  describe".write_object" do
+  let(:engine) {  {model_name: 'Engine',content: {name: 'engine'+nb.to_s,engine_conf: {action: ['LIKE','SHARE'],score: [2,5],algorithm: 'Person',type: 'UserBased', neighborhood: 5 }.to_json ,application_id: 1}} }
 
     context "when a user is saved in database" do
       it {expect((DbAccessor::Writer.write_object(user))[:code]).to eq 201}
     end
 
+    context "when an admin user is saved in database" do
+      it do
+        admin_user = user
+        admin_user[:content][:login] = "admin#{nb.to_s}"
+        admin_user[:content][:email] = "admin#{nb.to_s}@gmail.com"
+        admin_user[:content][:admin] = true
+        expect((DbAccessor::Writer.write_object(admin_user))[:code]).to eq 201
+      end
+    end
+
     context "when an application is saved in database" do
       it {expect((DbAccessor::Writer.write_object(app))[:code]).to eq 201}
     end
@@ -73,5 +81,3 @@ describe DbAccessor::Writer do
     end
 
   end
-
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dbAccessor
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - fabira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-08 00:00:00.000000000 Z
+date: 2014-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -48,16 +48,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement