jinx-json 2.1.2 → 2.1.4

data/Gemfile

@@ -5,5 +5,5 @@ group :development do
   gem 'ruby-debug'
   # Uncomment to use a local gem.
   #gem 'jinx', :path => File.dirname(__FILE__) + '/../core'
-  gem 'jinx-json', :path => File.dirname(__FILE__), :require => 'jinx/json'
+  gem 'jinx-json', :path => File.dirname(__FILE__)
 end

data/History.md

@@ -1,6 +1,14 @@
 This history lists major release themes. See the GitHub commits (https://github.com/jinx/json)
 for change details.
 
+2.1.4 / 2012-11-01
+------------------
+* Only serialize Java attributes.
+
+2.1.3 / 2012-06-16
+------------------
+* Disable lazy loader.
+
 2.1.2 / 2012-06-12
 ------------------
 * Support caSmall web service.

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011 Oregon Health & Science University
+Copyright (c) 2012 Oregon Health & Science University
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

data/README.md

@@ -1,6 +1,5 @@
 Jinx JSON plug-in
 =================
-
 **Home**:         [http://github.com/jinx/json](http://github.com/jinx/json)    
 **Git**:          [http://github.com/jinx/json](http://github.com/jinx/json)       
 **Author**:       OHSU Knight Cancer Institute    
@@ -24,8 +23,24 @@ Enable Jinx for a Java package, as described in the [Jinx](http://github.com/jin
     require 'jinx/json'
     jsoned = jinxed.to_json #=> the JSON representation of a jinxed resource
     JSON[jsoned] #=> the deserialized jinxed resource
+    JSON
+
+The JSON payload consists of the following:
+
+* The standard primitive Java properties, e.g. [caTissue](http://github.com/caruby/tissue)
+  <tt>SpecimenCollectionGroup.surgicalPathologyNumber</tt>. If there is a Java <tt>id</tt> property,
+  then designate that property with <tt>identifier</tt>, since <tt>id</tt> is a reserved Ruby
+  method.
+
+* An object identifier property <tt>object_id</tt> which uniquely identifies the object in the scope
+  of the JSON object graph.
+
+* The standard Jinx <tt>Resource<tt/> reference properties, e.g. caTissue
+  <tt>TissueSpecimen.specimenCollectionGroup</tt>. If the referenced object content contains the
+   <tt>object_id</tt> property, then the reference resolves to the object defined in the JSON
+   object graph with that <tt>object_id</tt> value.
 
 Copyright
 ---------
-Jinx &copy; 2011 by [Oregon Health & Science University](http://www.ohsu.edu/xd/health/services/cancer/index.cfm).
+Jinx &copy; 2012 by [Oregon Health & Science University](http://www.ohsu.edu/xd/health/services/cancer).
 Jinx is licensed under the MIT license. Please see the LICENSE and LEGAL files for more information.

data/lib/jinx/json/collection.rb

@@ -1,13 +1,16 @@
 require 'jinx/helpers/collection'
+require 'jinx/json/state'
 
 module Jinx
   module Collection
     # Adds JSON serialization to collections.
     #
-    # @param args the JSON serialization options
-    # @return [String] the JSON representation of this Enumerable as an array
-    def to_json(*args)
-      to_a.to_json(*args)
+    # @param [State, Hash, nil] state the JSON state or serialization options
+    # @return [String] the JSON representation of this {Jinx::Resource}
+    def to_json(state=nil)
+      # Make a new State from the options if this is a top-level call.
+      state = JSON::State.for(state) unless JSON::State === state
+      to_a.to_json(state)
     end
   end
 end

data/lib/jinx/json/deserializable.rb

@@ -1,4 +1,4 @@
-require 'jinx/helpers/hashable'
+require 'jinx/helpers/hasher'
 
 module Jinx
   module JSON

data/lib/jinx/json/deserializer.rb

@@ -1,4 +1,4 @@
-require 'jinx/helpers/hashable'
+require 'jinx/helpers/hasher'
 
 module JSON
   # Bumps the default JSON nesting level to 100.

data/lib/jinx/json/serializable.rb

@@ -77,7 +77,7 @@ module Jinx
           return {:object_id => proxy_object_id}
         end
         visited << self
-        vh = value_hash
+        vh = value_hash(self.class.java_attributes)
         vh.each { |pa, v| vh[pa] = v.to_a if Set === v } 
         # Add the object id.
         vh[:object_id] = proxy_object_id

data/lib/jinx/json/version.rb

@@ -1,5 +1,5 @@
 module Jinx
   module JSON
-    VERSION = '2.1.2'
+    VERSION = '2.1.4'
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: jinx-json
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.1.2
+  version: 2.1.4
 platform: ruby
 authors: 
   - OHSU
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-12 00:00:00 Z
+date: 2012-11-01 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: bundler
@@ -91,7 +91,6 @@ files:
   - lib/jinx/json/deserializable.rb
   - lib/jinx/json/deserializer.rb
   - lib/jinx/json/serializable.rb
-  - lib/jinx/json/set.rb
   - lib/jinx/json/state.rb
   - lib/jinx/json/version.rb
   - spec/serializer_spec.rb