rubyfox-sfsobject 0.6.0-java → 0.6.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 183e560ee74a8286bc61b32f21afdedf8b236eaa
-  data.tar.gz: 4db6eaeff61ac1f9dbfb52263ae68a1460e5c625
+  metadata.gz: c82cfb1c96972e63c8984f750c6feefc88a7dc6e
+  data.tar.gz: 45b7574048602c2b71669383c662f0019c995c5e
 SHA512:
-  metadata.gz: 7aa03cc88362516ad3005f4286dcd9e5dbb5013a2db6b619eb6ce06d1f464b166b5d4dccde65fa00ea9fee7ede45dbec1f31d49ad1eb27460292f5b666d4b839
-  data.tar.gz: 94773ba2a2bdc567d4f8e9690ab9312724cb9d2cdbfd98c4c5dbf2e280404b68e43e9ecbf7a498063d85eca7fbf8e6f2a7c28261105f0edbc8b9f7c44312ffbd
+  metadata.gz: 53f360150c22a1df77594a14fe8ee9dfb4c29b55afff8a56fbe422f7ee65ed0ff4c393cc1eeab229f98a40ee1e3572d46825a8b6b2c5c918eaad02931c99acda
+  data.tar.gz: 77d8b85559129e5ee89e3d3cc7c6c650c35a4c371724189847f839a20b3501d44d93b4e99b9485deb891fc890ff3c7c7f50e6b007fd8c22657b3947cd1d5d465

data/.travis.yml

@@ -2,17 +2,14 @@ language: ruby
 sudo: false
 cache: bundler
 rvm:
-  - jruby-19mode
-  - jruby
-  - jruby-head
+  - jruby-9.1.5.0
+  - jruby-1.7.26
 env:
   global:
     - CODECLIMATE_REPO_TOKEN=7800b9ed7143dedbdc5e3c62021efa6944bacce3ea9e001654d7481cdabb8c07
     - JRUBY_OPTS='--dev -J-Xmx1024M'
 matrix:
   fast_finish: true
-  allow_failures:
-    - rvm: jruby-head
 notifications:
   webhooks:
     urls:

data/README.md

@@ -94,6 +94,11 @@ sfs_object[:string] # => "value"
 
 *   More docs, please!
 
+## Release
+
+1. Bump `VERSION` in `lib/rubyfox/sfsobject/version.rb`
+2. Commit version bump via `git commit -am "Release X.Y.Z"`
+3. Run `rake release`
 
 ## Contributing
 

data/Rakefile

@@ -17,3 +17,18 @@ RDoc::Task.new do |rdoc|
   rdoc.main     = 'README.rdoc'
   rdoc.rdoc_files.include('README.rdoc', 'lib/**/*.rb')
 end
+
+desc "Run console"
+task :console do
+  $LOAD_PATH << "./lib"
+  require 'rubyfox/sfsobject'
+
+  ENV['SF_DIR'] ||= File.join(File.dirname(__FILE__), 'test', 'vendor', 'smartfox')
+  Rubyfox::SFSObject.boot!(ENV['SF_DIR'] + "/lib")
+
+  require 'rubyfox/sfsobject/core_ext'
+
+  require 'irb'
+  ARGV.clear
+  IRB.start
+end

data/lib/rubyfox/sfsobject/bulk.rb

@@ -48,9 +48,7 @@ module Rubyfox
         "LONG_ARRAY"        =>  :getLongArray,
         "DOUBLE_ARRAY"      =>  :getDoubleArray,
         "SFS_OBJECT"        =>  proc { |k, v| to_hash(v.object) },
-        "SFS_ARRAY"         =>  proc do |k, v|
-          v.object.iterator.map { |e| to_hash(e.object) }
-        end
+        "SFS_ARRAY"         =>  proc { |k, v| to_array(v.object) }
       }
 
       # hash -> object
@@ -93,8 +91,18 @@ module Rubyfox
         hash
       end
 
+      def to_array(object)
+        object.iterator.each_with_index.map do |value, index|
+          _unwrap(object, index, value)
+        end
+      end
+
       def unwrap_value!(object, key)
         value = object.get(key)
+        _unwrap(object, key, value)
+      end
+
+      def _unwrap(object, key, value)
         raise ArgumentError, "nil value for #{key.inspect}" unless value
 
         if wrapper_method = _unwrapper(value)

data/lib/rubyfox/sfsobject/version.rb

@@ -1,5 +1,5 @@
 module Rubyfox
   module SFSObject
-    VERSION = "0.6.0"
+    VERSION = "0.6.1"
   end
 end

data/test/rubyfox/sfsobject/bulk_test.rb

@@ -94,6 +94,21 @@ class RubyfoxSFSObjectBulkTest < RubyfoxCase
     test "sfsobject" do
       assert_conversion({ :sfsobject => [Rubyfox::SFSObject.new]}, { :sfsobject => [{}] })
     end
+
+    test "loads mixed arrays" do
+      object = Rubyfox::SFSObject.from_json('{"mixed": [
+        "foo",
+        true,
+        1.0,
+        {
+          "deep" => ["Föhn", "BÄR"]
+        }
+      ]}')
+      expected = {
+       :mixed => ["foo", true, 1.0, {:deep => ["Föhn", "BÄR"]}]
+      }
+      assert_equal expected, Rubyfox::SFSObject::Bulk.to_hash(object)
+    end
   end
 
   private

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: rubyfox-sfsobject
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: java
 authors:
 - Peter Suschlik
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-09-09 00:00:00.000000000 Z
+date: 2016-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: rake
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rdoc
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: rdoc
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: minitest
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.8.0
+        version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 5.8.0
+  name: minitest
   prerelease: false
   type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.8.0
 description: Map SFSObject into Ruby Hash
 email:
 - ps@neopoly.de
@@ -59,10 +59,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-env
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".ruby-env"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -91,17 +91,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:
-rubygems_version: 2.1.9
+rubygems_version: 2.6.4
 signing_key:
 specification_version: 4
 summary: ''