old_sql 0.42.0 → 0.43.0

data/app/controllers/old_sql/report_controller.rb

@@ -46,7 +46,7 @@ module OldSql
       logger.info "GENERATION: #{@generation}"
       
       processor = load_processor(@report_name)
-      @report = processor.execute_query(@report_sql,@start_date,@end_date,query_vars(@report_name))
+      @report = processor.execute_query(@report_sql,@start_date,@end_date,query_vars(@report_name),@reports[@report_name]['report_design'])
       
       respond_to do |format|
         format.json { render :json => @report.to_json}

data/lib/generators/old_sql/install_generator.rb

@@ -6,8 +6,7 @@ module OldSql
     desc "Old SQL Install"
 
     def check_for_devise
-      puts "Old SQL works with devise, cancan and sanitize. Checking for a current installation of devise!
-           "
+      puts "Old SQL works with devise, cancan and sanitize. Checking for a current installation of devise!\n"
 
       if defined?(Devise)
         check_for_devise_models
@@ -16,16 +15,52 @@ module OldSql
       end
       
       puts "Please put gem 'cancan' into your Gemfile" unless defined?(Cancan)
-      
       puts "Please put gem 'sanitize' into your Gemfile" unless defined?(Sanitize)
-
-      copy_locales_files
-      create_old_sql_dirs
-      copy_old_sql_files
       
       puts "Also you need a new migration. We'll generate it for you now."
       invoke 'old_sql:install_migrations'
     end
+    
+    def copy_initializer
+      template "old_sql.rb", "config/initializers/old_sql.rb"
+    end
+    
+    def copy_locales_files
+      print "Now copying locales files! "
+      ###
+      locales_path = "#{gem_path}/config/locales/*.yml"
+
+      locales_app_path = "#{app_path}/config/locales"
+
+      unless File.directory?(locales_app_path)
+        FileUtils.mkdir locales_app_path
+      end
+
+      Dir.glob(locales_path).each do |file|
+        file_path = file.split("/")
+        file_path = file_path[-1]
+        FileUtils.copy_file(file, "#{locales_app_path}/#{file_path}")
+        print "."
+      end
+      print "\n"
+
+    end
+    
+    def create_old_sql_dirs
+      empty_directory "#{app_path}/config/old_sql/"
+      empty_directory "#{app_path}/config/old_sql/report_sql"
+      empty_directory "#{app_path}/config/old_sql/report_design"
+      empty_directory "#{app_path}/lib/old_sql/report_processor"
+    end
+    
+    def copy_old_sql_files
+      copy_file "#{gem_path}/config/old_sql/reports.yml.example", "#{app_path}/config/old_sql/reports.yml"
+      copy_file "#{gem_path}/config/old_sql/report_sql/user.erb.example", "#{app_path}/config/old_sql/report_sql/user.erb"
+      copy_file "#{gem_path}/lib/old_sql/report_processor/user_processor.rb.example", "#{app_path}/lib/old_sql/report_processor/user_processor.rb"
+      copy_file "user_design_template.csv", "#{app_path}/config/old_sql/report_design/user.csv"
+    end
+    
+    ################ PRIVATE ################
 
     private
 
@@ -137,39 +172,6 @@ module OldSql
 ======================================================"
       invoke 'devise', [model_name]
     end
-
-    def copy_locales_files
-      print "Now copying locales files! "
-      ###
-      locales_path = "#{gem_path}/config/locales/*.yml"
-
-      locales_app_path = "#{app_path}/config/locales"
-
-      unless File.directory?(locales_app_path)
-        FileUtils.mkdir locales_app_path
-      end
-
-      Dir.glob(locales_path).each do |file|
-        file_path = file.split("/")
-        file_path = file_path[-1]
-        FileUtils.copy_file(file, "#{locales_app_path}/#{file_path}")
-        print "."
-      end
-      print "\n"
-
-    end
-    
-    def create_old_sql_dirs
-      empty_directory "#{app_path}/config/old_sql/"
-      empty_directory "#{app_path}/config/old_sql/report_sql"
-      empty_directory "#{app_path}/lib/old_sql/report_processor"
-    end
-    
-    def copy_old_sql_files
-      copy_file "#{gem_path}/config/old_sql/reports.yml.example", "#{app_path}/config/old_sql/reports.yml"
-      copy_file "#{gem_path}/config/old_sql/report_sql/user.erb.example", "#{app_path}/config/old_sql/report_sql/user.erb"
-      copy_file "#{gem_path}/lib/old_sql/report_processor/user_processor.rb.example", "#{app_path}/lib/old_sql/report_processor/user_processor.rb"
-    end
     
     def app_path
       app_path = Rails.public_path.split("/")

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

