erp_base_erp_svcs 3.0.7 → 3.1.0

data/lib/erp_base_erp_svcs/extensions/active_record/migration.rb

@@ -0,0 +1,39 @@
+ActiveRecord::Migration.class_eval do
+  def copy(destination, sources, options = {})
+    copied = []
+
+    FileUtils.mkdir_p(destination) unless File.exists?(destination)
+
+    destination_migrations = ActiveRecord::Migrator.migrations(destination)
+    last = destination_migrations.last
+    sources.each do |scope, path|
+      source_migrations = ActiveRecord::Migrator.migrations(path)
+
+      source_migrations.each do |migration|
+        source = File.read(migration.filename)
+        source = "# This migration comes from #{scope} (originally #{migration.version})\n#{source}"
+        
+        if duplicate = destination_migrations.detect { |m| m.name == migration.name }
+          if options[:refresh] && duplicate.scope == scope.to_s
+            Dir.glob(File.join(destination,"*_#{migration.name.underscore}.#{scope.to_s}.rb")).each { |f| puts "Removing old migration #{migration.name}"; File.delete(f) }
+          elsif options[:on_skip] && duplicate.scope != scope.to_s
+            options[:on_skip].call(scope, migration)
+          end
+          next unless options[:refresh]
+        end
+        
+        migration.version = next_migration_number(last ? last.version + 1 : 0).to_i unless options[:preserve_timestamp]
+        new_path = File.join(destination, "#{migration.version}_#{migration.name.underscore}.#{scope}.rb")
+        old_path, migration.filename = migration.filename, new_path
+        last = migration
+        
+        File.open(migration.filename, "w") { |f| f.write source }
+        copied << migration
+        options[:on_copy].call(scope, migration, old_path) if options[:on_copy]
+        destination_migrations << migration
+      end
+    end
+
+    copied
+  end
+end

data/lib/erp_base_erp_svcs/extensions.rb

@@ -11,8 +11,7 @@ require 'erp_base_erp_svcs/extensions/active_record/has_notes'
 require 'erp_base_erp_svcs/extensions/active_record/acts_as_note_type'
 require 'erp_base_erp_svcs/extensions/active_record/is_describable'
 require 'erp_base_erp_svcs/extensions/active_record/has_contact'
-require 'erp_base_erp_svcs/extensions/active_record/migrator'
-require 'erp_base_erp_svcs/extensions/active_record/data_migrator'
 require 'erp_base_erp_svcs/extensions/active_record/sti_instantiation'
 require 'erp_base_erp_svcs/extensions/active_record/to_hash'
+require 'erp_base_erp_svcs/extensions/active_record/migration'
 

data/lib/erp_base_erp_svcs/version.rb

@@ -1,8 +1,8 @@
 module ErpBaseErpSvcs
   module VERSION #:nodoc:
     MAJOR = 3
-    MINOR = 0
-    TINY  = 7
+    MINOR = 1
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].compact.join('.')
   end

data/lib/erp_base_erp_svcs.rb

@@ -6,13 +6,8 @@ require "erp_base_erp_svcs/non_escape_json_string"
 
 module ErpBaseErpSvcs
   class << self
-    def setup_compass_ae_callback(config, engine, &block)
-      config.before_initialize do
-        callback = (Rails.application.config.cache_classes ? 'after_initialize' : 'to_prepare') 
-        config.send(callback) do
-          block.call(engine)
-        end
-      end
+    def determine_callback
+      (Rails.env == 'development') ?  'to_prepare' : 'after_initialize'
     end
 
     def mount_compass_ae_engines(routes)
@@ -22,15 +17,15 @@ module ErpBaseErpSvcs
     end
 
     def register_as_compass_ae_engine(config, engine)
-      setup_compass_ae_callback(config, engine) do |engine|
-        ErpBaseErpSvcs.load_compass_ae_engine(engine)
+      config.send(ErpBaseErpSvcs.determine_callback) do
+        ErpBaseErpSvcs.load_compass_ae_engine(engine, config)
       end
     end
 
-    def load_compass_ae_engine(engine)
+    def load_compass_ae_engine(engine, config)
       Rails.application.config.erp_base_erp_svcs.compass_ae_engines << engine unless Rails.application.config.erp_base_erp_svcs.compass_ae_engines.include?(engine)
       load_compass_ae_extensions(engine)
