kentouzu 0.0.8 → 0.0.9

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v0.0.9
+
+* Added `all_with_reified_drafts` method.
+* Changed `()` to `call` for clarity in overridden `save` method.
+* Tidied up some formatting.
+
 ## v0.0.8
 
 * Fixed bug that occurs when reifying object with STI when type column is blank.

data/Gemfile.lock

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

data/README.md

@@ -14,11 +14,11 @@ Add the gem to your project's Gemfile:
 
 Generate a migration for the drafts table:
 
-    rails g kentouzu:install
+    $ rails g kentouzu:install
 
 Run the migration:
 
-    rake db:migrate
+    $ rake db:migrate
 
 Add `has_drafts` to the models you want to have drafts on.
 

data/lib/kentouzu/draft.rb

@@ -7,7 +7,7 @@ class Draft < ActiveRecord::Base
 
   validates_presence_of :event
 
-  def self.with_item_keys item_type, item_id
+  def self.with_item_keys(item_type, item_id)
     scoped :conditions => { :item_type => item_type, :item_id => item_id }
   end
 
@@ -27,7 +27,7 @@ class Draft < ActiveRecord::Base
 
   scope :between, lambda { |start_time, end_time| where(["#{Kentouzu.timestamp_field} > ? AND #{Kentouzu.timestamp_field} < ?", start_time, end_time]).order("#{Kentouzu.timestamp_field} ASC, #{self.primary_key} ASC") }
 
-  def reify options = {}
+  def reify(options = {})
     without_identity_map do
       options[:has_one] = 3 if options[:has_one] == true
       options.reverse_merge! :has_one => false
@@ -95,7 +95,7 @@ class Draft < ActiveRecord::Base
 
   private
 
-  def without_identity_map &block
+  def without_identity_map(&block)
     if defined?(ActiveRecord::IdentityMap) && ActiveRecord::IdentityMap.respond_to?(:without)
       ActiveRecord::IdentityMap.without &block
     else
@@ -103,7 +103,7 @@ class Draft < ActiveRecord::Base
     end
   end
 
-  def reify_has_ones model, lookback
+  def reify_has_ones(model, lookback)
     model.class.reflect_on_all_associations(:has_one).each do |association|
       child = model.send association.name
 

data/lib/kentouzu/has_drafts.rb

@@ -5,7 +5,7 @@ module Kentouzu
     end
 
     module ClassMethods
-      def has_drafts options = {}
+      def has_drafts(options = {})
         send :include, InstanceMethods
 
         class_attribute :draft_association_name
@@ -47,6 +47,32 @@ module Kentouzu
           Draft.where(:item_type => self.name, :event => 'create')
         end
 
+        define_singleton_method "all_with_reified_#{drafts_association_name.to_s}".to_sym do |order_by = Kentouzu.timestamp_field|
+          existing_drafts = Draft.where("`drafts`.`item_type` = \"#{self.name}\" AND `drafts`.`item_id` IS NOT NULL").group_by { |draft| draft.item_id }.map { |k, v| v.sort_by { |draft| draft.created_at }.first }
+
+          new_drafts = Draft.where("`drafts`.`item_type` = \"#{self.name}\" AND `drafts`.`item_id` IS NULL")
+
+          existing_reified_objects = existing_drafts.map { |draft| draft.reify }
+
+          new_reified_objects = new_drafts.map do |draft|
+            object = draft.reify
+
+            object.send "#{Kentouzu.timestamp_field}=", draft.created_at
+
+            object
+          end
+
+          existing_objects = self.all.reject { |object| existing_reified_objects.map { |reified_object| reified_object.id }.include? object.id }
+
+          all_objects = (existing_objects + existing_reified_objects + new_reified_objects).sort_by { |object| object.send order_by }
+
+          if block_given?
+            all_objects.select! { |object| yield object }
+          end
+
+          all_objects
+        end
+
         def drafts_off
           self.drafts_enabled_for_model = false
         end
@@ -67,7 +93,7 @@ module Kentouzu
 
             draft.save
           else
-            default_save.bind(self).()
+            default_save.bind(self).call
           end
         end
       end
@@ -76,12 +102,13 @@ module Kentouzu
         source_draft.nil?
       end
 
-      def draft_at timestamp, reify_options = {}
+      def draft_at(timestamp, reify_options = {})
         v = send(self.class.versions_association_name).following(timestamp).first
+
         v ? v.reify(reify_options) : self
       end
 
-      def with_drafts method = nil
+      def with_drafts(method = nil)
         drafts_were_enabled = self.drafts_enabled_for_model
 
         self.class.drafts_on
@@ -91,7 +118,7 @@ module Kentouzu
         self.class.drafts_off unless drafts_were_enabled
       end
 
-      def without_drafts method = nil
+      def without_drafts(method = nil)
         drafts_were_enabled = self.drafts_enabled_for_model
 
         self.class.drafts_off

data/lib/kentouzu/version.rb

@@ -1,3 +1,3 @@
 module Kentouzu
-  VERSION = '0.0.8'
+  VERSION = '0.0.9'
 end

data/lib/kentouzu.rb

@@ -7,7 +7,7 @@ require 'kentouzu/has_drafts'
 require 'kentouzu/draft'
 
 module Kentouzu
-  def self.enabled= value
+  def self.enabled=(value)
     Kentouzu.config.enabled = value
   end
 
@@ -15,7 +15,7 @@ module Kentouzu
     !!Kentouzu.config.enabled
   end
 
-  def self.enabled_for_controller= value
+  def self.enabled_for_controller=(value)
     drafts_store[:request_enabled_for_controller] = value
   end
 
@@ -23,7 +23,7 @@ module Kentouzu
     !!drafts_store[:request_enabled_for_controller]
   end
 
-  def self.timestamp_field= field_name
+  def self.timestamp_field=(field_name)
     Kentouzu.config.timestamp_field = field_name
   end
 
@@ -31,7 +31,7 @@ module Kentouzu
     Kentouzu.config.timestamp_field
   end
 
-  def self.source= value
+  def self.source=(value)
     drafts_store[:source] = value
   end
 
@@ -39,7 +39,7 @@ module Kentouzu
     drafts_store[:source]
   end
 
-  def self.controller_info= value
+  def self.controller_info=(value)
     drafts_store[:controller_info] =  value
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kentouzu
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-13 00:00:00.000000000 Z
+date: 2013-08-26 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: 3721753059103140299
+      hash: 1950418574329021728
 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: 3721753059103140299
+      hash: 1950418574329021728
 requirements: []
 rubyforge_project: kentouzu
 rubygems_version: 1.8.25