Merge pull request #162 from sayant1204/update_rspec

added tag for skipping updation of googlechart/highchart files locally

Author: Shekharrajak

lib/assets/.keep

@@ -13,7 +13,7 @@
 require 'daru/view/adapters/googlecharts/iruby_notebook'
 
 # Rails Helper
-require 'daru/view/app/rails/railtie.rb' if defined?(Rails)
+require 'daru/view/app/rails/railtie' if defined?(Rails)
 
 module Daru
   module View

lib/daru/view.rb

@@ -255,7 +255,7 @@ def extract_chart_type(options)
           chart_type = 'SteppedArea' if chart_type == 'Steppedarea'
           chart_type = 'TreeMap' if chart_type == 'Treemap'
           direct_name = %w[Map Histogram TreeMap Timeline Gauge]
-          direct_name.include?(chart_type) ? chart_type : chart_type + 'Chart'
+          direct_name.include?(chart_type) ? chart_type : "#{chart_type}Chart"
         end
 
         # For google table, column is needed.

lib/daru/view/adapters/googlecharts.rb

@@ -13,7 +13,7 @@ module Display
   attr_accessor :formatters
 
   def show_script(dom=SecureRandom.uuid, options={})
-    script_tag = options.fetch(:script_tag) { true }
+    script_tag = options.fetch(:script_tag, true)
     # To understand different formatters see:
     # https://developers.google.com/chart/interactive/docs/reference#formatters
     apply_formatters if is_a?(GoogleVisualr::DataTable)
@@ -282,7 +282,7 @@ def apply_date_arrow_bar_number_formatter(formatter)
     formatter[:options] ||= {}
     formatter[:columns] ||= 0
     frmttr = GoogleVisualr.const_get(
-      formatter[:type].to_s.capitalize + 'Format'
+      "#{formatter[:type].to_s.capitalize}Format"
     ).new(formatter[:options])
     frmttr.columns(formatter[:columns])
     frmttr

lib/daru/view/adapters/googlecharts/display.rb

@@ -1,7 +1,9 @@
 module GoogleVisualr
   class PatternFormat < Formatter
     attr_accessor :des_col
+
     def initialize(format_string='')
+      super
       @format_string = format_string
     end
 

lib/daru/view/adapters/googlecharts/formatters.rb

@@ -1,5 +1,5 @@
 class String
-  def js_code(true_or_false=true)
+  def js_code(true_or_false: true)
     @_lazy_high_charts_js_code = true_or_false
     self
   end

lib/daru/view/adapters/highcharts/core_ext/string.rb

@@ -54,6 +54,7 @@ class HighChart
     #   be rendered in
     attr_accessor :div_id
     attr_accessor :user_options
+
     # @example
     #
     # To display the html code of the chart, use `to_html`. To see the same
@@ -71,14 +72,15 @@ def to_html(placeholder=random_canvas_id)
       script << high_chart_css(placeholder)
       # Helps to denote either of the three classes.
       chart_class = extract_chart_class
+      case chart_class
       # When user wants to plot a HighMap
-      if chart_class == 'Map'
+      when 'Map'
         script << high_map(placeholder, self)
       # When user wants to plot a HighStock
-      elsif chart_class == 'StockChart'
+      when 'StockChart'
         script << high_stock(placeholder, self)
       # When user wants to plot a HighChart
-      elsif chart_class == 'Chart'
+      when 'Chart'
         script << high_chart(placeholder, self)
       end
       script
@@ -117,7 +119,7 @@ def high_chart_css(placeholder)
         css_script << "\n<style>"
         # Applying the css to chart div
         css_data.each do |css|
-          css_script << "\n  #" + placeholder + ' '
+          css_script << "\n  ##{placeholder} "
           css_script << css
         end
         css_script << "\n</style>"
@@ -133,9 +135,10 @@ def high_chart_css(placeholder)
     #   notebook and returns initial script of the modules for web frameworks
     def load_dependencies(type)
       dep_js = extract_dependencies
-      if type == 'iruby'
+      case type
+      when 'iruby'
         LazyHighCharts.init_iruby(dep_js) unless dep_js.nil?
-      elsif type == 'web_frameworks'
+      when 'web_frameworks'
         dep_js.nil? ? '' : LazyHighCharts.init_javascript(dep_js)
       end
     end
@@ -214,7 +217,7 @@ def extract_export_code(
       js << "\n \t\tvar chart = Highcharts.charts[Highcharts.attr(chartDom,"
       js << " 'data-highcharts-chart')]"
       js << "\n \t\tchart.exportChartLocal({"
-      js << "\n \t\t\t" + append_chart_type(export_type)
+      js << "\n \t\t\t#{append_chart_type(export_type)}"
       js << "\n \t\t\tfilename: '#{file_name}'"
       js << "\n \t\t});\n \t};\n })();"
       js << "\n </script>"
@@ -236,7 +239,7 @@ def extract_export_code_iruby(
       js << "\n \tvar chart = Highcharts.charts[Highcharts.attr(chartDom,"
       js << " 'data-highcharts-chart')]"
       js << "\n \tchart.exportChart({"
-      js << "\n \t\t" + append_chart_type(export_type)
+      js << "\n \t\t#{append_chart_type(export_type)}"
       js << "\n \t\tfilename: '#{file_name}'"
       js << "\n \t});"
       js << "\n })();"

lib/daru/view/adapters/highcharts/display.rb

@@ -39,7 +39,7 @@ def init_iruby
         private
 
         def multi_dimension_check(arr)
-          arr.all? { |a| a.class==Array }
+          arr.all? { |a| a.instance_of?(Array) }
         end
 
         def guess_data(data_set)

lib/daru/view/adapters/nyaplot.rb

@@ -3,6 +3,7 @@ module View
     class Plot
       attr_reader :chart, :data, :options, :user_options
       attr_accessor :adapter
+
       class << self
         # class method
         #
@@ -15,7 +16,7 @@ def adapter=(adapter)
           require "daru/view/adapters/#{adapter}"
           # rubocop:disable Style/ClassVars
           @@adapter = Daru::View::Adapter.const_get(
-            adapter.to_s.capitalize + 'Adapter'
+            "#{adapter.to_s.capitalize}Adapter"
           )
           # rubocop:enable Style/ClassVars
         end
@@ -46,7 +47,7 @@ def initialize(data=[], options={}, user_options={}, &block)
       def adapter=(adapter)
         require "daru/view/adapters/#{adapter}"
         @adapter = Daru::View::Adapter.const_get(
-          adapter.to_s.capitalize + 'Adapter'
+          "#{adapter.to_s.capitalize}Adapter"
         )
       end
 

lib/daru/view/plot.rb

@@ -65,8 +65,8 @@ def extract_charts_script(charts_id_div_tag=[])
         charts_script = ''
         @data.each do |plot|
           chart_script = extract_chart_script(plot)
-          charts_id_div_tag << chart_script.partition(%r{<div(.*?)<\/div>}ixm)[1]
-          chart_script.sub!(%r{<div(.*?)<\/div>}ixm, '')
+          charts_id_div_tag << chart_script.partition(%r{<div(.*?)</div>}ixm)[1]
+          chart_script.sub!(%r{<div(.*?)</div>}ixm, '')
           charts_script << chart_script
         end
         charts_script