patriarch 0.0.2 → 0.0.3

data/.gitignore

@@ -1,5 +1,8 @@
+spec/dummy/lib
 *.gem
 *.rbc
+*.swp
+*.swo
 .bundle
 .config
 .yardoc

data/lib/generators/patriarch/patriarch_generator.rb

@@ -1,69 +1,69 @@
-class PatriarchGenerator < Rails::Generators::Base
-  source_root File.expand_path('../templates', __FILE__)
-  
-  desc "Generate files needed to implement the BEHAVIOUR you specified. Don't forget to add declarations into models"
+require "rails/generators"
 
-  argument :behaviour, :type => :string
+  class PatriarchGenerator < Rails::Generators::Base
+    source_root File.expand_path('../templates', __FILE__)
+    
+    desc "Generate files needed to implement the BEHAVIOUR you specified. Don't forget to add declarations into models"
 
-  public
-  def init_directories
-    empty_directory "lib/patriarch/services/#{behaviour.underscore.downcase}"
-    empty_directory "lib/patriarch/services/#{undo(behaviour.underscore.downcase)}"
-    template "empty_behaviour_module.rb", "lib/patriarch/services/#{behaviour.underscore.downcase}.rb"   
-    template "tools_methods.rb", "lib/patriarch/behaviours/#{behaviour.underscore.downcase}/tools_methods.rb"
-  end
+    argument :behaviour, :type => :string
 
-  def generate_services
-    create_services(behaviour)
-    # implémenter un switch ici, plus zoli ...
-    self.class.send(:define_method,:class_name) do
-      undo(behaviour).classify
+    public
+    def init_directories
+      empty_directory "lib/patriarch/services/#{behaviour.underscore.downcase}"
+      empty_directory "lib/patriarch/services/#{Patriarch.undo(behaviour.underscore.downcase)}"
+      template "empty_behaviour_module.rb", "lib/patriarch/behaviours/#{behaviour.underscore.downcase}.rb"   
+      template "empty_service_module.rb", "lib/patriarch/services/#{behaviour.underscore.downcase}.rb"         
+      template "tools_methods.rb", "lib/patriarch/behaviours/#{behaviour.underscore.downcase}/tools_methods.rb"
     end
-    create_undo_services(behaviour)
-  end
 
-  private
-    def class_name
-      behaviour.classify
+    def generate_services
+      create_services(behaviour)
+      # implémenter un switch ici, plus zoli ...
+      self.class.send(:define_method,:class_name) do
+        Patriarch.undo(behaviour).classify
+      end
+      create_undo_services(behaviour)
     end
 
-    def create_services(behaviour)
-      behaviour_str = behaviour.underscore.downcase
-      template "authorization_service.rb", "lib/patriarch/services/#{behaviour_str}/authorization_service.rb"
-      
-      template "before_manager_service.rb", "lib/patriarch/services/#{behaviour_str}/before_manager_service.rb"
-      template "before_service.rb", "lib/patriarch/services/#{behaviour_str}/before_service.rb"
+    private
+      def class_name
+        behaviour.classify
+      end
 
-      template "manager_service.rb", "lib/patriarch/services/#{behaviour_str}/manager_service.rb"
-                
-      template "service.rb", "lib/patriarch/services/#{behaviour_str}/service.rb"    
+      def undo_class_name
+        Patriarch.undo(behaviour).classify
+      end
 
+      def create_services(behaviour)
+        behaviour_str = behaviour.underscore.downcase
+        template "authorization_service.rb", "lib/patriarch/services/#{behaviour_str}/authorization_service.rb"
+        
+        template "before_manager_service.rb", "lib/patriarch/services/#{behaviour_str}/before_manager_service.rb"
+        template "before_service.rb", "lib/patriarch/services/#{behaviour_str}/before_service.rb"
 
-      template "after_manager_service.rb", "lib/patriarch/services/#{behaviour_str}/after_manager_service.rb"
-      template "after_service.rb", "lib/patriarch/services/#{behaviour_str}/after_service.rb"
-    end
+        template "manager_service.rb", "lib/patriarch/services/#{behaviour_str}/manager_service.rb"
+                  
+        template "service.rb", "lib/patriarch/services/#{behaviour_str}/service.rb"    
 
-    def create_undo_services(behaviour)
-      undo_behaviour_str = undo(behaviour).underscore.downcase
 
-      template "authorization_service.rb", "lib/patriarch/services/#{undo_behaviour_str}/authorization_service.rb"
-      
-      template "before_manager_service.rb", "lib/patriarch/services/#{undo_behaviour_str}/before_manager_service.rb"
-      template "before_service.rb", "lib/patriarch/services/#{undo_behaviour_str}/before_service.rb"
+        template "after_manager_service.rb", "lib/patriarch/services/#{behaviour_str}/after_manager_service.rb"
+        template "after_service.rb", "lib/patriarch/services/#{behaviour_str}/after_service.rb"
+      end
 
-      template "manager_service.rb", "lib/patriarch/services/#{undo_behaviour_str}/manager_service.rb"
-                
-      template "undo_service.rb", "lib/patriarch/services/#{undo_behaviour_str}/service.rb"    
+      def create_undo_services(behaviour)
+        undo_behaviour_str = Patriarch.undo(behaviour).underscore.downcase
 
-      template "after_manager_service.rb", "lib/patriarch/services/#{undo_behaviour_str}/after_manager_service.rb"
-      template "after_service.rb", "lib/patriarch/services/#{undo_behaviour_str}/after_service.rb"
-    end
+        template "authorization_service.rb", "lib/patriarch/services/#{undo_behaviour_str}/authorization_service.rb"
+        
+        template "before_manager_service.rb", "lib/patriarch/services/#{undo_behaviour_str}/before_manager_service.rb"
+        template "before_service.rb", "lib/patriarch/services/#{undo_behaviour_str}/before_service.rb"
 
+        template "manager_service.rb", "lib/patriarch/services/#{undo_behaviour_str}/manager_service.rb"
+                  
+        template "undo_service.rb", "lib/patriarch/services/#{undo_behaviour_str}/service.rb"    
 
-    def undo(str)
-      undo = "undo_" 
-      undo << str
-      undo 
-    end
+        template "after_manager_service.rb", "lib/patriarch/services/#{undo_behaviour_str}/after_manager_service.rb"
+        template "after_service.rb", "lib/patriarch/services/#{undo_behaviour_str}/after_service.rb"
+      end
 
-end
+  end # PatriarchGenerator

data/lib/generators/patriarch/templates/empty_behaviour_module.rb

@@ -1,2 +1,7 @@
-module Patriarch::Services::<%= class_name %>
+module Patriarch
+  module Behaviours
+    module <%= class_name %>
+      autoload :ToolsMethods, 'patriarch/behaviours/<%= class_name.underscore %>/tools_methods.rb'
+    end
+  end
 end

data/lib/generators/patriarch/templates/empty_service_module.rb

@@ -0,0 +1,24 @@
+module Patriarch
+  module Services
+    module <%= class_name %>
+      autoload :AfterManagerService,    'patriarch/services/<%= class_name.underscore %>/after_manager_service.rb'
+      autoload :AfterService,           'patriarch/services/<%= class_name.underscore %>/after_service.rb'
+      autoload :AuthorizationService,   'patriarch/services/<%= class_name.underscore %>/authorization_service.rb'
+      autoload :BeforeManagerService,   'patriarch/services/<%= class_name.underscore %>/before_manager_service.rb'
+      autoload :BeforeService,          'patriarch/services/<%= class_name.underscore %>/before_service.rb'      
+      autoload :ManagerService,         'patriarch/services/<%= class_name.underscore %>/manager_service.rb'
+      autoload :Service,                'patriarch/services/<%= class_name.underscore %>/service.rb'     
+    end
+
+    module <%= undo_class_name %>
+      autoload :AfterManagerService,    'patriarch/services/<%= undo_class_name.underscore %>/after_manager_service.rb'
+      autoload :AfterService,           'patriarch/services/<%= undo_class_name.underscore %>/after_service.rb'
+      autoload :AuthorizationService,   'patriarch/services/<%= undo_class_name.underscore %>/authorization_service.rb'
+      autoload :BeforeManagerService,   'patriarch/services/<%= undo_class_name.underscore %>/before_manager_service.rb'
+      autoload :BeforeService,          'patriarch/services/<%= undo_class_name.underscore %>/before_service.rb'      
+      autoload :ManagerService,         'patriarch/services/<%= undo_class_name.underscore %>/manager_service.rb'
+      autoload :Service,                'patriarch/services/<%= undo_class_name.underscore %>/service.rb'          
+    end
+  end
+end
+

data/lib/patriarch/authorization_service.rb

@@ -1,10 +1,12 @@
 require 'singleton'
 
-class Patriarch::AuthorizationService
-  include Singleton
+module Patriarch
+  class AuthorizationService
+    include Singleton
 
-  # override if necessary
-  def grant?(*args)
-    true
+    # override if necessary
+    def grant?(*args)
+      true
+    end
   end
 end

data/lib/patriarch/behaviours.rb

@@ -1,7 +1,5 @@
-#require 'patriarch/behaviours/own'
-#require 'patriarch/behaviours/subscribe'
-#require 'patriarch/behaviours/tagging'
-#require 'patriarch/behaviours/join'
+require 'verbs'
+require 'patriarch'
 
 module Patriarch
   module Behaviours
@@ -61,12 +59,6 @@ module Patriarch
         end
       end      
 
-      def undo(str)
-        undo = "undo_" 
-        undo << str
-        undo 
-      end
-
       def included(klass)
         klass.extend ClassMethods
         klass.extend ActiveModel::Callbacks
@@ -77,8 +69,6 @@ module Patriarch
     end
 
     module ClassMethods
-      def add_behaviours(*behaviours)
-      end
 
       def add_behaviour(behaviour,options)
         # add_behaviour :like, :by => bla,  :on => [:item,:user] || :community, :as => :aimer, :reverse_as => :haïr ...
@@ -102,7 +92,7 @@ module Patriarch
             # TODO
             def self.included(klass)
               klass.extend ActiveModel::Callbacks
-              klass.send(:define_model_callbacks, self.const_get(:Behaviour).to_sym, Patriarch::Behaviours.undo(self.const_get(:Behaviour)).to_sym)
+              klass.send(:define_model_callbacks, self.const_get(:Behaviour).to_sym, Patriarch.undo(self.const_get(:Behaviour)).to_sym)
             end 
 
             # like
@@ -113,9 +103,9 @@ module Patriarch
             end
 
             # undo_like
-            define_method(Patriarch::Behaviours.undo(methods_mod.const_get(:Behaviour)).to_sym) do |entity,options={}|
-              run_callbacks Patriarch::Behaviours.undo(methods_mod.const_get(:Behaviour)).to_sym do
-                "Patriarch::Services::#{(Patriarch::Behaviours.undo(methods_mod.const_get(:Behaviour))).classify}::ManagerService".constantize.instance.resolve(self,entity)   
+            define_method(Patriarch.undo(methods_mod.const_get(:Behaviour)).to_sym) do |entity,options={}|
+              run_callbacks Patriarch.undo(methods_mod.const_get(:Behaviour)).to_sym do
+                "Patriarch::Services::#{(Patriarch.undo(methods_mod.const_get(:Behaviour))).classify}::ManagerService".constantize.instance.resolve(self,entity)   
               end
             end
 

data/lib/patriarch/dao_services/retriever_service.rb

@@ -25,10 +25,10 @@ class Patriarch::DAOServices::RetrieverService < Patriarch::Service
     actor_id = transaction_item.actor_id
     actor_type = transaction_item.actor_type
     
-    if Redis.constants.map(&:to_s).include?("#{dao_info[:type].camelize}")
+    if Redis::Objects.constants.map(&:to_s).include?("#{dao_info[:type].pluralize.camelize}")
       redis_dao_class = "Redis::#{dao_info[:type].camelize}".constantize
     else
-      raise InvalidRedisTypeException
+      raise InvalidRedisTypeException, "Redis constants available were #{Redis::Objects.constants} and supplied type was #{dao_info[:type]}"
     end
 
     redis_dao_class.new("#{actor_type}:#{actor_id}:#{dao_info[:key]}")
@@ -40,10 +40,10 @@ class Patriarch::DAOServices::RetrieverService < Patriarch::Service
     target_id = transaction_item.target_id
     target_type = transaction_item.target_type  
 
-    if Redis.constants.map(&:to_s).include?("#{dao_info[:type].camelize}")
+    if Redis::Objects.constants.map(&:to_s).include?("#{dao_info[:type].pluralize.camelize}")
       redis_dao_class = "Redis::#{dao_info[:type].camelize}".constantize
     else
-      raise InvalidRedisTypeException
+      raise InvalidRedisTypeException, "Redis constants available were #{Redis::Objects.constants} and supplied type was #{dao_info[:type]}"
     end
     redis_dao_class.new("#{target_type}:#{target_id}:#{dao_info[:key]}")    
   end

data/lib/patriarch/manager_service.rb

@@ -1,15 +1,16 @@
 require 'singleton'
 
-# Interface avec les couches les plus hautes
-class Patriarch::ManagerService
-  include Singleton
+module Patriarch
+  class ManagerService
+    include Singleton
 
-  # /!\ Changer l'architecture ici, l'idée est là
-  #def resolve(*args, options={})
-    # Traitement des options
-    # ...
+    # /!\ Changer l'architecture ici, l'idée est là
+    #def resolve(*args, options={})
+      # Traitement des options
+      # ...
 
-    # Traitement normal
-  #  after_resolve(*args)
-  #end
-end
+      # Traitement normal
+    #  after_resolve(*args)
+    #end
+  end
+end

data/lib/patriarch/service.rb

@@ -1,5 +1,5 @@
 require 'singleton'
 
-class Judge::Service
+class Patriarch::Service
   include Singleton 
 end

data/lib/patriarch/transaction.rb

@@ -1,68 +1,70 @@
-class Patriarch::Transaction
-  attr_reader  :id, :steps, :current_step_number
-  attr_reader  :type
+module Patriarch
+  class Transaction
+    attr_reader  :id, :steps, :current_step_number
+    attr_reader  :type
 
-  forwarded_methods_syms =  [:relation_type,:actor_type,:target_type,:actor_id,:target_id,
-                             :context,:actor,:target]
+    forwarded_methods_syms =  [:relation_type,:actor_type,:target_type,:actor_id,:target_id,
+                               :context,:actor,:target]
 
-  # Forward methods that are not this transaction's job to step object
-  forwarded_methods_syms.each do |method_sym|
-    define_method(method_sym) do
-      current_step.send(method_sym)
+    # Forward methods that are not this transaction's job to step object
+    forwarded_methods_syms.each do |method_sym|
+      define_method(method_sym) do
+        current_step.send(method_sym)
+      end
     end
-  end
 
 
-  # id => go $redis.incr
-  def initialize(type,id) #relation_type,actor,target,
-    @type = type 
-    @id = id 
-    @steps = []
-    @current_step_number = 0
-  end
+    # id => go $redis.incr
+    def initialize(type,id) #relation_type,actor,target,
+      @type = type 
+      @id = id 
+      @steps = []
+      @current_step_number = 0
+    end
 
-  # Initializes a new step and stores it in the steps array right away
-  # A step matches a "like", "follow", "own", etc.
-  # Register that we went a step further into the transaction processus
-  # Medium is nil by default (bipartite transactions does not require more than target/actor)
-  def add_step(relation_type,actor,target,medium=nil)
     # Initializes a new step and stores it in the steps array right away
-    new_step = Patriarch::TransactionStep.new(relation_type,actor,target,medium)
-    
-    # if initilization failed we should not move forward ...
-    raise PatriarchTransactionStepInstanciationException unless new_step
-
+    # A step matches a "like", "follow", "own", etc.
     # Register that we went a step further into the transaction processus
-    @steps << new_step 
-    @current_step_number += 1
-  end
+    # Medium is nil by default (bipartite transactions does not require more than target/actor)
+    def add_step(relation_type,actor,target,medium=nil)
+      # Initializes a new step and stores it in the steps array right away
+      new_step = Patriarch::TransactionStep.new(relation_type,actor,target,medium)
+      
+      # if initilization failed we should not move forward ...
+      raise PatriarchTransactionStepInstanciationException unless new_step
 
-  # Executes the calls to redis in one block here.
-  def execute
-    $redis.multi do
-      steps.each do |step|
-        step.execute
+      # Register that we went a step further into the transaction processus
+      @steps << new_step 
+      @current_step_number += 1
+    end
+
+    # Executes the calls to redis in one block here.
+    def execute
+      $redis.multi do
+        steps.each do |step|
+          step.execute
+        end
       end
     end
-  end
 
-  def transaction_queue
-    transaction_queue = []
-    steps.each do |step|
-      transaction_queue.concat(step.queue)
+    def transaction_queue
+      transaction_queue = []
+      steps.each do |step|
+        transaction_queue.concat(step.queue)
+      end
+      transaction_queue
     end
-    transaction_queue
-  end
 
-  def add_to_queue(proc)
-    current_step.add_to_queue(proc)
-  end
+    def add_to_queue(proc)
+      current_step.add_to_queue(proc)
+    end
 
-  alias :queue :transaction_queue
+    alias :queue :transaction_queue
 
-  protected
+    protected
 
-  def current_step
-    steps[current_step_number-1]
+    def current_step
+      steps[current_step_number-1]
+    end
   end
-end
+end

data/lib/patriarch/transaction_step.rb

@@ -1,39 +1,41 @@
-class Patriarch::TransactionStep
-  attr_accessor :context, :queue
+module Patriarch 
+  class TransactionStep
+    attr_accessor :context, :queue
 
-  def initialize(relation_type,actor,target,medium)
-    @context = { 
-      :relation_type  => relation_type,
-      :actor_type     => actor.class.name.underscore.to_sym,
-      :target_type    => target.class.name.underscore.to_sym,
-      :actor_id       => actor.id,
-      :target_id      => target.id,
-    }
-    @queue = []
-  end
+    def initialize(relation_type,actor,target,medium)
+      @context = { 
+        :relation_type  => relation_type,
+        :actor_type     => actor.class.name.underscore.to_sym,
+        :target_type    => target.class.name.underscore.to_sym,
+        :actor_id       => actor.id,
+        :target_id      => target.id,
+      }
+      @queue = []
+    end
 
-  # defines access methods to context fields letting it be encapsulated nicely
-  [:relation_type,:actor_type,:target_type,:actor_id,:target_id].each do |context_key|
-    define_method(context_key) do
-      context[context_key]
+    # defines access methods to context fields letting it be encapsulated nicely
+    [:relation_type,:actor_type,:target_type,:actor_id,:target_id].each do |context_key|
+      define_method(context_key) do
+        context[context_key]
+      end
     end
-  end
 
-  def actor
-    actor_type.to_s.camelize.constantize.find actor_id
-  end
+    def actor
+      actor_type.to_s.camelize.constantize.find actor_id
+    end
 
-  def target
-    target_type.to_s.camelize.constantize.find target_id
-  end
+    def target
+      target_type.to_s.camelize.constantize.find target_id
+    end
 
-  def execute
-    queue.each do |redis_instruction|
-      redis_instruction.call
+    def execute
+      queue.each do |redis_instruction|
+        redis_instruction.call
+      end
     end
-  end
 
-  def add_to_queue(proc)
-    queue << proc
+    def add_to_queue(proc)
+      queue << proc
+    end
   end
-end
+end

data/lib/patriarch/version.rb

@@ -1,3 +1,3 @@
 module Patriarch
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/patriarch.rb

@@ -1,5 +1,38 @@
 require "patriarch/version"
+require "redis"
+require "redis/objects"
+require "rails/generators"
+
+
+require File.expand_path('../generators/patriarch/patriarch_generator',__FILE__)
 
 module Patriarch
-  # Your code goes here...
-end
+	autoload :Service,																'patriarch/service'
+	autoload :Transaction,														'patriarch/transaction'
+	autoload :TransactionStep,                        'patriarch/transaction_step'
+	autoload :AuthorizationService,										'patriarch/authorization_service'
+	autoload :ManagerService,			 									  'patriarch/manager_service'
+	autoload :Behaviours, 														'patriarch/behaviours'
+
+  module DAOServices	
+		autoload :BipartiteRelationshipBuilderService,  'patriarch/dao_services/bipartite_relationship_builder_service'
+		autoload :RedisMapperService,									  'patriarch/dao_services/redis_mapper_service'
+		autoload :RetrieverService,											'patriarch/dao_services/retriever_service'
+	end
+
+	module ToolServices
+		autoload :RedisCleaner,													'patriarch/tool_services/redis_cleaner'
+		autoload :RedisExtractorService,								'patriarch/tool_services/redis_extractor_service'	
+	end
+
+	module TransactionServices
+		autoload :TransactionManagerService,						'patriarch/transaction_services/transaction_manager_service'		
+	end
+
+  def self.undo(str)
+    undo = "undo_" 
+    undo << str
+    undo 
+  end
+
+end # Patriarch

data/patriarch.gemspec

@@ -10,10 +10,22 @@ Gem::Specification.new do |spec|
 	
 	spec.platform      = Gem::Platform::RUBY
 	spec.licenses 		 = ['MIT']
-	
+	spec.post_install_message = "Thanks for installing!"
+
+  # Main dependencies
+  spec.add_dependency             "redis-objects"
+  spec.add_runtime_dependency     "verbs"
+  spec.add_runtime_dependency     "rails"
+  spec.add_runtime_dependency     "railties"
+  spec.add_runtime_dependency     "redis-objects"  
+
+  # Dependencies needed for testing
 	spec.add_development_dependency "rspec"
-	spec.add_runtime_dependency     "redis-objects"
+  spec.add_development_dependency "fakeredis"
+  spec.add_development_dependency "autotest-rails"
+  spec.add_development_dependency "ZenTest" 
 
+  # Other options ...
 	spec.files         = `git ls-files`.split($\)
   spec.executables   = spec.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})

data/spec/lib/patriarch/add_behaviour_spec.rb

@@ -1,72 +1,59 @@
 require 'spec_helper'
 
-
 describe Patriarch::Behaviours do
   
-  # setup with empty fake klasses here
-  
-  class ModelClass; 
-    include Patriarch::Behaviours
-  end
-  
-  class ModelKlass; 
-   include Patriarch::Behaviours
-  end
-
-  ModelClass.add_behaviour :like, :on => [:modelKlass]
-  ModelKlass.add_behaviour :like, :by => [:modelClass]
+  Monster.add_behaviour       :like, :on => [:fallenAngel]
+  FallenAngel.add_behaviour   :like, :by => [:monster]
 
 
   context "when adding a behaviour" do
+    before(:all) do
+      @monster        = new_monster
+      @fallen_angel   = new_fallen_angel
+    end
+
     it "should implement basic tool methods" do
       progressive_like = (Verbs::Conjugator.conjugate :like, :aspect => :progressive).split(/ /).last
-      ModelClass.new.should respond_to("#{"model_klass".pluralize}_i_like")
-      ModelClass.new.should respond_to("#{"model_klass".pluralize}_i_like_ids")
-      ModelKlass.new.should respond_to("#{"model_class".pluralize}_#{progressive_like}_me")
-      ModelKlass.new.should respond_to("#{"model_class".pluralize}_#{progressive_like}_me_ids")
+      @monster.should         respond_to("#{"fallen_angel".pluralize}_i_like")
+      @monster.should         respond_to("#{"fallen_angel".pluralize}_i_like_ids")
+      @fallen_angel.should    respond_to("#{"monster".pluralize}_#{progressive_like}_me")
+      @fallen_angel.should    respond_to("#{"monster".pluralize}_#{progressive_like}_me_ids")
     end
 
     it "should implement actions only on model being added behaviours with ':on' options" do
-      mc = ModelClass.new
-      mk = ModelKlass.new
-      mc.should respond_to(:like)
-      mc.should respond_to(:undo_like)
-      mk.should_not respond_to(:like)
-      mk.should_not respond_to(:undo_like)
+      @monster.should           respond_to(:like)
+      @monster.should           respond_to(:undo_like)
+      @fallen_angel.should_not  respond_to(:like)
+      @fallen_angel.should_not  respond_to(:undo_like)
     end
-  end
+  end # context "when adding a behaviour"
 
   context "when using an added behaviour" do
-    User.add_behaviour :smoke, :on => [:User]
-    User.add_behaviour :smoke, :by => [:User]
-
     before(:all) do
-      @userA = create_user
-      @userB = create_user
-      @userA.smoke @userB         
+      @monster = new_monster
+      @fallen_angel   = new_fallen_angel
+      @monster.like @fallen_angel         
     end
 
     it "shall play the transaction nicely" do 
-      @userA.users_i_smoke.should == [@userB]
-      @userB.users_smoking_me.should == [@userA]
+      @monster.fallen_angels_i_like.should == [@fallen_angel]
+      @fallen_angel.monsters_liking_me.should == [@monster]
       
-      @userA.users_i_smoke_ids.should == [@userB.id]
-      @userB.users_smoking_me_ids.should == [@userA.id]
+      @monster.fallen_angels_i_like_ids.should == [@fallen_angel.id]
+      @fallen_angel.monsters_liking_me_ids.should == [@monster.id]
     end
 
     it "shall play reverse transaction nicely" do
-      @userA.undo_smoke @userB
-      @userA.users_i_smoke.include?(@userB).should be_false
-      @userB.users_smoking_me.include?(@userA).should be_false
+      @monster.undo_like @fallen_angel
+      @monster.fallen_angels_i_like.include?(@fallen_angel).should be_false
+      @fallen_angel.monsters_liking_me.include?(@monster).should be_false
 
-      
-      
-     # @userA.users_i_smoke_ids.should be_empty
-      #@userB.users_smoking_me_ids.should be_empty
+      @monster.fallen_angels_i_like_ids.should be_empty
+      @fallen_angel.monsters_liking_me_ids.should be_empty
     end
 
     after(:all) do
-      @userA.undo_smoke @userB   
+      @monster.undo_like @fallen_angel   
     end 
-  end
-end
+  end # context "when using an added behaviour"
+end # describe

data/spec/lib/patriarch/bipartite_relationship_builder_spec.rb

@@ -3,19 +3,19 @@ require 'spec_helper'
 describe Patriarch::DAOServices::BipartiteRelationshipBuilderService do
   before(:each) do
     @instance = Patriarch::DAOServices::BipartiteRelationshipBuilderService.instance
-    @user = create_user
-    @item = create_item(@user)
+    @monster        = new_monster
+    @fallen_angel   = new_fallen_angel
     @transac ||= Patriarch::TransactionServices::TransactionManagerService.instance.new_transaction(:like)
-    @transac.add_step(:like,@user,@item)
+    @transac.add_step(:like,@monster,@fallen_angel)
   end
 
   it "shall insert processable lambdas into queues when create is called" do
     # Stubs the DAO retriever service so it gives DAO arrays back
     dao_sample = { 
-      :actor => Redis::SortedSet.new("user:1:redis_likes"), 
-      :target => Redis::Set.new("item:1:redis_liker_users")
+      :actor => Redis::SortedSet.new("monster:1:patriarch_fallen_angels_i_like"), 
+      :target => Redis::SortedSet.new("fallen_angel:1:patriarch_monsters_liking_me")
     }
-    Patriarch::DAOServices::RetrieverService.instance.stub(:call).with(any_args()).and_return(dao_sample)
+    Patriarch::DAOServices::RetrieverService.instance.stub(:call).twice.with(any_args()).and_return(dao_sample)
     
     expect{
       @instance.create(@transac)
@@ -29,12 +29,11 @@ describe Patriarch::DAOServices::BipartiteRelationshipBuilderService do
   it "shall insert processable lambdas into queues when destroy is called" do
     # Stubs the DAO retriever service so it gives DAO arrays back
     dao_sample = { 
-      :actor => Redis::SortedSet.new("user:1:redis_likes"), 
-      :target => Redis::Set.new("item:1:redis_liker_users")
+      :actor => Redis::SortedSet.new("monster:1:patriarch_fallen_angels_i_like"), 
+      :target => Redis::SortedSet.new("fallen_angel:1:patriarch_monsters_liking_me")
     }
-    Patriarch::DAOServices::RetrieverService.instance.stub(:call).with(any_args()).and_return(dao_sample)
+    Patriarch::DAOServices::RetrieverService.instance.stub(:call).twice.with(any_args()).and_return(dao_sample)
     
-
     expect{
       @instance.destroy(@transac)
     }.to change{ @transac.transaction_queue.select{ |queue_element| queue_element.is_a? Proc}.size }.by(2)
@@ -45,7 +44,7 @@ describe Patriarch::DAOServices::BipartiteRelationshipBuilderService do
   end
 
   after(:each) do
-    $redis.del "user:#{@user.id}:redis_likes"
-    $redis.del "item:#{@item.id}:redis_liker_users"
+    $redis.del "monster:#{@monster.id}:patriarch_fallen_angels_i_like"
+    $redis.del "fallen_angel:#{@fallen_angel.id}:patriarch_monsters_liking_me"
   end
 end

data/spec/lib/patriarch/like_service_spec.rb

@@ -2,16 +2,17 @@ require 'spec_helper'
 
 describe Patriarch::Services do
   before (:each) do
-    @user = create_user
-    @item = create_item(@user)
+    @monster        = new_monster
+    @fallen_angel   = new_fallen_angel
   end
 
   context "LikeService" do
     it "should register like informations properly" do
       # Wrong way of doing tests, test should not know about what's inside ...
-      Patriarch::Services::Like::ManagerService.instance.resolve(@user,@item)
-      Redis::SortedSet.new("user:#{@user.id}:redis_likes").members.include?(@item.id.to_s).should be_true
-      Redis::SortedSet.new("item:#{@item.id}:redis_liker_users").members.include?(@user.id.to_s).should be_true    
+      pending "redo this test ffs"
+      # Patriarch::Services::Like::ManagerService.instance.resolve(@mc,@mk)
+      # Redis::SortedSet.new("mc:#{@mc.id}:redis_likes").members.include?(@mk.id.to_s).should be_true
+      # Redis::SortedSet.new("mk:#{@mk.id}:redis_liker_mcs").members.include?(@mc.id.to_s).should be_true    
     end
   end
 

data/spec/lib/patriarch/redis_mapper_service_spec.rb

@@ -3,15 +3,17 @@ require 'spec_helper'
 describe Patriarch::DAOServices::RedisMapperService do
   before(:each) do
     @instance = Patriarch::DAOServices::RedisMapperService.instance
-    @context = {:relation_type => :like, :actor_type => :user, :target_type => :item, 
+    @context = {:relation_type => :like, :actor_type => :monster, :target_type => :fallen_angel, 
     :actor_id => 1, :target_id => 1}
     @transaction_item = double()
-    @transaction_item.stub(:context).and_return(@context)
+    @transaction_item.stub(:relation_type).and_return(@context[:relation_type])
+    @transaction_item.stub(:actor_type).and_return(@context[:actor_type])
+    @transaction_item.stub(:target_type).and_return(@context[:target_type])    
   end
 
   it "shall retrieve right DAO information" do
-    @instance.call(@transaction_item,:actor).should eq({:type => "sorted_set", :key => "redis_likes"})
-    @instance.call(@transaction_item,:target).should eq({:type => "sorted_set", :key => "redis_liker_users"})
+    @instance.call(@transaction_item,:actor).should eq({:type => "sorted_set", :key => "patriarch_fallen_angels_i_like"})
+    @instance.call(@transaction_item,:target).should eq({:type => "sorted_set", :key => "patriarch_monsters_liking_me"})
   end
 end
 

data/spec/spec_helper.rb

@@ -0,0 +1,117 @@
+require 'redis'
+require 'redis/objects'
+
+# Beware of poor autoload in redis_objects ...
+# TODO ask nateware 
+require 'redis/objects/hashes'
+require 'redis/objects/sorted_sets'
+
+require 'patriarch'
+require 'active_model'
+require 'action_view'
+require 'rails/generators'
+require 'rspec/autorun'
+
+require File.expand_path("../../lib/generators/patriarch/patriarch_generator", __FILE__)
+
+RSpec.configure do |config|
+  # ## Mock Framework
+  #
+  # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
+  #
+  # config.mock_with :mocha
+  # config.mock_with :flexmock
+  # config.mock_with :rr
+end
+
+$redis=Redis.new(:host => 'localhost', :port => 6379, :db => 8)
+$redis.flushdb
+
+dummy_location = File.expand_path("../../spec/dummy", __FILE__)
+
+puts "Cleaning previous dummy"
+# refactor with elegant code here
+`yes|rm -r #{dummy_location + "/*"}` 
+
+# Destroy previously initialized files in dummy, clean up !
+puts "Generating files to be tested in a dummy"
+
+# Initialize files in dummy :)
+# Capture prevents stdout outputs from code between curly braces to be displayed
+# This avoid polluting user interface 
+capture(:stdout) { PatriarchGenerator.start(%w(like),{:destination_root => dummy_location}) }
+
+#Enhance load_path with dummy located files ...
+$LOAD_PATH << File.expand_path("../../spec/dummy/lib", __FILE__)
+$LOAD_PATH << File.expand_path("../../lib", __FILE__)
+
+# load files living in the dummy ...
+require File.expand_path("../../spec/dummy/lib/patriarch/services/like", __FILE__)
+require File.expand_path("../../spec/dummy/lib/patriarch/behaviours/like", __FILE__)
+
+class Monster
+  attr_reader :id
+  
+  class << self 
+    attr_accessor :count, :object_mapping
+  end
+
+  self.count = 1
+  self.object_mapping = {}
+  
+  def initialize
+    @id = self.class.count
+    self.class.count += 1
+    self.class.object_mapping.merge!({@id => self.object_id})
+  end
+
+  def self.find(ids)
+    ids = Array(ids)
+    result = []
+    ids.each do |id|
+      object_ref = self.object_mapping[id]
+      record = ObjectSpace._id2ref(object_ref)
+      result << record unless record.nil?
+    end
+    result
+  end
+end
+
+class FallenAngel
+  attr_reader :id
+  
+  class << self 
+    attr_accessor :count, :object_mapping
+  end
+
+  self.count = 1
+  self.object_mapping = {}
+  
+  def initialize
+    @id = self.class.count
+    self.class.count += 1
+    self.class.object_mapping.merge!({@id => self.object_id})
+  end
+
+  def self.find(ids)
+    ids = Array(ids)
+    result = []
+    ids.each do |id|
+      object_ref = self.object_mapping[id]
+      record = ObjectSpace._id2ref(object_ref)
+      result << record unless record.nil?
+    end
+    result
+  end
+end
+
+Monster.send(:include,Patriarch::Behaviours)
+FallenAngel.send(:include,Patriarch::Behaviours)
+
+def new_monster
+  Monster.new
+end
+
+def new_fallen_angel
+  FallenAngel.new
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: patriarch
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,55 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-25 00:00:00.000000000 Z
+date: 2012-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &23131200 !ruby/object:Gem::Requirement
+  name: redis-objects
+  requirement: &12695180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
+  prerelease: false
+  version_requirements: *12695180
+- !ruby/object:Gem::Dependency
+  name: verbs
+  requirement: &12694700 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  version_requirements: *23131200
+  version_requirements: *12694700
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: &12694280 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *12694280
+- !ruby/object:Gem::Dependency
+  name: railties
+  requirement: &12693800 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *12693800
 - !ruby/object:Gem::Dependency
   name: redis-objects
-  requirement: &23130660 !ruby/object:Gem::Requirement
+  requirement: &12693300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +65,51 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23130660
+  version_requirements: *12693300
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &12692620 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *12692620
+- !ruby/object:Gem::Dependency
+  name: fakeredis
+  requirement: &12691360 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *12691360
+- !ruby/object:Gem::Dependency
+  name: autotest-rails
+  requirement: &12690940 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *12690940
+- !ruby/object:Gem::Dependency
+  name: ZenTest
+  requirement: &12690500 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *12690500
 description: Patriach is about adding behaviours on the fly to good old active record
   models.
 email:
@@ -54,6 +131,7 @@ files:
 - lib/generators/patriarch/templates/before_manager_service.rb
 - lib/generators/patriarch/templates/before_service.rb
 - lib/generators/patriarch/templates/empty_behaviour_module.rb
+- lib/generators/patriarch/templates/empty_service_module.rb
 - lib/generators/patriarch/templates/manager_service.rb
 - lib/generators/patriarch/templates/service.rb
 - lib/generators/patriarch/templates/tools_methods.rb
@@ -76,15 +154,14 @@ files:
 - patriarch.gemspec
 - spec/lib/patriarch/add_behaviour_spec.rb
 - spec/lib/patriarch/bipartite_relationship_builder_spec.rb
-- spec/lib/patriarch/clean_reclip_spec.rb
 - spec/lib/patriarch/like_service_spec.rb
-- spec/lib/patriarch/reclip_spec.rb
 - spec/lib/patriarch/redis_mapper_service_spec.rb
 - spec/lib/patriarch/retriever_service_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/giglemad/patriarch
 licenses:
 - MIT
-post_install_message: 
+post_install_message: Thanks for installing!
 rdoc_options: []
 require_paths:
 - lib
@@ -109,8 +186,7 @@ summary: Manage relationships between instances of your models easily
 test_files:
 - spec/lib/patriarch/add_behaviour_spec.rb
 - spec/lib/patriarch/bipartite_relationship_builder_spec.rb
-- spec/lib/patriarch/clean_reclip_spec.rb
 - spec/lib/patriarch/like_service_spec.rb
-- spec/lib/patriarch/reclip_spec.rb
 - spec/lib/patriarch/redis_mapper_service_spec.rb
 - spec/lib/patriarch/retriever_service_spec.rb
+- spec/spec_helper.rb

data/spec/lib/patriarch/clean_reclip_spec.rb

@@ -1,31 +0,0 @@
-require 'spec_helper'
-
-describe "reclip cleaner" do
-  before (:each) do
-    @recliper_user = create_user
-    @item = create_item(create_user)
-    @recliped_on_user = create_user
-    @recliper_user.reclip(@item,@recliped_on_user)
-    @reclip_id = @item.reclips_of_me_reclips_ids.first
-  end
-
-  it "shall clean reclips everywhere when given a single item" do
-    Patriarch::Behaviours::Reclip.clean_reclip_id(@reclip_id)
-
-    @recliped_on_user.reclipeds_on_me_reclips_ids.include?(@reclip_id).should be_false
-    @recliper_user.reclipeds_by_me_reclips_ids.include?(@reclip_id).should be_false
-    @item.reclips_of_me_reclips_ids.include?(@reclip_id).should be_false
-  end
-
-  it "shall clean all the reclip stuff (on him, by him) of a given user properly" do
-    pending('like the test above but in the adequate loop')
-  end
-
-  it "shall clean all the reclip stuff (on him, by him) of a given group properly" do
-    pending('like the test above but in the adequate loop')
-  end
-
-  it "shall clean all the reclip stuff of a given item properly" do
-    pending('like the test above but in the adequate loop')
-  end
-end

data/spec/lib/patriarch/reclip_spec.rb

@@ -1,39 +0,0 @@
-require 'spec_helper'
-
-describe "reclip" do
-  before (:each) do
-    @recliper_user = create_user
-    @item = create_item(create_user)
-    @recliped_on_user = create_user
-  end
-
-  it "stores informations in redis properly" do
-    @recliper_user.reclip(@item,@recliped_on_user)
-    
-    # Guy being recliped on remembers it
-    @recliped_on_user.reclipeds_on_me.should == [@item]
-    # Recliper remembers the reclip it did
-    @recliper_user.reclipeds_by_me.should == [@item]
-    
-    # Item    
-    @recliper_user.reclipeds_by_me.should have(1).reclip_hash
-  end
-
-  it "only updates information when clipped twice" do 
-    @recliper_user.reclip(@item,@recliped_on_user)
-    old_time = @recliper_user.reclipeds_by_me(:with_scores => true).first[1]
-    @recliper_user.reclip(@item,@recliped_on_user)
-    new_time = @recliper_user.reclipeds_by_me(:with_scores => true).first[1]
-
-    new_time.should_not eq(old_time)
-
-    # Guy being recliped on remembers it
-    @recliped_on_user.reclipeds_on_me.should == [@item]
-    # Recliper remembers the reclip it did
-    @recliper_user.reclipeds_by_me.should == [@item]
-    
-    # Item    
-    @recliper_user.reclipeds_by_me.should have(1).reclip_hash    
-  end
-
-end