cell_set 0.1.0 → 0.1.1

data/lib/cell_set/cell_set.rb

@@ -27,7 +27,8 @@ module CellSet
             axis.cell_set = self
             axis
           elsif axis.is_a?(Hash)
-            CellSetAxis.new(:cell_set => self).from_json(axis.to_json)
+            axis['cell_set'] = self
+            CellSetAxis.new(axis)
           else
             throw ArgumentError
           end
@@ -87,6 +88,7 @@ module CellSet
       k = 0
       @axes.each do |axis|
         coordinate = coordinates[k]
+        k += 1
         if coordinate < 0 || coordinate >= axis.positionCount
           throw IndexError, "Coordinate #{coordinate} of axis #{k} is out of range (#{bounds.join(", ")})"
         end

data/lib/cell_set/cell_set_axis.rb

@@ -36,7 +36,7 @@ module CellSet
       @cell_set = if cell_set.is_a?(CellSet)
         cell_set
       elsif cell_set.is_a?(Hash)
-        CellSet.new.from_json(cell_set.to_json)
+        CellSet.new(cell_set)
       else
         throw ArgumentError
       end
@@ -56,7 +56,7 @@ module CellSet
           if position.is_a?(Position)
             position
           elsif position.is_a?(Hash)
-            Position.new.from_json(position.to_json)
+            Position.new(position)
           else
             throw ArgumentError
           end

data/lib/cell_set/position.rb

@@ -37,7 +37,7 @@ module CellSet
           if member.is_a?(Member)
             member
           elsif member.is_a?(Hash)
-            Member.new.from_json(member.to_json)
+            Member.new(member)
           else
             throw ArgumentError
           end

data/lib/cell_set/version.rb

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

data/lib/cell_set.rb

@@ -13,11 +13,11 @@ end
   require "cell_set/#{file}"
 end
 
-%w(ruby).each do |file|
-  require "mondrian/olap/cell_set/#{file}"
-end
-
 if RUBY_PLATFORM == "java"
+  %w(ruby).each do |file|
+    require "mondrian/olap/cell_set/#{file}"
+  end
+
   ActiveSupport.on_load(:cell_set_model) do
     Java::Mondrian::olap4j::MondrianOlap4jCellSet.send(:include, Mondrian::OLAP::CellSet::Ruby)
     Mondrian::OLAP::Result.send(:include, ::CellSet::Result)

data/spec/models/cell_set_spec.rb

@@ -79,6 +79,55 @@ describe CellSet::CellSet do
     end
   end
 
+  context "cells" do
+    let(:cellHash) do
+      {
+        "0" => {
+          "formatted_value" => "10.0",
+          "value" => 10.0
+        },
+        "4" => {
+          "formatted_value" => "11.0",
+          "value" => 11.0
+        },
+        "6" => {
+          "formatted_value" => "12.0",
+          "value" => 12.0
+        }
+      }
+    end
+
+    let(:cell_set) do
+      cell_set = Factory.build(:cell_set)
+
+      cell_set.axes = [0, 1].map do |ordinal|
+        axis = Factory.build(:cell_set_axis, :axis_ordinal => ordinal)
+        axis.should_receive(:positionCount).at_least(:once).and_return(5)
+        axis
+      end
+
+      cell_set.instance_variable_set(:@cellHash, cellHash)
+
+      cell_set
+    end
+
+    it "should have maxOrdinal" do
+      cell_set.maxOrdinal.should == 25
+    end
+
+    it "should have cells" do
+      cell_set.maxOrdinal.times do |num|
+        if cellHash.keys.include?(num.to_s)
+          cell_set.cell(num).value.should == cellHash[num.to_s]["value"]
+          cell_set.cell(cell_set.ordinalToCoordinates(num)).value == cellHash[num.to_s]["value"]
+        else
+          cell_set.cell(num).value.should be_nil
+          cell_set.cell(cell_set.ordinalToCoordinates(num)).value.should be_nil
+        end
+      end
+    end
+  end
+
   context "Serialization" do
     let(:column_position) do
       Factory.build(:position, :ordinal => 0)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cell_set
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-23 00:00:00.000000000Z
+date: 2012-03-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport