dbAccessor 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c61b012dfc9cccbae90d2061d52e8a4d688890c
-  data.tar.gz: 79b90af685032fb41cd27a4908c52a72a1782a32
+  metadata.gz: 81b5c788930e7f1eb49c7dabf748020bb49551b1
+  data.tar.gz: 28707829eb2eeda2982a270f082966972df3701c
 SHA512:
-  metadata.gz: 13d1aee432f57aa4cc02c9403341defd8617a9934c0f7e84f2b3c706aa69ab5aa518dd87ece694310e4537762cacde4804753054ba85c0f8ddf1dde1c4b2e89e
-  data.tar.gz: 36e9379fdc0c6f6c265e34aa924b40bcd7e893509389c143c00a2590c87de1e27854bac6269d3ad73016aa40f5c4f4bda24061d192ad078c7c7615faf972f39c
+  metadata.gz: b945c8d58e369547feea8724af0c273058999ddfaeda20c602df4437e8a2203ae88c6a9059ca644f6b161923f9ee7e792f1de71b0950b7361b8581850db8e39f
+  data.tar.gz: 3d35f1926f11995b97c655d52593187ce60aa2cefccc9cbcbf7dab053aa05e2ba39eee167eba938ec1192c7522b7adc00a21c637210c9cea76e60c3d3d9b000d

data/lib/dbAccessor/base.rb

@@ -59,7 +59,7 @@ module Db_Accessor
     end
 
     def self.valid_object_columns?(model_name,content)
-      engine_columns      = [:id,:engine_conf,:application_id]
+      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]

data/lib/dbAccessor/deleter/deleter.rb

@@ -4,20 +4,20 @@ require_relative '../base'
 
 class DbAccessor::Deleter < Db_Accessor::Base
 
-  
+
   def self.delete_all(given_object)
     waited_keys = [:model_name,:condition]
     if validate(given_object,waited_keys) && valid_condition?(given_object)
 	  model = get_model_name(given_object)
       condition = given_object[:condition]
-      condition == {} ? model.update_all("deleted = true") : model.where(condition).update_all("deleted = true") 
+      condition == {} ? model.update_all("deleted = true") : model.where(condition).update_all("deleted = true")
 	  return_response(200,"success")
     else
       return_response(400,"Not deleted")
     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])
@@ -34,7 +34,7 @@ class DbAccessor::Deleter < Db_Accessor::Base
   end
 
   def self.validate(param,waited_keys)
-      param.is_a?(Hash) && valid_keys?(param,waited_keys) && !validate_argument(param) && is_model?(param[:model_name])  
+      param.is_a?(Hash) && valid_keys?(param,waited_keys) && !validate_argument(param) && is_model?(param[:model_name])
   end
 
   def self.validate_id(param)
@@ -50,15 +50,15 @@ class DbAccessor::Deleter < Db_Accessor::Base
     end
     return true
   end
-  
+
   def self.valid_condition?(param)
     condition = param[:condition]
     model_name = param[:model_name]
     if condition.is_a?(Hash)
-      if !(condition.empty?) 
+      if !(condition.empty?)
         keys = condition.keys
         values = condition.values
-        if !(valid_object_columns?(model_name,condition)) || validate_argument(condition) || !(valid_attributes_values?(condition)) 
+        if !(valid_object_columns?(model_name,condition)) || validate_argument(condition) || !(valid_attributes_values?(condition))
           return false
         end
       else
@@ -69,5 +69,5 @@ class DbAccessor::Deleter < Db_Accessor::Base
     end
     return true
   end
- 
+
 end

data/lib/dbAccessor/version.rb

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

data/lib/dbAccessor/writer/writer.rb

@@ -40,7 +40,7 @@ private ######################################################################
           content[:name].is_a?(String) && content[:api_key].is_a?(String) && content[:url].is_a?(String)
 
       elsif model_name == ENGINE_MODEL
-          content[:engine_conf].is_a?(String) && content[:application_id].is_a?(Fixnum)
+          content[:name].is_a?(String) && content[:engine_conf].is_a?(String) && content[:application_id].is_a?(Fixnum)
 
       elsif model_name == ENGINE_DATA_MODEL
           content[:customer_id].is_a?(Fixnum) && content[:item_id].is_a?(Fixnum) && content[:preference].is_a?(Fixnum) && content[:engine_id].is_a?(Fixnum)

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

@@ -1,6 +1,7 @@
 class CreateEngines < ActiveRecord::Migration
     def self.up
       create_table :engines do |e|
+        e.string     :name
         e.column     :engine_conf, :json
         e.integer    :application_id
         e.timestamps

data/spec/feed/dbTest/model/application.rb

@@ -8,19 +8,20 @@ require_relative 'config'
 
 class Application < ActiveRecord::Base
   attr_accessor :api_key_to_update
-  
+
 
   validates_presence_of   :name, :api_key, :url
   validates_uniqueness_of :api_key, :url
+  validates_uniqueness_of :name, :scope => :user_id
   has_many                :engines
   belongs_to              :user
-  
+
 
   after_save    :save_app
  # before_update :save_status
  # after_update  :update_app
 
-  private 
+  private
 
   def save_status
       @api_key_to_update  = api_key
@@ -29,7 +30,7 @@ class Application < ActiveRecord::Base
   def save_app
       option  = {user: false,app: true}
       to_save = {api_key: api_key}.to_json
-      RestClient.post("#{AUTH_MANAGER_URI}auth_manager/adder/save",{object: to_save,option: option}) 
+      RestClient.post("#{AUTH_MANAGER_URI}auth_manager/adder/save",{object: to_save,option: option})
   end
 
   def update_app
@@ -37,9 +38,9 @@ class Application < ActiveRecord::Base
       old_obj = {api_key: @api_key_to_update}.to_json
       to_update = {api_key: api_key}.to_json
       if deleted == false
-        RestClient.put("#{AUTH_MANAGER_URI}auth_manager/updater/update",{object: to_update,old_object: old_obj,option: option})  
+        RestClient.put("#{AUTH_MANAGER_URI}auth_manager/updater/update",{object: to_update,old_object: old_obj,option: option})
       else
-        RestClient.delete("#{AUTH_MANAGER_URI}auth_manager/deleter/delete",{object: to_update,option: option})  
+        RestClient.delete("#{AUTH_MANAGER_URI}auth_manager/deleter/delete",{object: to_update,option: option})
       end
   end
 

data/spec/feed/dbTest/model/engine.rb

@@ -4,8 +4,9 @@ require_relative 'application'
 
 class Engine < ActiveRecord::Base
 
-  validates_presence_of :engine_conf
-  has_one               :engine_data
-  belongs_to            :application
+  validates_uniqueness_of :name , :scope => :application_id
+  validates_presence_of   :engine_conf,:name
+  has_one                 :engine_data
+  belongs_to              :application
 
 end

data/spec/updater_spec.rb

@@ -17,7 +17,7 @@ describe DbAccessor::Updater do
 	  param = {model_name: "Application",attributes: {15 => {api_key: UUID.new.generate}} }
 	  it {expect((DbAccessor::Updater.update_by_id(param))[:code]).to eq 200 }
 
-	  param = {model_name: "Engine",attributes: {5 => {engine_conf: {name: 'name', similarity_metric: 'similarity_metric',reco_algo: 'reco_algo',neighborhood: 'neighborhood'}.to_json} } }
+	  param = {model_name: "Engine",attributes: {1 => {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
 

data/spec/writer_spec.rb

@@ -10,7 +10,7 @@ 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: {engine_conf: {name: 'engine'+nb.to_s,action: ['LIKE','SHARE'],score: [2,5],algorithm: 'Person',type: 'UserBased', neighborhood: 5 }.to_json ,application_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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dbAccessor
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - fabira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-07 00:00:00.000000000 Z
+date: 2014-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler