dbAccessor 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c43e3dd32fdfcab6e7347fb6ded4e801283d499
-  data.tar.gz: ce4afbf8d6c5ebaa5c61ff37aaf9da4570793c0f
+  metadata.gz: 67a4c4de72687a32de28ac35f226e3005b85861f
+  data.tar.gz: eb556c400dc24d68c43499faa3e9076fe0b8c8aa
 SHA512:
-  metadata.gz: ae50ce367c0cf1a19721bd5dc3fe7abaaff3035ef6c6689c9dea64beb45d77ccb12230ca727b3b249dcea37f88848d74a575f5477b02e774596dddfee8b839fe
-  data.tar.gz: b755eef29fde8c995745194924a70169008b2028ad95683247cc31726cd6842d6c9df0eefc2cc28f805d41fd5680f1ada7f1ed3048064ada2a43f9835d39b721
+  metadata.gz: f781d73d92df60d8cdadcedff1602148324a5c77fadd7e745331fc2d7e43b7f81283dc5bb9ad717146273f0ab1b38ff1da86d4fd5b1f3232e8c09aeb397b5222
+  data.tar.gz: ef21b5958da09dbf4e5d51d3b00a6153f5839b7dd36d4586c569c888e6bd74ac9ebe6346c529bc1182ebd9bff3b1f7be7bbcfccebaaae2c74f059b2beb8cfc49

data/Gemfile

@@ -1,4 +1,9 @@
 source 'https://rubygems.org'
+gem "autotest"
+gem "autotest-fsevent"
+gem "autotest-growl"
+gem "ZenTest"
+gem "auth_manager"
 
 # Specify your gem's dependencies in dbAccessor.gemspec
 gemspec

data/dbAccessor.gemspec

@@ -22,15 +22,10 @@ Gem::Specification.new do |spec|
   # version 1.9.0 or greater
   spec.required_ruby_version = ">= 1.9"
   spec.add_development_dependency "bundler", "~> 1.5"
-  spec.add_development_dependency "autotest", "~> 4.4", ">= 4.4.6"
   spec.add_development_dependency "uuid", "~> 2.3", ">= 2.3.7"
-  spec.add_development_dependency "autotest-fsevent", "~> 0.2", ">= 0.2.9"
-  spec.add_development_dependency "autotest-growl", "~> 0.2", ">= 0.2.16"
-  spec.add_development_dependency "ZenTest", "~> 4.10", ">= 4.10.0"
   spec.add_development_dependency "rspec", "~> 2.6"
   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"
-  spec.add_development_dependency "auth_manager"
   spec.add_development_dependency "redis"
 end

data/lib/dbAccessor/base.rb

@@ -1,11 +1,14 @@
 module Db_Accessor
   
   class Base
-    USER_MODEL = 'User'
-    APP_MODEL  = 'Application'
-    app_columns  = [:id,:name,:api_key,:url,:user_id]
-    user_columns = [:id,:login,:password,:firstname,:lastname,:gender,:email]
-    
+    USER_MODEL   = 'User'
+    APP_MODEL    = 'Application'
+    ENGINE_MODEL = 'Engine'
+    ENGINE_DATA_MODEL = 'Engine_data'
+    ACTION_MODEL = 'Action'
+    ASSIGNMENT_MODEL = 'Assignment'
+  
+      
     def self.validate_argument(given_param)
       resp = nil
       given_param.values.each do |v|
@@ -31,7 +34,8 @@ module Db_Accessor
     end
 
     def self.is_model?(param)
-      param == USER_MODEL || param == APP_MODEL 
+      model = [ USER_MODEL, APP_MODEL, ENGINE_MODEL, ENGINE_DATA_MODEL,ACTION_MODEL,ASSIGNMENT_MODEL]
+      model.include?(param)
     end
 
     def self.valid_hash?(param)
@@ -60,10 +64,26 @@ module Db_Accessor
   end
 
   def self.valid_object_columns?(model_name,content)
