[browsermedia#671] Fix namespaced tables

* Projects shouldn't have the namespace to generated migrations.

Author: peakpg

features/generators/content_blocks_for_projects.feature

@@ -34,7 +34,7 @@ Feature:
  """
  class CreatePetstoreProducts < ActiveRecord::Migration
  def change
- create_content_table :petstore_products do |t|
+ create_content_table :products do |t|
  t.string :name
  t.string :price
 
@@ -123,7 +123,7 @@ Feature:
  """
  class CreatePetstoreDogs < ActiveRecord::Migration
  def change
- create_content_table :petstore_dogs do |t|
+ create_content_table :dogs do |t|
 
  t.timestamps
  end

lib/generators/cms/content_block/content_block_generator.rb

@@ -31,9 +31,20 @@ def alter_the_model
  end
 
  def alter_the_migration
+ puts "Table name: #{table_name}"
+ puts "Namespaced: #{namespaced?}"
+ puts "Coreapplication: #{@in_core_application}"
+
  migration = self.class.migration_exists?(File.absolute_path("db/migrate"), "create_#{table_name}")
+
+ if @in_core_application
+ gsub_file migration, "create_table :#{table_name}", "create_table :#{unnamespaced_table_name}"
+ puts "From #{table_name} to #{unnamespaced_table_name}"
+ end
+
  gsub_file migration, "create_table", "create_content_table"
 
+
  # Attachments do not require a FK from this model to attachments.
  self.attributes.select { |attr| attr.type == :attachment }.each do |attribute|
  gsub_file migration, "t.attachment :#{attribute.name}", ""
@@ -70,6 +81,14 @@ def create_routes
 
  private
 
+ # @override NamedBase#table_name Copy&Paste of this method to make sure project table names are not actually namespaced in migrations.
+ def unnamespaced_table_name
+ @unnamespaced_table_name ||= begin
+ base = pluralize_table_names? ? plural_name : singular_name
+ (regular_class_path + [base]).join('_')
+ end
+ end
+
  def model_has_attachment?
  !attachment_attributes().empty?
  end