smartclient 0.0.4 → 0.0.5

data/lib/DSResponse.rb

@@ -1,4 +1,5 @@
 class DSResponse
+	attr_accessor :data, :startRow, :endRow, :totalRow, :status  
 	@data = nil
 	@startRow = 0
 	@endRow = 0
@@ -23,6 +24,6 @@ class DSResponse
 
 	def status=(value)
 	  @status = value
-	end
+	end 
 end  
 

data/lib/DataSource.rb

@@ -21,7 +21,7 @@ class DataSource
     ds_content['isc.RestDataSource.create('] = ''
     ds_content[');'] = ''
     #remove tab, newline tag \n \r \t etc
-    result = ds_content.gsub('/\r|\n|\t|>>|\/\//', '')
+    result = ds_content
     return JSON.parse(result)
   end
 =begin
@@ -81,20 +81,18 @@ private
       response.status = 0
       response.totalRow = objs_count      
     
-      @result = { :response => response } 
-      return @result 
+      return response 
     end
 =begin
   <summary>Add new item</summary>  
 =end     
     def add(request)      
       new_data = request.data
-      new_supplyitem = @model.create(new_data)
+      new_supplyitem = @model.create(new_data)	  
       response = DSResponse.new
       response.data = new_data
-      response.status = 0
-      @result = { :response => response }
-      return @result
+      response.status = 0      
+      return response
     end
 =begin
   <summary>Remove the selected item</summary>  
@@ -103,12 +101,11 @@ private
       data = request.data
       item_id = data['itemID']
       # remove the item
-      @model.destroy(item_id)
+      @model.destroy(item_id)	  
       response = DSResponse.new
       response.data = data
-      response.status = 0
-      @result = { :response => response }
-      return @result 
+      response.status = 0      
+      return response 
     end
 =begin
   <summary>Update the items</summary>  
@@ -124,7 +121,7 @@ private
       merged_data.delete('itemID')
       
       #update
-      @model.update(item_id, merged_data)      
+      @model.update(item_id, merged_data)      	  
       return nil
     end
 end

data/lib/RPCManager.rb

@@ -12,6 +12,7 @@ require 'DSResponse'
 class RPCManager
   @request = nil  
   @model = nil
+  @temp_request = nil
 =begin
   <summary>
     Process the request with the model.
@@ -22,10 +23,34 @@ class RPCManager
     model: the object that is mapped to the table
   </params>
 =end
-  def initialize(request=nil, model=nil)
-    @request = request
-    @model = model
+  def initialize(request=nil, model=nil)    
+    @model = model		 
+	# 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
+		req_hash[:transaction] = HashWithIndifferentAccess.new
+		req_hash[:transaction][:transactionNum] = -1 				
+		req_list = Array.new
+		req_list << request
+		req_hash[:transaction][:operations] = req_list
+		@request = req_hash
+	else
+		@request = request
+	end	 
   end  
+=begin
+	<summary>
+		Returns true if the request has transaction support
+    </summary>
+    <returns></returns>
+=end
+	def check_transaction(request)
+		if request.include?(:transaction)# and request.include?(:operations) and request.include?(:transactionNum) 
+			return true
+		else
+			return false
+		end
+	end
 =begin
   <summary>
       Transforms a object object into a Json. Will setup the serializer with the        
@@ -35,16 +60,80 @@ class RPCManager
       <returns>the created json object</returns>
 =end
   def processRequest
-    # retrieve the requests with data   
-    req = DSRequest.new(@request, @model)  
-    # set the response variable
-    res = req.execute
-  
-    # safeguard, if was null, create an empty response with failed status
-    if res.nil?
-      res = DSResponse.new
-      res.status=-1
-    end                
-    return res      
+	response = processTransaction   	
+	@result = { :response => response } 
+    return @result 	
   end
+=begin
+	<summary>
+		Process the transaction request for which this RPCManager was created for
+    </summary>
+    <returns></returns>
+=end
+	def processTransaction		
+		# retrieve the requests with data in form
+		transaction_request = @request[:transaction] 		
+		# store transaction num, we'll use it later to see if there was a transaction or not
+		transaction_num = transaction_request[:transactionNum]
+		# 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|								
+					
+					req = DSRequest.new(op, @model) 					
+					# execute the request and get the response
+					res = req.execute							 
+					if res == nil
+						res = DSResponse.new
+						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	 
+				end			
+			rescue ActiveRecord::RecordInvalid
+				# if it occurs exception
+				raise ActiveRecord::Rollback
+			end
+		end
+		
+		# if we have only one object, send directly the DSResponse
+		if transaction_num  == -1
+			response = DSResponse.new
+			response.data = res_list[0].data
+			response.startRow = res_list[0].startRow
+			response.endRow = res_list[0].endRow
+			response.totalRow = res_list[0].totalRow
+			response.status = res_list[0].status
+			
+			return response
+		end
+		
+		# 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 = DSResponse.new
+			res.data = response.data			
+			res.startRow = response.startRow
+			res.endRow = response.endRow
+			res.totalRow = response.totalRow
+			res.status = response.status
+			
+			responses << res
+		end 
+		return responses
+	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartclient
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-14 00:00:00.000000000 Z
+date: 2013-05-16 00:00:00.000000000 Z
 dependencies: []
-description: ! "This gem will work for the smartclient. \n\t                 After
-  you install this gem, you should define the filter method in the models.\n\t                 To
-  do this you need to copy the filter method of the filter.rb of the gem/smartclient
-  directory to the model class."
+description: ! "This gem will work for the smartclient.  The transaction method was
+  added.\n\t                 After you install this gem, you should define the filter
+  method in the models.\n\t                 To do this you need to copy the filter
+  method of the filter.rb of the gem/smartclient directory to the model class."
 email: kris.jin81@gmail.com
 executables: []
 extensions: []