old_sql 1.21.0 → 1.22.0

data/README.md

@@ -1,5 +1,4 @@
-Old SQL
-=======
+# Old SQL
 
 Old SQL is a Rails Engine database reporting gem that uses plain old SQL.
 
@@ -25,8 +24,7 @@ Some features of Old SQL are:
   even add Devise support to an existing model (by default users).
 * Support for multiple database connections.
 
-Quick Setup and Demo
---------------------
+## Quick Setup and Demo
 
 1. Add gem 'old_sql', and gem 'devise' to your Gemfile.
 2. bundle install
@@ -40,8 +38,8 @@ Quick Setup and Demo
 9. Authenticate using your old_sql_admin user.
 10. Select user from the Reports drop down list. Click run.
 
-Screenshots
------------
+## Screenshots
+
 #### jqGrid
 
 ![jqGrid view](https://github.com/egonz/old_sql/raw/master/screenshots/jqgrid.png "jqGrid view")
@@ -54,8 +52,7 @@ Screenshots
 
 ![table view](https://github.com/egonz/old_sql/raw/master/screenshots/chart.png "Chart view")
 
-Installation
-------------
+## Installation
 
 To install Old SQL type:
 
@@ -70,8 +67,7 @@ This generator will also create a migration that will add a old_sql_admin column
 
 If not already installed Devise is setup.
 
-Creating Reports
-----------------
+## Creating Reports
 
 Configure your reports config/old_sql/report.yml. An example configuration is created when you run the old_sql:install generator.
 
@@ -109,7 +105,7 @@ Configure your reports config/old_sql/report.yml. An example configuration is cr
 	  report_view: jqgrid
 	  query_vars:
         - 
-          foo: bar
+          old_sql_admin: 0
 	  fields: 
         - 'id'
         - 'name'
@@ -214,8 +210,7 @@ Optionally create a processor under lib/old_sql_report_processor:
 	  end
 	end
 
-Design File Tips
-----------------
+## Design File Tips
 
 Design files, both CSV and CHART, work best (only?) with queries that return a single record.
 Ideally the query returns aggregate results, from one or more tables. For example:
@@ -236,8 +231,7 @@ Ideally the query returns aggregate results, from one or more tables. For exampl
 If you need to process more than a single record create a subclass of OldSql::ReportProcessor::Base. See 
 [UserOldSqlDemoProcessor](https://github.com/egonz/old_sql/blob/master/lib/generators/old_sql/templates/user_processor.rb.example).
 		
-Customize
----------
+## Customize
 
 All css and html template files can be copied to your installation by executing: 
 
@@ -245,8 +239,7 @@ All css and html template files can be copied to your installation by executing:
 	
 Settings for Old SQL can be configured in config/initializers/old_sql.rb.
 
-Rake Examples
--------------
+## Rake Examples
 
 	rake old_sql:print:range[user_table,'development','2011-03-01','2011-09-01']
 
@@ -254,8 +247,7 @@ Rake Examples
 
 	rake old_sql:print:week[user_table,'development']
 
-Contributing to old_sql
------------------------
+## Contributing to old_sql
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
 * Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
@@ -265,8 +257,7 @@ Contributing to old_sql
 * Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
 * Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
 
-Copyright
----------
+## Copyright
 
 Copyright (c) 2011 Eddie Gonzales. See LICENSE.txt for
 further details.

data/app/controllers/old_sql/report_controller.rb

@@ -60,6 +60,7 @@ module OldSql
       
       @width = 800
       @height = 500
+      @google_chart_colors = google_chart_colors
       
       processor = load_base_processor
       @report = processor.execute_query(@reports[@report_name],@start_date,@end_date,query_vars(@report_name))
@@ -199,6 +200,11 @@ module OldSql
         return nil if @report.nil?
         @report.keys.first
       end
+      
+      def google_chart_colors
+        json = OldSql.google_chart_colors.to_json
+        json.html_safe
+      end
   end
 end
 

data/app/views/old_sql/report/chart.html.erb

@@ -5,7 +5,7 @@
 	var chart_title = "<%=@reports[@report_name]['description']%> Report";
 	var chart_type = "<%=chart_type%>";
 	var chart_data = <%=chart_data%>;
-	var chart_colors = ['#E35F18','#307CC7','#D95117','#0A4592','#B33A13','#073D8D','#902811','#052D79','#7A1904','#061E59','#6E0E02','#071253','#530005','#1F3058','#2A437F','#3657A8','#5675BB','#7A94CC','#F38200','#C4794B','#BF5D29','#B8410B','#AD3300','#802205','#36170F'];
+	var chart_colors = <%=@google_chart_colors%>;
 	var width = <%=@width%>;
 	var height = <%=@height%>;
 </script>

data/lib/generators/old_sql/templates/old_sql.rb

@@ -26,4 +26,8 @@ OldSql.setup do |config|
   # ==> jqGrid Report View Configuration
   # Number of rows to display in the jqGrid component in the jqGrid report view.
   config.jqgrid_row_num = 25
+  
+  # ==> Google Chart View Configuration
+  # Google chart colors.
+  config.google_chart_colors = ['#E35F18','#307CC7','#D95117','#0A4592','#B33A13','#073D8D','#902811','#052D79','#7A1904','#061E59','#6E0E02','#071253','#530005','#1F3058','#2A437F','#3657A8','#5675BB','#7A94CC','#F38200','#C4794B','#BF5D29','#B8410B','#AD3300','#802205','#36170F']
 end

data/lib/old_sql.rb

@@ -34,6 +34,10 @@ module OldSql
   mattr_accessor :jqgrid_row_num
   @@jqgrid_row_num = 25
   
+  # Google chart colors.
+  mattr_accessor :google_chart_colors
+  @@google_chart_colors = ['#E35F18','#307CC7','#D95117','#0A4592','#B33A13','#073D8D','#902811','#052D79','#7A1904','#061E59','#6E0E02','#071253','#530005','#1F3058','#2A437F','#3657A8','#5675BB','#7A94CC','#F38200','#C4794B','#BF5D29','#B8410B','#AD3300','#802205','#36170F']
+  
   # Default way to setup Old SQL. Run rails generate old_sql:install to create
   # a fresh initializer with all configuration values.
   def self.setup

data/public/javascripts/old_sql/chart.js

@@ -26,8 +26,8 @@ function drawChart() {
 	chart.draw(data, {
 		width: width, 
 		height: height,
-		title:chart_title,
-       	colors:['#E35F18','#307CC7','#D95117','#0A4592','#B33A13','#073D8D','#902811','#052D79','#7A1904','#061E59','#6E0E02','#071253','#530005','#1F3058','#2A437F','#3657A8','#5675BB','#7A94CC','#F38200','#C4794B','#BF5D29','#B8410B','#AD3300','#802205','#36170F'],
+		title: chart_title,
+       	colors: chart_colors,
 		is3D: true
 	});
 }

metadata

@@ -2,7 +2,7 @@
 name: old_sql
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.21.0
+  version: 1.22.0
 platform: ruby
 authors: 
 - Eddie Gonzales
@@ -193,7 +193,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -341398864351494341
+      hash: -1682679697401515691
       segments: 
       - 0
       version: "0"