d3js-charts 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a825299b88f5bfdd074a45042fd18947915e4bfd
-  data.tar.gz: 5645e8ba5f198a2fdb10fecc4aa031c0c224631d
+  metadata.gz: b29b9258205ab78c8044200fa234b8d5511590b9
+  data.tar.gz: 37077bc44c04eb11f1b8fc6380cfc2fa3d51e2bb
 SHA512:
-  metadata.gz: 51595d7b9c47104aae70a9cf4de34cf60ce4f4c4527aa944584e4b7638f57f0d19e9713e9edfd420ae10b1e6d0d446500d66f390fd52e0de71fe2a6ab0e9c353
-  data.tar.gz: 10af19e6a34a5c2a29c2d10226309724cd526168a8ae518d5a54587252af880ad32c02386b4dfa09ebc7ace71629b9c0bf905a0e345b0cf14c667bf6f2de604a
+  metadata.gz: 1c4f5cbfb7e80c78f231f70b5a408b240c7484bb9c30876954485a88e21bc1aafde0cd1b2349ee4b5f6461cdac31597ca312caee97ed03bd7250ea531d399708
+  data.tar.gz: 7b81f95067d47f396432dd4927d9856e6881392d3e7e24476c05c677453e68749565f9af23c4a258b45c6a0b27fc98733a3fa6427cce3362ed3d030da77cef68

data/CHANGELOG.md

@@ -1,3 +1,3 @@
-## 1.1.0 (9 March 2017)
+## 1.0.0 (9 March 2017)
 
 * Initial commit

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    d3js-charts (1.1.0)
+    d3js-charts (1.1.1)
       railties (>= 3.1)
 
 GEM

data/README.md

@@ -23,6 +23,10 @@ Then add it to your manifest file, most probably at `app/assets/javascripts/appl
 
     //= require d3
 
+and add to files sass `app/assets/javascripts/application.scss`:
+
+		@import "d3js-charts/*";
+
 
 ## Usage
 

data/d3js-charts.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.summary     = "D3 for Rails Asset Pipeline"
   s.description = "This gem provides view helpers to create d3.js charts easily"
 
-  s.required_rubygems_version = ">= 1.1.0"
+  s.required_rubygems_version = ">= 1.0.0"
   s.rubyforge_project         = "d3js-charts"
 
   s.add_dependency "railties", ">= 3.1"

data/lib/chart_generators/bar_chart_generator.rb

@@ -4,8 +4,8 @@ class HorizontalBarChartGenerator < BaseGenerator
   #   element - div id or class for chart
   #   data    - array with chart's points 
   def generate( element, data )
-    add_assets( 'horizontal_bar_chart'+element.to_s+'.js', js_code( element, data ) )
-    add_assets( 'horizontal_bar_chart'+element.to_s+'.css', css_code( element ) )   
+    add_assets( "#{element[1..-1]}"+'.js', js_code( element, data ) )
+    add_assets( "#{element[1..-1]}"+'.scss', css_code( element ) )   
   end
 
 end
@@ -16,8 +16,8 @@ class VerticalBarChartGenerator < BaseGenerator
   #   element - div id or class for chart
   #   tsv_url - file with [ X , Y ] data table  
   def generate( element, tsv_url )
-    add_assets( 'vertical_bar_chart'+element.to_s+'.js', js_code( element, tsv_url ) )
-    add_assets( 'vertical_bar_chart'+element.to_s+'.css', css_code( element ) )   
+    add_assets( "#{element[1..-1]}"+'.js', js_code( element, tsv_url ) )
+    add_assets( "#{element[1..-1]}"+'.scss', css_code( element ) )   
   end
 
 end

data/lib/chart_generators/base_generator.rb

@@ -16,14 +16,14 @@ class BaseGenerator
 
   # get chart's css-code form template
   def css_code( element )
-    erb = ERB.new( temp_css )
+    erb = ERB.new( temp_scss )
     erb.result( binding )      
   end
 
   private 
 
   def file_type( f_name )
-    File.extname(f_name) == '.css' ? 'stylesheets' : 'javascripts'
+    File.extname(f_name) == '.scss' ? 'stylesheets' : 'javascripts'
   end
 
   def create_dir( f_name )
@@ -51,8 +51,8 @@ class BaseGenerator
     File.read temp_path('js')
   end
 
-  def temp_css
-    File.read temp_path('css')
+  def temp_scss
+    File.read temp_path('scss')
   end
 
   def gem_root

data/lib/chart_generators/bubble_chart_generator.rb

@@ -4,8 +4,8 @@ class BubbleChartGenerator < BaseGenerator
   #   element - div id or class for chart
   #   data_url - json file with data
   def generate( element, data_url )
-    add_assets( 'bubble_chart'+element.to_s+'.js', js_code( element, data_url ) )
-    add_assets( 'bubble_chart'+element.to_s+'.css', css_code( element ) )   
+    add_assets( "#{element[1..-1]}"+'.js', js_code( element, data_url ) )
+    add_assets( "#{element[1..-1]}"+'.scss', css_code( element ) )   
   end
 
 end

data/lib/chart_generators/histogram_generator.rb

@@ -4,8 +4,8 @@ class HistogramGenerator < BaseGenerator
   #   element - div id or class for chart
   #   data    - array with chart's points 
   def generate( element, data )
-    add_assets( 'histogram'+element.to_s+'.js', js_code( element, data ) )
-    add_assets( 'histogram'+element.to_s+'.css', css_code( element ) )   
+    add_assets( "#{element[1..-1]}"+'.js', js_code( element, data ) )
+    add_assets( "#{element[1..-1]}"+'.scss', css_code( element ) )   
   end
 
 end

data/lib/chart_generators/line_chart_generator.rb

@@ -4,8 +4,8 @@ class LineChartGenerator < BaseGenerator
   #   element - div id or class for chart
   #   data - file with [ X , Y ] data table  
   def generate( element, data )
-    add_assets( 'line_chart'+element.to_s+'.js', js_code( element, data ) )
-    add_assets( 'line_chart'+element.to_s+'.css', css_code( element ) )   
+    add_assets( "#{element[1..-1]}"+'.js', js_code( element, data ) )
+    add_assets( "#{element[1..-1]}"+'.scss', css_code( element ) )   
   end
 
 end

data/lib/chart_generators/pie_chart_generator.rb

@@ -4,8 +4,8 @@ class PieChartGenerator < BaseGenerator
   #   element - div id or class for chart
   #   csv_url - file with [ X , Y ] data table  
   def generate( element, csv_url )
-    add_assets( 'pie_chart'+element.to_s+'.js', js_code( element, csv_url ) )
-    add_assets( 'pie_chart'+element.to_s+'.css', css_code( element ) )   
+    add_assets( "#{element[1..-1]}"+'.js', js_code( element, csv_url ) )
+    add_assets( "#{element[1..-1]}"+'.scss', css_code( element ) )   
   end
 
 end

data/lib/chart_generators/polar_area_diagram_generator.rb

@@ -4,8 +4,8 @@ class PolarAreaDiagramGenerator < BaseGenerator
   #   element - div id or class for chart
   #   data_url - json file with data
   def generate( element, data_url )
-    add_assets( 'polar_area_diagram'+element.to_s+'.js', js_code( element, data_url ) ) 
-    add_assets( 'polar_area_diagram'+element.to_s+'.css', css_code( element ) ) 
+    add_assets( "#{element[1..-1]}"+'js', js_code( element, data_url ) ) 
+    add_assets( "#{element[1..-1]}"+'.scss', css_code( element ) ) 
   end
 
 end

data/lib/chart_generators/radar_chart_generator.rb

@@ -4,8 +4,8 @@ class RadarChartGenerator < BaseGenerator
   #   element - div id or class for chart
   #   data_url - json file with data
   def generate( element, data_url )
-    add_assets( 'radar_chart'+element.to_s+'.js', js_code( element, data_url ) )
-    add_assets( 'radar_chart'+element.to_s+'.css', css_code( element ) )   
+    add_assets( "#{element[1..-1]}"+'.js', js_code( element, data_url ) )
+    add_assets( "#{element[1..-1]}"+'.scss', css_code( element ) )   
   end
 
 end

data/lib/chart_generators/streamgraph_generator.rb

@@ -4,8 +4,8 @@ class StreamgraphGenerator < BaseGenerator
   #   element - div id or class for chart
   #   data_url - csv file with data
   def generate( element, data_url )
-    add_assets( 'streamgraph'+element.to_s+'.js', js_code( element, data_url ) )
-    add_assets( 'streamgraph'+element.to_s+'.css', css_code( element ) )   
+    add_assets( "#{element[1..-1]}"+'.js', js_code( element, data_url ) )
+    add_assets( "#{element[1..-1]}"+'.scss', css_code( element ) )   
   end
 
 end

data/lib/chart_generators/treemap_generator.rb

@@ -4,8 +4,8 @@ class TreemapGenerator < BaseGenerator
   #   element - div id or class for chart
   #   data_url - json file with data
   def generate( element, data_url )
-    add_assets( 'treemap'+element.to_s+'.js', js_code( element, data_url ) )
-    add_assets( 'treemap'+element.to_s+'.css', css_code( element ) )   
+    add_assets( "#{element[1..-1]}"+'.js', js_code( element, data_url ) )
+    add_assets( "#{element[1..-1]}"+'.scss', css_code( element ) )   
   end
 
 end

data/lib/chart_helpers/common/bar_chart.rb

@@ -2,12 +2,12 @@ module BarChart
 
     def horizontal_bar_chart( data, element='.horizontal_bar_chart' )
       HorizontalBarChartGenerator.new.generate( element, data )
-      content_tag( :div, '', class: element[1..-1] )
+      content_tag( :div, '', class: "#{element[1..-1]}" )
     end
 
     def vertical_bar_chart( data_url, element='.vertical_bar_chart' )
       VerticalBarChartGenerator.new.generate( element, data_url )
-      content_tag( :div, '', class: element[1..-1] )
+      content_tag( :div, '', class: "#{element[1..-1]}" )
     end
 
     # TODO

data/lib/chart_helpers/common/histogram.rb

@@ -2,7 +2,7 @@ module Histogram
 
     def histogram( data, element='.histogram' )
       HistogramGenerator.new.generate( element, data )
-      content_tag( :div, '', class: element[1..-1] )
+      content_tag( :div, '', class: "#{element[1..-1]}" )
     end
 
     # TODO

data/lib/chart_helpers/common/pie_chart.rb

@@ -2,7 +2,7 @@ module PieChart
 
     def pie_chart( data_url, element='.pie_chart' )
       PieChartGenerator.new.generate( element, data_url )
-      content_tag( :div, '', class: element[1..-1] )
+      content_tag( :div, '', class: "#{element[1..-1]}" )
     end
 
     # TODO

data/lib/d3/charts/version.rb

@@ -1,5 +1,5 @@
 module D3
   module Charts
-    VERSION = "1.1.0"
+    VERSION = "1.1.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: d3js-charts
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - leavitals
@@ -99,16 +99,6 @@ files:
 - lib/chart_helpers/well_known_named/nolan_chart.rb
 - lib/chart_helpers/well_known_named/pert_chart.rb
 - lib/chart_helpers/well_known_named/smith_chart.rb
-- lib/chart_templates/css/bubble_chart.css.erb
-- lib/chart_templates/css/histogram.css.erb
-- lib/chart_templates/css/horizontal_bar_chart.css.erb
-- lib/chart_templates/css/line_chart.css.erb
-- lib/chart_templates/css/pie_chart.css.erb
-- lib/chart_templates/css/polar_area_diagram.css.erb
-- lib/chart_templates/css/radar_chart.css.erb
-- lib/chart_templates/css/streamgraph.css.erb
-- lib/chart_templates/css/treemap.css.erb
-- lib/chart_templates/css/vertical_bar_chart.css.erb
 - lib/chart_templates/js/bubble_chart.js.erb
 - lib/chart_templates/js/histogram.js.erb
 - lib/chart_templates/js/horizontal_bar_chart.js.erb
@@ -119,6 +109,16 @@ files:
 - lib/chart_templates/js/streamgraph.js.erb
 - lib/chart_templates/js/treemap.js.erb
 - lib/chart_templates/js/vertical_bar_chart.js.erb
+- lib/chart_templates/scss/bubble_chart.scss.erb
+- lib/chart_templates/scss/histogram.scss.erb
+- lib/chart_templates/scss/horizontal_bar_chart.scss.erb
+- lib/chart_templates/scss/line_chart.scss.erb
+- lib/chart_templates/scss/pie_chart.scss.erb
+- lib/chart_templates/scss/polar_area_diagram.scss.erb
+- lib/chart_templates/scss/radar_chart.scss.erb
+- lib/chart_templates/scss/streamgraph.scss.erb
+- lib/chart_templates/scss/treemap.scss.erb
+- lib/chart_templates/scss/vertical_bar_chart.scss.erb
 - lib/d3/charts.rb
 - lib/d3/charts/engine.rb
 - lib/d3/charts/railtie.rb
@@ -140,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.1.0
+      version: 1.0.0
 requirements: []
 rubyforge_project: d3js-charts
 rubygems_version: 2.6.12