phenomenal 1.0.0 → 1.0.1

data/LICENSE

@@ -1,19 +1,171 @@
 Copyright (C) 2011 Thibault Poncelet <thibault.poncelet@student.uclouvain.be>
 Copyright (C) 2011 Loic Vigneron <loic.vigneron@student.uclouvain.be>
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
 
 ========================
 

data/lib/phenomenal/conflict_policies.rb

@@ -2,20 +2,20 @@
 module Phenomenal::ConflictPolicies
   
   # Prefer not default adaptation, error if two not default ones
-    def no_resolution_conflict_policy(adaptation1,adaptation2)
-      if adaptation1.context==default_context()
+    def no_resolution_conflict_policy(context1,context2)
+      if context1==default_context()
         1
-      elsif adaptation2.context.name==default_context()
+      elsif context2==default_context()
         -1
       else #Fail if two non default adaptations
         Phenomenal::Logger.instance.error(
-            "Illegal duplicate adapation of #{adaptation1.to_s}"
+            "Illegal duplicate adapation between contexts #{context1} and #{context2} "
         )
       end
     end
 
     # Age based conflict resolution
-    def age_conflict_policy(adaptation1, adaptation2)
-       adaptation1.context.age <=> adaptation2.context.age
+    def age_conflict_policy(context1, context2)
+       context1.age <=> context2.age
     end
 end

data/lib/phenomenal/context.rb

@@ -4,7 +4,7 @@ class Phenomenal::Context
   @@total_activations = 0
   
   attr_accessor :activation_age, :activation_frequency, :adaptations, 
-    :activation_count, :parent,:forgotten
+    :activation_count, :parent, :forgotten
   attr_reader :manager,:name
   
   def self.create(context,*contexts,nested,closest_feature,&block)

data/lib/phenomenal/manager.rb

@@ -106,7 +106,7 @@ class Phenomenal::Manager
   
   # Call the old implementation of the method 'caller.caller_method'
   def proceed(calling_stack,instance,*args,&block)
-    calling_adaptation = find_adapatation(calling_stack)
+    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
@@ -150,6 +150,12 @@ class Phenomenal::Manager
     end
     return c
   end
+  
+  
+  # Resolution policy
+  def conflict_policy(context1, context2)
+    age_conflict_policy(context1, context2)
+  end
 
   private
   def find_simple_context(context)
@@ -253,7 +259,7 @@ class Phenomenal::Manager
   # Return the adaptation that math the calling_stack, on the basis of the
   # file and the line number --> proceed is always called under an
   # adaptation definition
-  def find_adapatation(calling_stack)
+  def find_adaptation(calling_stack)
     source = calling_stack[0]
     source_info = source.scan(/(.+\.rb):(\d+)/)[0]
     call_file = source_info[0]
@@ -288,12 +294,7 @@ class Phenomenal::Manager
   def sorted_adaptations_for(klass,method_name,instance)
     relevant_adaptations =
       active_adaptations.find_all { |i| i.concern?(klass, method_name,instance) }
-    relevant_adaptations.sort!{|a,b| conflict_policy(a,b)}
-  end
-  
-  # Resolution policy
-  def conflict_policy(adaptation1, adaptation2)
-    age_conflict_policy(adaptation1, adaptation2)
+    relevant_adaptations.sort!{|a,b| conflict_policy(a.context,b.context)}
   end
   
    # Set the default context

data/lib/phenomenal/version.rb

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

data/spec/integration/adaptation_spec.rb

@@ -49,6 +49,8 @@ describe "Simple adaptations" do
     force_forget_context(context(:test))
     force_forget_context(context(:test_2))
     force_forget_context(context(:test_3))
+    
+    phen_change_conflict_policy { |a,b| age_conflict_policy(a,b) }
   end
   
   it "should override default behavior" do

metadata

@@ -1,127 +1,120 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: phenomenal
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.0.1
   prerelease: 
-  version: 1.0.0
 platform: ruby
-authors: 
+authors:
 - Loic Vigneron - Thibault Poncelet
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-24 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-03-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70279300835880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "2.5"
+      - !ruby/object:Gem::Version
+        version: '2.5'
   type: :development
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: *70279300835880
 description: A context oriented programming framework for Ruby
 email: team@phenomenal-gem.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- lib/phenomenal/manager.rb
-- lib/phenomenal/feature.rb
-- lib/phenomenal/proc.rb
+files:
+- lib/phenomenal/adaptation.rb
 - lib/phenomenal/conflict_policies.rb
-- lib/phenomenal/viewer/graphical.rb
-- lib/phenomenal/viewer/textual.rb
-- lib/phenomenal/viewer/dsl.rb
+- lib/phenomenal/context.rb
 - lib/phenomenal/dsl.rb
-- lib/phenomenal/version.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/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/relationships_store.rb
+- lib/phenomenal/relationships/requirement.rb
 - lib/phenomenal/relationships/suggestion.rb
-- lib/phenomenal/relationships/feature_relationships.rb
-- lib/phenomenal/context.rb
-- lib/phenomenal/logger.rb
-- lib/phenomenal/adaptation.rb
+- lib/phenomenal/version.rb
+- lib/phenomenal/viewer/dsl.rb
+- lib/phenomenal/viewer/graphical.rb
+- lib/phenomenal/viewer/textual.rb
 - lib/phenomenal.rb
 - LICENSE
 - Rakefile
 - README
-- 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/context_spec.rb
 - spec/dsl_spec.rb
-- spec/proc_spec.rb
-- spec/integration/composition_spec.rb
-- spec/integration/combined_contexts_spec.rb
+- spec/feature_spec.rb
 - spec/integration/adaptation_spec.rb
-- spec/integration/open_context.rb
+- spec/integration/combined_contexts_spec.rb
+- spec/integration/composition_spec.rb
 - spec/integration/conflict_policy_spec.rb
+- spec/integration/open_context.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.11
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: A context oriented programming framework for Ruby
-test_files: 
-- spec/spec_helper.rb
-- spec/feature_spec.rb
-- spec/context_spec.rb
-- spec/test_classes.rb
-- spec/manager_spec.rb
+test_files:
 - 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/context_spec.rb
 - spec/dsl_spec.rb
-- spec/proc_spec.rb
-- spec/integration/composition_spec.rb
-- spec/integration/combined_contexts_spec.rb
+- spec/feature_spec.rb
 - spec/integration/adaptation_spec.rb
-- spec/integration/open_context.rb
+- spec/integration/combined_contexts_spec.rb
+- spec/integration/composition_spec.rb
 - spec/integration/conflict_policy_spec.rb
+- spec/integration/open_context.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