old_sql 0.9.0 → 0.10.0

data/Gemfile

@@ -4,6 +4,8 @@ source "http://rubygems.org"
 #   gem "activesupport", ">= 2.3.5"
 
 gem "sanitize"
+gem "devise"
+gem "cancan"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/app/controllers/old_sql/report_controller.rb

@@ -2,6 +2,8 @@ require 'csv'
 
 module OldSql
   class ReportController < ApplicationController
+    before_filter :authenticate_user!
+    before_filter :ensure_old_sql_admin!
     before_filter :_init
     before_filter :_reports
 
@@ -99,6 +101,10 @@ module OldSql
     
 
     private
+      def ensure_old_sql_admin!
+        raise CanCan::AccessDenied unless current_user.old_sql_admin?
+      end
+      
       def _init
 		    #todo add Devise support
         #@authorization_adapter.authorize(:index) if @authorization_adapter
@@ -108,7 +114,7 @@ module OldSql
       end
       
       def _reports
-        template = File.read("#{Rails.root}/config/reports.yml")
+        template = File.read("#{Rails.root}/config/old_sql/reports.yml")
         @reports = YAML.load(Erubis::Eruby.new(template).result)
       end
       

data/config/old_sql/report_sql/user.erb.example

@@ -0,0 +1,6 @@
+-- Change the where clause so that it can be  for your database
+
+SELECT u.id, u.name
+FROM users u
+WHERE u.created_at > date('<%=start_date.gsub('/','-')%>')
+AND u.created_at < date('<%=end_date.gsub('/','-')%>')

data/config/old_sql/reports.yml.example

@@ -0,0 +1,15 @@
+# Old SQL Reports YAML
+# This is an example report. Replace it with your actual reports.
+#
+# 'processor:' is optional, and should point to a class in lib/old_sql.
+# See lib/old_sql/user_processor.rb for an example.
+
+user:
+  name: user
+  value: User
+  report_sql: user
+  virality: false
+  #processor: User_Processor
+  fields: 
+    - 'id'
+    - 'name'

data/lib/generators/old_sql/USAGE

@@ -0,0 +1,15 @@
+Description:
+    Installs Old SQL.
+
+Examples:
+    `rails generate old_sql:install`
+
+        Creates locale and migration files:
+
+            Locales:    config/locales/old_sql.XX.yml
+
+        Creates SQL and Parser directories and examples:
+      
+            Reports:    config/old_sql/reports.yml
+            SQL:        config/old_sql/report_sql/
+            Parsers:    lib/old_sql/report_processor/

data/lib/generators/old_sql/install_generator.rb

@@ -0,0 +1,125 @@
+module OldSql
+  class InstallGenerator < Rails::Generators::Base
+    source_root File.expand_path('../templates', __FILE__)
+    argument :model_name, :type => :string, :default => 'user'
+
+    desc "Old SQL Install"
+
+    def check_for_devise
+      puts "Hello!0
+Old SQL works with devise. Checking for a current installation of devise!
+"
+      if defined?(Devise)
+        check_for_devise_models
+      else
+        puts "Please put gem 'devise' into your Gemfile"
+      end
+
+      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
+
+    private
+
+    def check_for_devise_models
+      # File.exists?
+      devise_path =  FileUtils.pwd + "/config/initializers/devise.rb"
+
+      if File.exists?(devise_path)
+        parse_route_files
+      else
+        puts "Looks like you don't have devise install! We'll install it for you!"
+        invoke 'devise:install'
+        set_devise
+
+      end
+    end
+
+    def parse_route_files
+      # check if migrations exist
+      app_path = Rails.public_path.split("/")
+      app_path.delete_at(-1)
+      app_path = app_path.join("/")
+      routes_path = app_path + "/config/routes.rb"
+
+      content = ""
+
+      File.readlines(routes_path).each{|line|
+        content += line
+      }
+
+      unless content.index("devise_for").nil?
+        # there is a devise_for in routes => Do nothing
+        puts "Great! You have devise installed and setup!"
+      else
+        puts "Great you have devise installed, but not set up!"
+        set_devise
+      end
+    end
+
+    def set_devise
+      puts "Setting up devise for you!
+======================================================"
+      invoke 'devise', [model_name]
+    end
+
+    def copy_locales_files
+      print "Now copying locales files! "
+      gem_path = __FILE__
+      gem_path = gem_path.split("/")
+
+      gem_path = gem_path[0..-5]
+      gem_path = gem_path.join("/")
+      ###
+      locales_path = gem_path + "/config/locales/*.yml"
+
+      app_path = Rails.public_path.split("/")
+      app_path.delete_at(-1)
+      app_path = app_path.join("/")
+
+      app_path = app_path + "/config/locales"
+
+      unless File.directory?(app_path)
+        FileUtils.mkdir app_path
+      end
+
+      Dir.glob(locales_path).each do |file|
+        file_path = file.split("/")
+        file_path = file_path[-1]
+        FileUtils.copy_file(file, app_path + "/" + file_path)
+        print "."
+      end
+      print "\n"
+
+    end
+    
+    def create_old_sql_dirs
+      app_path = Rails.public_path.split("/")
+      app_path.delete_at(-1)
+      app_path = app_path.join("/")
+      
+      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
+      app_path = Rails.public_path.split("/")
+      app_path.delete_at(-1)
+      app_path = app_path.join("/")
+      
+      gem_path = __FILE__
+      gem_path = gem_path.split("/")
+      gem_path = gem_path[0..-5]
+      gem_path = gem_path.join("/")
+      
+      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
+  end
+end

data/lib/generators/old_sql/install_migrations_generator.rb

@@ -0,0 +1,24 @@
+require 'rails/generators'
+require 'rails/generators/migration'
+
+module OldSql
+  class InstallMigrationsGenerator < Rails::Generators::Base
+    include Rails::Generators::Migration
+    source_root File.expand_path('../templates', __FILE__)
+
+    def self.next_migration_number(dirname)
+      if ActiveRecord::Base.timestamped_migrations
+        migration_number = Time.now.utc.strftime("%Y%m%d%H%M%S").to_i
+        migration_number += 1
+        migration_number.to_s
+      else
+        "%.3d" % (current_migration_number(dirname) + 1)
+      end
+    end
+
+    def create_migration_file
+      migration_template 'add_old_sql_admin_to_users_migration.rb', 'db/migrate/add_old_sql_admin_to_users.rb' rescue p $!.message
+      #sleep 1 # ensure scripts have different timestamps
+    end
+  end
+end

data/lib/generators/old_sql/old_sql_generator.rb

@@ -0,0 +1,23 @@
+module OldSql
+  class OldSqlGenerator < Rails::Generators::Base
+    source_root File.expand_path('../templates', __FILE__)
+    namespace "old_sql"
+
+    def print_instructions
+      puts "OldSql!
+
+Hello, to install old_sql into your app you need to run:
+
+  rails g old_sql:install
+
+By default Old SQL works with Devise to provide authentication. If you use
+Devise, but want use another model than the default 'user' you can provide the
+custom model name as an argument:
+
+  rails g old_sql:install member
+
+"
+    end
+
+  end
+end

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

@@ -0,0 +1,9 @@
+class AddOldSqlAdminToUsers < ActiveRecord::Migration
+  def self.up
+    add_column :users, :old_sql_admin, :boolean, :default => false
+  end
+
+  def self.down
+    remove_column :users, :old_sql_admin
+  end
+end

data/lib/old_sql/engine.rb

@@ -4,8 +4,6 @@ require "action_controller"
 
 module OldSql
   class Engine < Rails::Engine
-    engine_name :old_sql
-    
     initializer "static assets" do |app|
       app.middleware.use ::ActionDispatch::Static, "#{root}/public"
     end

data/lib/old_sql/report_processor/base.rb

@@ -15,7 +15,7 @@ module OldSql
           vars = vars.merge query_vars
         end
       
-        template = File.read("#{Rails.root}/config/report_sql/#{report_sql}.erb")
+        template = File.read("#{Rails.root}/config/old_sql/report_sql/#{report_sql}.erb")
         sql = Erubis::Eruby.new(template).result(vars)
       
         Rails.logger.debug sql

data/lib/old_sql/report_processor/user_processor.rb.example

@@ -0,0 +1,19 @@
+require 'old_sql/report_processor/base'
+
+module OldSql
+  module ReportProcessor
+    class UserProcessor < OldSql::ReportProcessor::Base
+   
+      def parse(resultset)
+        init(resultset)
+     
+        Rails.logger.debug "REC: #{@rec}"
+     
+        new_row(nil, [@rec['id'], @rec['name']])
+        new_row('Totals', ['...'])
+     
+        @data
+      end
+    end
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: old_sql
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors: 
 - Eddie Gonzales
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-06 00:00:00 Z
+date: 2011-06-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sanitize
@@ -24,16 +24,38 @@ dependencies:
   prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  name: devise
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: cancan
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id004
 description: OldSQL is a Rails Engine database reporting gem that uses plain old SQL
 email: egonzales@pureplay.com
 executables: []
@@ -54,11 +76,19 @@ files:
 - app/views/old_sql/report/index.html.erb
 - app/views/old_sql/report/print.html.erb
 - config/locales/old_sql.en.yml
+- config/old_sql/report_sql/user.erb.example
+- config/old_sql/reports.yml.example
 - config/routes.rb
 - lib/extensions/action_controller/base.rb
+- lib/generators/old_sql/USAGE
+- lib/generators/old_sql/install_generator.rb
+- lib/generators/old_sql/install_migrations_generator.rb
+- lib/generators/old_sql/old_sql_generator.rb
+- lib/generators/old_sql/templates/add_old_sql_admin_to_users_migration.rb
 - lib/old_sql.rb
 - lib/old_sql/engine.rb
 - lib/old_sql/report_processor/base.rb
+- lib/old_sql/report_processor/user_processor.rb.example
 - public/javascripts/old_sql/date_format.js
 - public/javascripts/old_sql/jqgrid/i18n/grid.locale-bg.js
 - public/javascripts/old_sql/jqgrid/i18n/grid.locale-bg1251.js
@@ -159,7 +189,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -772255520100120061
+      hash: -3491554766410394640
       segments: 
       - 0
       version: "0"