-    keys = content.keys
-    user_attributes = [:id,:login,:password,:firstname,:lastname,:gender,:email]
-    app_attributes  = [:id,:api_key,:name,:url,:user_id]
-    model_name == "User" ? attributes = user_attributes : attributes = app_attributes
+    engine_columns = [:id,:name,:action_based,:application_id]
+    engine_data_columns = [:id,:customer_id,:item_id,:preference,:engine_id]
+    action_columns = [:id,:name,:score]
+    assignment_columns = [:id,:engine_id,:action_id]
+    app_columns  = [:id,:name,:api_key,:url,:user_id]
+    user_columns = [:id,:login,:password,:firstname,:lastname,:gender,:email]
+ 
+    keys = content.keys 
+    if model_name == "User" 
+       attributes = user_columns 
+    elsif model_name == "Application"
+       attributes = app_columns
+    elsif model_name == "Engine"
+        attributes = engine_columns
+    elsif model_name == "Engine_data"
+        attributes = engine_data_columns
+    else
+        attributes = action_columns
+    end
+    
     verify_keys(keys,attributes)
   end
 

data/lib/dbAccessor/version.rb

@@ -1,3 +1,3 @@
 module DbAccessor
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/dbAccessor/writer/writer.rb

@@ -36,6 +36,8 @@ private ######################################################################
       content[:login].is_a?(String) && content[:password].is_a?(String) && content[:email].is_a?(String) && !(email_pattern.match(content[:email])).nil? 
       elsif model_name == 'Application'
           content[:name].is_a?(String) && content[:api_key].is_a?(String) && content[:url].is_a?(String)
+      elsif model_name == 'Engine'
+          content[:name].is_a?(String) && content[:action_based].is_a?(String) && content[:application_id].is_a?(Fixnum)
       else
           false
       end
@@ -43,7 +45,8 @@ private ######################################################################
 
    
   def self.validate(param,waited_keys)
-     valid_hash?(param) && valid_keys?(param,waited_keys) && is_model?(param[:model_name]) && valid_object_columns?(param[:model_name],param[:content]) && !validate_argument(param) && !validate_argument(param[:content]) && validate_required_params(param)
+   valid_hash?(param) && valid_keys?(param,waited_keys) && is_model?(param[:model_name]) && valid_object_columns?(param[:model_name],param[:content]) && !validate_argument(param) && !validate_argument(param[:content]) && validate_required_params(param)
+
   end
 
 

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

@@ -39,5 +39,4 @@ class User < ActiveRecord::Base
       end
   end
 
-
 end

data/spec/updater_spec.rb

@@ -40,7 +40,7 @@ describe DbAccessor::Updater do
 	end
 
 	context "when the object is not found" do
-	  param = {model_name: "User",attributes: { 100 => { login: "fabi"}} } 
+	  param = {model_name: "User",attributes: { 10000 => { login: "fabi"}} } 
       it {expect((DbAccessor::Updater.update_by_id(param))[:code]).to eq 400 }
     end
 

data/spec/writer_spec.rb

@@ -10,6 +10,7 @@ describe DbAccessor::Writer do
 
   let(:app) { {model_name: 'Application',content: {name: 'Wikina'+nb.to_s,api_key: api_key,url: 'http://www.wiki'+nb.to_s+'.com',user_id: 2}} }   
   
+  let(:engine) { {model_name: 'Engine',content: {name: 'reco'+nb.to_s,action_based: 'like',application_id: 2}} }   
 
   describe".write_object" do
 
@@ -21,6 +22,10 @@ describe DbAccessor::Writer do
       it {expect((DbAccessor::Writer.write_object(app))[:code]).to eq 201}
     end
 
+    context "when an engine is saved in database" do
+      it {expect((DbAccessor::Writer.write_object(engine))[:code]).to eq 201}
+    end
+
     context "when the object's parameters are empty" do
      it {expect((DbAccessor::Writer.write_object({model_name: '',content: user[:content]}))[:code]).to eq 400 }
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dbAccessor
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - fabira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-31 00:00:00.000000000 Z
+date: 2014-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -24,26 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
-- !ruby/object:Gem::Dependency
-  name: autotest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.4.6
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.4.6
 - !ruby/object:Gem::Dependency
   name: uuid
   requirement: !ruby/object:Gem::Requirement
@@ -64,66 +44,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.7
-- !ruby/object:Gem::Dependency
-  name: autotest-fsevent
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.9
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.9
-- !ruby/object:Gem::Dependency
-  name: autotest-growl
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.16
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.16
-- !ruby/object:Gem::Dependency
-  name: ZenTest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.10'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.10.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.10'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.10.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -198,20 +118,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.17.1
-- !ruby/object:Gem::Dependency
-  name: auth_manager
-  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