update hamster dependency to ~3.0

Author: ievgrafov

gnuplotrb.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(/^(test|spec|unimplemented_features|examples|future_work|notebooks|\..+)/) }
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'hamster', '~> 1.0'
+  spec.add_runtime_dependency 'hamster', '~> 3.0'
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.2'

lib/gnuplotrb/multiplot.rb

@@ -26,7 +26,7 @@ class Multiplot
     # @param options [Hash] see options in top class docs
     def initialize(*plots, **options)
       @plots = plots[0].is_a?(Hamster::Vector) ? plots[0] : Hamster::Vector.new(plots)
-      @options = Hamster.hash(options)
+      @options = Hamster::Hash[options]
       OptionHandling.validate_terminal_options(@options)
       yield(self) if block_given?
     end

lib/gnuplotrb/plot.rb

@@ -49,9 +49,9 @@ def initialize(*datasets)
       # had to relace **options arg with this because in some cases
       # Daru::DataFrame was mentioned as hash and added to options
       # instead of plots
-      @options = Hamster.hash
+      @options = Hamster::Hash.empty
       if datasets[-1].is_a?(Hamster::Hash) || datasets[-1].is_a?(Hash)
-        @options = Hamster.hash(datasets[-1])
+        @options = Hamster::Hash[datasets[-1]]
         datasets = datasets[0..-2]
       end
       @datasets = parse_datasets_array(datasets)

lib/gnuplotrb/staff/dataset.rb

@@ -234,15 +234,15 @@ def new_with_options(options)
     # Initialize Dataset from given String
     def init_string(data, options)
       @type, @data = File.exist?(data) ? [:datafile, "'#{data}'"] : [:math_function, data.clone]
-      @options = Hamster.hash(options)
+      @options = Hamster::Hash[options]
     end
 
     ##
     # Initialize Dataset from given Datablock
     def init_dblock(data, options)
       @type = :datablock
       @data = data.clone
-      @options = Hamster.hash(options)
+      @options = Hamster::Hash[options]
     end
 
     ##
@@ -288,7 +288,7 @@ def init_daru_vector(data, options)
     def init_default(data, file: false, **options)
       @type = :datablock
       @data = Datablock.new(data, file)
-      @options = Hamster.hash(options)
+      @options = Hamster::Hash[options]
     end
   end
 end

spec/animation_spec.rb

@@ -33,7 +33,7 @@
 
   context 'option handling' do
     before do
-      @options = Hamster.hash(title: 'GnuplotRB::Animation', yrange: 0..3)
+      @options = Hamster::Hash[title: 'GnuplotRB::Animation', yrange: 0..3]
       @anim = Animation.new(**@options)
     end
 

spec/dataset_spec.rb

@@ -104,7 +104,7 @@
 
   context 'options handling' do
     before do
-      @options = Hamster.hash(title: 'GnuplotRB::Dataset', with: 'lines')
+      @options = Hamster::Hash[title: 'GnuplotRB::Dataset', with: 'lines']
       @dataset = Dataset.new('sin(x)', @options)
     end
 
@@ -124,7 +124,7 @@
     end
 
     it 'should allow to safely set several options at once' do
-      new_options = Hamster.hash(title: 'Some new title', with: 'lines', lt: 3)
+      new_options = Hamster::Hash[title: 'Some new title', with: 'lines', lt: 3]
       new_dataset = @dataset.options(new_options)
       @options.each { |key, value| expect(@dataset.send(key)).to eql(value) }
       new_options.each { |key, value| expect(new_dataset.send(key)).to eql(value) }
@@ -136,15 +136,15 @@
       x = (0..10).to_a
       y = x.map { |xx| Math.exp(-xx) }
       @data = [x, y]
-      @options = Hamster.hash(title: 'GnuplotRB::Dataset', with: 'lines')
+      @options = Hamster::Hash[title: 'GnuplotRB::Dataset', with: 'lines']
       @sinx = Dataset.new('sin(x)', @options)
       @dataset = Dataset.new([x, y])
       @temp_file_dataset = Dataset.new([x, y], file: true)
     end
 
     it 'should update options' do
       # works just as Dataset#options(...)
-      new_options = Hamster.hash(title: 'Some new title', with: 'lines', lt: 3)
+      new_options = Hamster::Hash[title: 'Some new title', with: 'lines', lt: 3]
       new_dataset = @sinx.update(new_options)
       @options.each { |key, value| expect(@sinx.send(key)).to eql(value) }
       new_options.each { |key, value| expect(new_dataset.send(key)).to eql(value) }

spec/multiplot_spec.rb

@@ -33,7 +33,7 @@
 
   context 'option handling' do
     before do
-      @options = Hamster.hash(title: 'GnuplotRB::Multiplot', yrange: 0..3)
+      @options = Hamster::Hash[title: 'GnuplotRB::Multiplot', yrange: 0..3]
       @mp = Multiplot.new(**@options)
     end
 

spec/plot_spec.rb

@@ -47,7 +47,7 @@
 
   context 'options handling' do
     before do
-      @options = Hamster.hash(title: 'GnuplotRB::Plot', yrange: 0..3)
+      @options = Hamster::Hash[title: 'GnuplotRB::Plot', yrange: 0..3]
       @plot = Plot.new(**@options)
     end
 

spec/splot_spec.rb

@@ -27,7 +27,7 @@
 
   context 'options handling' do
     before do
-      @options = Hamster.hash(title: 'GnuplotRB::Plot', yrange: 0..3)
+      @options = Hamster::Hash[title: 'GnuplotRB::Plot', yrange: 0..3]
       @plot = Splot.new(**@options)
     end