lalala 4.0.0.dev.162 → 4.0.0.dev.165

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85ab922bcd762d6346607b0910afa1cbf3b44080
-  data.tar.gz: ecac7d2acab2bf0f4af49de9047483d9a08b57a0
+  metadata.gz: 8d09f6cbd3bc0bf378e619fc8fec19048a28690f
+  data.tar.gz: a5821336b7851714566f7c848f90630eeeebfa0b
 SHA512:
-  metadata.gz: 3abf89d212e5fec3606f2df68c96af433a5c61ce61310fd64c126d509510eab129ea3d3b62af780263be6c0fa80b2f75f714d4a9488da04ee6d09d2231516973
-  data.tar.gz: 71a4da8d9ea4de8ccccf3d5fa157796335d5ee65563072de23f8dd57204abd5af24725c1f72dfd3421618161c2afda3add4a0cd59b9ad4f8136c6271fcd4b8f2
+  metadata.gz: 492462e6f2cf0ded49d860a6d9654a1936b73f67193f610d878651a5fe4002cc4f71519d75c2872d7404ce4ae3d4aa26eadd793f3f90321f4e9785a27b3b0433
+  data.tar.gz: 7d7307073c1f0e35881d5639d24b676b3271414734181e539a6345b5faf9c38343bb47e7d4a565fea82129b6111d40394f22427a8ad3a9c3af59b39cdb7e081d

data/{test/dummy/db/migrate/20130327213858_create_pages.rb → db/migrate/20130321140353_create_pages.rb}

@@ -1,5 +1,13 @@
 class CreatePages < ActiveRecord::Migration
-  def up
+  def migrate(direction)
+    super
+    if direction == :up
+      # Reset the column info
+      ApplicationPage.reset_column_information
+    end
+  end
+
+  def change
     create_table :pages do |t|
       t.integer :parent_id
       t.integer :position
@@ -29,14 +37,5 @@ class CreatePages < ActiveRecord::Migration
     add_index :page_translations, [:page_id]
     add_index :page_translations, [:locale]
     add_index :page_translations, [:path_component]
-
-    # Reset the column info
-    ApplicationPage.reset_column_information
-  end
-
-  def down
-    drop_table :pages
-    drop_table :page_hierarchies
-    drop_table :page_translations
   end
 end

data/db/migrate/20130328171232_create_images.rb

@@ -0,0 +1,5 @@
+class CreateImages < ActiveRecord::Migration
+  def change
+    # no-op
+  end
+end

data/db/migrate/20130423142125_replace_images_with_assets.rb

@@ -0,0 +1,24 @@
+class ReplaceImagesWithAssets < ActiveRecord::Migration
+  def change
+
+    create_table :assets do |t|
+      t.string     :asset
+      t.string     :type
+      t.references :asset_owner, polymorphic: true
+      t.string     :asset_owner_section
+
+      t.timestamps
+    end
+
+    add_index :assets, [:asset_owner_id, :asset_owner_type, :asset_owner_section], name: 'asset_owner_idx'
+
+    create_table :asset_translations do |t|
+      t.string     :locale
+      t.references :asset
+
+      t.string     :title
+      t.text       :caption
+    end
+
+  end
+end

data/db/migrate/20130506155010_add_locale_to_asset_translations.rb

@@ -0,0 +1,5 @@
+class AddLocaleToAssetTranslations < ActiveRecord::Migration
+  def change
+    # no-op
+  end
+end

data/lib/generators/lalala/devise/devise_generator.rb

@@ -33,25 +33,11 @@ module Lalala
         gsub_file routes_file, /devise_for :#{plural_table_name}/, "devise_for :#{plural_table_name}, ActiveAdmin::Devise.config"
       end
 
-      def add_default_user_to_migration
+      def remove_migration
         # Don't assume that we have a migration!
         devise_migration_file = Dir["db/migrate/*_devise_create_#{table_name}.rb"].first
         return if devise_migration_file.nil?
-
-        devise_migration_content = File.read(devise_migration_file)
-
-        if devise_migration_content["def change"]
-          inject_into_file  devise_migration_file,
-                            "def migrate(direction)\n    super\n    # Create a default user\n    #{class_name}.create!(:email => 'admin@example.com', :password => 'password', :password_confirmation => 'password') if direction == :up\n  end\n\n  ",
-                            :before => "def change"
-        elsif devise_migration_content[/def (self.)?up/]
-          inject_into_file  devise_migration_file,
-                            "# Create a default user\n    #{class_name}.create!(:email => 'admin@example.com', :password => 'password', :password_confirmation => 'password')\n\n    ",
-                            :before => "add_index :#{table_name}, :email"
-        else
-          puts devise_migration_content
-          raise "Failed to add default admin user to migration."
-        end
+        File.unlink(devise_migration_file)
       end
     end
   end

data/lib/generators/lalala/install/install_generator.rb

@@ -64,14 +64,6 @@ module Lalala
         generate "lalala:assets"
       end
 
