cell_set 0.1.1 → 0.1.2

data/lib/cell_set/cell_set.rb

@@ -8,6 +8,7 @@ module CellSet
     include Attributes
     include ActiveModel::Serializers::JSON
     include ActiveModel::Serializers::Xml
+    self.include_root_in_json = false
 
     def as_json(options = nil)
       # Strangely couldn't use options = {} in JRuby
@@ -15,7 +16,11 @@ module CellSet
       json = super(options)
       unless (options.has_key?(:only) && !options[:only].include?("cells")) ||
           (options.has_key?(:except) && options[:except].include?("cells"))
-        json.first[1]["cells"] = @cellHash
+        if options[:root]
+          json.first[1]["cells"] = @cellHash
+        else
+          json["cells"] = @cellHash
+        end
       end
       json
     end

data/lib/cell_set/version.rb

@@ -1,3 +1,3 @@
 module Version
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/models/cell_set_axis_spec.rb

@@ -74,6 +74,15 @@ describe CellSet::CellSetAxis do
         }
       end
 
+      it "should serialize with root" do
+        axis.as_json(:root => true).should == {
+          "cell_set_axis" => {
+            "axis_ordinal" => 0,
+            "positions" => [position1, position2]
+          }
+        }
+      end
+
       it "should deserialize" do
         ::CellSet::CellSetAxis.new.from_json(axis.to_json).should == axis
       end

data/spec/models/cell_set_spec.rb

@@ -152,6 +152,13 @@ describe CellSet::CellSet do
     context "JSON" do
       it "should serialize" do
         cell_set.as_json.should == {
+          "axes" => [column_axis, row_axis],
+          "cells" => {}
+        }
+      end
+
+      it "should serialize with root" do
+        cell_set.as_json(:root => true).should == {
           "cell_set" => {
             "axes" => [column_axis, row_axis],
             "cells" => {}
@@ -161,25 +168,19 @@ describe CellSet::CellSet do
 
       it "should serialize only cells" do
         cell_set.as_json(:only => "cells").should == {
-            "cell_set" => {
-                "cells" => {}
-            }
+          "cells" => {}
         }
       end
 
       it "should serialize excluding cells" do
         cell_set.as_json(:except => "cells").should == {
-          "cell_set" => {
-              "axes" => [column_axis, row_axis]
-          }
+          "axes" => [column_axis, row_axis]
         }
       end
 
       it "should serialize only axes" do
         cell_set.as_json(:only => "axes").should == {
-          "cell_set" => {
-              "axes" => [column_axis, row_axis]
-          }
+          "axes" => [column_axis, row_axis]
         }
       end
 

data/spec/models/member_spec.rb

@@ -56,6 +56,26 @@ describe CellSet::Member do
         }
       end
 
+      it "should serialize with root" do
+        member.as_json(:root => true).should == {
+          "member" => {
+            "caption" => nil,
+            "childMembers" => [],
+            "depth" => nil,
+            "description" => nil,
+            "dimension" => nil,
+            "expression" => nil,
+            "hierarchy" => nil,
+            "level" => nil,
+            "memberType" => nil,
+            "name" => name,
+            "ordinal" => 0,
+            "parentMember" => nil,
+            "uniqueName" => unique_name
+          }
+        }
+      end
+
       it "should deserialize" do
         ::CellSet::Member.new.from_json(member.to_json).should == member
       end

data/spec/models/position_spec.rb

@@ -66,8 +66,17 @@ describe CellSet::Position do
     context "JSON" do
       it "should serialize" do
         position.as_json.should == {
+          "ordinal" => 0,
+          "members" => [member1, member2]
+        }
+      end
+
+      it "should serialize with root" do
+        position.as_json(:root => true).should == {
+          "position" => {
             "ordinal" => 0,
             "members" => [member1, member2]
+          }
         }
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cell_set
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors: