mingo 0.1.5 → 0.2.0

data/Rakefile

@@ -1,5 +1,5 @@
 task :default => :spec
 
 task :spec do
-  exec *%w[bundle exec ruby lib/mingo.rb --color]
+  exec *%w[bundle exec ruby -Ilib lib/mingo.rb --color]
 end

data/lib/mingo/callbacks.rb

@@ -0,0 +1,19 @@
+class Mingo
+  module Callbacks
+    def self.included(base)
+      base.extend ActiveModel::Callbacks
+      base.send :define_model_callbacks, :create, :save, :update, :destroy
+    end
+    
+    def save(*args)
+      action = persisted? ? 'update' : 'create'
+      send(:"_run_#{action}_callbacks") do
+        _run_save_callbacks { super }
+      end
+    end
+
+    def destroy
+      _run_destroy_callbacks { super }
+    end
+  end
+end

data/lib/mingo/changes.rb

@@ -0,0 +1,47 @@
+class Mingo
+  module Changes
+    def self.included(base)
+      base.after_save :clear_changes
+    end
+    
+    attr_reader :changes
+    
+    def initialize(*args)
+      @changes = {}
+      super
+    end
+    
+    def changed?
+      changes.any?
+    end
+    
+    private
+    
+    def _regular_writer(key, value)
+      track_change(key, value)
+      super
+    end
+
+    def track_change(key, value)
+      old_value = _regular_reader(key)
+      unless value == old_value
+        memo = (changes[key.to_sym] ||= [old_value])
+        memo[0] == value ? changes.delete(key.to_sym) : (memo[1] = value)
+      end
+    end
+
+    def clear_changes
+      changes.clear
+    end
+    
+    private
+    
+    def values_for_update
+      changes.inject('$set' => {}, '$unset' => {}) do |doc, (key, values)|
+        value = values[1]
+        value.nil? ? (doc['$unset'][key] = 1) : (doc['$set'][key] = value)
+        doc
+      end
+    end
+  end
+end

data/lib/mingo/persistence.rb

@@ -0,0 +1,63 @@
+require 'active_support/concern'
+
+class Mingo
+  module Persistence
+    extend ActiveSupport::Concern
+    
+    module ClassMethods
+      def create(obj = nil)
+        new(obj).tap do |object|
+          yield object if block_given?
+          object.save
+        end
+      end
+    end
+    
+    module InstanceMethods
+      def initialize(*args)
+        @destroyed = false
+        super
+      end
+
+      def persisted?
+        !!id
+      end
+
+      def save(options = {})
+        if persisted?
+          hash = values_for_update
+          unless %w[$set $unset] == hash.keys && hash.values.all? { |v| v.empty? }
+            update(hash, options)
+          end
+        else
+          self['_id'] = self.class.collection.insert(self.to_hash, options)
+        end
+      end
+
+      def update(doc, options = {})
+        self.class.collection.update({'_id' => self.id}, doc, options)
+      end
+
+      def reload
+        doc = self.class.first(id, :convert => nil)
+        replace doc
+      end
+
+      def destroy
+        self.class.collection.remove('_id' => self.id)
+        @destroyed = true
+        self.freeze
+      end
+
+      def destroyed?
+        @destroyed
+      end
+      
+      private
+
+      def values_for_update
+        self.to_hash
+      end
+    end
+  end
+end

data/lib/mingo/timestamps.rb

@@ -0,0 +1,21 @@
+class Mingo
+  module Timestamps
+    def self.included(base)
+      base.before_update :touch_updated_timestamp
+    end
+
+    def created_at
+      @created_at ||= self.id && self.id.generation_time
+    end
+
+    def updated_at
+      self[:updated_at] || created_at
+    end
+
+    protected
+
+    def touch_updated_timestamp
+      self[:updated_at] = Time.now if changed?
+    end
+  end
+end

data/lib/mingo.rb

@@ -2,10 +2,6 @@ require 'active_support/core_ext/hash/conversions'
 require 'mongo'
 require 'active_model'
 require 'hashie/dash'
-# for ObjectId:
-require 'thread'
-require 'socket'
-require 'digest/md5'
 
 BSON::ObjectId.class_eval do
   def self.[](id)
@@ -15,34 +11,18 @@ BSON::ObjectId.class_eval do
   def id
     self
   end
-  
-  def initialize(time_or_data = nil)
-    if Time === time_or_data or Date === time_or_data
-      @data = generate_from_time(time_or_data)
-    else
-      @data = time_or_data || generate
-    end
-  end
-  
-  private
-  
-  def generate_from_time(time)
-    oid = ''
-    oid += [time.to_i].pack("N")
-    oid += Digest::MD5.digest(Socket.gethostname)[0, 3]
-    oid += [Process.pid % 0xFFFF].pack("n")
-    oid += [get_inc].pack("N")[1, 3]
-    oid.unpack("C12")
-  end
 end
 
 class Mingo < Hashie::Dash