-      def create_migrations
-        Dir["#{self.class.source_root}/migrations/*.rb"].sort.each do |filepath|
-          name = File.basename(filepath)
-          migration_template "migrations/#{name}", "db/migrate/#{name.gsub(/^\d+_/,'')}"
-          sleep 1
-        end
-      end
-
     end
   end
 end

data/lib/lalala/engine.rb

@@ -9,6 +9,15 @@ module Lalala
     config.lalala.i18n = ActiveSupport::OrderedOptions.new
     config.lalala.i18n.adapter = nil
 
+    initializer "lalala.migrations" do |app|
+      app.class.configure do
+        if app.class.to_s == "Dummy::Application"
+        else
+          config.paths['db/migrate'] += Lalala::Engine.paths['db/migrate'].existent
+        end
+      end
+    end
+
     initializer "lalala.threadsafe" do |app|
       unless Rails.env.development? or Rails.env.test?
         app.config.threadsafe!

data/lib/lalala/version.rb

@@ -1,6 +1,6 @@
 module Lalala
   VERSION = "4.0.0"
-  BUILD   = "162"
+  BUILD   = "165"
 
   if BUILD != ("{{BUILD_NUMBER" + "}}") # prevent sed replacement (see script/ci)
     BUILD_VERSION = "#{VERSION}.dev.#{BUILD}"

data/test/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130327213858) do
+ActiveRecord::Schema.define(:version => 20130506155010) do
 
   create_table "active_admin_comments", :force => true do |t|
     t.string   "resource_id",   :null => false
@@ -46,6 +46,25 @@ ActiveRecord::Schema.define(:version => 20130327213858) do
   add_index "admin_users", ["email"], :name => "index_admin_users_on_email", :unique => true
   add_index "admin_users", ["reset_password_token"], :name => "index_admin_users_on_reset_password_token", :unique => true
 
+  create_table "asset_translations", :force => true do |t|
+    t.string  "locale"
+    t.integer "asset_id"
+    t.string  "title"
+    t.text    "caption"
+  end
+
+  create_table "assets", :force => true do |t|
+    t.string   "asset"
+    t.string   "type"
+    t.integer  "asset_owner_id"
+    t.string   "asset_owner_type"
+    t.string   "asset_owner_section"
+    t.datetime "created_at",          :null => false
+    t.datetime "updated_at",          :null => false
+  end
+
+  add_index "assets", ["asset_owner_id", "asset_owner_type", "asset_owner_section"], :name => "asset_owner_idx"
+
   create_table "page_hierarchies", :id => false, :force => true do |t|
     t.integer "ancestor_id",   :null => false
     t.integer "descendant_id", :null => false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lalala
 version: !ruby/object:Gem::Version
-  version: 4.0.0.dev.162
+  version: 4.0.0.dev.165
 platform: ruby
 authors:
 - Simon Menke
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-23 00:00:00.000000000 Z
+date: 2013-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -1333,6 +1333,13 @@ files:
 - config/initializers/active_admin.rb
 - config/initializers/carrierwave.rb
 - config/routes.rb
+- db/migrate/20130321140345_devise_create_admin_users.rb
+- db/migrate/20130321140351_create_admin_notes.rb
+- db/migrate/20130321140352_move_admin_notes_to_comments.rb
+- db/migrate/20130321140353_create_pages.rb
+- db/migrate/20130328171232_create_images.rb
+- db/migrate/20130423142125_replace_images_with_assets.rb
+- db/migrate/20130506155010_add_locale_to_asset_translations.rb
 - lalala-assets.gemspec
 - lalala-development.gemspec
 - lalala-test.gemspec
@@ -1350,10 +1357,6 @@ files:
 - lib/generators/lalala/install/templates/application_page.rb
 - lib/generators/lalala/install/templates/dashboard.rb
 - lib/generators/lalala/install/templates/errors_controller.rb
-- lib/generators/lalala/install/templates/migrations/1_create_admin_notes.rb
-- lib/generators/lalala/install/templates/migrations/2_move_admin_notes_to_comments.rb
-- lib/generators/lalala/install/templates/migrations/3_create_pages.rb
-- lib/generators/lalala/install/templates/migrations/4_create_assets.rb
 - lib/generators/lalala/install/templates/models/file_asset.rb
 - lib/generators/lalala/install/templates/models/image_asset.rb
 - lib/generators/lalala/install/templates/pages_controller.rb
@@ -1455,10 +1458,6 @@ files:
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
 - test/dummy/db/.gitkeep
-- test/dummy/db/migrate/20130327213850_devise_create_admin_users.rb
-- test/dummy/db/migrate/20130327213856_create_admin_notes.rb
-- test/dummy/db/migrate/20130327213857_move_admin_notes_to_comments.rb
-- test/dummy/db/migrate/20130327213858_create_pages.rb
 - test/dummy/db/schema.rb
 - test/dummy/lib/assets/.gitkeep
 - test/dummy/log/.gitkeep
