daru 0.1.5 → 0.3

data/spec/plotting/gruff/category_spec.rb

@@ -10,7 +10,7 @@ describe Daru::Vector, 'plotting category vector with gruff' do
       expect(plot).to receive :data
       dv.plot type: :bar
     end
-    
+
     it 'plots bar graph with block' do
       expect(plot).to receive :labels=
       expect(plot).to receive :data
@@ -18,7 +18,7 @@ describe Daru::Vector, 'plotting category vector with gruff' do
       dv.plot(type: :bar) { |p| p.title = 'hello' }
     end
   end
-  
+
   context 'pie' do
     let(:plot) { instance_double 'Gruff::Pie' }
     before { allow(Gruff::Pie).to receive(:new).and_return(plot) }
@@ -27,7 +27,7 @@ describe Daru::Vector, 'plotting category vector with gruff' do
       dv.plot type: :pie
     end
   end
-  
+
   context 'sidebar' do
     let(:plot) { instance_double 'Gruff::SideBar' }
     before { allow(Gruff::SideBar).to receive(:new).and_return(plot) }

data/spec/plotting/gruff/dataframe_spec.rb

@@ -18,7 +18,7 @@ describe Daru::DataFrame, 'plotting dataframe using gruff' do
       expect(plot).to receive(:data).exactly(3).times
       df.plot type: :bar
     end
-    
+
     it 'plots bar graph with block' do
       expect(plot).to receive :labels=
       expect(plot).to receive(:data).exactly(3).times
@@ -56,7 +56,7 @@ describe Daru::DataFrame, 'plotting dataframe using gruff' do
       df.plot type: :scatter, x: :c, y: :a
     end
   end
-  
+
   context 'invalid type' do
     it { expect { df.plot type: :lol }.to raise_error ArgumentError }
   end
@@ -72,13 +72,23 @@ describe Daru::DataFrame, 'dataframe category plotting with gruff' do
     }, index: 'a'..'f')
   end
   before { df.to_category :c }
-  
+
   context 'scatter' do
     let(:plot) { instance_double 'Gruff::Scatter' }
-    before { allow(Gruff::Scatter).to receive(:new).and_return(plot) }    
+    before { allow(Gruff::Scatter).to receive(:new).and_return(plot) }
     it 'plots scatter plot categorized by category vector' do
       expect(plot).to receive(:data).exactly(2).times
       df.plot type: :scatter, x: :a, y: :b, categorized: { by: :c }
     end
+
+    it 'plots with axes description' do
+      expect(plot).to receive(:data).exactly(2).times
+      expect(plot).to receive(:x_axis_label=).exactly(1).times
+      expect(plot).to receive(:y_axis_label=).exactly(1).times
+      df.plot type: :scatter, x: :a, y: :b, categorized: { by: :c } do |gruff_plot|
+        gruff_plot.x_axis_label = 'A data'
+        gruff_plot.y_axis_label = 'B data'
+      end
+    end
   end
 end

data/spec/plotting/gruff/vector_spec.rb

@@ -7,13 +7,13 @@ describe Daru::Vector, 'plotting vector with gruff' do
   context 'line' do
     let(:plot) { instance_double 'Gruff::Line' }
     before { allow(Gruff::Line).to receive(:new).and_return(plot) }
-    
+
     it 'plots line graph without block' do
       expect(plot).to receive(:labels=)
       expect(plot).to receive(:data)
       dv.plot type: :line
     end
-    
+
     it 'plots line graph with block' do
       expect(plot).to receive :labels=
       expect(plot).to receive :data
@@ -21,28 +21,28 @@ describe Daru::Vector, 'plotting vector with gruff' do
       dv.plot(type: :line) { |p| p.title = 'hello' }
     end
   end
-  
+
   context 'bar' do
     let(:plot) { instance_double 'Gruff::Bar' }
     before { allow(Gruff::Bar).to receive(:new).and_return(plot) }
-    
+
     it 'plots bar graph' do
       expect(plot).to receive :labels=
       expect(plot).to receive :data
       dv.plot type: :bar
     end
   end
-  
+
   context 'pie' do
     let(:plot) { instance_double 'Gruff::Pie' }
     before { allow(Gruff::Pie).to receive(:new).and_return(plot) }
-    
+
     it 'plots pie graph' do
       expect(plot).to receive(:data).exactly(3).times
       dv.plot type: :pie
     end
   end
-  
+
   context 'scatter' do
     let(:plot) { instance_double 'Gruff::Scatter' }
     before { allow(Gruff::Scatter).to receive(:new).and_return(plot) }
@@ -52,7 +52,7 @@ describe Daru::Vector, 'plotting vector with gruff' do
       dv.plot type: :scatter
     end
   end
-  
+
   context 'sidebar' do
     let(:plot) { instance_double 'Gruff::SideBar' }
     before { allow(Gruff::SideBar).to receive(:new).and_return(plot) }
@@ -63,7 +63,7 @@ describe Daru::Vector, 'plotting vector with gruff' do
       dv.plot type: :sidebar
     end
   end
-  
+
   context 'invalid type' do
     it { expect { dv.plot type: :lol }.to raise_error ArgumentError }
   end

data/spec/plotting/nyaplot/category_spec.rb

@@ -7,7 +7,7 @@ describe Daru::Vector, 'plotting category' do
     Daru::Vector.new ['III']*10 + ['II']*5 + ['I']*5,
       type: :category,
       categories: ['I', 'II', 'III']
-  end  
+  end
   before do
     Daru.plotting_library = :nyaplot
     allow(Nyaplot::Plot).to receive(:new).and_return(plot)
@@ -17,7 +17,6 @@ describe Daru::Vector, 'plotting category' do
       expect(plot).to receive(:add).with(:bar, ['I', 'II', 'III'], [5, 5, 10])
       expect(plot).to receive :x_label
       expect(plot).to receive :y_label
-      expect(plot).to receive(:show)
       dv.plot(type: :bar) do |p|
         p.x_label 'Categories'
         p.y_label 'Frequency'
@@ -26,23 +25,20 @@ describe Daru::Vector, 'plotting category' do
 
     it 'plots bar graph without taking a block' do
       expect(plot).to receive(:add).with(:bar, ["I", "II", "III"], [5, 5, 10])
-      expect(plot).to receive(:show)
-      dv.plot(type: :bar)
+      expect(dv.plot(type: :bar)).to eq plot
     end
 
     it 'plots bar graph with percentage' do
       expect(plot).to receive(:add).with(:bar, ["I", "II", "III"], [25, 25, 50])
       expect(plot).to receive(:yrange).with [0, 100]
-      expect(plot).to receive(:show)
-      dv.plot(type: :bar, method: :percentage)
+      expect(dv.plot(type: :bar, method: :percentage)).to eq plot
     end
 
     it 'plots bar graph with fraction' do
       expect(plot).to receive(:add).with(:bar, ["I", "II", "III"], [0.25, 0.25, 0.50])
       expect(plot).to receive(:yrange).with [0, 1]
-      expect(plot).to receive(:show)
-      dv.plot(type: :bar, method: :fraction)
-    end    
+      expect(dv.plot(type: :bar, method: :fraction)).to eq plot
+    end
   end
 
   context 'other type' do

data/spec/plotting/nyaplot/dataframe_spec.rb

@@ -21,6 +21,16 @@ describe Daru::DataFrame, 'plotting' do
       index: [:one, :two, :three, :four]
     )
   }
+
+  let(:df_with_index_as_default) {
+    Nyaplot::DataFrame.new [
+      {:x=>1, :y1=>5, :y2=>-3, :cat=>:a, :_index=>:one},
+      {:x=>2, :y1=>7, :y2=>-7, :cat=>:b, :_index=>:two},
+      {:x=>3, :y1=>9, :y2=>-11, :cat=>:c, :_index=>:three},
+      {:x=>4, :y1=>11, :y2=>-15, :cat=>:d, :_index=>:four}
+    ]
+  }
+
   let(:plot) { instance_double('Nyaplot::Plot') }
   let(:diagram) { instance_double('Nyaplot::Diagram') }
 
@@ -35,8 +45,7 @@ describe Daru::DataFrame, 'plotting' do
         .with(numerics.to_nyaplotdf, :box, :x, :y1, :y2)
         .ordered
 
-      expect(plot).to receive(:show).ordered
-      data_frame.plot(type: :box)
+      expect(data_frame.plot(type: :box)).to eq plot
     end
   end
 
@@ -47,8 +56,7 @@ describe Daru::DataFrame, 'plotting' do
           .with(data_frame.to_nyaplotdf, :scatter, :x, :y1)
           .ordered
 
-        expect(plot).to receive(:show).ordered
-        data_frame.plot(type: :scatter, x: :x, y: :y1)
+        expect(data_frame.plot(type: :scatter, x: :x, y: :y1)).to eq plot
       end
 
       it 'works without :y provided' do
@@ -56,8 +64,20 @@ describe Daru::DataFrame, 'plotting' do
           .with(data_frame.to_nyaplotdf, :scatter, :x)
           .ordered
 
-        expect(plot).to receive(:show).ordered
-        data_frame.plot(type: :scatter, x: :x)
+        expect(data_frame.plot(type: :scatter, x: :x)).to eq plot
+      end
+    end
+
+    context 'default x axis' do
+      it 'sets the x axis as the index value if not defined' do
+        expect(plot).to receive(:add_with_df)
+          .with(df_with_index_as_default, :line, :_index, :y1)
+          .ordered
+
+        expect(
+          data_frame.plot(
+            type: :line, y: :y1)
+        ).to eq plot
       end
     end
 
@@ -69,9 +89,10 @@ describe Daru::DataFrame, 'plotting' do
         expect(plot).to receive(:add_with_df)
           .with(data_frame.to_nyaplotdf, :scatter, :x, :y2)
           .ordered
-        expect(plot).to receive(:show).ordered
 
-        data_frame.plot(type: :scatter, x: [:x, :x], y: [:y1, :y2])
+        expect(
+          data_frame.plot(type: :scatter, x: [:x, :x], y: [:y1, :y2])
+        ).to eq plot
       end
 
       it 'works with multiple types provided' do
@@ -81,9 +102,11 @@ describe Daru::DataFrame, 'plotting' do
         expect(plot).to receive(:add_with_df)
           .with(data_frame.to_nyaplotdf, :line, :x, :y2)
           .ordered
-        expect(plot).to receive(:show).ordered
 
-        data_frame.plot(type: [:scatter, :line], x: [:x, :x], y: [:y1, :y2])
+        expect(
+          data_frame.plot(
+            type: [:scatter, :line], x: [:x, :x], y: [:y1, :y2])
+        ).to eq plot
       end
 
       it 'works with numeric var names' do
@@ -93,9 +116,9 @@ describe Daru::DataFrame, 'plotting' do
         expect(plot).to receive(:add_with_df)
           .with(data_frame.to_nyaplotdf, :line, :x, :y2)
           .ordered
-        expect(plot).to receive(:show).ordered
 
-        data_frame.plot(
+        expect(
+          data_frame.plot(
           type: [:scatter, :line],
           # FIXME: this didn't work due to default type: :scatter opts
           #type1: :scatter,
@@ -104,7 +127,8 @@ describe Daru::DataFrame, 'plotting' do
           x2: :x,
           y1: :y1,
           y2: :y2
-        )
+          )
+        ).to eq plot
       end
     end
   end
@@ -121,13 +145,13 @@ describe Daru::DataFrame, 'category plotting' do
     end
     let(:plot) { instance_double('Nyaplot::Plot') }
     let(:diagram) { instance_double('Nyaplot::Diagram::Scatter') }
-  
+
     before do
       df.to_category :c
       allow(Nyaplot::Plot).to receive(:new).and_return(plot)
       allow(plot).to receive(:add_with_df).and_return(diagram)
     end
-    
+
     it 'plots scatter plot categoried by color with a block' do
       expect(plot).to receive :add_with_df
       expect(diagram).to receive(:title).exactly(3).times
@@ -136,7 +160,6 @@ describe Daru::DataFrame, 'category plotting' do
       expect(plot).to receive :legend
       expect(plot).to receive :xrange
       expect(plot).to receive :yrange
-      expect(plot).to receive :show
       df.plot(type: :scatter, x: :a, y: :b, categorized: {by: :c, method: :color}) do |p, d|
         p.xrange [-10, 10]
         p.yrange [-10, 10]
@@ -149,9 +172,11 @@ describe Daru::DataFrame, 'category plotting' do
       expect(diagram).to receive(:color).exactly(3).times
       expect(diagram).to receive(:tooltip_contents).exactly(3).times
       expect(plot).to receive :legend
-      expect(plot).to receive :show
-      df.plot(type: :scatter, x: :a, y: :b,
-        categorized: {by: :c, method: :color})
+      expect(
+        df.plot(
+          type: :scatter, x: :a, y: :b,
+          categorized: {by: :c, method: :color})
+      ).to eq plot
     end
 
     it 'plots scatter plot categoried by custom colors' do
@@ -162,9 +187,8 @@ describe Daru::DataFrame, 'category plotting' do
       expect(diagram).to receive(:color).with :green
       expect(diagram).to receive(:tooltip_contents).exactly(3).times
       expect(plot).to receive :legend
-      expect(plot).to receive :show
-      df.plot(type: :scatter, x: :a, y: :b,
-        categorized: {by: :c, method: :color, color: [:red, :blue, :green]})
+      expect(df.plot(type: :scatter, x: :a, y: :b,
+        categorized: {by: :c, method: :color, color: [:red, :blue, :green]})).to eq plot
     end
 
     it 'plots scatter plot categoried by shape' do
@@ -173,9 +197,8 @@ describe Daru::DataFrame, 'category plotting' do
       expect(diagram).to receive(:shape).exactly(3).times
       expect(diagram).to receive(:tooltip_contents).exactly(3).times
       expect(plot).to receive :legend
-      expect(plot).to receive :show
-      df.plot(type: :scatter, x: :a, y: :b,
-        categorized: {by: :c, method: :shape})
+      expect(df.plot(type: :scatter, x: :a, y: :b,
+        categorized: {by: :c, method: :shape})).to eq plot
     end
 
     it 'plots scatter plot categoried by custom shapes' do
@@ -186,9 +209,13 @@ describe Daru::DataFrame, 'category plotting' do
       expect(diagram).to receive(:shape).with 'diamond'
       expect(diagram).to receive(:tooltip_contents).exactly(3).times
       expect(plot).to receive :legend
-      expect(plot).to receive :show
-      df.plot(type: :scatter, x: :a, y: :b,
-        categorized: {by: :c, method: :shape, shape: %w(circle triangle-up diamond)})
+      expect(
+        df.plot(
+          type: :scatter, x: :a, y: :b,
+          categorized: {
+            by: :c, method: :shape,
+            shape: %w(circle triangle-up diamond)})
+      ).to eq plot
     end
 
     it 'plots scatter plot categoried by size' do
@@ -197,9 +224,8 @@ describe Daru::DataFrame, 'category plotting' do
       expect(diagram).to receive(:size).exactly(3).times
       expect(diagram).to receive(:tooltip_contents).exactly(3).times
       expect(plot).to receive :legend
-      expect(plot).to receive :show
-      df.plot(type: :scatter, x: :a, y: :b,
-        categorized: {by: :c, method: :size})
+      expect(df.plot(type: :scatter, x: :a, y: :b,
+        categorized: {by: :c, method: :size})).to eq plot
     end
 
     it 'plots scatter plot categoried by cusom sizes' do
@@ -210,9 +236,17 @@ describe Daru::DataFrame, 'category plotting' do
       expect(diagram).to receive(:size).with 300
       expect(diagram).to receive(:tooltip_contents).exactly(3).times
       expect(plot).to receive :legend
-      expect(plot).to receive :show
-      df.plot(type: :scatter, x: :a, y: :b,
-        categorized: {by: :c, method: :size, size: [100, 200, 300]})
+      expect(
+        df.plot(
+          type: :scatter,
+          x: :a, y: :b,
+          categorized: {
+            by: :c,
+            method: :size,
+            size: [100, 200, 300]
+            }
+          )
+        ).to eq plot
     end
   end
 
@@ -226,13 +260,13 @@ describe Daru::DataFrame, 'category plotting' do
     end
     let(:plot) { instance_double('Nyaplot::Plot') }
     let(:diagram) { instance_double('Nyaplot::Diagram::Scatter') }
-  
+
     before do
       df.to_category :c
       allow(Nyaplot::Plot).to receive(:new).and_return(plot)
       allow(plot).to receive(:add_with_df).and_return(diagram)
     end
-    
+
     it 'plots line plot categoried by color with a block' do
       expect(plot).to receive :add_with_df
       expect(diagram).to receive(:title).exactly(3).times
@@ -240,7 +274,6 @@ describe Daru::DataFrame, 'category plotting' do
       expect(plot).to receive :legend
       expect(plot).to receive :xrange
       expect(plot).to receive :yrange
-      expect(plot).to receive :show
       df.plot(type: :line, x: :a, y: :b, categorized: {by: :c, method: :color}) do |p, d|
         p.xrange [-10, 10]
         p.yrange [-10, 10]
@@ -252,8 +285,12 @@ describe Daru::DataFrame, 'category plotting' do
       expect(diagram).to receive(:title).exactly(3).times
       expect(diagram).to receive(:color).exactly(3).times
       expect(plot).to receive :legend
-      expect(plot).to receive :show
-      df.plot(type: :line, x: :a, y: :b, categorized: {by: :c, method: :color})
+      expect(
+        df.plot(
+          type: :line, x: :a, y: :b,
+          categorized: {by: :c, method: :color}
+        )
+      ).to eq plot
     end
 
     it 'plots line plot categoried by custom colors' do
@@ -263,9 +300,12 @@ describe Daru::DataFrame, 'category plotting' do
       expect(diagram).to receive(:color).with :blue
       expect(diagram).to receive(:color).with :green
       expect(plot).to receive :legend
-      expect(plot).to receive :show
-      df.plot(type: :line, x: :a, y: :b,
-        categorized: {by: :c, method: :color, color: [:red, :blue, :green]})
+      expect(
+        df.plot(
+          type: :line, x: :a, y: :b,
+          categorized: {by: :c, method: :color, color: [:red, :blue, :green]}
+          )
+      ).to eq plot
     end
 
     it 'plots line plot categoried by stroke width' do
@@ -273,8 +313,12 @@ describe Daru::DataFrame, 'category plotting' do
       expect(diagram).to receive(:title).exactly(3).times
       expect(diagram).to receive(:stroke_width).exactly(3).times
       expect(plot).to receive :legend
-      expect(plot).to receive :show
-      df.plot(type: :line, x: :a, y: :b, categorized: {by: :c, method: :stroke_width})
+      expect(
+        df.plot(
+          type: :line, x: :a, y: :b,
+          categorized: {by: :c, method: :stroke_width}
+        )
+      ).to eq plot
     end
 
     it 'plots line plot categoried by custom stroke widths' do
@@ -284,9 +328,13 @@ describe Daru::DataFrame, 'category plotting' do
       expect(diagram).to receive(:stroke_width).with 200
       expect(diagram).to receive(:stroke_width).with 300
       expect(plot).to receive :legend
-      expect(plot).to receive :show
-      df.plot(type: :line, x: :a, y: :b,
-        categorized: {by: :c, method: :stroke_width, stroke_width: [100, 200, 300]})
+      expect(
+        df.plot(
+          type: :line, x: :a, y: :b,
+          categorized: {
+            by: :c, method: :stroke_width, stroke_width: [100, 200, 300]}
+          )
+      ).to eq plot
     end
   end