-  # ActiveModel::Callbacks
   include ActiveModel::Conversion
   extend ActiveModel::Translation
   
-  autoload :Cursor, 'mingo/cursor'
-  autoload :ManyProxy, 'mingo/many_proxy'
+  autoload :Cursor,       'mingo/cursor'
+  autoload :ManyProxy,    'mingo/many_proxy'
+  autoload :Persistence,  'mingo/persistence'
+  autoload :Callbacks,    'mingo/callbacks'
+  autoload :Changes,      'mingo/changes'
+  autoload :Timestamps,   'mingo/timestamps'
   
   class << self
     attr_writer :db, :collection
@@ -101,13 +81,6 @@ class Mingo < Hashie::Dash
       end
     end
     
-    def create(obj = nil)
-      new(obj).tap do |object|
-        yield object if block_given?
-        object.save
-      end
-    end
-    
     def many(property, *args, &block)
       proxy_class = block_given?? Class.new(ManyProxy, &block) : ManyProxy
       ivar = "@#{property}"
@@ -119,18 +92,23 @@ class Mingo < Hashie::Dash
     end
   end
   
-  attr_reader :changes
-  
-  def initialize(obj = nil)
-    @changes = {}
-    @destroyed = false
-    
-    if obj and obj['_id'].is_a? BSON::ObjectId
-      # a doc loaded straight from the db
-      merge!(obj)
-    else
-      super
+  include Module.new {
+    def initialize(obj = nil)
+      if obj and obj['_id'].is_a? BSON::ObjectId
+        # a doc loaded straight from the db
+        merge!(obj)
+      else
+        super
+      end
     end
+  }
+  
+  include Persistence
+  include Callbacks
+  include Changes
+  
+  def id
+    self['_id']
   end
   
   # overwrite these to avoid checking for declared properties
@@ -147,72 +125,9 @@ class Mingo < Hashie::Dash
   def stringify_keys() self end
   alias :stringify_keys! :stringify_keys
   
-  def id
-    self['_id']
-  end
-  
-  def persisted?
-    !!id
-  end
-
-  def save(options = {})
-    if persisted?
-      update(values_for_update, options)
-    else
-      self['_id'] = self.class.collection.insert(self.to_hash, options)
-    end.
-      tap { changes.clear }
-  end
-  
-  def update(doc, options = {})
-    self.class.collection.update({'_id' => self.id}, doc, options)
-  end
-  
-  def reload
-    doc = self.class.first(id, :convert => nil)
-    replace doc
-  end
-
-  def destroy
-    self.class.collection.remove('_id' => self.id)
-    @destroyed = true
-    self.freeze
-  end
-  
-  def destroyed?
-    @destroyed
-  end
-  
-  def changed?
-    changes.any?
-  end
-  
   def ==(other)
     other.is_a?(self.class) and other.id == self.id
   end
-  
-  private
-  
-  def values_for_update
-    changes.inject('$set' => {}, '$unset' => {}) do |doc, (key, values)|
-      value = values[1]
-      value.nil? ? (doc['$unset'][key] = 1) : (doc['$set'][key] = value)
-      doc
-    end
-  end
-  
-  def _regular_writer(key, value)
-    track_change(key, value)
-    super
-  end
-  
-  def track_change(key, value)
-    old_value = _regular_reader(key)
-    unless value == old_value
-      memo = (changes[key.to_sym] ||= [old_value])
-      memo[0] == value ? changes.delete(key.to_sym) : (memo[1] = value)
-    end
-  end
 end
 
 if $0 == __FILE__

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mingo
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,23 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-03-07 00:00:00.000000000 +01:00
-default_executable: 
+date: 2011-04-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &2157373800 !ruby/object:Gem::Requirement
+  requirement: &2157911220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *2157373800
+  version_requirements: *2157911220
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &2157373320 !ruby/object:Gem::Requirement
+  requirement: &2157910740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,7 +32,7 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *2157373320
+  version_requirements: *2157910740
 description: Mingo is a minimal document-object mapper for MongoDB.
 email: mislav.marohnic@gmail.com
 executables: []
@@ -41,10 +40,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Rakefile
+- lib/mingo/callbacks.rb
+- lib/mingo/changes.rb
 - lib/mingo/cursor.rb
 - lib/mingo/many_proxy.rb
+- lib/mingo/persistence.rb
+- lib/mingo/timestamps.rb
 - lib/mingo.rb
-has_rdoc: false
 homepage: http://github.com/mislav/mingo
 licenses: []
 post_install_message: 
@@ -65,8 +67,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.5.3
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Minimal Mongo
 test_files: []
+has_rdoc: