mongoid_silo 0.2.3 → 0.3.0

data/app/workers/mongoid_silo/update_silo_worker.rb

@@ -5,8 +5,8 @@ module MongoidSilo
   class UpdateSiloWorker
     include Sidekiq::Worker
 
-    def perform(item_id, item_class, name, mode="save", generator=nil)
-      @item_id, @item_class, @generator = item_id, item_class, generator
+    def perform(item_id, item_class, name, mode="save", generator=nil, callback=nil)
+      @item_id, @item_class, @generator, @callback = item_id, item_class, generator, callback
       mode.to_s == "save" ? update_silo(name, generator) : destroy_silo(name)
     end
 
@@ -21,6 +21,9 @@ module MongoidSilo
       else
         @silo = Silo.create(item_class: @item_class, item_id: @item_id, bag: @content, silo_type: name)
       end
+      if @callback
+        @item.__send__(@callback).call(@item, :updated)
+      end
     end
 
     def destroy_silo name
@@ -28,6 +31,9 @@ module MongoidSilo
       if @silo
         @silo.destroy
       end
+      if @callback
+        @item.__send__(@callback).call(@item, :destroyed)
+      end
     end
 
     def item_class

data/lib/mongoid/silo.rb

@@ -9,17 +9,19 @@ module Mongoid
         opts = if block_given?
           opts = ActiveSupport::OrderedOptions.new
           opts.dependents = []
+          opts.callback = nil
           yield(opts)
           opts.generator ||= "MongoidSilo::GrainBelt"
           opts
         else
           opts[:generator] ||= "MongoidSilo::GrainBelt"
           opts[:dependents] = []
+          opts[:callback] = nil
           opts
         end
         setup_own_silo name, opts
         if opts[:dependents].length != 0
-          setup_listeners name, opts[:dependents], opts[:generator]
+          setup_listeners name, opts[:dependents], opts[:generator], opts[:callback]
         end
       end
 
@@ -32,18 +34,18 @@ module Mongoid
         end
 
         set_callback :save, :after do
-          update_silo name, opts[:generator]
+          update_silo name, opts[:generator], opts[:callback]
         end
 
         set_callback :destroy, :after do
-          destroy_silo name
+          destroy_silo name, opts[:callback]
         end
       end
 
-      def setup_listeners name, dependents, generator
+      def setup_listeners name, dependents, generator, callback
         registry = dependents.each_with_object([]) do |dep, arr|
           next unless dep[:class_name]
-          out = {class_name: dep[:class_name], parent_class: self.to_s, silo_name: name.to_s, generator: generator}
+          out = {class_name: dep[:class_name], parent_class: self.to_s, silo_name: name.to_s, generator: generator, callback: callback}
           if dep[:foreign_key]
             out[:foreign_key] = dep[:foreign_key]
           else
@@ -57,24 +59,24 @@ module Mongoid
           key[:class_name].classify.constantize.class_eval <<-EOS, __FILE__, __LINE__+1
             set_callback :save, :after do
               ident = key[:foreign_key].to_sym
-              MongoidSilo::UpdateSiloWorker.perform_async(self.__send__(ident), "#{key[:parent_class]}", "#{key[:silo_name]}", :save, "#{key[:generator]}")
+              MongoidSilo::UpdateSiloWorker.perform_async(self.__send__(ident), "#{key[:parent_class]}", "#{key[:silo_name]}", :save, "#{key[:generator]}", #{key[:callback]})
             end
 
             set_callback :destroy, :after do
               ident = key[:foreign_key].to_sym
-              MongoidSilo::UpdateSiloWorker.perform_async(self.__send__(ident), "#{key[:parent_class]}", "#{key[:silo_name]}", :destroy)
+              MongoidSilo::UpdateSiloWorker.perform_async(self.__send__(ident), "#{key[:parent_class]}", "#{key[:silo_name]}", :destroy, #{key[:callback]})
             end
           EOS
         end
       end
     end
 
-    def update_silo name, generator
-      MongoidSilo::UpdateSiloWorker.perform_async(self.id.to_s, self.class.to_s, name, :save, generator)
+    def update_silo name, generator, callback
+      MongoidSilo::UpdateSiloWorker.perform_async(self.id.to_s, self.class.to_s, name, :save, generator, callback)
     end
 
-    def destroy_silo name
-      MongoidSilo::UpdateSiloWorker.perform_async(self.id.to_s, self.class.to_s, name, :destroy)
+    def destroy_silo name, callback
+      MongoidSilo::UpdateSiloWorker.perform_async(self.id.to_s, self.class.to_s, name, :destroy, callback)
     end
 
     def from_silo name="default"

data/lib/mongoid_silo/version.rb

@@ -1,3 +1,3 @@
 module MongoidSilo
-  VERSION = "0.2.3"
+  VERSION = "0.3.0"
 end

data/spec/factories/callback_project_factory.rb

@@ -0,0 +1,5 @@
+FactoryGirl.define do
+  factory :callback_project do
+    name { Faker::Name.name }
+  end
+end

data/spec/models/silo_spec.rb

@@ -113,12 +113,10 @@ describe Silo do
       project_item3 = create(:block_project_item, block_project_id: block_project.id)
       block_project.block_silo["items"].length.should eq(3)
 
-      puts "Name was: " + project_item2.name
       
       project_item2.name = Faker::Name.name
       project_item2.save
       
-      puts project_item2._save_callbacks.inspect
       bp = BlockProject.find block_project.id
 
       bp.block_silo["items"].map{|i| i["name"]}.sort.should eq(
@@ -173,5 +171,16 @@ describe Silo do
       Silo.count.should eq(0)
     end
   end
+  
+  context "Callbacks", focus: true do
+    subject(:project) { build(:callback_project) }
+    
+    it "should trigger a named callback" do
+      CallbackProject.should_receive(:triggered)
+      project.save 
+    end
+    
+    
+  end
 
 end

data/spec/support/models/callback_project.rb

@@ -0,0 +1,20 @@
+class CallbackProject
+  include Mongoid::Document
+  include Mongoid::Silo
+  
+  field :name
+  
+  silo :basic do |config|
+    config.callback = :triggered
+  end
+  
+  def triggered
+    Proc.new{|x|
+      x.class.triggered
+    }
+  end
+  
+  def self.triggered
+    true
+  end
+end

metadata

@@ -1,64 +1,64 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_silo
 version: !ruby/object:Gem::Version
-  version: 0.2.3
-  prerelease:
+  version: 0.3.0
+  prerelease: 
 platform: ruby
 authors:
 - John Maxwell
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-20 00:00:00.000000000 Z
+date: 2013-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.9
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.9
-    none: false
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: mongoid
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.0.16
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.0.16
-    none: false
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: sidekiq
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.6.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.6.1
-    none: false
-  prerelease: false
-  type: :runtime
 description: MongoidSilo gives a simple way to create static representations of models
 email:
 - john@musicglue.com
@@ -66,9 +66,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -84,6 +84,7 @@ files:
 - mongoid_silo.gemspec
 - spec/factories/block_project_factory.rb
 - spec/factories/block_project_item_factory.rb
+- spec/factories/callback_project_factory.rb
 - spec/factories/complex_project_factory.rb
 - spec/factories/multi_silo_project_factory.rb
 - spec/factories/project_factory.rb
@@ -93,6 +94,7 @@ files:
 - spec/spec_helper.rb
 - spec/support/models/block_project.rb
 - spec/support/models/block_project_item.rb
+- spec/support/models/callback_project.rb
 - spec/support/models/complex_project.rb
 - spec/support/models/multi_silo_project.rb
 - spec/support/models/project.rb
@@ -102,33 +104,32 @@ files:
 - spec/support/silovators/make_name_grain_belt.rb
 homepage: https://github.com/musicglue/mongoid_silo
 licenses: []
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
-  none: false
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
-  none: false
+      version: '0'
 requirements: []
-rubyforge_project:
+rubyforge_project: 
 rubygems_version: 1.8.24
-signing_key:
+signing_key: 
 specification_version: 3
 summary: MongoidSilo is a bit like a Grain Elevator, but without the grain.
 test_files:
 - spec/factories/block_project_factory.rb
 - spec/factories/block_project_item_factory.rb
+- spec/factories/callback_project_factory.rb
 - spec/factories/complex_project_factory.rb
 - spec/factories/multi_silo_project_factory.rb
 - spec/factories/project_factory.rb
@@ -138,6 +139,7 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/models/block_project.rb
 - spec/support/models/block_project_item.rb
+- spec/support/models/callback_project.rb
 - spec/support/models/complex_project.rb
 - spec/support/models/multi_silo_project.rb
 - spec/support/models/project.rb
@@ -145,3 +147,4 @@ test_files:
 - spec/support/silovators/make_complex_grain_belt.rb
 - spec/support/silovators/make_location_grain_belt.rb
 - spec/support/silovators/make_name_grain_belt.rb
+has_rdoc: