kentouzu 0.0.13 → 0.1.0

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v0.1.0
+
+* Rails 4 compatibility.
+
 ## v0.0.13
 
 * Fixed 'all_with_reified_drafts` so that the most recent existing draft is pulled, overriding older drafts.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kentouzu (0.0.13)
+    kentouzu (0.1.0)
       activerecord (>= 3.0)
       railties (>= 3.0)
 

data/lib/generators/kentouzu/install_generator.rb

@@ -1,11 +1,10 @@
 require 'rails/generators'
 require 'rails/generators/migration'
-require 'rails/generators/active_record/migration'
+require 'rails/generators/active_record'
 
 module Kentouzu
   class InstallGenerator < Rails::Generators::Base
     include Rails::Generators::Migration
-    extend ActiveRecord::Generators::Migration
 
     source_root File.expand_path('../templates', __FILE__)
 
@@ -14,5 +13,9 @@ module Kentouzu
     def create_migration_file
       migration_template 'create_drafts.rb', 'db/migrate/create_drafts.rb'
     end
+
+    def self.next_migration_number(dirname)
+      ActiveRecord::Generators::Base.next_migration_number(dirname)
+    end
   end
 end

data/lib/kentouzu/draft.rb

@@ -1,6 +1,4 @@
 class Draft < ActiveRecord::Base
-  attr_accessible :item_type, :item_id, :event, :source_type, :source_id, :object
-
   belongs_to :item, :polymorphic => true
 
   belongs_to :source, :polymorphic => true

data/lib/kentouzu/has_drafts.rb

@@ -37,11 +37,19 @@ module Kentouzu
         class_attribute :drafts_association_name
         self.drafts_association_name = options[:drafts] || :drafts
 
-        has_many self.drafts_association_name,
-                 :class_name => draft_class_name,
-                 :as         => :item,
-                 :order      => "#{Kentouzu.timestamp_field} ASC, #{self.draft_class_name.constantize.primary_key} ASC",
-                 :dependent  => :destroy
+        if ActiveRecord::VERSION::STRING.to_f >= 4.0 # `has_many` syntax for specifying order uses a lambda in Rails 4
+          has_many self.drafts_association_name,
+                   lambda { order("#{Kentouzu.timestamp_field} ASC, #{self.draft_class_name.constantize.primary_key} ASC") },
+                   :class_name => draft_class_name,
+                   :as         => :item,
+                   :dependent  => :destroy
+        else
+          has_many self.drafts_association_name,
+                   :class_name => draft_class_name,
+                   :as         => :item,
+                   :order      => "#{Kentouzu.timestamp_field} ASC, #{self.draft_class_name.constantize.primary_key} ASC",
+                   :dependent  => :destroy
+        end
 
         define_singleton_method "new_#{drafts_association_name.to_s}".to_sym do
           Draft.where(:item_type => self.name, :event => 'create')

data/lib/kentouzu/version.rb

@@ -1,3 +1,3 @@
 module Kentouzu
-  VERSION = '0.0.13'
+  VERSION = '0.1.0'
 end

data/spec/dummy/app/models/message.rb

@@ -1,5 +1,3 @@
 class Message < ActiveRecord::Base
-  attr_accessible :first_name, :last_name, :subject, :body
-
   has_drafts :if => Proc.new { |b| self.first_name == 'Draft' }
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kentouzu
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-09 00:00:00.000000000 Z
+date: 2014-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -259,7 +259,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3152904909740143463
+      hash: -333500455675358414
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -268,7 +268,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3152904909740143463
+      hash: -333500455675358414
 requirements: []
 rubyforge_project: kentouzu
 rubygems_version: 1.8.25