has_moderated 1.0.rc7 → 1.0.rc8

data/README.rdoc

@@ -5,7 +5,7 @@
 
 Add it to your project's Gemfile
 
-  gem "has_moderated", ">=1.0.rc7"
+  gem "has_moderated", ">=1.0.rc8"
 
 and run
 
@@ -26,9 +26,9 @@ When upgrading, rerun the generator
 
   rails generate has_moderated:install
 
-If there is a new migration file and you have filename conflicts, remove the old one and apply the new one, in case the schema changed. This is especially important if you are upgrading from a previous version to v1.x.
+If you are upgrading from a version lower than 1.0.x you need to remove the old create_moderations migration file.
 
-Before upgrading make sure you have reviewed and accepted/declined all current moderations first! This means the moderations table in database must be empty, otherwise the migration process will fail (on purpose). I suggest you modify the migration generated by has_moderated:install to first accept or discard all existing moderations, based on your preference - or do it in your administrative interface before deploying the upgrade.
+Make sure you have reviewed and accepted/declined all current moderations before upgrading! This means the moderations table in database should be empty, otherwise the migration process might fail (on purpose).
 
 == Why use this instead of something like Papertrail?
 
@@ -136,7 +136,7 @@ The fake object described above has a nifty feature (1.0.rc7+) that allows you t
   preview.title = "Task 2"
   preview.update_moderation
   moderation.parsed_data # => {:attributes=>{"title"=>"Task 2"}}
-  moderation.apply
+  moderation.accept
   Task.first.title # => "Task 2"
 
 === Get a real ActiveRecord preview
@@ -277,6 +277,8 @@ It is also possible you will encounter problems with some heavily customized ass
 
 This is just for my personal todo list...
 
+perhaps can use .freeze for preview?
+
 improve functionality when rerunning has_moderated:install generator
 
 hm maybe has_moderated_association could be just a has_moderated_create on the assoc? just check stuff like if task_id is not nil or something. could be much easier to implement then

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

@@ -2,15 +2,25 @@ module HasModerated
   module Generators
     class InstallGenerator < ::Rails::Generators::Base
       desc "This generator installs files for has_moderated."
-      source_root File.expand_path('../templates', __FILE__)
       include Rails::Generators::Migration
 
+      def self.source_root
+        @_has_moderated_source_root ||= File.expand_path("../templates", __FILE__)
+      end
+      
       def files
-        class_collisions 'Moderation'
+        # class_collisions 'Moderation'
         template 'moderation.rb', File.join('app/models', 'moderation.rb')
-        migration_template 'migration.rb', 'db/migrate/create_moderations.rb'
       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
+      
       private
         def self.next_migration_number(dirname) #:nodoc:
           if ActiveRecord::Base.timestamped_migrations

data/lib/has_moderated/common.rb

@@ -1,9 +1,5 @@
 module HasModerated
   module Common
-    def self.included(base)
-      base.send :include, InstanceMethods
-    end
-    
     def self.init(klass)
       unless klass.class_variable_defined? "@@moderation_disabled"
         klass.class_eval do

data/lib/has_moderated/railtie.rb

@@ -0,0 +1,14 @@
+module HasModerated
+  class Railtie < Rails::Railtie
+    initializer "has_moderated.include_in_activerecord" do
+      ActiveSupport.on_load :active_record do
+        include HasModerated::Common::InstanceMethods
+        extend HasModerated::UserHooks::ClassMethods
+        extend HasModerated::Associations::Base::ClassMethods
+        extend HasModerated::ModeratedAttributes::ClassMethods
+        extend HasModerated::ModeratedCreate::ClassMethods
+        extend HasModerated::ModeratedDestroy::ClassMethods
+      end
+    end
+  end
+end

data/lib/has_moderated/version.rb

@@ -1,3 +1,3 @@
 module HasModerated
-  VERSION = "1.0.rc7"
+  VERSION = "1.0.rc8"
 end

data/lib/has_moderated.rb

@@ -14,18 +14,4 @@ require 'has_moderated/moderated_create'
 require 'has_moderated/moderated_destroy'
 
 require 'has_moderated/carrier_wave'
-
-module HasModerated
-  def self.included(base)
-    HasModerated::Common::included(base)
-    base.send :extend, HasModerated::UserHooks::ClassMethods
-    
-    # TODO: only include class methods that can be called, lazy load everything else
-    base.send :extend, HasModerated::Associations::Base::ClassMethods
-    base.send :extend, HasModerated::ModeratedAttributes::ClassMethods
-    base.send :extend, HasModerated::ModeratedCreate::ClassMethods
-    base.send :extend, HasModerated::ModeratedDestroy::ClassMethods
-  end
-end
-
-ActiveRecord::Base.send :include, HasModerated
+require 'has_moderated/railtie' if defined?(Rails)

data/test/dummy/log/development.log

@@ -70,3 +70,8 @@ Connecting to database specified by database.yml
 Connecting to database specified by database.yml
 Connecting to database specified by database.yml
 Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml