rails-extjs-direct 0.0.14 → 0.0.15

data/lib/rails-extjs-direct/mixins/action_controller/direct_controller.rb

@@ -32,14 +32,11 @@ module Rails::ExtJS::Direct::Controller
 
         params["authenticity_token"] = token if token
 
-        params[:id] = @xrequest.id
-
-        if @xrequest.id.kind_of?(Array)
-          params[:data] = @xrequest.params
+        if @xrequest.params.kind_of?(Integer) || @xrequest.params.kind_of?(Array)
+          params[:id] = @xrequest.params
         elsif @xrequest.params.kind_of?(Hash)
-          params[:data] = {}
           @xrequest.params.each do |k,v|
-            params[:data][k] = v
+            params[k] = v
           end
         end
     end

data/lib/rails-extjs-direct/xrequest.rb

@@ -8,24 +8,11 @@ class XRequest
 
     def initialize(params)
         # TODO: simply setting @id, @params
-        @id         = (params["id"].to_i > 0) ? params["id"].to_i : (params["data"].kind_of?(Array) && (params["data"].first.kind_of?(Integer) || params["data"].first.nil?)) ? params["data"].shift : nil
         @tid        = params["tid"]
         @type       = params["type"]
-        @params     = (params["data"].kind_of?(Array) && params["data"].length == 1 && params["data"].first.kind_of?(Hash)) ? params["data"].first : params["data"] || []
+        @params     = (params["data"].kind_of?(Array)) ? params["data"].first : {}
         @controller = params["xcontroller"]
         @action     = params["xaction"]
     end
 
-    ##
-    # arg
-    # return a request argument at index.  can be used to access either [] or {}
-    # @param {String/Integer} index
-    # @raises XException if params doesn't exist.
-    #
-    def arg(index)
-        if params[index].nil?
-            raise XException.new("Attempt to access unknown request argument '#{index.to_s}' on transaction #{@tid}")
-        end
-        @params[index]
-    end
 end

data/lib/rails-extjs-direct.rb

@@ -4,7 +4,7 @@
 module Rails
     module ExtJS
         module Direct
-            VERSION = '0.0.14'
+            VERSION = '0.0.15'
         end
     end
 end

data/rails-extjs-direct.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rails-extjs-direct}
-  s.version = "0.0.14"
+  s.version = "0.0.15"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chris Scott"]
-  s.date = %q{2009-09-27}
+  s.date = %q{2009-09-29}
   s.description = %q{A series of components for implementing the Ext.Direct API specification in Rails 2.3 and higher.
 Ext.Direct in Rails is implementede with Rack Middleware.}
   s.email = ["christocracy@gmail.com"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rails-extjs-direct
 version: !ruby/object:Gem::Version 
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors: 
 - Chris Scott
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-27 00:00:00 -04:00
+date: 2009-09-29 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency