patriarch 0.0.3 → 0.0.4

data/.gitignore

@@ -1,4 +1,4 @@
-spec/dummy/lib
+spec/dummy
 *.gem
 *.rbc
 *.swp

data/Gemfile

@@ -1,4 +1,6 @@
 source 'https://rubygems.org'
 
+gem 'redis-objects', :require => 'redis/objects'
+
 # Specify your gem's dependencies in patriarch.gemspec
 gemspec

data/lib/generators/patriarch/install_generator.rb

@@ -0,0 +1,11 @@
+require "rails/generators"
+
+class InstallGenerator < Rails::Generators::Base
+  source_root File.expand_path('../templates', __FILE__)
+  
+  desc "Installs the gem"
+
+  def init_directories
+    copy_file "empty_behaviours_declaration.rb", "lib/patriarch/behaviours.rb"
+  end
+end # InstallGenerator

data/lib/generators/patriarch/patriarch_generator.rb

@@ -1,69 +1,114 @@
 require "rails/generators"
+require "redis/objects/sorted_sets"
 
-  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"
+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"
 
-    argument :behaviour, :type => :string
+  argument :behaviour, :type => :string
 
-    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"
+  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
+
+  def ensure_autoload
+
+    puts destination_root
+
+    # Copy empty declaration if it does not exists so we can insert autoload declaration
+    unless File.exists? [File.expand_path(destination_root),"lib/patriarch/behaviours.rb"].join('/')
+      copy_file "empty_behaviours_declaration.rb", "lib/patriarch/behaviours.rb"
     end
 
-    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)
+    unless File.exists? "lib/patriarch/services.rb"    
+      copy_file "empty_services_declaration.rb", "lib/patriarch/services.rb" 
     end
 
-    private
-      def class_name
-        behaviour.classify
-      end
+    # Autoload declaration insertion
+    insert_into_file "lib/patriarch/services.rb", :after => "  module Services\n" do
+      "    autoload :#{class_name}, 'patriarch/services/#{behaviour.underscore.downcase}.rb'\n"
+    end
 
-      def undo_class_name
-        Patriarch.undo(behaviour).classify
-      end
+    insert_into_file "lib/patriarch/services.rb", :after => "  module Services\n" do
+      "    autoload :#{undo_class_name}, 'patriarch/services/#{behaviour.underscore.downcase}.rb'\n"
+    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"
+    # Autoload declaration insertion
+    insert_into_file "lib/patriarch/behaviours.rb", :after => "  module Behaviours\n" do
+      "    autoload :#{class_name}, 'patriarch/behaviours/#{behaviour.underscore.downcase}.rb'\n"
+    end
 
-        template "manager_service.rb", "lib/patriarch/services/#{behaviour_str}/manager_service.rb"
-                  
-        template "service.rb", "lib/patriarch/services/#{behaviour_str}/service.rb"    
+    insert_into_file "lib/patriarch/behaviours.rb", :after => "  module Behaviours\n" do
+      "    autoload :#{undo_class_name}, 'patriarch/behaviours/#{Patriarch.undo(behaviour.underscore.downcase)}.rb'\n"
+    end
 
+    # load File.expand_path('lib/patriarch/behaviours.rb', __FILE__)
+  end
 
-        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"
+  def build_initializer
+    unless File.exists? "config/initializers/patriarch.rb" 
+      create_file "config/initializers/patriarch.rb" do 
+        "require 'patriarch'\n\n"+
+        "load File.expand_path('../../../lib/patriarch/behaviours.rb', __FILE__)\n" + 
+        "load File.expand_path('../../../lib/patriarch/services.rb', __FILE__)"
       end
+    end
+  end
+
+  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
+
+  private
+    def class_name
+      behaviour.classify
+    end
 
-      def create_undo_services(behaviour)
-        undo_behaviour_str = Patriarch.undo(behaviour).underscore.downcase
+    def undo_class_name
+      Patriarch.undo(behaviour).classify
+    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"
+    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 "manager_service.rb", "lib/patriarch/services/#{undo_behaviour_str}/manager_service.rb"
-                  
-        template "undo_service.rb", "lib/patriarch/services/#{undo_behaviour_str}/service.rb"    
+      template "manager_service.rb", "lib/patriarch/services/#{behaviour_str}/manager_service.rb"
+                
+      template "service.rb", "lib/patriarch/services/#{behaviour_str}/service.rb"    
 
-        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 # PatriarchGenerator
+      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
+
+    def create_undo_services(behaviour)
+      undo_behaviour_str = Patriarch.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 "manager_service.rb", "lib/patriarch/services/#{undo_behaviour_str}/manager_service.rb"
+                
+      template "undo_service.rb", "lib/patriarch/services/#{undo_behaviour_str}/service.rb"    
+
+      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 # PatriarchGenerator

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

