hessian2 2.0.3 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b9a89d291633b69257f589b65f232b5dcc38466
-  data.tar.gz: 69d82afa46069344e29a162c978ec3c095b9a0de
+  metadata.gz: c29b58ed9dcdc79f7e81a7dc8e204f9846fbd8ce
+  data.tar.gz: 868e420d3e2193979cac16c54fe1e8a72f0c3da8
 SHA512:
-  metadata.gz: 336224add2f6534f56e6c1357567f6e165550c9a24f9e466b4530966c6d9a821844d1c7c8190aa69de8bffb979704e0fa791a95d61c7e9ad70cd9478f26a092e
-  data.tar.gz: 26a9830f996c2a9bd0a4b3e2ea342bbd9ff532c2dc2b6fee33abf9fbdca6d0c0b1151b7e114e14ef9ad545e0db3b83b75de8aef563a61e8cb029bc7e2240ce34
+  metadata.gz: b34738c7d43f403b072ba23ee182bfefe680da6f6534b036a18329ecbd8f916c62cec834d2c4322bc169f4d4598dc32f753821d48cc3f3d3c6a776e42766da9c
+  data.tar.gz: ac41f701ff5b2cedd999be07986f8a4e58740a1fe9a3cd64e28f37d955d09943b328e2faf884797d85610a2600beea011be58cb8f6502899f4a836bdb5ca7e7e

data/README.md

@@ -4,6 +4,8 @@ like json, additionally, 麻绳2 parse your object as a struct.
 
 hessian2 implements hessian 2.0 protocol. look [web services protocol](http://hessian.caucho.com/doc/hessian-ws.html) and [serialization protocol](http://hessian.caucho.com/doc/hessian-serialization.html).
 
+Sequel::Mysql2::Dataset and ActiveRecord::Relation are also okey.
+
 ## comparing
 
 yajl-ruby: json, fast.

data/hessian2.gemspec

@@ -20,6 +20,5 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_development_dependency 'rspec'
-  s.add_runtime_dependency 'activerecord'
   s.add_runtime_dependency 'bigdecimal'
 end

data/lib/hessian2/class_wrapper.rb

@@ -15,6 +15,8 @@ module Hessian2
 	      else
 	      	fields = if sample.is_a?(Hash)
 		      	sample.keys.map{|k| k.to_sym }
+          elsif sample.instance_variable_get(:@values).is_a?(Hash)
+            sample.values.keys.map{|k| k }
 		      elsif sample.instance_variable_get(:@attributes).is_a?(Hash)
 		      	sample.attributes.keys.map{|k| k.to_sym }
           elsif sample.is_a?(ClassWrapper)
@@ -32,6 +34,8 @@ module Hessian2
 		      		nil
 		      	elsif obj.is_a?(Hash)
 			        fields.map{|f| obj[f] || obj[f.to_s] }
+            elsif obj.instance_variable_get(:@values).is_a?(Hash)
+              fields.map{|f| obj.values[f] }
 			      elsif obj.instance_variable_get(:@attributes).is_a?(Hash)
 			        fields.map{|f| obj.attributes[f.to_s] }
             elsif obj.is_a?(ClassWrapper)
@@ -53,6 +57,11 @@ module Hessian2
 		        	fields << k.to_sym
 		        	values << v
 		        end
+          elsif object.instance_variable_get(:@values).is_a?(Hash)
+            object.values.each do |k, v|
+              fields << k
+              values << v
+            end
 		      elsif object.instance_variable_get(:@attributes).is_a?(Hash)
 		        object.attributes.each do |k, v|
 		        	fields << k.to_sym

data/lib/hessian2/struct_wrapper.rb

@@ -41,6 +41,9 @@ module Hessian2
       values = []
       if object.is_a?(Hash)
         members.each{|f| values << (object[f] || object[f.to_s]) }
+      elsif object.instance_variable_get(:@values).is_a?(Hash)
+        attrs = object.values
+        members.each{|f| values << attrs[f] }
       elsif object.instance_variable_get(:@attributes).is_a?(Hash)
         attrs = object.attributes
         members.each{|f| values << attrs[f.to_s] }

data/lib/hessian2/version.rb

@@ -1,3 +1,3 @@
 module Hessian2
-  VERSION = "2.0.3"
+  VERSION = "2.0.5"
 end

data/lib/hessian2/writer.rb

@@ -1,6 +1,5 @@
 require 'hessian2/constants'
 require 'bigdecimal'
-require 'active_record'
 
 module Hessian2
   module Writer
@@ -53,7 +52,7 @@ module Hessian2
         write_float(val)
       when Fixnum
         write_int(val)
-      when Array, ActiveRecord::Relation
+      when Array
         write_array(val, refs, crefs, trefs)
       when Bignum
         if val >= -0x80_000_000 && val <= 0x7f_fff_fff # four octet longs
@@ -102,7 +101,7 @@ module Hessian2
       return write_ref(idx) if idx
 
       refs[arr.object_id] = refs.size
-      len = arr.size
+      len = arr.count
       if len <= LIST_DIRECT_MAX # [x78-7f] value*
         str = [ BC_LIST_DIRECT_UNTYPED + len ].pack('C')
       else  # x58 int value*
@@ -287,6 +286,8 @@ module Hessian2
     def write_object(object, refs = {}, crefs = {}, trefs = {})
       return write_nil unless object
 
+      return write_array(object, refs, crefs, trefs) if object.respond_to?(:count) && (object.respond_to?(:sql) || object.respond_to?(:to_sql))
+
       idx = refs[object.object_id]
       return write_ref(idx) if idx
 
@@ -469,8 +470,10 @@ module Hessian2
     def get_fields(object)
       fields = if object.is_a?(Hash)
         object.keys.map{|k| k.to_sym }
+      elsif object.instance_variable_get(:@values).is_a?(Hash)
+        object.values.keys
       elsif object.instance_variable_get(:@attributes).is_a?(Hash)
-        object.attributes.keys.map{|k| k.to_sym }
+        object.attributes.keys
       else
         object.instance_variables.map{|k| k[1..-1].to_sym }
       end
@@ -486,8 +489,10 @@ module Hessian2
       
       vstr = if object.is_a?(Hash)
         fields.map{|f| write(object[f] || object[f.to_s], refs, crefs, trefs) }.join
+      elsif object.instance_variable_get(:@values).is_a?(Hash)
+        fields.map{|f| write(object.values[f], refs, crefs, trefs) }.join
       elsif object.instance_variable_get(:@attributes).is_a?(Hash)
-        fields.map{|f| write(object.attributes[f.to_s], refs, crefs, trefs) }.join
+        fields.map{|f| write(object.attributes[f], refs, crefs, trefs) }.join
       else
         fields.map{|f| write(object.instance_variable_get(f.to_s.prepend('@')), refs, crefs, trefs) }.join
       end

metadata

@@ -1,55 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: hessian2
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.5
 platform: ruby
 authors:
 - takafan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-20 00:00:00.000000000 Z
+date: 2014-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   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: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bigdecimal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: like json, additionally, 麻绳2 parse your object as a struct.
@@ -59,7 +45,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -129,17 +115,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: hessian2
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Hessian2