acts_as_versionable 0.0.2 → 0.3.0

data/lib/acts_as_versionable.rb

@@ -3,79 +3,130 @@ require 'acts_as_versionable/version'
 # ActsAsVersionable
 module ActsAsVersionable
 
-  class NoSuchVersionError < Exception; end
-  
-  def self.included(base)
-    base.extend ClassMethods
+  class NoSuchVersionError < Exception
   end
-
-  module ClassMethods
   
-    def create_class(name, superclass, &block)
-      klass = Class.new superclass, &block
-      Object.const_set name, klass
+  extend ActiveSupport::Concern
+
+    included do 
+    end
+
+    module ClassMethods      
+    
+      def create_class(name, superclass, &block)
+        klass = Class.new superclass, &block
+        Object.const_set name, klass
+      end
+          
+      def acts_as_versionable options={}
+          options.symbolize_keys!
+
+          has_many :versions, :class_name => "#{self.name.pluralize}Versions", :dependent => :destroy
+          after_save :apply_versioning
+          after_save :clear_old_versions 
+
+          attr_accessor :local_changes
+          cattr_accessor :max_versions
+          
+          self.max_versions = options[:limit].to_i  
+          
+          class << create_class("#{self.name.pluralize}Versions", ActiveRecord::Base)
+            def actual_columns
+              content_columns.reject { |c| c.type == :datetime || c.name == 'versioned_as' }
+            end
+          end
+          
+          include InstanceMethods
+      end
+    
     end
+    
+    module InstanceMethods
+      
+      def version
+        current_version || 0
+      end
 
-    def acts_as_versionable(opts = {})
-      has_many :versions, :class_name => "#{self}Version", :dependent => :destroy
-      after_save :apply_versioning 
+      def revert_to(version)
+        revision = versions.find_by_versioned_as(version) 
 
-      attr_accessor :local_changes
+        raise NoSuchVersionError, "Couldn't find #{version} version" if revision.blank?
 
-      class << create_class("#{self}Version", ActiveRecord::Base)
-        def actual_columns
-          content_columns.reject { |c| c.type == :datetime || c.name == 'versioned_as' }
+        versions.actual_columns.each do |column|
+          self[column.name] = revision[column.name]  
         end
+
+        self.current_version = version
+        self.local_changes = true
+        self.save
       end
 
-      include InstanceMethods
-    end
+      private
 
-  end
+      def apply_versioning
+        unless self.local_changes
+          version_content = {}
+          last_version = version + 1
 
-  module InstanceMethods
+          versions.actual_columns.each do |column|
+            version_content[column.name] = self[column.name]
+          end
 
-    def version
-      current_version || 0
-    end
+          version_content.merge!(:versioned_as => last_version)
 
-    def revert_to(version)
-      revision = versions.find_by_versioned_as(version) 
-      
-      raise NoSuchVersionError, "Couldn't find #{version} version" if revision.blank?
+          if versions.create(version_content)
+            self.local_changes = true
+            self.update_attribute(:current_version, last_version)
+          end
+        end
 
-      versions.actual_columns.each do |column|
-        self[column.name] = revision[column.name]  
+        self.local_changes = false 
       end
 
-      self.current_version = version
-      self.local_changes = true
-      self.save
+      def clear_old_versions
+        return if self.max_versions == 0
+        excess_baggage = self.current_version - self.max_versions
+        if excess_baggage > 0
+          versions.where("versioned_as <= ?",excess_baggage).destroy_all
+        end    
+      end  
+
     end
+end
 
-    private
-      
-    def apply_versioning
-      unless self.local_changes
-        version_content = {}
-        last_version = version + 1
+ActiveRecord::Base.class_eval { include ActsAsVersionable }
 
-        versions.actual_columns.each do |column|
-          version_content[column.name] = self[column.name]
-        end
+  #def self.included(base)
+  #  base.extend ClassMethods
+  #end
 
-        version_content.merge!(:versioned_as => last_version)
+  #module ClassMethods
+  
+  #  def create_class(name, superclass, &block)
+  #    klass = Class.new superclass, &block
+  #    Object.const_set name, klass
+  #  end
 
-        if versions.create(version_content)
-          self.local_changes = true
-          self.update_attribute(:current_version, last_version)
-        end
-      end
+  #  def acts_as_versionable(opts = {})
 
-      self.local_changes = false 
-    end
+  #    has_many :versions, :class_name => "#{self}Version", :dependent => :destroy
+  #    after_save :apply_versioning
+  #    after_save :clear_old_versions 
 
-  end
+  #    attr_accessor :local_changes
 
-end
+  #    class << create_class("#{self}Version", ActiveRecord::Base)
+  #      def actual_columns
+  #        content_columns.reject { |c| c.type == :datetime || c.name == 'versioned_as' }
+  #      end
+  #    end
+
+      #include InstanceMethods
+  #  end
+
+  #end
+
+  
+
+#end
 

data/lib/acts_as_versionable/version.rb

@@ -1,3 +1,3 @@
 module ActsAsVersionable
-  VERSION = "0.0.2"
+  VERSION = "0.3.0"
 end

data/lib/generators/{versionize/templates/migration.rb → versionable/templates/migration.rb.erb}

@@ -1,16 +1,13 @@
 <% 
-  model = model_name.constantize
-  model_name = model_name.downcase # model_name.downcase! - can't modify frozen string
-  versions_table = model_name + '_versions'
-  columns = model.content_columns.reject { |c| c.type == :datetime }
+  versions_table = "#{@model_name.pluralize}_versions".downcase  
+  columns = @model.classify.constantize.content_columns.reject { |c| c.type == :datetime }
 %>
 class <%= migration_name %> < ActiveRecord::Migration
   def self.up
     create_table :<%= versions_table %> do |t| 
       <% columns.each do |column| %>
-        t.column :<%= column.name %>, :<%= column.type %>
+      t.column :<%= column.name %>, :<%= column.type %>
       <% end %>
-
       t.integer :<%= model_name + '_id' %>
       t.integer :versioned_as
       t.timestamps

data/lib/generators/versionable/versionable_generator.rb

@@ -0,0 +1,37 @@
+require 'rails/generators'
+require 'rails/generators/migration'
+
+class VersionableGenerator < Rails::Generators::NamedBase  
+  include Rails::Generators::Migration
+  source_root File.expand_path('../templates', __FILE__)
+  argument :klass, :type => :string, :description => "Model to versionate"
+  
+  attr_accessor :migration_name, :model_name, :model
+  
+  def self.next_migration_number(path)
+    Time.now.utc.strftime("%Y%m%d%H%M%S")
+  end
+
+  def create_model_file  
+    @model_name = klass.downcase
+    @model = klass
+    puts @model
+    @migration_name = "create_#{@model_name}_versions".camelize 
+    puts @migration_name         
+    migration_template "migration.rb.erb", "db/migrate/create_#{@model_name}_versions.rb"
+  end
+  
+  
+  #def manifest
+  #  
+  #  record do |m|
+  #    m.migration_template('migration.rb', 'db/migrate', 
+  #      :assigns => {
+  #        :model_name => @model_name,
+  #        :migration_name => "CreateVersionsFor#{@model_name.pluralize}"
+  #     }, 
+  #      :migration_file_name => "create_versions_for_#{model_name_for_migration}")
+  #  end
+  #end
+
+end

data/test/acts_as_versionable_test.rb

@@ -2,7 +2,8 @@ require 'rubygems'
 gem 'activerecord'
 require 'active_record'
 require 'test/unit'
-require "#{File.dirname(__FILE__)}/../init"
+#require "#{File.dirname(__FILE__)}/../init"
+require File.join(File.dirname(__FILE__), '../lib', 'acts_as_versionable')
 
 ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_versionable
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -25,8 +25,8 @@ files:
 - init.rb
 - lib/acts_as_versionable.rb
 - lib/acts_as_versionable/version.rb
-- lib/generators/versionize/templates/migration.rb
-- lib/generators/versionize/versionize_generator.rb
+- lib/generators/versionable/templates/migration.rb.erb
+- lib/generators/versionable/versionable_generator.rb
 - test/acts_as_versionable_test.rb
 homepage: ''
 licenses: []

data/lib/generators/versionize/versionize_generator.rb

@@ -1,28 +0,0 @@
-class VersionableGenerator < Rails::Generators::Base
-  attr_accessor :model_name
-
-  def initialize(args, opts = {})
-    super
-    @model_name = args.first
-  end
-
-  def manifest
-    model_name_for_migration = @model_name.downcase.pluralize
-    
-    record do |m|
-      m.migration_template('migration.rb', 'db/migrate', 
-        :assigns => {
-          :model_name => @model_name,
-          :migration_name => "CreateVersionsFor#{@model_name.pluralize}"
-        }, 
-        :migration_file_name => "create_versions_for_#{model_name_for_migration}")
-    end
-  end
-
-protected
-
-  def banner
-    "Usage: #{$0} versionize ModelName"
-  end
-
-end