@@ -0,0 +1,5 @@
+module Patriarch
+  module Behaviours
+    # Autoloads declaration will be inserted here
+  end
+end

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

@@ -0,0 +1,5 @@
+module Patriarch
+  module Services
+    # Autoloads declaration will be inserted here
+  end
+end

data/lib/patriarch/dao_services/bipartite_relationship_builder_service.rb

@@ -1,3 +1,5 @@
+require "redis/objects/sorted_sets"
+
 class Patriarch::DAOServices::BipartiteRelationshipBuilderService < Patriarch::Service
   def create(transaction_item)
     # t => changer nom pour différencier de la date créée pour le Patriarch::Transaction 

data/lib/patriarch/dao_services/retriever_service.rb

@@ -1,3 +1,5 @@
+require 'redis/objects/sorted_sets'
+
 class InvalidRedisTypeException < Exception
 end
 

data/lib/patriarch/tool_services/redis_extractor_service.rb

@@ -9,12 +9,11 @@ class Patriarch::ToolServices::RedisExtractorService < Patriarch::Service
       to = from + limit -1
     end 
 
-    dao = Redis::SortedSet.new("#{calling_entity.class.name.downcase}:#{calling_entity.id}:#{redis_key}")
+    dao = Redis::SortedSet.new("#{calling_entity.class.name.underscore}:#{calling_entity.id}:#{redis_key}")
 
     if options[:with_scores] 
       # Do not use this anymore, go take the right redis objects not using this kind of methods ...
       # DEGOLASSE
-      Redis::SortedSet.new
       ids_with_scores_from_redis = dao.revrange(from,to,:with_scores => true) || []
       ids_with_scores_from_redis.map{ |id,score| [id.to_i,score] } 
     else

data/lib/patriarch/version.rb

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

data/lib/patriarch.rb

@@ -1,6 +1,7 @@
 require "patriarch/version"
 require "redis"
 require "redis/objects"
+require "redis/objects/sorted_sets"
 require "rails/generators"
 
 
@@ -36,3 +37,5 @@ module Patriarch
   end
 
 end # Patriarch
+
+require File.expand_path('../patriarch/behaviours',__FILE__)

data/patriarch.gemspec

@@ -13,11 +13,9 @@ Gem::Specification.new do |spec|
 	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"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: patriarch
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-26 00:00:00.000000000 Z
+date: 2012-11-27 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: redis-objects
-  requirement: &12695180 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *12695180
 - !ruby/object:Gem::Dependency
   name: verbs
-  requirement: &12694700 !ruby/object:Gem::Requirement
+  requirement: &14218700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12694700
+  version_requirements: *14218700
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &12694280 !ruby/object:Gem::Requirement
+  requirement: &14218280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,21 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12694280
+  version_requirements: *14218280
 - !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: &12693300 !ruby/object:Gem::Requirement
+  requirement: &14192480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12693300
+  version_requirements: *14192480
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &12692620 !ruby/object:Gem::Requirement
+  requirement: &14192060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12692620
+  version_requirements: *14192060
 - !ruby/object:Gem::Dependency
   name: fakeredis
-  requirement: &12691360 !ruby/object:Gem::Requirement
+  requirement: &14191640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12691360
+  version_requirements: *14191640
 - !ruby/object:Gem::Dependency
   name: autotest-rails
-  requirement: &12690940 !ruby/object:Gem::Requirement
+  requirement: &14191220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12690940
+  version_requirements: *14191220
 - !ruby/object:Gem::Dependency
   name: ZenTest
-  requirement: &12690500 !ruby/object:Gem::Requirement
+  requirement: &14190800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12690500
+  version_requirements: *14190800
 description: Patriach is about adding behaviours on the fly to good old active record
   models.
 email:
@@ -124,6 +102,7 @@ files:
 - README.md
 - Rakefile
 - lib/generators/patriarch/USAGE
+- lib/generators/patriarch/install_generator.rb
 - lib/generators/patriarch/patriarch_generator.rb
 - lib/generators/patriarch/templates/after_manager_service.rb
 - lib/generators/patriarch/templates/after_service.rb
@@ -131,7 +110,9 @@ 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_behaviours_declaration.rb
 - lib/generators/patriarch/templates/empty_service_module.rb
+- lib/generators/patriarch/templates/empty_services_declaration.rb
 - lib/generators/patriarch/templates/manager_service.rb
 - lib/generators/patriarch/templates/service.rb
 - lib/generators/patriarch/templates/tools_methods.rb