patriarch 0.2.4 → 0.2.5

data/.travis.yml

@@ -0,0 +1,12 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 1.9.2
+  
+notifications:
+  irc:
+    - "irc.iiens.net#blackbird_prive"
+
+branches:
+  only:
+    - master

data/README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/giglemad/patriarch.png)](https://travis-ci.org/giglemad/patriarch)
+[![Dependency Status](https://gemnasium.com/giglemad/patriarch.png)](https://gemnasium.com/giglemad/patriarch)
 # Patriarch
 
 N-N tables are often a pain to deal with in SQL especially when you want to
@@ -32,11 +34,6 @@ Add this line to your application's Gemfile:
 gem 'patriarch'
 ```
 
-Or this one if you want to be up-to-date in real time
-```ruby
-gem 'patriarch', :git => 'https://github.com/nateware/redis-objects.git'
-```
-
 And then execute:
 
     $ bundle update
@@ -44,6 +41,10 @@ And then execute:
 Or install it yourself as:
 
     $ gem install patriarch
+    
+Patriarch needs to generate some file before you use it, type this:
+
+    $ rails generate patriarch:install
 
 ## Usage
 
@@ -236,5 +237,7 @@ user.posts_i_comment_via_messages_ids :with_medium => true
 
 ## Thanks
 
+I'd like to give credit to @nateware who built the awesome Redis-Objects this gem rely on to perform operations against redis.
+
 Thanks for using this gem ! If you are really really grateful or want to talk about this and happen to be in Paris, you
 can issue a beer pull request that i will happily merge.

data/Rakefile

@@ -1,2 +1,7 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+task :default => :spec
+

data/lib/patriarch/dao_services/bipartite_relationship_builder_service.rb

@@ -1,5 +1,5 @@
 require "redis/objects/sorted_sets"
-
+require 'ostruct'
 # Patriarch::Transaction instances are composed of transaction steps that each represent
 # a behaviour being triggered. RelationshipBuilderServices allow Services managing transaction
 # flow to build transaction step correctly. This deals with transaction step needed to represent
@@ -16,8 +16,11 @@ class Patriarch::DAOServices::BipartiteRelationshipBuilderService < Patriarch::S
     actor_dao = dao_tab[:actor]
     target_dao = dao_tab[:target]
 
-    l   = build_lambda_for_create(actor_dao,transaction_item.target_id,t)
-    ll   = build_lambda_for_create(target_dao,transaction_item.actor_id,t)
+    l   = build_ostruct_for_create(actor_dao,transaction_item.target_id,t)
+    ll   = build_ostruct_for_create(target_dao,transaction_item.actor_id,t)
+
+    p "#{l.inspect} is creating on key #{actor_dao.key} : #{transaction_item.target_type} #{transaction_item.target_id}"
+    p "#{ll.inspect} is creating on key #{target_dao.key} : #{transaction_item.actor_type} #{transaction_item.actor_id}"    
  
     # care about that, should be encapsulated into a beautiful add_to_queue method
     transaction_item.add_to_queue l
@@ -32,12 +35,11 @@ class Patriarch::DAOServices::BipartiteRelationshipBuilderService < Patriarch::S
     
     actor_dao = dao_tab[:actor]
     target_dao = dao_tab[:target]
-    
-    l   = lambda { actor_dao.delete transaction_item.target_id }
-    ll  = lambda { target_dao.delete transaction_item.actor_id }
 
-    # p "#{l.inspect} is deleting on key #{actor_dao.key} : #{transaction_item.target_type} #{transaction_item.target_id}"
-    # p "#{ll.inspect} is deleting on key #{target_dao.key} : #{transaction_item.actor_type} #{transaction_item.actor_id}"
+    #l   = proc { actor_dao.delete transaction_item.target_id }
+    #ll  = proc { target_dao.delete transaction_item.actor_id }
+    l  = OpenStruct.new(:method_sym => :delete ,:dao => actor_dao, :args => [transaction_item.target_id])
+    ll = OpenStruct.new(:method_sym => :delete ,:dao => target_dao, :args => [transaction_item.actor_id])
 
     transaction_item.add_to_queue l
     transaction_item.add_to_queue ll
@@ -47,12 +49,14 @@ class Patriarch::DAOServices::BipartiteRelationshipBuilderService < Patriarch::S
   # @param [Redis::Objects] dao
   # @param [Array] ids
   # @param [Time] time
-  # Returns lambda objects that store a redis operation
-  def build_lambda_for_create(dao,id,time)
+  # Returns ostruct objects that store parameters to execute a redis operation
+  def build_ostruct_for_create(dao,id,time)
     if dao.is_a? Redis::SortedSet
-      return lambda { dao.add id, time }
+      return OpenStruct.new(:method_sym => :add ,:dao => dao, :args => [id,time])
+      # return lambda { dao.add ids, time }
     else
-      return lambda { dao.add id }
+      return OpenStruct.new(:method_sym => :add ,:dao => dao, :args => [id])      
+      # return lambda { dao.add ids }
     end
-  end
+  end  
 end

data/lib/patriarch/dao_services/tripartite_relationship_builder_service.rb

@@ -20,9 +20,9 @@ class Patriarch::DAOServices::TripartiteRelationshipBuilderService < Patriarch::
 
     protagonist_ids = [transaction_item.actor_id,transaction_item.target_id,transaction_item.medium_id]
 
-    l    = build_lambda_for_create(actor_dao,protagonist_ids,t)
-    ll   = build_lambda_for_create(target_dao,protagonist_ids,t)
-    lll  = build_lambda_for_create(medium_dao,protagonist_ids,t)
+    l    = build_ostruct_for_create(actor_dao,protagonist_ids,t)
+    ll   = build_ostruct_for_create(target_dao,protagonist_ids,t)
+    lll  = build_ostruct_for_create(medium_dao,protagonist_ids,t)
 
     # care about that, should be encapsulated into a beautiful add_to_queue method
     transaction_item.add_to_queue l
@@ -42,10 +42,14 @@ class Patriarch::DAOServices::TripartiteRelationshipBuilderService < Patriarch::
 
     protagonist_ids = [transaction_item.actor_id,transaction_item.target_id,transaction_item.medium_id]
 
-    l   = lambda { actor_dao.delete protagonist_ids }
-    ll  = lambda { target_dao.delete protagonist_ids }
-    lll = lambda { medium_dao.delete protagonist_ids }
+    #l   = lambda { actor_dao.delete protagonist_ids }
+    #ll  = lambda { target_dao.delete protagonist_ids }
+    #lll = lambda { medium_dao.delete protagonist_ids }
 
+    l   = OpenStruct.new(:method_sym => :delete ,:dao => actor_dao, :args => [protagonist_ids])
+    ll  = OpenStruct.new(:method_sym => :delete ,:dao => target_dao, :args => [protagonist_ids])
+    lll = OpenStruct.new(:method_sym => :delete ,:dao => medium_dao, :args => [protagonist_ids])
+    
     transaction_item.add_to_queue l
     transaction_item.add_to_queue ll
     transaction_item.add_to_queue lll
@@ -55,12 +59,14 @@ class Patriarch::DAOServices::TripartiteRelationshipBuilderService < Patriarch::
   # @param [Redis::Objects] dao
   # @param [Array] ids
   # @param [Time] time
-  # Returns lambda objects that store a redis operation
-  def build_lambda_for_create(dao,ids,time)
+  # Returns ostruct objects that store parameters to execute a redis operation
+  def build_ostruct_for_create(dao,ids,time)
     if dao.is_a? Redis::SortedSet
-      return lambda { dao.add ids, time }
+      return OpenStruct.new(:method_sym => :add ,:dao => dao, :args => [ids,time])
+      # return lambda { dao.add ids, time }
     else
-      return lambda { dao.add ids }
+      return OpenStruct.new(:method_sym => :add ,:dao => dao, :args => [ids])      
+      # return lambda { dao.add ids }
     end
   end
 end

data/lib/patriarch/tool_services/redis_cleaner_service.rb

@@ -123,8 +123,6 @@ class Patriarch::ToolServices::RedisCleanerService < Patriarch::Service
           end
         end
       end
-
-
     end # if my_behaviours.include?
 
     transac

data/lib/patriarch/transaction.rb

@@ -83,8 +83,8 @@ module Patriarch
       transaction_queue
     end
 
-    def add_to_queue(proc)
-      current_step.add_to_queue(proc)
+    def add_to_queue(instructions)
+      current_step.add_to_queue(instructions)
     end
 
     alias :queue :transaction_queue

data/lib/patriarch/transaction_step.rb

@@ -43,18 +43,22 @@ module Patriarch
       target_type.to_s.camelize.constantize.find target_id
     end
 
-    # execute the redis instruction embedded into this step
+    # execute the redis instructions embedded into this step against
+    # instructions are a dao, a method to call upon and its argument embedded into a OpenStruct
+    # before Patriarch 0.2.5, was embedded directly in a proc, was a complete failure for unknown reasons
     # Patriach::Transaction use this method on each of the steps it registered within a multi block
     def execute
-      queue.each do |redis_instruction|
-        redis_instruction.call
+      queue.each do |redis_ostruct_instruction|
+        os = redis_ostruct_instruction
+        dao, method_sym, args = [os.dao,os.method_sym,os.args]
+        dao.send(method_sym,*args)
+        # deprecated, remove this : redis_instruction.call 
       end
     end
 
-    # Add a redis instruction embedded in a proc into the queue of instruction to be processed of this step
-    # @param [Proc] proc the chunk of executable redis code embedded into a Proc to be added to queue
-    def add_to_queue(proc)
-      queue << proc
+    # @param [OpenStruct] ostruct dao with parameters and method to call embedded here to be processed later
+    def add_to_queue(ostruct)
+      queue << ostruct
     end
   end
 end

data/lib/patriarch/version.rb

@@ -1,3 +1,3 @@
 module Patriarch
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/patriarch.gemspec

@@ -2,8 +2,8 @@
 require File.expand_path('../lib/patriarch/version', __FILE__)
 
 Gem::Specification.new do |spec|
-  spec.authors       = ["Hugo Lepetit"]
-  spec.email         = ["hugo@blackbid.co"]
+  spec.authors       = ["Hugo Lepetit","Loïc Delmaire"]
+  spec.email         = ["hugo@blackbid.co","loic@blackbird.co"]
   spec.description   = %q{Patriach is about adding behaviours on the fly to good old active record models.}
   spec.summary       = %q{Manage relationships between instances of your models easily}
   spec.homepage      = "https://github.com/giglemad/patriarch"

data/spec/lib/patriarch/dao_services/bipartite_relationship_builder_spec.rb

@@ -22,20 +22,28 @@ describe Patriarch::DAOServices::BipartiteRelationshipBuilderService do
   it "shall insert processable lambdas into queues when create is called" do
     expect{
       instance.create(@transac)
-    }.to change{ @transac.transaction_queue.select{ |queue_element| queue_element.is_a? Proc}.size }.by(2)
+    }.to change{ @transac.transaction_queue.select{ |queue_element| queue_element.is_a? OpenStruct}.size }.by(2)
   
     expect{
-      @transac.transaction_queue.each{ |proc| proc.call }
+      @transac.transaction_queue.each do |redis_ostruct_instruction|
+        os = redis_ostruct_instruction
+        dao, method_sym, args = [os.dao,os.method_sym,os.args]
+        dao.send(method_sym,*args)
+      end
     }.to change{ $redis.keys.size}.by(2)
   end
 
   it "shall insert processable lambdas into queues when destroy is called" do
     expect{
       instance.destroy(@transac)
-    }.to change{ @transac.transaction_queue.select{ |queue_element| queue_element.is_a? Proc}.size }.by(2)
+    }.to change{ @transac.transaction_queue.select{ |queue_element| queue_element.is_a? OpenStruct}.size }.by(2)
 
     expect{
-      @transac.transaction_queue.each{ |proc| proc.call }
+      @transac.transaction_queue.each do |redis_ostruct_instruction|
+        os = redis_ostruct_instruction
+        dao, method_sym, args = [os.dao,os.method_sym,os.args]
+        dao.send(method_sym,*args)
+      end
     }.to change{ $redis.info["total_commands_processed"].to_i}.by(3)
   end
 
@@ -43,4 +51,4 @@ describe Patriarch::DAOServices::BipartiteRelationshipBuilderService do
     $redis.del "monster:#{monster.id}:patriarch_fallen_angels_i_like"
     $redis.del "fallen_angel:#{fallen_angel.id}:patriarch_monsters_liking_me"
   end
-end
+end

data/spec/lib/patriarch/dao_services/tripartite_relationship_builder_spec.rb

@@ -24,20 +24,28 @@ describe Patriarch::DAOServices::TripartiteRelationshipBuilderService do
   it "shall insert processable lambdas into queues when create is called" do
     expect{
       instance.create(@transac)
-    }.to change{ @transac.transaction_queue.select{ |queue_element| queue_element.is_a? Proc}.size }.by(3)
+    }.to change{ @transac.transaction_queue.select{ |queue_element| queue_element.is_a? OpenStruct}.size }.by(3)
   
     expect{
-      @transac.transaction_queue.each{ |proc| proc.call }
+      @transac.transaction_queue.each do |redis_ostruct_instruction| 
+        os = redis_ostruct_instruction
+        dao, method_sym, args = [os.dao,os.method_sym,os.args]
+        dao.send(method_sym,*args)
+			end
     }.to change{ $redis.keys.size}.by(3)
   end
 
   it "shall insert processable lambdas into queues when destroy is called" do
     expect{
       instance.destroy(@transac)
-    }.to change{ @transac.transaction_queue.select{ |queue_element| queue_element.is_a? Proc}.size }.by(3)
+    }.to change{ @transac.transaction_queue.select{ |queue_element| queue_element.is_a? OpenStruct}.size }.by(3)
 
     expect{
-      @transac.transaction_queue.each{ |proc| proc.call }
+      @transac.transaction_queue.each do |redis_ostruct_instruction|
+				os = redis_ostruct_instruction                        			
+        dao, method_sym, args = [os.dao,os.method_sym,os.args]
+	      dao.send(method_sym,*args)
+			end
     }.to change{ $redis.info["total_commands_processed"].to_i}.by(4)
   end
 
@@ -46,4 +54,4 @@ describe Patriarch::DAOServices::TripartiteRelationshipBuilderService do
     $redis.del "fallen_angel:#{fallen_angel.id}:patriarch_monsters_prasing_me_via_love_letters"
     $redis.del "love_letter:#{fallen_angel.id}:patriarch_monsters_prasing_fallen_angels_via_me"
   end
-end
+end

data/spec/lib/patriarch/destroy_entity_spec.rb

@@ -5,6 +5,8 @@ describe 'entities including Patriarch::Behaviours #destroy' do
   before(:all) do
     Monster.add_behaviour       :lure, :by => [:fallenAngel]
     FallenAngel.add_behaviour   :lure, :on => [:monster]
+    FallenAngel.add_behaviour   :lure, :by => [:fallenAngel]
+    FallenAngel.add_behaviour   :lure, :on => [:fallenAngel]    
     Monster.add_behaviour       :like, :on => [:fallenAngel] 
     FallenAngel.add_behaviour   :like, :by => [:monster]
 
@@ -24,12 +26,65 @@ describe 'entities including Patriarch::Behaviours #destroy' do
     f.lure m
     m.like f
     f.destroy
+    f.destroyed?.should be_true
     f.monsters_i_lure.should be_empty
     f.monsters_liking_me.should be_empty
     m.fallen_angels_i_like.include?(f).should be_false
     m.fallen_angels_luring_me.include?(f).should be_false
   end
 
+  context  "cascading style" do
+    # KIKOOOOOOOO Test for Skelz0r
+    before(:all) do
+      FallenAngel.class_eval do
+        before_destroy :destroy_fallen_angels_i_lure
+        def destroy_fallen_angels_i_lure
+          self.fallen_angels_i_lure.each do |lured_fallen_angel|
+            lured_fallen_angel.destroy
+          end  
+        end
+      end
+    end 
+
+    it "cleans safely on top of the 'transitive' behaviour chain" do
+      f,fa,fal = [FallenAngel.create,FallenAngel.create,FallenAngel.create]
+      f.lure fa; fa.lure fal
+      
+      f.destroy
+      
+      f.fallen_angels_i_lure.should be_empty
+      fa.fallen_angels_i_lure.should be_empty
+      
+      fa.destroyed?.should be_false
+      FallenAngel.where(:id => fa.id).should be_empty
+      
+      fal.destroyed?.should be_false
+      FallenAngel.where(:id => fal.id).should be_empty    
+      
+      f.destroyed?.should be_true
+      FallenAngel.where(:id => f.id).should be_empty    
+    end
+
+    it "cleans safely anywhere in the 'transitive' behaviour chain" do
+      f,fa,fal = [FallenAngel.create,FallenAngel.create,FallenAngel.create]
+      f.lure fa; fa.lure fal
+      
+      fa.destroy
+      
+      f.fallen_angels_i_lure.should be_empty
+      fa.fallen_angels_i_lure.should be_empty
+      
+      fa.destroyed?.should be_true
+      FallenAngel.where(:id => fa.id).should be_empty    
+
+      fal.destroyed?.should be_false
+      FallenAngel.where(:id => fa.id).should be_empty    
+
+      f.destroyed?.should be_false
+      Array(FallenAngel.where(:id => f.id)).should == [f]        
+    end    
+  end
+
   context ' when another callback fails' do
   
     # they do not trigger a rollback when they return false

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: patriarch
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
 - Hugo Lepetit
+- Loïc Delmaire
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-31 00:00:00.000000000 Z
+date: 2013-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: verbs
@@ -127,11 +128,13 @@ description: Patriach is about adding behaviours on the fly to good old active r
   models.
 email:
 - hugo@blackbid.co
+- loic@blackbird.co
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md