phenomenal 1.0.1 → 1.1.0

data/{README → README.md}

@@ -1,3 +1,9 @@
+Phenomenal Gem
+===
 Phenomenal Gem is a context-oriented framework implemented in Ruby that allows context-oriented programming in Ruby and Ruby on Rails applications. 
 
 See www.phenomenal-gem.com for more details
+
+Architecture
+===
+![architecture](http://www.phenomenal-gem.com/assets/project/phenomenal_use_diagram.png)

data/lib/phenomenal.rb

@@ -19,7 +19,6 @@ require_relative "./phenomenal/context.rb"
 require_relative "./phenomenal/feature.rb"
 require_relative "./phenomenal/logger.rb"
 require_relative "./phenomenal/manager.rb"
-require_relative "./phenomenal/proc.rb"
 
 # Viewer
 require_relative "./phenomenal/viewer/graphical.rb"

data/lib/phenomenal/adaptation.rb

@@ -39,13 +39,13 @@ class  Phenomenal::Adaptation
   def bind(instance,*args,&block)
     if instance_adaptation?
       if implementation.class==Proc
-        implementation.phenomenal_bind(instance).call(*args,&block)
+        instance.instance_exec(*args,block,&implementation)
       else
         implementation.bind(instance).call(*args,&block)
       end
     else
       if implementation.class==Proc
-        implementation.phenomenal_class_bind(klass).call(*args,&block)
+        klass.instance_exec(*args,block,&implementation)
       else
         implementation.call(*args,&block)
       end

data/lib/phenomenal/context.rb

@@ -87,6 +87,11 @@ class Phenomenal::Context
   # Add a new method adaptation to the 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(
+        "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
       instance = klass.instance_methods.include?(method_name)
@@ -142,6 +147,7 @@ class Phenomenal::Context
   # Add multiple adaptations at definition time
   def add_adaptations(&block)
     instance_eval(&block) if block
+    @current_adapted_class=nil #Reset adapted class after context closed
   end
   
   # Set the current adapted class for the next adapt calls

data/lib/phenomenal/relationships/dsl.rb

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

data/lib/phenomenal/relationships/feature_relationships.rb

@@ -10,14 +10,17 @@ module Phenomenal::FeatureRelationships
   def requirements_for(source,targets)
     add_relationship(source,targets,Phenomenal::Requirement)
   end  
+  alias_method :phen_requirements_for,:requirements_for
   
   def implications_for(source,targets)
     add_relationship(source,targets,Phenomenal::Implication)
   end  
+  alias_method :phen_implications_for,:implications_for
   
   def suggestions_for(source,targets)
     add_relationship(source,targets,Phenomenal::Suggestion)
   end  
+  alias_method :phen_suggestions_for,:suggestions_for
   
   private 
   def add_relationship(source,targets,type)

data/lib/phenomenal/version.rb

@@ -1,3 +1,3 @@
 module Phenomenal
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,120 +1,124 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: phenomenal
-version: !ruby/object:Gem::Version
-  version: 1.0.1
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 1.1.0
 platform: ruby
-authors:
+authors: 
 - Loic Vigneron - Thibault Poncelet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-07 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-04-17 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &70279300835880 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.5'
+      - !ruby/object:Gem::Version 
+        version: "2.5"
   type: :development
-  prerelease: false
-  version_requirements: *70279300835880
+  version_requirements: *id001
 description: A context oriented programming framework for Ruby
 email: team@phenomenal-gem.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
-- lib/phenomenal/adaptation.rb
+
+files: 
+- lib/phenomenal/manager.rb
+- lib/phenomenal/feature.rb
 - lib/phenomenal/conflict_policies.rb
-- lib/phenomenal/context.rb
+- lib/phenomenal/viewer/graphical.rb
+- lib/phenomenal/viewer/textual.rb
+- lib/phenomenal/viewer/dsl.rb
 - lib/phenomenal/dsl.rb
-- lib/phenomenal/feature.rb
-- lib/phenomenal/logger.rb
-- lib/phenomenal/manager.rb
-- lib/phenomenal/proc.rb
-- lib/phenomenal/relationships/context_relationships.rb
-- lib/phenomenal/relationships/dsl.rb
-- lib/phenomenal/relationships/feature_relationships.rb
+- lib/phenomenal/version.rb
 - lib/phenomenal/relationships/implication.rb
-- lib/phenomenal/relationships/relationship.rb
-- lib/phenomenal/relationships/relationships_manager.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/version.rb
-- lib/phenomenal/viewer/dsl.rb
-- lib/phenomenal/viewer/graphical.rb
-- lib/phenomenal/viewer/textual.rb
+- lib/phenomenal/relationships/feature_relationships.rb
+- lib/phenomenal/context.rb
+- lib/phenomenal/logger.rb
+- lib/phenomenal/adaptation.rb
 - lib/phenomenal.rb
 - LICENSE
 - Rakefile
-- README
-- spec/adaptation_spec.rb
+- README.md
+- spec/spec_helper.rb
+- spec/feature_spec.rb
 - spec/context_spec.rb
+- spec/test_classes.rb
+- spec/manager_spec.rb
+- spec/adaptation_spec.rb
+- spec/relationships/relationships_store_spec.rb
+- spec/relationships/relationship_spec.rb
+- spec/relationships/feature_relationships_spec.rb
+- spec/relationships/dsl_spec.rb
+- spec/relationships/context_relationships_spec.rb
+- spec/relationships/relationships_manager_spec.rb
 - spec/dsl_spec.rb
-- spec/feature_spec.rb
-- spec/integration/adaptation_spec.rb
-- spec/integration/combined_contexts_spec.rb
 - spec/integration/composition_spec.rb
-- spec/integration/conflict_policy_spec.rb
+- spec/integration/combined_contexts_spec.rb
+- spec/integration/adaptation_spec.rb
 - spec/integration/open_context.rb
+- spec/integration/conflict_policy_spec.rb
 - spec/integration/relationships_spec.rb
-- spec/manager_spec.rb
-- spec/proc_spec.rb
-- spec/relationships/context_relationships_spec.rb
-- spec/relationships/dsl_spec.rb
-- spec/relationships/feature_relationships_spec.rb
-- spec/relationships/relationship_spec.rb
-- spec/relationships/relationships_manager_spec.rb
-- spec/relationships/relationships_store_spec.rb
-- spec/spec_helper.rb
-- spec/test_classes.rb
 homepage: http://www.phenomenal-gem.com
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
       version: 1.9.2
-required_rubygems_version: !ruby/object:Gem::Requirement
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: A context oriented programming framework for Ruby
-test_files:
-- spec/adaptation_spec.rb
+test_files: 
+- spec/spec_helper.rb
+- spec/feature_spec.rb
 - spec/context_spec.rb
+- spec/test_classes.rb
+- spec/manager_spec.rb
+- spec/adaptation_spec.rb
+- spec/relationships/relationships_store_spec.rb
+- spec/relationships/relationship_spec.rb
+- spec/relationships/feature_relationships_spec.rb
+- spec/relationships/dsl_spec.rb
+- spec/relationships/context_relationships_spec.rb
+- spec/relationships/relationships_manager_spec.rb
 - spec/dsl_spec.rb
-- spec/feature_spec.rb
-- spec/integration/adaptation_spec.rb
-- spec/integration/combined_contexts_spec.rb
 - spec/integration/composition_spec.rb
-- spec/integration/conflict_policy_spec.rb
+- spec/integration/combined_contexts_spec.rb
+- spec/integration/adaptation_spec.rb
 - spec/integration/open_context.rb
+- spec/integration/conflict_policy_spec.rb
 - spec/integration/relationships_spec.rb
-- spec/manager_spec.rb
-- spec/proc_spec.rb
-- spec/relationships/context_relationships_spec.rb
-- spec/relationships/dsl_spec.rb
-- spec/relationships/feature_relationships_spec.rb
-- spec/relationships/relationship_spec.rb
-- spec/relationships/relationships_manager_spec.rb
-- spec/relationships/relationships_store_spec.rb
-- spec/spec_helper.rb
-- spec/test_classes.rb

data/lib/phenomenal/proc.rb

@@ -1,34 +0,0 @@
-# Add methods to Proc classe
-class Proc
-  # Define a bind method on Proc object,
-  # This allow to execute a Proc as it was an instance method of reciever
-  # Used for composition of instance methods adaptations
-  # Src: http://www.ruby-forum.com/topic/173699
-  def phenomenal_bind(receiver)
-    block, time = self, Time.now
-    (class << receiver; self end).class_eval do
-      method_name = "__bind_#{time.to_i}_#{time.usec}-#{rand(100000)}"
-      define_method(method_name, &block)
-      method = instance_method(method_name)
-      remove_method(method_name)
-      method
-    end.bind(receiver)
-  end
-
-  # Define a bind_class method on Proc object,
-  # This allow to execute a Proc as it was an class method of klass
-  # Used for composition of class methods adaptations
-  def phenomenal_class_bind(klass)
-    block, time = self, Time.now
-      method_name = "__bind_#{time.to_i}_#{time.usec}-#{rand(100000)}"
-      method = nil
-      klass.instance_eval do
-        define_singleton_method(method_name, &block)
-        method = method(method_name)
-        (class << self; self end).instance_eval do
-          remove_method(method_name)
-        end
-      end
-      method
-  end
-end

data/spec/proc_spec.rb

@@ -1,20 +0,0 @@
-require "spec_helper"
-
-describe Proc do
-  describe "#phenomenal_bind" do
-    it "should be possible to bind proc as instance methods" do
-      p = Proc.new{"Proc"}
-      p.should respond_to :phenomenal_bind
-      o = BasicObject.new
-      p.phenomenal_bind(o).call.should == "Proc"
-    end
-  end
-  
-  describe "#phenomenal_class_bind" do
-    it "should be possible to bind proc as class methods" do
-      p = Proc.new{"Proc"}
-      p.should respond_to :phenomenal_class_bind
-      p.phenomenal_bind(BasicObject).call.should == "Proc"
-    end
-  end
-end