old_sql 1.2.0 → 1.3.0

data/lib/generators/old_sql/install_devise_migrations_generator.rb

@@ -4,7 +4,7 @@ require 'rails/generators/migration'
 module OldSql
   class InstallDeviseMigrationsGenerator < Rails::Generators::Base
     include Rails::Generators::Migration
-    source_root File.expand_path('../templates/devise', __FILE__)
+    source_root File.expand_path('../templates', __FILE__)
 
     def self.next_migration_number(dirname)
       if ActiveRecord::Base.timestamped_migrations

data/lib/generators/old_sql/install_generator.rb

@@ -54,10 +54,11 @@ module OldSql
     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"
+      path_to_reports_config = "#{app_path}/config/old_sql/reports.yml"
+      copy_file "reports.yml.example", path_to_reports_config unless File.exists?(path_to_reports_config)
+      copy_file "user.erb.example", "#{app_path}/config/old_sql/report_sql/user_old_sql_demo.erb"
+      copy_file "user_processor.rb.example", "#{app_path}/lib/old_sql/report_processor/user_old_sql_demo_processor.rb"
+      copy_file "user_design_template.csv", "#{app_path}/config/old_sql/report_design/user_old_sql_demo.csv"
     end
     
     ################ PRIVATE ################
@@ -128,15 +129,7 @@ module OldSql
     
     def create_model_class
       model_path = "#{app_path}/app/models/#{model_name}.rb"
-      
-      gem_path = __FILE__
-      gem_path = gem_path.split("/")
-      gem_path = gem_path[0..-5]
-      gem_path = gem_path.join("/")
-      devise_template_path = "#{gem_path}/lib/generators/old_sql/templates/devise/devise_model.rb.template"
-      
-      copy_file devise_template_path, model_path
-      
+      copy_file "devise_model.rb.template", model_path
       gsub_file model_path, /DeviseModel/, "#{model_name.capitalize}"
     end
     

data/{config/old_sql → lib/generators/old_sql/templates}/reports.yml.example

@@ -7,10 +7,10 @@
 user:
   name: user
   value: User
-  report_sql: user
+  report_sql: user_old_sql_demo
   virality: false
-  report_design: user
-  #report_processor: User_Processor
+  report_design: user_old_sql_demo
+  #report_processor: User_Old_Sql_Demo_Processor
   fields: 
     - 'id'
     - 'name'

data/lib/{old_sql/report_processor → generators/old_sql/templates}/user_processor.rb.example

@@ -2,7 +2,7 @@ require 'old_sql/report_processor/base'
 
 module OldSql
   module ReportProcessor
-    class UserProcessor < OldSql::ReportProcessor::Base
+    class UserOldSqlDemoProcessor < OldSql::ReportProcessor::Base
    
       def parse(resultset)
         init(resultset)

metadata

@@ -2,7 +2,7 @@
 name: old_sql
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Eddie Gonzales
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-10 00:00:00 Z
+date: 2011-06-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sanitize
@@ -76,8 +76,6 @@ 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
@@ -85,11 +83,14 @@ files:
 - 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_devise_to_users_migration.rb
 - 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/devise_model.rb.template
 - lib/generators/old_sql/templates/old_sql.rb
+- lib/generators/old_sql/templates/reports.yml.example
+- lib/generators/old_sql/templates/user.erb.example
 - lib/generators/old_sql/templates/user_design_template.csv
+- lib/generators/old_sql/templates/user_processor.rb.example
 - lib/old_sql.rb
 - lib/old_sql/engine.rb
 - lib/old_sql/report_design/cell.rb
@@ -98,7 +99,6 @@ files:
 - 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
 - public/javascripts/old_sql/jqgrid/i18n/grid.locale-bg.js
 - public/javascripts/old_sql/jqgrid/i18n/grid.locale-bg1251.js
@@ -200,7 +200,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1929929110961270162
+      hash: -1147415374575206566
       segments: 
       - 0
       version: "0"