-      load_root_compass_ae_framework_extensions
+      load_root_compass_ae_framework_extensions(config)
     end
 
     #forces rails to reload model extensions and framework extensions
@@ -101,14 +96,19 @@ module ErpBaseErpSvcs
       end
     end
 
-    def load_root_compass_ae_framework_extensions
-      Dir.glob(File.join(Rails.root,"lib/extensions/compass_ae/**/*.rb")).each do |file|
-        load file
+    def load_root_compass_ae_framework_extensions(config)
+      config.send(ErpBaseErpSvcs.determine_callback) do
+        Dir.glob(File.join(Rails.root,"lib/extensions/compass_ae/**/*.rb")).each do |file|
+          load file
+        end
       end
+
     end
     
   end
 end
 
 #load the engine after this module is defined
-require "erp_base_erp_svcs/engine"
+require "erp_base_erp_svcs/engine"
+
+

data/lib/tasks/erp_base_erp_svcs_tasks.rake

@@ -1,36 +1,72 @@
-Rake::Task["db:migrate"].clear_actions
+require 'fileutils'
 
-namespace :db do
-  task :migrate => :environment do
-    ActiveRecord::Migrator.prepare_migrations
-    Rake::Task["db:migrate:original_migrate"].reenable
-    Rake::Task["db:migrate:original_migrate"].invoke
-    ActiveRecord::Migrator.cleanup_migrations
+#redefine copy engine migrations rake task
+Rake::Task["railties:install:migrations"].clear
+
+namespace :railties do
+  namespace :install do
+    # desc "Copies missing migrations from Railties (e.g. plugins, engines). You can specify Railties to use with FROM=railtie1,railtie2"
+    task :migrations => :'db:load_config' do
+      to_load = ENV['FROM'].blank? ? :all : ENV['FROM'].split(",").map {|n| n.strip }
+      #added to allow developer to perserve timestamps
+      preserve_timestamp = ENV['PRESERVE_TIMESTAMPS'].blank? ? false : (ENV['PRESERVE_TIMESTAMPS'].to_s.downcase == "true")
+      #refresh will replace migrations from engines
+      refresh = ENV['REFRESH'].blank? ? false : (ENV['REFRESH'].to_s.downcase == "true")
+      railties = ActiveSupport::OrderedHash.new
+      Rails.application.railties.all do |railtie|
+        next unless to_load == :all || to_load.include?(railtie.railtie_name)
+
+        if railtie.respond_to?(:paths) && (path = railtie.paths['db/migrate'].first)
+          railties[railtie.railtie_name] = path
+        end
+      end
+
+      on_skip = Proc.new do |name, migration|
+        puts "NOTE: Migration #{migration.basename} from #{name} has been skipped. Migration with the same name already exists."
+      end
+
+      on_copy = Proc.new do |name, migration, old_path|
+        puts "Copied migration #{migration.basename} from #{name}"
+      end
+
+      ActiveRecord::Migration.copy(ActiveRecord::Migrator.migrations_paths.first, railties,
+                                    :on_skip => on_skip, :on_copy => on_copy, :preserve_timestamp => preserve_timestamp, :refresh => refresh)
+    end
   end
+end
 
+namespace :db do
   namespace :migrate do
-    
+
     desc "list pending migrations"
     task :list_pending => :environment do
-      ActiveRecord::Migrator.prepare_migrations
       pending_migrations = ActiveRecord::Migrator.new('up', 'db/migrate/').pending_migrations.collect{|item| File.basename(item.filename)}
       puts "================Pending Migrations=========="
       puts pending_migrations
       puts "============================================"
