phenomenal 1.1.1 → 1.2.1

data/README.md

@@ -4,6 +4,18 @@ Phenomenal Gem is a context-oriented framework implemented in Ruby that allows c
 
 See www.phenomenal-gem.com for more details
 
-Architecture
-===
-![architecture](http://www.phenomenal-gem.com/assets/project/phenomenal_use_diagram.png)
+## Contributions
+If you want to contribute, please:
+
+  * Fork the project.
+  * Make your feature addition or bug fix.
+  * Add tests for it. This is *very* important.
+  * Send a pull request on Github with a clear description.
+
+Tests are executed with
+
+        rake        
+  
+## Copyright
+
+Copyright (c) 2011-2012 Loïc Vigneron - Thibault Poncelet. See LICENSE for details.

data/lib/phenomenal.rb

@@ -2,26 +2,28 @@
 module Phenomenal 
   module Viewer end
 end
-#Relationships
-require_relative "./phenomenal/relationships/context_relationships.rb"
-require_relative "./phenomenal/relationships/feature_relationships.rb"
-require_relative "./phenomenal/relationships/relationships_store.rb"
-require_relative "./phenomenal/relationships/relationships_manager.rb"
-require_relative "./phenomenal/relationships/relationship.rb"
-require_relative "./phenomenal/relationships/requirement.rb"
-require_relative "./phenomenal/relationships/implication.rb"
-require_relative "./phenomenal/relationships/suggestion.rb"
+#Error
+require_relative "./phenomenal/error.rb"
 
-# Core
-require_relative "./phenomenal/adaptation.rb"
+#Relationships
+require_relative "./phenomenal/relationship/context_relationships.rb"
+require_relative "./phenomenal/relationship/feature_relationships.rb"
+require_relative "./phenomenal/relationship/relationship_store.rb"
+require_relative "./phenomenal/relationship/relationship_manager.rb"
+require_relative "./phenomenal/relationship/relationship.rb"
+require_relative "./phenomenal/relationship/requirement.rb"
+require_relative "./phenomenal/relationship/implication.rb"
+require_relative "./phenomenal/relationship/suggestion.rb"
 
-require_relative "./phenomenal/context.rb"
-require_relative "./phenomenal/feature.rb"
-require_relative "./phenomenal/logger.rb"
+# Context
+require_relative "./phenomenal/context/adaptation.rb"
+require_relative "./phenomenal/context/context_creation.rb"
+require_relative "./phenomenal/context/context.rb"
+require_relative "./phenomenal/context/feature.rb"
 
 #Manager
-require_relative "./phenomenal/manager/adaptations_management.rb"
-require_relative "./phenomenal/manager/contexts_management.rb"
+require_relative "./phenomenal/manager/adaptation_management.rb"
+require_relative "./phenomenal/manager/context_management.rb"
 require_relative "./phenomenal/manager/conflict_policies.rb"
 require_relative "./phenomenal/manager/manager.rb"
 
@@ -30,8 +32,6 @@ require_relative "./phenomenal/viewer/graphical.rb"
 require_relative "./phenomenal/viewer/textual.rb"
 
 # DSL
-require_relative "./phenomenal/relationships/dsl.rb"
+require_relative "./phenomenal/relationship/dsl.rb"
 require_relative "./phenomenal/viewer/dsl.rb"
 require_relative "./phenomenal/dsl.rb"
-
-

data/lib/phenomenal/{adaptation.rb → context/adaptation.rb}

@@ -32,23 +32,15 @@ class  Phenomenal::Adaptation
       klass.define_singleton_method(method_name,implementation)
     end
   end
-  
-  # IMPROVE try to find a better implementation
+
   # Bind the implementation corresponding to this adaptation to 'instance' when
   # instance_adaptation or to implementation class when class method 
   def bind(instance,*args,&block)
-    if instance_adaptation?
-      if implementation.class==Proc
-        instance.instance_exec(*args,block,&implementation)
-      else
-        implementation.bind(instance).call(*args,&block)
-      end
+    target = instance_adaptation? ? instance : klass
+    if implementation.is_a?(Proc)
+      bind_proc(target,*args,&block)
     else
-      if implementation.class==Proc
-        klass.instance_exec(*args,block,&implementation)
-      else
-        implementation.call(*args,&block)
-      end
+      bind_method(target,*args,&block)
     end
   end
   
@@ -65,13 +57,50 @@ class  Phenomenal::Adaptation
   end
   
   private
+  def bind_proc(target,*args,&block)
+    args.push(block)
+    target.instance_exec(*args,&implementation)
+  end
+  
+  def bind_method(target,*args,&block)
+    if instance_adaptation?
+      implementation.bind(target).call(*args,&block)
+    else
+      implementation.call(*args,&block)
+    end
+  end
+  
   def check_validity
-    if klass.instance_methods.include?(method_name) && !instance_adaptation? ||
-      !klass.instance_methods.include?(method_name) &&  instance_adaptation?
-      Phenomenal::Logger.instance.error(
+    method = get_original_method
+    if method.arity != implementation.arity
+      raise(Phenomenal::Error,
+        "Illegal adaptation for context #{context},the adaptation "+ 
+        "have to keep the original method arity for method: " +
+        "#{klass.name}.#{method_name}: (#{method.arity} instead of " +
+        "#{implementation.arity})." 
+      )
+    elsif klass.instance_methods.include?(method_name) ^ instance_adaptation?
+      raise(Phenomenal::Error,
         "Illegal adaptation for context: #{context}" +
         " for #{klass.name}.#{method_name}, type mismatch"
       )
     end
   end
+  
+  def get_original_method
+    begin
+      if instance_adaptation?
+        method = klass.instance_method(method_name)
+      else
+        method = klass.method(method_name)
+      end
+    rescue NameError
+      raise(Phenomenal::Error,
+        "Illegal adaptation for context #{context},a method with "+
+        "name: #{method_name} should exist in class #{klass.name} to "+ 
+        "be adapted."
+      )
+    end
+    method
+  end
 end

data/lib/phenomenal/{context.rb → context/context.rb}

@@ -1,82 +1,13 @@
 # Represents a first class context
 class Phenomenal::Context
+  extend Phenomenal::ContextCreation
   include Phenomenal::ContextRelationships
+  
   @@total_activations = 0
   
   attr_accessor :activation_age, :activation_frequency, :adaptations, 
     :activation_count, :parent, :forgotten
-  attr_reader :manager,:name
-  
-  # Class metods
-  class << self
-    def create(context,*contexts,nested,closest_feature,&block)
-      manager = Phenomenal::Manager.instance
-      contexts.insert(0,context)
-      if contexts.length==1
-        context = find_or_create_simple_context(manager,context)
-      else #Combined contexts
-        context = find_or_create_combined_context(manager,contexts,nested,closest_feature)
-      end
-      context.add_adaptations(&block)
-      context
-    end
-    
-    private
-    def find_or_create_simple_context(manager,context)
-      if !manager.context_defined?(context)
-        self.new(context) 
-      else
-        context = manager.find_context(context)
-        if !context.instance_of?(self)
-          Phenomenal::Logger.instance.error(
-            "Only #{self.name} can be used with this keyword."
-          )
-        end
-        context
-      end
-    end
-    
-    def find_or_create_combined_context(manager,contexts,nested,closest_feature)
-      if !manager.context_defined?(*contexts) # New combined context
-        context = create_combined_context(manager,contexts,nested,closest_feature)
-      else
-        context = manager.find_context(*contexts)
-        if !context.instance_of?(self)
-          Phenomenal::Logger.instance.error(
-            "Only #{self.name} can be used with this keyword."
-          )
-        end
-      end
-      context
-    end
-    
-    def create_combined_context(manager,contexts,nested,closest_feature)
-      context = self.new
-      context.parent=closest_feature # Set parent
-      instances = Array.new
-      first = contexts.first
-      contexts.each do |c|
-        # Use the object instance if already available
-        # otherwise create it
-        if manager.context_defined?(c)
-          c = manager.find_context(c) 
-          if !nested && c!=first && !c.instance_of?(self)
-            Phenomenal::Logger.instance.error(
-              "Only #{self.name} can be used with this keyword."
-            )
-          end
-        else
-          c = self.new(c) 
-        end
-        instances.push(c)
-        manager.shared_contexts[c]= Array.new if !manager.shared_contexts[c]
-        manager.shared_contexts[c].push(context)
-      end
-      manager.combined_contexts[context] = instances
-      context
-    end
-  end
-  
+  attr_reader :manager,:name  
   # Instance methods
   def initialize(name=nil, manager=nil)
     @manager = manager || Phenomenal::Manager.instance
@@ -95,7 +26,7 @@ class Phenomenal::Context
   # TODO handle relationships references
   def forget
     if active?
-      Phenomenal::Logger.instance.error(
+      raise(Phenomenal::Error,
         "Active context cannot be forgotten"
       )
     else
@@ -108,40 +39,18 @@ class Phenomenal::Context
   # Return the adaptation just created
   def add_adaptation(klass, method_name,instance,umeth=nil, &implementation)
     if klass.nil? # Not defined class
-      Phenomenal::Logger.instance.error(
+      raise(Phenomenal::Error,
         "The class to be adapted wasn't specified. Don't forget to use 'adaptations_for(Klass)' before adapting a method"
       )
     end
-    if umeth
-      implementation = umeth
-    end
     if adaptations.find{ |i| i.concern?(klass,method_name,instance) }
-      Phenomenal::Logger.instance.error(
+     raise(Phenomenal::Error,
         "Illegal duplicated adaptation in context: #{self} for " + 
         "#{klass.name}:#{method_name}."
       )
     else
-      if klass.instance_methods.include?(method_name) && instance
-        method = klass.instance_method(method_name)
-      elsif klass.methods.include?(method_name) && !instance
-        method = klass.method(method_name)
-      else
-        Phenomenal::Logger.instance.error(
-          "Illegal adaptation for context #{self},a method with "+
-          "name: #{method_name} should exist in class #{klass.name} to "+ 
-          "be adapted."
-        )
-      end
-      if method.arity != implementation.arity
-        Phenomenal::Logger.instance.error(
-          "Illegal adaptation for context #{self},the adaptation "+ 
-          "have to keep the original method arity for method: " +
-          "#{klass.name}.#{method_name}: (#{method.arity} instead of " +
-          "#{implementation.arity})." 
-        )
-      end
       adaptation = Phenomenal::Adaptation.new(
-        self, klass, method_name,instance, implementation
+        self, klass, method_name,instance, umeth||implementation
       )
       adaptations.push(adaptation)
       manager.register_adaptation(adaptation)
@@ -152,14 +61,14 @@ class Phenomenal::Context
   # Catch nested context calls and transform them in nested contexts creation
   def context(context,*contexts,&block)
     check_validity
-    Phenomenal::Context.create(self,context,*contexts,true,self,&block)
+    Phenomenal::Context.create(true,self,self,context,*contexts,&block)
   end
   alias_method :phen_context,:context
   
   # Catch nested feature calls and transform them in nested contexts creation
   def feature(feature,*features, &block)
     check_validity
-    Phenomenal::Feature.create(self,feature,*features,true,self,&block)
+    Phenomenal::Feature.create(true,self,self,feature,*features,&block)
   end
   alias_method :phen_feature,:feature
 
@@ -189,7 +98,7 @@ class Phenomenal::Context
     adaptation_index =
       adaptations.find_index{ |i| i.concern?(klass, method_name,instance) }
     if !adaptation_index
-      Phenomenal::Logger.instance.error(
+      raise(Phenomenal::Error,
         "Illegal deleting of an inexistent adaptation in context: " +
         "#{self} for #{klass.name}.#{method_name})."
       )
@@ -210,7 +119,7 @@ class Phenomenal::Context
   end  
   
   # Deactivate the context
-  def deactivate(caller_context=nil)
+  def deactivate
     check_validity
     was_active = active?
     if self.activation_count>0
@@ -269,7 +178,7 @@ class Phenomenal::Context
       p=p.parent
     end
     if p.nil?
-      manager.default_context
+      manager.default_feature
     else
       p
     end
@@ -279,8 +188,8 @@ class Phenomenal::Context
   def to_s
     if name
       name.to_s
-    elsif self==manager.default_context
-      "Default context"
+    elsif self==manager.default_feature
+      "Default feature"
     elsif manager.combined_contexts[self]
        "#{manager.combined_contexts[self].flatten}"
     else
@@ -291,7 +200,7 @@ class Phenomenal::Context
   private
   def check_validity
     if forgotten
-      Phenomenal::Logger.instance.error(
+      raise(Phenomenal::Error,
         "Action not allowed anymore when context has been forgotten."
       )
     end

data/lib/phenomenal/context/context_creation.rb

@@ -0,0 +1,68 @@
+module Phenomenal::ContextCreation
+  def create(nested,closest_feature,context,*contexts,&block)
+    manager = Phenomenal::Manager.instance
+    contexts.insert(0,context)
+    if contexts.length==1
+      context = find_or_create_simple_context(manager,context)
+    else #Combined contexts
+      context = find_or_create_combined_context(manager,contexts,nested,closest_feature)
+    end
+    context.add_adaptations(&block)
+    context
+  end
+  
+  private
+  def find_or_create_simple_context(manager,context)
+    if !manager.context_defined?(context)
+      self.new(context) 
+    else
+      context = manager.find_context(context)
+      if !context.instance_of?(self)
+        raise(Phenomenal::Error,
+          "Only #{self.name} can be used with this keyword."
+        )
+      end
+      context
+    end
+  end
+  
+  def find_or_create_combined_context(manager,contexts,nested,closest_feature)
+    if !manager.context_defined?(*contexts) # New combined context
+      context = create_combined_context(manager,contexts,nested,closest_feature)
+    else
+      context = manager.find_context(*contexts)
+      if !context.instance_of?(self)
+        raise(Phenomenal::Error,
+          "Only #{self.name} can be used with this keyword."
+        )
+      end
+    end
+    context
+  end
+  
+  def create_combined_context(manager,contexts,nested,closest_feature)
+    context = self.new
+    context.parent=closest_feature # Set parent
+    instances = Array.new
+    first = contexts.first
+    contexts.each do |c|
+      # Use the object instance if already available
+      # otherwise create it
+      if manager.context_defined?(c)
+        c = manager.find_context(c) 
+        if !nested && c!=first && !c.instance_of?(self)
+          raise(Phenomenal::Error,
+            "Only #{self.name} can be used with this keyword."
+          )
+        end
+      else
+        c = self.new(c) 
+      end
+      instances.push(c)
+      manager.shared_contexts[c]= Array.new if !manager.shared_contexts[c]
+      manager.shared_contexts[c].push(context)
+    end
+    manager.combined_contexts[context] = instances
+    context
+  end
+end

data/lib/phenomenal/dsl.rb

@@ -5,13 +5,13 @@ module Phenomenal::DSL
     klass.class_eval do
       # Define context with adaptations
       def phen_context(context,*contexts,&block)
-        Phenomenal::Context.create(context,*contexts,false,nil,&block)
+        Phenomenal::Context.create(false,nil,context,*contexts,&block)
       end
       Phenomenal::DSL.phen_alias(:context,klass)
       
       # Define context with adaptations
       def phen_feature(context,*contexts,&block)
-        Phenomenal::Feature.create(context,*contexts,false,nil,&block)
+        Phenomenal::Feature.create(false,nil,context,*contexts,&block)
       end
       Phenomenal::DSL.phen_alias(:feature,klass)
       
@@ -48,21 +48,13 @@ module Phenomenal::DSL
       
       # Activate Context
       def phen_activate_context(context,*contexts)
-        contexts=[] if contexts.nil?
-        contexts.push(context)
-        contexts.each do |c|
-          Phenomenal::Manager.instance.find_context(c).activate
-        end
+        Phenomenal::DSL.phen_switch_context_state(true,context,*contexts)
       end
       Phenomenal::DSL.phen_alias(:activate_context,klass)
       
       # Deactivate Context
       def phen_deactivate_context(context,*contexts)
-        contexts=[] if contexts.nil?
-        contexts.push(context)
-        contexts.each do |c|
-          Phenomenal::Manager.instance.find_context(c).deactivate 
-        end 
+        Phenomenal::DSL.phen_switch_context_state(false,context,*contexts)
       end
       Phenomenal::DSL.phen_alias(:deactivate_context,klass)
       
@@ -76,9 +68,9 @@ module Phenomenal::DSL
         Phenomenal::Manager.instance.find_context(context).information
       end
       
-      # Default Context
-      def phen_default_context
-        Phenomenal::Manager.instance.default_context
+      # Default Feature
+      def phen_default_feature
+        Phenomenal::Manager.instance.default_feature
       end
       
       # Defined context registered in the manager
@@ -104,9 +96,21 @@ module Phenomenal::DSL
   end
   
   private
+  def self.phen_switch_context_state(activate,context,*contexts)
+    contexts=[] if contexts.nil?
+    contexts.push(context)
+    contexts.each do |c|
+      if activate
+        Phenomenal::Manager.instance.find_context(c).activate 
+      else
+        Phenomenal::Manager.instance.find_context(c).deactivate 
+      end
+    end 
+  end
+  
   def self.phen_alias(method,klass)
     if Kernel.respond_to? method
-      Phenomenal::Logger.instance.warn(
+      raise(Phenomenal::Error,
         "The Phenomenal DSL keyword #{method} wasn't defined, use"+
         " phen_#{method} instead"
       )

data/lib/phenomenal/error.rb

@@ -0,0 +1,2 @@
+class Phenomenal::Error < StandardError 
+end

data/lib/phenomenal/manager/{adaptations_management.rb → adaptation_management.rb}

@@ -1,12 +1,12 @@
-module Phenomenal::AdaptationsManagement
+module Phenomenal::AdaptationManagement
   attr_accessor :active_adaptations, :deployed_adaptations
   
   # Register a new adaptation for a registered context
   def register_adaptation(adaptation)
-    default_adaptation = default_context.adaptations.find do|i| 
+    default_adaptation = default_feature.adaptations.find do|i| 
       i.concern?(adaptation.klass,adaptation.method_name,adaptation.instance_adaptation?)
     end
-    if adaptation.context!=default_context && !default_adaptation
+    if adaptation.context!=default_feature && !default_adaptation
       save_default_adaptation(adaptation.klass, adaptation.method_name,adaptation.instance_adaptation?)
     end
     activate_adaptation(adaptation) if adaptation.context.active?
@@ -22,8 +22,8 @@ module Phenomenal::AdaptationsManagement
     calling_adaptation = find_adaptation(calling_stack)
     # IMPROVE Problems will appears if proceed called in a file where
     # adaptations are defined but not in one of them=> how to check?
-    # IMPROVE Problems will also appears if two adaptations are defined on the same
-    # line using the ';' some check needed at add_adaptation ?
+    # IMPROVE Problems will also appears if two adaptations are defined on the 
+    # same line using the ';' some check needed at add_adaptation ?
     adaptations_stack = sorted_adaptations_for(calling_adaptation.klass,  
       calling_adaptation.method_name,calling_adaptation.instance_adaptation?)
     calling_adaptation_index = adaptations_stack.find_index(calling_adaptation)
@@ -54,7 +54,7 @@ module Phenomenal::AdaptationsManagement
   # conflict policy
   def redeploy_adaptation(klass, method_name,instance)
     to_deploy = resolve_conflict(klass,method_name,instance)
-    # Do nothing when to_deploy==nil to break at default context deactivation
+    # Do nothing when to_deploy==nil to break at default feature deactivation
     if !deployed_adaptations.include?(to_deploy) && to_deploy!=nil
       deploy_adaptation(to_deploy)
     end
@@ -79,7 +79,7 @@ module Phenomenal::AdaptationsManagement
     else
       method = klass.method(method_name)
     end
-    adaptation = default_context.add_adaptation(klass,method_name,instance,method)
+    adaptation = default_feature.add_adaptation(klass,method_name,instance,method)
   end
   
   # Return the adaptation that math the calling_stack, on the basis of the
@@ -96,7 +96,7 @@ module Phenomenal::AdaptationsManagement
     end
 
     if  match==nil
-      Phenomenal::Logger.instance.error(
+      raise(Phenomenal::Error,
         "Inexistant adaptation for proceed call at #{call_file}:#{call_line}"
       )
     end
@@ -114,7 +114,7 @@ module Phenomenal::AdaptationsManagement
   
   # Gets the relevants adaptations for a file in DESC order of line number
   def relevant_adaptations(call_file)
-    relevants = active_adaptations.select{ |i| i.src_file == call_file }
+    relevants = active_adaptations.find_all{ |i| i.src_file == call_file }
     # Sort by src_line DESC order
     relevants.sort!{ |a,b| b.src_line <=> a.src_line }
   end
@@ -128,7 +128,7 @@ module Phenomenal::AdaptationsManagement
   # conflict policy
   def sorted_adaptations_for(klass,method_name,instance)
     relevants =
-      active_adaptations.find_all { |i| i.concern?(klass, method_name,instance) }
+      active_adaptations.find_all{ |i| i.concern?(klass, method_name,instance) }
     relevants.sort!{|a,b| conflict_policy(a.context,b.context)}
   end
 end

data/lib/phenomenal/manager/conflict_policies.rb

@@ -2,13 +2,14 @@
 module Phenomenal::ConflictPolicies
   # Prefer not default adaptation, error if two not default ones
     def no_resolution_conflict_policy(context1,context2)
-      if context1==default_context()
+      if context1==default_feature()
         1
-      elsif context2==default_context()
+      elsif context2==default_feature()
         -1
       else #Fail if two non default adaptations
-        Phenomenal::Logger.instance.error(
-            "Illegal duplicate adapation between contexts #{context1} and #{context2} "
+        raise(Phenomenal::Error,
+          "Illegal duplicate adapation between contexts #{context1}"+ 
+          "and #{context2} "
         )
       end
     end

data/lib/phenomenal/manager/{contexts_management.rb → context_management.rb}

@@ -1,15 +1,15 @@
-module Phenomenal::ContextsManagement
-  attr_accessor :contexts, :default_context, :combined_contexts, :shared_contexts
+module Phenomenal::ContextManagement
+  attr_accessor :contexts, :default_feature, :combined_contexts,:shared_contexts
   
   # Register a new context 
   def register_context(context)
     if context_defined?(context)
-      Phenomenal::Logger.instance.error(
+      raise(Phenomenal::Error,
         "The context #{context} is already registered"
       )
     end
     if context.name && context_defined?(context.name)
-      Phenomenal::Logger.instance.error(
+      raise(Phenomenal::Error,
         "There is already a context with name: #{context.name}." + 
         " If you want to have named context it has to be a globally unique name"
       )
@@ -22,15 +22,15 @@ module Phenomenal::ContextsManagement
   
   # Unregister a context (forget)
   def unregister_context(context)
-    if context==default_context && contexts.size>1
-      Phenomenal::Logger.instance.error(
-        "Default context can only be forgotten when alone"
+    if context==default_feature && contexts.size>1
+      raise(Phenomenal::Error,
+        "Default feature can only be forgotten when alone"
       )
     else
       contexts.delete(context)
       unregister_combined_contexts(context)
-      # Restore default context
-      init_default() if context==default_context
+      # Restore default feature
+      init_default() if context==default_feature
     end
   end
   
@@ -75,8 +75,9 @@ module Phenomenal::ContextsManagement
     end
   end
   
-  # Check wether context 'context' (or combined context) exist in the context manager
-  # Context can be either the context name or the context instance itself
+  # Check wether context 'context' (or combined context) exist in the context 
+  # manager. Context can be either the context name or the context instance 
+  # itself.
   # Return the context if found, or nil otherwise
   def context_defined?(context, *contexts)
     c=nil
@@ -134,7 +135,7 @@ module Phenomenal::ContextsManagement
     if find
       find
     else
-      Phenomenal::Logger.instance.error(
+      raise(Phenomenal::Error,
         "Unknown context #{context}"
       )
     end
@@ -157,13 +158,13 @@ module Phenomenal::ContextsManagement
       end
     end
     if list.length==0
-      Phenomenal::Logger.instance.error(
+      raise(Phenomenal::Error,
         "Unknown combined context #{contexts}"
       )
     elsif list.length==1
       return list.first
     else
-      Phenomenal::Logger.instance.error(
+      raise(Phenomenal::Error,
         "Multiple definition of combined context #{contexts}"
       )
     end

data/lib/phenomenal/manager/manager.rb

@@ -3,17 +3,17 @@ require 'singleton'
 class Phenomenal::Manager
   include Singleton
   include Phenomenal::ConflictPolicies
-  include Phenomenal::AdaptationsManagement
-  include Phenomenal::ContextsManagement
+  include Phenomenal::AdaptationManagement
+  include Phenomenal::ContextManagement
   
   attr_accessor :rmanager
   
   # PRIVATE METHODS
   private
-   # Set the default context
+   # Set the default feature
   def init_default
-    self.default_context= Phenomenal::Feature.new(nil,self)
-    self.default_context.activate
+    self.default_feature = Phenomenal::Feature.new(nil,self)
+    self.default_feature.activate
   end
 
   # Private constructor because this is a singleton object
@@ -23,7 +23,7 @@ class Phenomenal::Manager
     @active_adaptations = Array.new
     @combined_contexts = Hash.new
     @shared_contexts = Hash.new
-    @rmanager = Phenomenal::RelationshipsManager.instance
+    @rmanager = Phenomenal::RelationshipManager.instance
     init_default()
   end
 end

data/lib/phenomenal/{relationships → relationship}/dsl.rb

@@ -4,19 +4,19 @@ module Phenomenal::DSL
     klass.class_eval do
       # Requirements
       def phen_requirements_for(source,targets)
-        Phenomenal::Manager.instance.default_context.requirements_for(source,targets)
+        Phenomenal::Manager.instance.default_feature.requirements_for(source,targets)
       end
       Phenomenal::DSL.phen_alias(:requirements_for,klass)
       
        # Implications
       def phen_implications_for(source,targets)
-        Phenomenal::Manager.instance.default_context.implications_for(source,targets)
+        Phenomenal::Manager.instance.default_feature.implications_for(source,targets)
       end
       Phenomenal::DSL.phen_alias(:implications_for,klass)
       
        # Suggestions
       def phen_suggestions_for(source,targets)
-        Phenomenal::Manager.instance.default_context.suggestions_for(source,targets)
+        Phenomenal::Manager.instance.default_feature.suggestions_for(source,targets)
       end
       Phenomenal::DSL.phen_alias(:suggestions_for,klass)
       

data/lib/phenomenal/{relationships → relationship}/feature_relationships.rb

@@ -27,7 +27,7 @@ module Phenomenal::FeatureRelationships
   def add_relationship(source,targets,type)
     targets[:on]=Array.new.push(targets[:on]) if !targets[:on].is_a?(Array)
     if targets[:on].nil?
-      Phenomenal::Logger.instance.error(
+      raise(Phenomenal::Error,
         "Invalid relationship, missing target context"
       )
     end

data/lib/phenomenal/{relationships/relationships_manager.rb → relationship/relationship_manager.rb}

@@ -1,6 +1,6 @@
 require 'singleton'
 # This class manage the different relatiohsips in the system between contexts
-class Phenomenal::RelationshipsManager
+class Phenomenal::RelationshipManager
   include Singleton
   
   attr_accessor :relationships
@@ -41,10 +41,8 @@ class Phenomenal::RelationshipsManager
         relationships.add(relationship)
       end
     rescue Phenomenal::Error => m
+      # Unable to activate the feature #{feature} \n #{m}
       feature.deactivate
-      Phenomenal::Logger.instance.debug(
-        "Unable to activate the feature #{feature} \n #{m}"
-      )
     end
   end
   
@@ -58,6 +56,6 @@ class Phenomenal::RelationshipsManager
   end
   
   def initialize
-    @relationships = Phenomenal::RelationshipsStore.new
+    @relationships = Phenomenal::RelationshipStore.new
   end
 end

data/lib/phenomenal/{relationships/relationships_store.rb → relationship/relationship_store.rb}

@@ -1,6 +1,6 @@
 # Define the class where all the actives relationships are
 # efficiently stored
-class Phenomenal::RelationshipsStore
+class Phenomenal::RelationshipStore
   attr_accessor :sources, :targets
   
   def initialize

data/lib/phenomenal/{relationships → relationship}/requirement.rb

@@ -23,7 +23,7 @@ class Phenomenal::Requirement < Phenomenal::Relationship
   private
   def check_requirement
     if source.active? && !target.active?
-      Phenomenal::Logger.instance.error(
+      raise(Phenomenal::Error,
         "Requirement of #{target} for #{source} is not satisfied"
       )
     end

data/lib/phenomenal/version.rb

@@ -1,3 +1,3 @@
 module Phenomenal
-  VERSION = "1.1.1"
+  VERSION = "1.2.1"
 end

data/lib/phenomenal/viewer/graphical.rb

@@ -13,14 +13,14 @@ class Phenomenal::Viewer::Graphical
   
   def initialize(destination_file)
     if !@@graphviz
-      Phenomenal::Logger.instance.error(
+      raise(Phenomenal::Error,
         "The 'ruby-graphviz' gem isn't available. Please install it to generate graphic visualisations\n"+
         " Otherwise use the text version: phen_textual_view"
       )
     end
     
     @manager=Phenomenal::Manager.instance
-    @rmanager=Phenomenal::RelationshipsManager.instance
+    @rmanager=Phenomenal::RelationshipManager.instance
     @destination_file=destination_file
     @main_graph=nil
     @feature_nodes={}
@@ -82,7 +82,7 @@ class Phenomenal::Viewer::Graphical
   def graph_container(relationship)
     s_parent_feature=relationship.source.parent_feature
     t_parent_feature=relationship.target.parent_feature
-    if s_parent_feature==t_parent_feature && s_parent_feature!=manager.default_context
+    if s_parent_feature==t_parent_feature && s_parent_feature!=manager.default_feature
       feature_nodes[relationship.source.parent_feature]
     else
       main_graph
@@ -91,7 +91,7 @@ class Phenomenal::Viewer::Graphical
   
   def set_edge(context,edge,relationship)
     # Define edge label
-    if context!=manager.default_context
+    if context!=manager.default_feature
       edge[:label]=context.to_s
      end
     # Define edge color
@@ -106,15 +106,15 @@ class Phenomenal::Viewer::Graphical
     elsif relationship.is_a?(Phenomenal::Requirement)
       edge[:arrowhead]="inv"
     else
-      Phenomenal::Logger.instance.error(
+      raise(Phenomenal::Error,
         "This relationship hasn't been defined yet in the graphical viewer"
       )
     end
   end
   
   def add_node_for(context)
-    # The default context is the first to be added to the main graph
-    if feature_nodes[context.parent_feature].nil? && context==manager.default_context 
+    # The default feature is the first to be added to the main graph
+    if feature_nodes[context.parent_feature].nil? && context==manager.default_feature 
       current_graph=main_graph
     # Always add the parent_feature before the contexts inside
     elsif feature_nodes[context.parent_feature].nil?

data/lib/phenomenal/viewer/textual.rb

@@ -4,7 +4,7 @@ class Phenomenal::Viewer::Textual
   
   def initialize()
     @manager=Phenomenal::Manager.instance
-    @rmanager=Phenomenal::RelationshipsManager.instance
+    @rmanager=Phenomenal::RelationshipManager.instance
   end
   
   def generate()

data/spec/context_spec.rb

@@ -40,8 +40,8 @@ describe Phenomenal::Context do
       force_forget_context(context)
     end
     
-    it "should be anonymous if it is the default context" do
-      Phenomenal::Manager.instance.default_context.name.should be_nil
+    it "should be anonymous if it is the default feature" do
+      Phenomenal::Manager.instance.default_feature.name.should be_nil
     end
   end
   
@@ -65,11 +65,11 @@ describe Phenomenal::Context do
   end
   
   describe "#add_adaptation" do
-    it "should save the default behavior in the default context" do
+    it "should save the default behavior in the default feature" do
       @context.add_adaptation(TestString, :size,true) do
         42
       end
-      a = phen_default_context.adaptations.find{|a| a.concern?(TestString,:size,true)}
+      a = phen_default_feature.adaptations.find{|a| a.concern?(TestString,:size,true)}
       a.bind(TestString.new("1234")).should==4
     end
     
@@ -261,8 +261,8 @@ describe Phenomenal::Context do
       @context.anonymous?.should be_false
     end
     
-    it "should be true for the default context" do
-      Phenomenal::Manager.instance.default_context.anonymous?.should be_true
+    it "should be true for the default feature" do
+      Phenomenal::Manager.instance.default_feature.anonymous?.should be_true
     end
     
     it "should be true when the context has no name" do
@@ -278,7 +278,7 @@ describe Phenomenal::Context do
     end
     it "should have a matching :name field" do
       @context.information[:name].should==:test
-      default = Phenomenal::Manager.instance.default_context
+      default = Phenomenal::Manager.instance.default_feature
       default.information[:name].should be_nil
     end
     it "should have a matching :adaptation field" do
@@ -314,7 +314,7 @@ describe Phenomenal::Context do
   describe "#parent_feature" do
     it "should be the default feature parent for simple contexts" do
       c = context :b
-      c.parent_feature.should be Phenomenal::Manager.instance.default_context
+      c.parent_feature.should be Phenomenal::Manager.instance.default_feature
       c.forget
     end
     

data/spec/dsl_spec.rb

@@ -106,9 +106,9 @@ describe Phenomenal::DSL do
     end
   end
   
-  describe "#phen_default_context" do
+  describe "#phen_default_feature" do
     it "should exist in Kernel" do 
-      Kernel.should respond_to :phen_default_context
+      Kernel.should respond_to :phen_default_feature
     end
   end
   

data/spec/integration/adaptation_spec.rb

@@ -40,7 +40,6 @@ describe "Simple adaptations" do
         @klass_inst_var+1
       end
     end
-    
   end
   
   after :each do
@@ -108,12 +107,14 @@ describe "Simple adaptations" do
   
   it "sould be possible to access class variables" do
     TestClass.klass_var_access.should==1
-    activate_context(:test_2)
-    
+  
     pending "Adaptations doesn't have access to class variables, seems to be a Ruby bug"
+    activate_context(:test_2)
+    t.instance_klass_var_access.should==2
     TestClass.klass_var_access.should==2
     
     deactivate_context(:test_2)
+    t.instance_klass_var_access.should==1
     TestClass.klass_var_access.should==1
   end
   

data/spec/integration/conflict_policy_spec.rb

@@ -34,14 +34,14 @@ describe "Conflict policies" do
   it "should set the age of the context such that the most recent one has the smaller age" do
     phen_change_conflict_policy { |a,b| age_conflict_policy(a,b) }
     
-    phen_context_active?(phen_default_context).should be_true
+    phen_context_active?(phen_default_feature).should be_true
     phen_context_active?(:screening).should be_false
     phen_context_active?(:quiet).should be_false
 
     phen_activate_context(:screening)
     
     (phen_context_information(:screening)[:age] <
-            phen_context_information(phen_default_context)[:age]).should be_true,
+            phen_context_information(phen_default_feature)[:age]).should be_true,
             "screening context has been activated more recently than default"
 
     phen_activate_context(:quiet)
@@ -49,7 +49,7 @@ describe "Conflict policies" do
             phen_context_information(:screening)[:age]).should be_true
             "quiet context has been activated more recently than screening"
     (phen_context_information(:screening)[:age] <
-            phen_context_information(phen_default_context)[:age]).should be_true,
+            phen_context_information(phen_default_feature)[:age]).should be_true,
             "quiet context has still been activated more recently than default"
     phen_deactivate_context(:quiet)
     phen_deactivate_context(:screening)

data/spec/integration/relationships_spec.rb

@@ -15,8 +15,8 @@ describe "Relationships" do
     @context_names.each do |name|
       force_forget_context(name)
     end
-    @manager.default_context.deactivate
-    @manager.default_context.forget
+    @manager.default_feature.deactivate
+    @manager.default_feature.forget
   end
   
   describe Phenomenal::Feature do
@@ -75,10 +75,10 @@ describe "Relationships" do
         phen_context_active?(:feature).should be_false
       end
       
-      it "should be possible to add requirements to the default context" do
+      it "should be possible to add requirements to the default feature" do
         requirements_for :a, :on=>[:b,:c,:d]
         requirements_for :a, :on=>:e
-        @manager.default_context.relationships.should have(4).items
+        @manager.default_feature.relationships.should have(4).items
       end
       
       it "should be possible to put requirements in the nested contexts" do
@@ -152,7 +152,7 @@ describe "Relationships" do
     describe "Suggestions" do
       it "should be working on the default feature" do
         suggestions_for :a,:on=>:b
-        @manager.default_context.relationships.should have(1).items
+        @manager.default_feature.relationships.should have(1).items
         context(:a).active?.should be_false
         context(:b).active?.should be_false
         expect {activate_context :a}.to_not raise_error
@@ -168,7 +168,7 @@ describe "Relationships" do
         context(:b).active?.should be_false
         expect {activate_context :a}.to_not raise_error
         suggestions_for :a,:on=>:b
-        @manager.default_context.relationships.should have(1).items
+        @manager.default_feature.relationships.should have(1).items
         context(:a).active?.should be_true
         context(:b).active?.should be_true
         expect {deactivate_context :a}.to_not raise_error

data/spec/manager_spec.rb

@@ -34,13 +34,13 @@ describe Phenomenal::Manager do
       @manager.contexts[context].should be_nil
     end
     
-    it "should allow to forget default context only when it is the only defined context" do
+    it "should allow to forget default feature only when it is the only defined context" do
       @manager.contexts.size.should==4
-      expect{@manager.unregister_context(@manager.default_context)}.to raise_error Phenomenal::Error
+      expect{@manager.unregister_context(@manager.default_feature)}.to raise_error Phenomenal::Error
       force_forget_context(@context)
       force_forget_context(@context2)
       @manager.contexts.size.should==1
-      expect{@manager.unregister_context(@manager.default_context)}.to_not raise_error
+      expect{@manager.unregister_context(@manager.default_feature)}.to_not raise_error
       @context = Phenomenal::Context.new(:test)
       @context2 = Phenomenal::Context.new(:test2)
     end

data/spec/relationships/relationships_manager_spec.rb

@@ -1,4 +1,4 @@
 require "spec_helper"
 
-describe Phenomenal::RelationshipsManager do
+describe Phenomenal::RelationshipManager do
 end

data/spec/relationships/relationships_store_spec.rb

@@ -1,13 +1,13 @@
 require "spec_helper"
 
-describe Phenomenal::RelationshipsStore do
+describe Phenomenal::RelationshipStore do
   before :each do
     @source = context :source
     @target = context :target
-    @relationship = Phenomenal::Relationship.new(:source,:target,phen_default_context)
-    @relationship2 = Phenomenal::Relationship.new(:source2,:target2,phen_default_context)
-    @relationship12 = Phenomenal::Relationship.new(:source,:target2,phen_default_context)
-    @store = Phenomenal::RelationshipsStore.new
+    @relationship = Phenomenal::Relationship.new(:source,:target,phen_default_feature)
+    @relationship2 = Phenomenal::Relationship.new(:source2,:target2,phen_default_feature)
+    @relationship12 = Phenomenal::Relationship.new(:source,:target2,phen_default_feature)
+    @store = Phenomenal::RelationshipStore.new
   end
   
   after :each do

metadata

@@ -2,7 +2,7 @@
 name: phenomenal
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.1.1
+  version: 1.2.1
 platform: ruby
 authors: 
 - Loic Vigneron - Thibault Poncelet
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-09 00:00:00 Z
+date: 2012-05-31 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -32,28 +32,29 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/phenomenal/feature.rb
+- lib/phenomenal/error.rb
 - lib/phenomenal/viewer/graphical.rb
 - lib/phenomenal/viewer/textual.rb
 - lib/phenomenal/viewer/dsl.rb
 - lib/phenomenal/dsl.rb
 - lib/phenomenal/version.rb
-- lib/phenomenal/relationships/implication.rb
-- lib/phenomenal/relationships/relationships_store.rb
-- lib/phenomenal/relationships/relationship.rb
-- lib/phenomenal/relationships/requirement.rb
-- lib/phenomenal/relationships/dsl.rb
-- lib/phenomenal/relationships/relationships_manager.rb
-- lib/phenomenal/relationships/context_relationships.rb
-- lib/phenomenal/relationships/suggestion.rb
-- lib/phenomenal/relationships/feature_relationships.rb
-- lib/phenomenal/context.rb
+- lib/phenomenal/relationship/implication.rb
+- lib/phenomenal/relationship/relationship.rb
+- lib/phenomenal/relationship/relationship_store.rb
+- lib/phenomenal/relationship/requirement.rb
+- lib/phenomenal/relationship/dsl.rb
+- lib/phenomenal/relationship/relationship_manager.rb
+- lib/phenomenal/relationship/context_relationships.rb
+- lib/phenomenal/relationship/suggestion.rb
+- lib/phenomenal/relationship/feature_relationships.rb
 - lib/phenomenal/manager/manager.rb
+- lib/phenomenal/manager/adaptation_management.rb
 - lib/phenomenal/manager/conflict_policies.rb
-- lib/phenomenal/manager/adaptations_management.rb
-- lib/phenomenal/manager/contexts_management.rb
-- lib/phenomenal/logger.rb
-- lib/phenomenal/adaptation.rb
+- lib/phenomenal/manager/context_management.rb
+- lib/phenomenal/context/feature.rb
+- lib/phenomenal/context/context.rb
+- lib/phenomenal/context/context_creation.rb
+- lib/phenomenal/context/adaptation.rb
 - lib/phenomenal.rb
 - LICENSE
 - Rakefile

data/lib/phenomenal/logger.rb

@@ -1,34 +0,0 @@
-require 'logger'
-require 'singleton'
-
-class Phenomenal::Error < StandardError; end
-  
-class Phenomenal::Logger 
-  attr_accessor :logger
-  include Singleton
-  
-  def info(msg)
-    logger.info(msg)
-  end
-  
-  def debug(msg)
-    logger.debug(msg)
-  end
-  
-  def warn(msg)
-    logger.warn(msg)
-  end
-  
-  def error(msg)
-    raise(Phenomenal::Error, msg)
-  end
-  
-  private
-  def initialize
-    self.logger = Logger.new(STDOUT)
-    self.logger.level = Logger::DEBUG
-    self.logger.datetime_format = "%Y-%m-%d - %H:%M:%S"
-  end
-end
-  
-