smartclient 0.0.6 → 0.0.7

data/lib/DataSource.rb

@@ -8,21 +8,10 @@ class DataSource
   attr_accessor :data_source
   @data_source = nil
   @model = nil   
-  def initialize(path, model)        
-    #@data_source = self.get_data(path)
+  @pk = nil
+  def initialize(path, model)            
     @model = model
-  end
-=begin
-  <summary> get the DataSource contents from the path and parse to JSON format </summary>  
-=end  
-  def get_data(path)
-    ds_content = File.read(path)
-    #remove the isc tag and the end tag
-    ds_content['isc.RestDataSource.create('] = ''
-    ds_content[');'] = ''
-    #remove tab, newline tag \n \r \t etc
-    result = ds_content
-    return JSON.parse(result)
+	@pk = @model.primary_key()	  
   end
 =begin
   <summary> get the field content by the filed name </summary>  
@@ -106,10 +95,7 @@ private
 		result = Array.new
 		result << query   
 		result.concat(criteria_query[:values])		
-		
-		Rails.logger.info('>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>')
-			Rails.logger.info(result)
-		Rails.logger.info('<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<')
+	
 		return result
 	end
 	
@@ -342,8 +328,8 @@ private
   <summary>Add new item</summary>  
 =end     
     def add(request)      
-      new_data = request.data
-      new_supplyitem = @model.create(new_data)	  
+      new_data = request.data	 
+      @model.create(new_data)			
       response = DSResponse.new
       response.data = new_data
       response.status = 0      
@@ -353,12 +339,12 @@ private
   <summary>Remove the selected item</summary>  
 =end         
     def remove(request)      
-      data = request.data
-      item_id = data['itemID']
+      data = request.data      	  
+	  id = data[@pk]	  
       # remove the item
-      @model.destroy(item_id)	  
+      @model.destroy(id)	  
       response = DSResponse.new
-      response.data = data
+      response.data = nil
       response.status = 0      
       return response 
     end
@@ -370,13 +356,14 @@ private
       old_data = request.oldValues
       # get the date from the request object
       update_data = request.data
-      item_id = update_data['itemID']
+	  	  
+      new_id = update_data[@pk]
       # merge to hash objects      
       merged_data = old_data.merge!(update_data)      
-      merged_data.delete('itemID')
+      merged_data.delete(@pk)
       
       #update
-      @model.update(item_id, merged_data)      	  
+      @model.update(new_id, merged_data)      	  
 	  response = DSResponse.new      
       response.status = 0      
       return response

data/lib/RPCManager.rb

@@ -23,8 +23,7 @@ class RPCManager
     model: the object that is mapped to the table
   </params>
 =end
-  def initialize(request=nil, model=nil)    
-    @model = model		 
+  def initialize(request=nil)        
 	# if is not wrapped in a transaction then we'll wrap it to make unified handling of the request	
 	if !check_transaction(request)		
 		req_hash = HashWithIndifferentAccess.new
@@ -38,6 +37,10 @@ class RPCManager
 		@request = request
 	end	 
   end  
+  
+  def model=(model)
+	@model = model
+  end
 =begin
 	<summary>
 		Helper method to decide if request contains an advanced criteria or not
@@ -78,6 +81,19 @@ class RPCManager
 	@result = { :response => response } 
     return @result 	
   end
+=begin
+	<summary>
+		Select the model by the datasource
+    </summary>
+    <returns>Datasource name</returns>
+=end  
+	def get_datasource
+		if @request.include?(:transaction)
+			return @request[:transaction][:operations][0][:dataSource]
+		else
+			return @request[:dataSource]
+		end
+	end
 =begin
 	<summary>
 		Process the transaction request for which this RPCManager was created for
@@ -92,16 +108,15 @@ class RPCManager
 		# fetch the operations
 		operations = transaction_request[:operations]
 		
-		queueFailed = false
 		# response list
 		res_list = Array.new			
 		# transaction progress
 		@model.transaction do 									
 			begin				
-				operations.each do |op|								
+				operations.each do |op|	 
 					# parase advanced criterias, if any
 					advanced_criteria = parse_advanced_criterias(op)
-					
+					 
 					req = DSRequest.new(op, @model) 					
 					unless advanced_criteria == nil
 						req.advancedCriteria = advanced_criteria
@@ -113,13 +128,10 @@ class RPCManager
 						res.status = -1
 					end
 					
-					# if request execution failed, mark the flag variable
-					if res.status == -1
-						queueFailed = true
-					end
+				
 						
 					# store the response for later
-					res_list << res	 
+					res_list << res	 					
 				end			
 			rescue ActiveRecord::RecordInvalid
 				# if it occurs exception
@@ -142,15 +154,13 @@ class RPCManager
 		# iterate over the responses and create a instance of an anonymous class which mimics the required json
 		responses = Array.new
 		
-		res_list.each do | response |
-			
+		res_list.each do | response |			
 			res = DSResponse.new
 			res.data = response.data			
 			res.startRow = response.startRow
 			res.endRow = response.endRow
 			res.totalRow = response.totalRow
-			res.status = response.status
-			
+			res.status = response.status			
 			responses << res
 		end 
 		return responses

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartclient
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-20 00:00:00.000000000 Z
+date: 2013-05-23 00:00:00.000000000 Z
 dependencies: []
 description: ! "SmartClient combines the industry's richest set of cross-browser UI
   components with a Java server framework to provide an end-to-end solution for building