gwt_rpc 0.0.1 → 0.1.0

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.1.0

data/gwt_rpc.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gwt_rpc}
-  s.version = "0.0.1"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Carpenter"]
-  s.date = %q{2011-02-02}
+  s.date = %q{2011-06-15}
   s.description = %q{Spider Google Web Toolkit sites using ruby}
   s.email = %q{andrew.main@gmail.com}
   s.extra_rdoc_files = [
@@ -65,7 +65,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/andrewcarpenter/gwt_rpc}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.4.2}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Ruby Google Web Toolkit client}
   s.test_files = [
     "spec/gwt_rpc/base_extensions/array_spec.rb",

data/lib/gwt_rpc/base_extensions/date.rb

@@ -6,7 +6,6 @@ module GwtRpc::BaseExtensions::Date
   module ClassMethods
     def gwt_deserialize(reader)
       reader.read_int
-      reader.read_int
     end
   end
 end

data/lib/gwt_rpc/base_extensions/float.rb

@@ -12,9 +12,7 @@ module GwtRpc::BaseExtensions::Float
   
   module ClassMethods
     def gwt_deserialize(reader)
-      ret = reader.read_int.to_f
-      reader.read_int # FIXME: ignoring this for now...
-      ret
+      reader.read_int.to_f
     end
   end
 end

data/lib/gwt_rpc/client.rb

@@ -13,7 +13,14 @@ class GwtRpc::Client
     @js_url
   end
   
-  delegate :domain, :js_url, :to => "self.class"
+  def self.gwt_permutation(permutation = nil)
+    if permutation
+      @gwt_permutation = permutation
+    end
+    @gwt_permutation
+  end
+  
+  delegate :domain, :js_url, :gwt_permutation, :to => "self.class"
   
   def self.map_classes(mapping)
     @class_map ||= {}

data/lib/gwt_rpc/request.rb

@@ -11,7 +11,11 @@ class GwtRpc::Request
       begin
         response = Typhoeus::Request.post(url,
               :body          => body,
-              :headers       => {'Content-Type' => "text/x-gwt-rpc; charset=utf-8"},
+              :headers       => {
+                'Content-Type' => "text/x-gwt-rpc; charset=utf-8",
+                'X-GWT-Module-Base' => @client.js_url,
+                'X-GWT-Permutation' => @client.gwt_permutation,
+              },
               :timeout       => 1000,
               :cache_timeout => 60)
         return GwtRpc::Response.new(@client, response).content

data/lib/gwt_rpc/response.rb

@@ -8,7 +8,7 @@ class GwtRpc::Response
     @raw_response = raw_response
     
     raise GwtRpc::Error::NoResponse.new("Error: no response to request") if @raw_response.code == 0
-    raise GwtRpc::Error::ServerError.new("Error: status code #{@raw_response.code} not 200") if @raw_response.code != 200
+    raise GwtRpc::Error::ServerError.new("Error: status code #{@raw_response.code} not 200; body is #{@raw_response.body}") if @raw_response.code != 200
     raise GwtRpc::Error::ServerError.new("Error: #{@raw_response.body}") if @raw_response.body !~ /^\/\/OK/
   end
   

data/lib/gwt_rpc/response/reader.rb

@@ -4,7 +4,8 @@ class GwtRpc::Response::Reader
   attr_reader :version, :string_table, :data, :objects
   def initialize(client, json_body)
     @client = client
-    (@version, placeholder, @string_table, *@data) = JSON.parse(json_body).reverse
+    true_json = demangle_json_body(json_body)
+    (@version, placeholder, @string_table, *@data) = JSON.parse(true_json).reverse
     @max_prior_string_location = 0
     @objects = []
   end
@@ -34,6 +35,7 @@ class GwtRpc::Response::Reader
     int = read_int
     
     if int < 0
+      puts "reading obj reference (#{int})" if DEBUG
       obj = @objects[-1 - int]
       # if int == -11
       #   puts obj.inspect
@@ -58,6 +60,7 @@ class GwtRpc::Response::Reader
         raise "unknown java class '#{java_class}'"
       end
     elsif int == 0
+      puts "reading obj nil (0)" if DEBUG
       obj = nil
     end
     obj
@@ -72,4 +75,16 @@ class GwtRpc::Response::Reader
     
     html
   end
+  
+  def demangle_json_body(faux_json)
+    if faux_json.match(/^\[(.+),\[(.+)\],0,7\]$/)
+      data = $1
+      string_table = $2
+      data.gsub!(/'/,'"')
+
+      "[#{data},[#{string_table}],0,7]"
+    else
+      raise "can't demangle"
+    end
+  end
 end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: gwt_rpc
 version: !ruby/object:Gem::Version 
-  hash: 29
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 1
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors: 
 - Andrew Carpenter
@@ -15,171 +10,130 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-02 00:00:00 -08:00
+date: 2011-06-15 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   name: typhoeus
-  type: :runtime
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
+  type: :runtime
   prerelease: false
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :runtime
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
+  type: :runtime
   prerelease: false
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: json
-  type: :runtime
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
+  type: :runtime
   prerelease: false
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">"
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
         version: 2.0.0
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
+  type: :development
   prerelease: false
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: bundler
-  type: :development
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
         version: 1.0.0
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
+  type: :development
   prerelease: false
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: jeweler
-  type: :development
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 1
-        - 5
-        - 1
         version: 1.5.1
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
+  type: :development
   prerelease: false
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: rcov
-  type: :development
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  requirement: *id007
-- !ruby/object:Gem::Dependency 
+  type: :development
   prerelease: false
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   name: typhoeus
-  type: :runtime
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  requirement: *id008
-- !ruby/object:Gem::Dependency 
+  type: :runtime
   prerelease: false
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :runtime
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  requirement: *id009
-- !ruby/object:Gem::Dependency 
+  type: :runtime
   prerelease: false
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
   name: json
-  type: :runtime
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  requirement: *id010
-- !ruby/object:Gem::Dependency 
+  type: :runtime
   prerelease: false
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">"
       - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 1
-        - 2
-        - 3
         version: 1.2.3
-  requirement: *id011
+  type: :development
+  prerelease: false
+  version_requirements: *id011
 description: Spider Google Web Toolkit sites using ruby
 email: andrew.main@gmail.com
 executables: []
@@ -248,7 +202,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: -1042891651709601889
       segments: 
       - 0
       version: "0"
@@ -257,14 +211,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Ruby Google Web Toolkit client