@@ -0,0 +1,7 @@
+# Use this hook to configure the default report view, etc.
+OldSql.setup do |config|
+  # ==> Default Report View Configuration
+  # Configure the default report view. This setting will be used unless overridden 
+  # in config/old_sql/reports.yml.
+  config.default_report_view = "jqgrid"
+end

data/lib/generators/old_sql/templates/user_design_template.csv

@@ -0,0 +1,6 @@
+# Old SQL:
+# Example Report Design document.
+#
+id,name
+"Example Math Operation",id + id
+"Totals","..."

data/lib/old_sql.rb

@@ -1,5 +1,15 @@
 module OldSql
   require 'old_sql/engine' if defined?(Rails)
+  
+  # The default report view. This setting will be used unless overridden in 
+  # config/old_sql/reports.yml.
+  @@default_report_view = 'jqgrid'
+  
+  # Default way to setup Old SQL. Run rails generate old_sql:install to create
+  # a fresh initializer with all configuration values.
+  def self.setup
+    yield self
+  end
 end
 
 require 'extensions/action_controller/base'

data/lib/old_sql/report_design/cell.rb

@@ -0,0 +1,27 @@
+module OldSql
+  module ReportDesign
+    class Cell
+      attr_accessor :cell_data, :cell
+      
+      def initialize(value)
+        @cell = value
+        @cell_data = []
+        
+        # Check if cell is a label
+        if @cell[0] =~ /['"]/
+          @cell_data << CellData.new(@cell)
+        else
+          value.split(" ").each {|cell_data| @cell_data << CellData.new(cell_data)}
+        end
+      end
+      
+      def expression?
+        if @cell_data.count>1
+          return true
+        else
+          return false
+        end
+      end
+    end
+  end
+end

data/lib/old_sql/report_design/cell_data.rb

@@ -0,0 +1,30 @@
+module OldSql
+  module ReportDesign
+    class CellData
+      attr_accessor :data, :type
+      
+      COLUMN = 1
+      LABEL = 2
+      OPERATOR = 3
+      
+      def initialize(value)
+        @data = value
+        set_type
+      end
+      
+      private
+      
+      def set_type
+        first_char = @data[0]
+        @type = case first_char
+                when /['"]/
+                  LABEL
+                when /[\/*+]/
+                  OPERATOR
+                else
+                  COLUMN
+                end
+      end
+    end
+  end
+end

data/lib/old_sql/report_design/model.rb

@@ -0,0 +1,21 @@
+module OldSql
+  module ReportDesign
+    class Model
+      attr_accessor :rows
+      
+      @rows = nil
+      
+      def initialize(value = [])
+        @rows = value
+      end
+      
+      def add(row)
+        @rows << Row.new(row) unless row[0] == "#"
+      end
+      
+      def row(index)
+        @rows[index]
+      end
+    end
+  end
+end

data/lib/old_sql/report_design/parser.rb

@@ -0,0 +1,28 @@
+module OldSql
+  module ReportDesign
+    class Parser
+      def self.read_file file_to_read
+        raise ArgumentError, 'Argument file is null.' unless !file_to_read.nil?
+        full_path = "#{report_design_path}/#{file_to_read}"
+        raise ArgumentError, "File #{full_path} not found." unless File.exists?(full_path)
+        
+        @model = Model.new
+        
+        file = File.new(full_path, "r")
+        while (line = file.gets)
+          @model.add line
+        end
+        file.close
+      
+        @model
+      end
+      
+      def self.report_design_path
+        app_path = Rails.public_path.split("/")
+        app_path.delete_at(-1)
+        app_path = app_path.join("/")
+        app_path << "/config/old_sql/report_design"
+      end
+    end
+  end
+end

data/lib/old_sql/report_design/row.rb

@@ -0,0 +1,20 @@
+module OldSql
+  module ReportDesign
+    class Row
+      attr_accessor :data, :cells
+      
+      def initialize(value)
+        @data = value
+        @cells = []
+        
+        @data.split(",").each do |cell|
+          @cells << Cell.new(cell)
+        end
+      end
+      
+      def cell(index)
+        @cells[index]
+      end
+    end
+  end
+end

data/lib/old_sql/report_processor/base.rb

@@ -3,12 +3,8 @@ module OldSql
     class Base
     
       ROUND_PRECISION = 2
-      
-      def hello_world
-        puts "Hello World"
-      end
     
-      def execute_query(report_sql,start_date,end_date,query_vars)
+      def execute_query(report_sql,start_date,end_date,query_vars,design=nil)
         vars = {:start_date => start_date, :end_date => end_date}
       
         if !query_vars.nil?
@@ -34,8 +30,12 @@ module OldSql
         rescue
           #todo log error
         end
-      
-        parse(@resultset)
+        
+        if design
+          parse_design(design, @resultset)
+        else
+          parse(@resultset)
+        end
       
         @data
       end
@@ -58,6 +58,38 @@ module OldSql
       
         @data
       end
+      
+      def parse_design(design, resultset)
+        Rails.logger.info "PARSING DESIGN DOCUMENT #{design}.csv"
+        model = OldSql::ReportDesign::Parser.read_file("#{design}.csv")
+        
+        init(resultset)
+        
+        model.rows.each do |row|
+          report_row = []
+          row.cells.each do |cell|
+            expression = ""
+            cell.cell_data.each do |cd|
+              if cell.expression?
+                if cd.type == OldSql::ReportDesign::CellData::COLUMN
+                  expression << @rec[cd.data].to_s
+                elsif cd.type == OldSql::ReportDesign::CellData::OPERATOR
+                  expression << cd.data
+                end
+              else
+                if cd.type == OldSql::ReportDesign::CellData::COLUMN
+                  report_row << @rec[cd.data]
+                elsif  cd.type == OldSql::ReportDesign::CellData::LABEL
+                  report_row << cd.data
+                end
+              end
+            end
+            report_row << eval(expression) unless expression.length==0
+          end
+          
+          new_row(nil, report_row)
+        end
+      end
     
       def new_data(page=1, total=1, records=1)
         @id = 0

metadata

@@ -2,7 +2,7 @@
 name: old_sql
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.42.0
+  version: 0.43.0
 platform: ruby
 authors: 
 - Eddie Gonzales
@@ -88,8 +88,15 @@ files:
 - lib/generators/old_sql/templates/add_old_sql_admin_to_users_migration.rb
 - lib/generators/old_sql/templates/devise/add_devise_to_users_migration.rb
 - lib/generators/old_sql/templates/devise/devise_model.rb.template
+- lib/generators/old_sql/templates/old_sql.rb
+- lib/generators/old_sql/templates/user_design_template.csv
 - lib/old_sql.rb
 - lib/old_sql/engine.rb
+- lib/old_sql/report_design/cell.rb
+- lib/old_sql/report_design/cell_data.rb
+- lib/old_sql/report_design/model.rb
+- lib/old_sql/report_design/parser.rb
+- lib/old_sql/report_design/row.rb
 - lib/old_sql/report_processor/base.rb
 - lib/old_sql/report_processor/user_processor.rb.example
 - public/javascripts/old_sql/date_format.js
@@ -192,7 +199,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4381450184784543765
+      hash: -3181007581839946414
       segments: 
       - 0
       version: "0"