@@ -1537,10 +1536,6 @@ test_files:
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
 - test/dummy/db/.gitkeep
-- test/dummy/db/migrate/20130327213850_devise_create_admin_users.rb
-- test/dummy/db/migrate/20130327213856_create_admin_notes.rb
-- test/dummy/db/migrate/20130327213857_move_admin_notes_to_comments.rb
-- test/dummy/db/migrate/20130327213858_create_pages.rb
 - test/dummy/db/schema.rb
 - test/dummy/lib/assets/.gitkeep
 - test/dummy/log/.gitkeep

data/lib/generators/lalala/install/templates/migrations/3_create_pages.rb

@@ -1,42 +0,0 @@
-class CreatePages < ActiveRecord::Migration
-  def up
-    create_table :pages do |t|
-      t.integer :parent_id
-      t.integer :position
-      t.string  :type
-      t.string  :static_uuid
-
-      t.timestamps
-    end
-
-    create_table :page_hierarchies, :id => false do |t|
-      t.integer  :ancestor_id, :null => false   # ID of the parent/grandparent/great-grandparent/... tag
-      t.integer  :descendant_id, :null => false # ID of the target tag
-      t.integer  :generations, :null => false   # Number of generations between the ancestor and the descendant. Parent/child = 1, for example.
-    end
-
-    create_table :page_translations do |t|
-      t.references :page
-      t.string     :locale
-
-      t.string :title
-      t.string :path_component
-      t.text   :body
-    end
-
-    add_index :page_hierarchies,  [:ancestor_id, :descendant_id], :unique => true
-    add_index :page_hierarchies,  [:descendant_id]
-    add_index :page_translations, [:page_id]
-    add_index :page_translations, [:locale]
-    add_index :page_translations, [:path_component]
-
-    # Reset the column info
-    ApplicationPage.reset_column_information
-  end
-
-  def down
-    drop_table :pages
-    drop_table :page_hierarchies
-    drop_table :page_translations
-  end
-end

data/lib/generators/lalala/install/templates/migrations/4_create_assets.rb

@@ -1,23 +0,0 @@
-class CreateAssets < ActiveRecord::Migration
-  def up
-    create_table :assets do |t|
-      t.string :asset # carrierwave file mount
-      t.string :type
-
-      t.references :asset_owner, polymorphic: true
-      t.string :asset_owner_section
-
-      t.timestamps
-    end
-
-    add_index :assets, [:asset_owner_id, :asset_owner_type, :asset_owner_section], name: 'asset_owner_idx'
-
-    ImageAsset.create_translation_table! title: :string, caption: :text
-  end
-
-  def down
-    drop_table :assets
-
-    ImageAsset.drop_translation_table!
-  end
-end

data/test/dummy/db/migrate/20130327213856_create_admin_notes.rb

@@ -1,17 +0,0 @@
-class CreateAdminNotes < ActiveRecord::Migration
-  def self.up
-    create_table :admin_notes do |t|
-      t.string :resource_id, :null => false
-      t.string :resource_type, :null => false
-      t.references :admin_user, :polymorphic => true
-      t.text :body
-      t.timestamps
-    end
-    add_index :admin_notes, [:resource_type, :resource_id]
-    add_index :admin_notes, [:admin_user_type, :admin_user_id]
-  end
-
-  def self.down
-    drop_table :admin_notes
-  end
-end

data/test/dummy/db/migrate/20130327213857_move_admin_notes_to_comments.rb

@@ -1,26 +0,0 @@
-class MoveAdminNotesToComments < ActiveRecord::Migration
-  def self.up
-    remove_index  :admin_notes, [:admin_user_type, :admin_user_id]
-    rename_table  :admin_notes, :active_admin_comments
-    rename_column :active_admin_comments, :admin_user_type, :author_type
-    rename_column :active_admin_comments, :admin_user_id, :author_id
-    add_column    :active_admin_comments, :namespace, :string
-    add_index     :active_admin_comments, [:namespace]
-    add_index     :active_admin_comments, [:author_type, :author_id]
-
-    # Update all the existing comments to the default namespace
-    say "Updating any existing comments to the #{ActiveAdmin.application.default_namespace} namespace."
-    comments_table_name = ActiveRecord::Migrator.proper_table_name("active_admin_comments")
-    execute "UPDATE #{comments_table_name} SET namespace='#{ActiveAdmin.application.default_namespace}'"
-  end
-
-  def self.down
-    remove_index  :active_admin_comments, :column => [:author_type, :author_id]
-    remove_index  :active_admin_comments, :column => [:namespace]
-    remove_column :active_admin_comments, :namespace
-    rename_column :active_admin_comments, :author_id, :admin_user_id
-    rename_column :active_admin_comments, :author_type, :admin_user_type
-    rename_table  :active_admin_comments, :admin_notes
-    add_index     :admin_notes, [:admin_user_type, :admin_user_id]
-  end
-end