-      ActiveRecord::Migrator.cleanup_migrations
-    end
-    
-    desc "original migrate"
-    task :original_migrate do
-      ActiveRecord::Migration.verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
-      ActiveRecord::Migrator.migrate("db/migrate/", ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
-      Rake::Task["db:schema:dump"].invoke if ActiveRecord::Base.schema_format == :ruby
     end
-    
+
   end#migrate
 end#db
 
 namespace :compass_ae do
+  namespace :install do
+    desc "Install all CompassAE schema migrations"
+    task :migrations => :environment do
+      compass_ae_railties = Rails.application.config.erp_base_erp_svcs.compass_ae_engines.collect{|e| "#{e.name.split("::").first.underscore}"}.join(',')
+      task = "railties:install:migrations"
+      ENV['FROM'] = compass_ae_railties
+      Rake::Task[task].invoke
+    end #migrations
+    
+    desc "Install all CompassAE data migrations"
+    task :data_migrations => :environment do
+      compass_ae_railties = Rails.application.config.erp_base_erp_svcs.compass_ae_engines.collect{|e| "#{e.name.split("::").first.underscore}"}.join(',')
+      task = "railties:install:data_migrations"
+      ENV['FROM'] = compass_ae_railties
+      Rake::Task[task].invoke
+    end #data_migrations
+  end #install
 
   desc "Upgrade you installation of Compass AE"
   task :upgrade => :environment do
@@ -46,14 +82,13 @@ namespace :compass_ae do
 
       ActiveRecord::Migrator.cleanup_upgrade_migrations
       RussellEdge::DataMigrator.cleanup_upgrade_migrations
-    rescue Exception=>ex
+    rescue Exception => ex
       ActiveRecord::Migrator.cleanup_migrations
       ActiveRecord::Migrator.cleanup_upgrade_migrations
       RussellEdge::DataMigrator.cleanup_upgrade_migrations
 
       puts ex.inspect
       puts ex.backtrace
-    end
-  end
-
-end
+    end #handle exceptions
+  end #upgrade
+end #compass_ae

data/spec/dummy/config/application.rb

@@ -37,6 +37,12 @@ module Dummy
 
     # Enable the asset pipeline
     config.assets.enabled = true
+
+    # Enforce whitelist mode for mass assignment.
+    # This will create an empty whitelist of attributes available for mass-assignment for all models
+    # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
+    # parameters by using an attr_accessible or attr_protected declaration.
+    config.active_record.whitelist_attributes = true    
   end
 end
 

data/spec/dummy/config/environments/spec.rb

@@ -1,6 +1,9 @@
 Dummy::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
+  # Raise exception on mass assignment protection for Active Record models
+  config.active_record.mass_assignment_sanitizer = :strict
+
   # In the development environment your application's code is reloaded on
   # every request.  This slows down response time but is perfect for development
   # since you don't have to restart the web server when you make code changes.

data/spec/dummy/db/data_migrations/20110525001935_add_usd_currency.erp_base_erp_svcs.rb

@@ -0,0 +1,12 @@
+# This migration comes from erp_base_erp_svcs (originally 20110525001935)
+class AddUsdCurrency
+  
+  def self.up
+    Currency.create(:name => 'US Dollar', :internal_identifier => 'USD', :major_unit_symbol => "$")
+  end
+  
+  def self.down
+    Currency.usd.destroy
+  end
+
+end

data/spec/dummy/db/data_migrations/20110609150135_add_iso_codes.erp_base_erp_svcs.rb

@@ -0,0 +1,19 @@
+# This migration comes from erp_base_erp_svcs (originally 20110609150135)
+require 'yaml'
+
+class AddIsoCodes
+  
+  def self.up
+    #find the erp_base_erp_svcs engine
+	  engine_path = Rails::Application::Railties.engines.find{|item| item.engine_name == 'erp_base_erp_svcs'}.config.root.to_s
+	
+	  GeoCountry.load_from_file(File.join(engine_path,'db/data_sets/geo_countries.yml'))
+    GeoZone.load_from_file(File.join(engine_path,'db/data_sets/geo_zones.yml'))
+  end
+  
+  def self.down
+    GeoCountry.delete_all
+    GeoZone.delete_all
+  end
+
+end

data/spec/dummy/db/data_migrations/20110913145838_setup_compass_ae_instance.erp_base_erp_svcs.rb

@@ -0,0 +1,12 @@
+# This migration comes from erp_base_erp_svcs (originally 20110913145838)
+class SetupCompassAeInstance
+  
+  def self.up
+    CompassAeInstance.create(version: 3.1)
+  end
+  
+  def self.down
+    #remove data here
+  end
+
+end