maroon 0.7.1 → 0.8.0

data/base/immutable_queue.rb

@@ -27,7 +27,7 @@ context :ImmutableQueue do
   end
 
   def self.empty
-    @@empty ||= ImmutableQueue.new(ImmutableStack::empty, ImmutableStack::empty)
+    @empty ||= ImmutableQueue.new(ImmutableStack::empty, ImmutableStack::empty)
   end
 
   def push_array(arr)

data/base/maroon_base.rb

@@ -10,7 +10,7 @@
 # With in the block supplied to the role method you can define role methods the same way as you define interactions. See the method who
 # in the below example
 # = Example
-#    Context::define :Greeter do
+#    Context.define :Greeter do
 #        role :who do
 #          say do
 #            @who #could be self as well to refer to the current role player of the 'who' role
@@ -39,23 +39,62 @@ c = context :Context do
 
   def self.define(*args, &block)
     name, base_class, default_interaction = *args
+
     if default_interaction and (not base_class.instance_of?(Class)) then
       base_class = eval(base_class.to_s)
     end
     if base_class and ((not default_interaction) and (not base_class.instance_of?(Class))) then
       base_class, default_interaction = default_interaction, base_class
     end
-    @@with_contracts ||= nil
-    @@generate_file_path ||= nil
-    ctx = self.send(:create_context_factory,  name, base_class, default_interaction, block)
-    transformer = Transformer.new name, ctx.roles,ctx.interactions,ctx.private_interactions,base_class, default_interaction
-    return transformer.transform @@generate_file_path, @@with_contracts
+    @with_contracts ||= nil
+
+    ctx = self.send(:create_context_factory, name, base_class, default_interaction, block)
+
+    if self.generate_dependency_graph
+      dependencies = {}
+      ctx.dependencies = DependencyGraphModel.new(DependencyGraph.new(name,ctx.roles,ctx.interactions,dependencies).create!)
+    end
+    transformer = Transformer.new(name, ctx.roles, ctx.interactions, ctx.private_interactions, base_class, default_interaction)
+    ctx.generated_class = transformer.transform(generate_files_in, @with_contracts)
+    ctx
   end
 
-  def self.generate_files_in(*args, &b)
+  def self.generate_files_in
+    @generate_files_in
+  end
 
-    @@generate_file_path = args[0]
+  def self.generate_files_in=(folder)
+    @generate_files_in = folder
+  end
 
+  def self.generate_code=(value)
+    @generate_code = value
+  end
+
+  def self.generate_dependency_graph=(value)
+    @generate_dependency_graph = value
+  end
+
+  def self.generate_code
+    @generate_code || !generate_dependency_graph || generate_files_in
+  end
+
+  def self.generate_dependency_graph
+    @generate_dependency_graph
+  end
+
+  def dependencies
+    @dependencies
+  end
+  def generated_class
+    @generated_class
+  end
+
+  def dependencies=(value)
+    @dependencies=value
+  end
+  def generated_class=(value)
+    @generated_class=value
   end
 
   def roles
@@ -116,12 +155,12 @@ c = context :Context do
   end
 
   def self.with_contracts(*args)
-    return @@with_contracts if (args.length == 0)
+    return @with_contracts if (args.length == 0)
     value = args[0]
-    if @@with_contracts and (not value) then
+    if @with_contracts and (not value) then
       raise('make up your mind! disabling contracts during execution will result in undefined behavior')
     end
-    @@with_contracts = value
+    @with_contracts = value
 
   end
 

data/base/transfomer.rb

@@ -1,197 +1,196 @@
-context :Transformer do
-
-  def initialize(context_name, roles, interactions,private_interactions, base_class,default_interaction)
-    @context_name = context_name
-
-    @roles = roles
-    @interactions = interactions
-    @base_class = base_class
-    @default_interaction = default_interaction
-    @private_interactions = private_interactions
-    @definitions = {}
-  end
-
-  role :private_interactions do end
-  role :context_name do end
-  role :roles do
-     def generated_source
-       impl = ''
-       getters = ''
-       roles.each do |role, methods|
-         getters << 'attr_reader :' + role.to_s + '
-         '
-         methods.each do |name, method_sources|
-           bind :method_sources => :method , :name=> :method_name , :role => :defining_role
-           definition = method.generated_source
-           (impl << ('   ' + definition )) if definition
-         end
-       end
-       (impl.strip! || '')+ '
-' + (getters.strip!  || '') + '
-'
-     end
-  end
-  role :interactions do
-    def generated_source
-      internal_methods = ''
-      external_methods = interactions.default
-      interactions.each do |name, interact|
-        interact.each do |m|
-          bind :m => :method, :name => :method_name
-          @defining_role = nil
-          code = method.generated_source
-
-          (method.is_private? ? internal_methods : external_methods) << ' ' << code
-        end
-      end
-      (external_methods.strip! || '') + '
-     private
-' + (internal_methods.strip! || '') + '
-'
-    end
-    def default
-       if @default
-         '
-               def self.call(*args)
-             arity = ' + name.to_s + '.method(:new).arity
-             newArgs = args[0..arity-1]
-             obj = ' + name.to_s + '.new *newArgs
-             if arity < args.length
-                 methodArgs = args[arity..-1]
-                 obj.' + default.to_s + ' *methodArgs
-             else
-                obj.' + default.to_s + '
-                             end
-         end
-            def call(*args);' + default.to_s + ' *args; end
-'
-       else
-         ''
-       end
-    end
-  end
-  role :method_name do end
-  role :defining_role do end
-  role :method do
-    def is_private?
-      defining_role != nil || (private_interactions.has_key? method.name)
-    end
-    def definition
-      key = (@defining_role ? @defining_role.to_s : '') + method_name.to_s
-      return @definitions[key] if @definitions.has_key? key
-      unless method.instance_of? Sexp
-        unless (method.instance_of? Array)  && method.length < 2 then
-          raise(('Duplicate definition of ' + method_name.to_s + '(' + method.to_s + ')'))
-        end
-        unless (method.instance_of? Array)  && method.length > 0 then
-          raise(('No source for ' + method_name.to_s))
-        end
-      end
-
-      d = (method.instance_of? Array) ? method[0] : method
-      raise 'Sexp require' unless d.instance_of? Sexp
-      @definitions[key] = d
-    end
-    def body
-      args = method.definition.detect { |d| d[0] == :args }
-      index = method.definition.index(args) + 1
-      if method.definition.length > index+1
-        body = method.definition[index..-1]
-        body.insert(0, :block)
-        body
-      else
-        method.definition[index]
-      end
-    end
-
-    def arguments
-      args = method.definition.detect { |d| d[0] == :args }
-      args && args.length > 1 ? args[1..-1] : []
-    end
-
-    def name
-      name = if method.definition[1].instance_of? Symbol
-               method.definition[1].to_s
-      else
-        (method.definition[1].select { |e| e.instance_of? Symbol }.map { |e| e.to_s }.join('.') + '.' + method.definition[2].to_s)
-      end
-      (
-      unless defining_role
-        name
-      else
-        'self_' + @defining_role.to_s + '_' + name.to_s
-      end).to_sym
-    end
-    def generated_source
-      AstRewritter.new(method.body, interpretation_context).rewrite!
-      body = Ruby2Ruby.new.process(method.body)
-      raise 'Body is undefined' unless body
-      args = method.arguments
-      if args && args.length
-        args = '('+ args.join(',') + ')'
-      else
-        args= ''
-      end
-
-      header = 'def ' + method.name.to_s + args
-      header + ' ' + body + ' end
-'
-    end
-  end
-
-
-  def transform(file_path, with_contracts)
-
-    code = interactions.generated_source + roles.generated_source
-
-    if file_path then
-      name = context_name.to_s
-      complete = ((((('class ' + name) + (@base_class ? (('<< ' + @base_class.name)) : (''))) + '
-      ') + code.to_s) + '
-           end')
-      File.open((((('./' + file_path.to_s) + '/') + name) + '.rb'), 'w') do |f|
-        f.write(complete)
-      end
-      complete
-    else
-      c = @base_class ? (Class.new(base_class)) : (Class.new)
-      if with_contracts then
-        c.class_eval(
-            'def self.assert_that(obj)
-  ContextAsserter.new(self.contracts,obj)
-end
-def self.refute_that(obj)
-  ContextAsserter.new(self.contracts,obj,false)
-end
-def self.contracts
-  @@contracts
-end
-def self.contracts=(value)
-  @@contracts = value
-end')
-        c.contracts = contracts
-      end
-      Kernel.const_set(context_name, c)
-      begin
-        temp = c.class_eval(code)
-      rescue SyntaxError
-        p 'error: ' + code
-      end
-
-      (temp or c)
-    end
-
-  end
-
-  private
-
-  def contracts
-    (@contracts ||= {})
-  end
-  def role_aliases
-    (@role_aliases ||={})
-  end
-  def interpretation_context
-    InterpretationContext.new(roles, contracts, role_aliases, defining_role, @private_interactions)
-  end
-end
+context :Transformer do
+
+  def initialize(context_name, roles, interactions,private_interactions, base_class,default_interaction)
+    @context_name = context_name
+
+    @roles = roles
+    @interactions = interactions
+    @base_class = base_class
+    @default_interaction = default_interaction
+    @private_interactions = private_interactions
+    @definitions = {}
+  end
+
+  role :private_interactions do end
+  role :context_name do end
+  role :roles do
+     def generated_source
+       impl = ''
+       getters = []
+       roles.each do |role, methods|
+         getters <<  role.to_s
+         methods.each do |name, method_sources|
+           bind :method_sources => :method , :name=> :method_name , :role => :defining_role
+           definition = method.generated_source
+           (impl << ('   ' + definition )) if definition
+         end
+       end
+       (impl.strip! || '')+ '
+' + (getters.length > 0 ? 'attr_reader :' +getters.join(', :') : '') + '
+'
+     end
+  end
+  role :interactions do
+    def generated_source
+      internal_methods = ''
+      external_methods = interactions.default
+      interactions.each do |name, interact|
+        interact.each do |m|
+          bind :m => :method, :name => :method_name
+          @defining_role = nil
+          code = method.generated_source
+
+          (method.is_private? ? internal_methods : external_methods) << ' ' << code
+        end
+      end
+      (external_methods.strip! || '') + '
+     private
+' + (internal_methods.strip! || '') + '
+'
+    end
+    def default
+       if @default
+         '
+               def self.call(*args)
+             arity = ' + name.to_s + '.method(:new).arity
+             newArgs = args[0..arity-1]
+             obj = ' + name.to_s + '.new *newArgs
+             if arity < args.length
+                 methodArgs = args[arity..-1]
+                 obj.' + default.to_s + ' *methodArgs
+             else
+                obj.' + default.to_s + '
+                             end
+         end
+            def call(*args);' + default.to_s + ' *args; end
+'
+       else
+         ''
+       end
+    end
+  end
+  role :method_name do end
+  role :defining_role do end
+  role :method do
+    def is_private?
+      defining_role != nil || (private_interactions.has_key? method.name)
+    end
+    def definition
+      key = (@defining_role ? @defining_role.to_s : '') + method_name.to_s
+      return @definitions[key] if @definitions.has_key? key
+      unless method.instance_of? Sexp
+        unless (method.instance_of? Array)  && method.length < 2 then
+          raise(('Duplicate definition of ' + method_name.to_s + '(' + method.to_s + ')'))
+        end
+        unless (method.instance_of? Array)  && method.length > 0 then
+          raise(('No source for ' + method_name.to_s))
+        end
+      end
+
+      d = (method.instance_of? Array) ? method[0] : method
+      raise 'Sexp require' unless d.instance_of? Sexp
+      @definitions[key] = d
+    end
+    def body
+      args = method.definition.detect { |d| d[0] == :args }
+      index = method.definition.index(args) + 1
+      if method.definition.length > index+1
+        body = method.definition[index..-1]
+        body.insert(0, :block)
+        body
+      else
+        method.definition[index]
+      end
+    end
+
+    def arguments
+      args = method.definition.detect { |d| d[0] == :args }
+      args && args.length > 1 ? args[1..-1] : []
+    end
+
+    def name
+      name = if method.definition[1].instance_of? Symbol
+               method.definition[1].to_s
+      else
+        (method.definition[1].select { |e| e.instance_of? Symbol }.map { |e| e.to_s }.join('.') + '.' + method.definition[2].to_s)
+      end
+      (
+      unless defining_role
+        name
+      else
+        'self_' + @defining_role.to_s + '_' + name.to_s
+      end).to_sym
+    end
+    def generated_source
+      AstRewritter.new(method.body, interpretation_context).rewrite!
+      body = Ruby2Ruby.new.process(method.body)
+      raise 'Body is undefined' unless body
+      args = method.arguments
+      if args && args.length
+        args = '('+ args.join(',') + ')'
+      else
+        args= ''
+      end
+
+      header = 'def ' + method.name.to_s + args
+      header + ' ' + body + ' end
+'
+    end
+  end
+
+
+  def transform(file_path, with_contracts)
+
+    code = interactions.generated_source + roles.generated_source
+
+    if file_path then
+      name = context_name.to_s
+      complete = ((((('class ' + name) + (@base_class ? (('<< ' + @base_class.name)) : (''))) + '
+      ') + code.to_s) + '
+           end')
+      File.open((((('./' + file_path.to_s) + '/') + name) + '.rb'), 'w') do |f|
+        f.write(complete)
+      end
+      complete
+    else
+      c = @base_class ? (Class.new(base_class)) : (Class.new)
+      if with_contracts then
+        c.class_eval(
+            'def self.assert_that(obj)
+  ContextAsserter.new(self.contracts,obj)
+end
+def self.refute_that(obj)
+  ContextAsserter.new(self.contracts,obj,false)
+end
+def self.contracts
+  @contracts
+end
+def self.contracts=(value)
+  @contracts = value
+end')
+        c.contracts = contracts
+      end
+      Kernel.const_set(context_name, c)
+      begin
+        temp = c.class_eval(code)
+      rescue SyntaxError
+        p 'error: ' + code
+      end
+
+      (temp or c)
+    end
+
+  end
+
+  private
+
+  def contracts
+    (@contracts ||= {})
+  end
+  def role_aliases
+    (@role_aliases ||={})
+  end
+  def interpretation_context
+    InterpretationContext.new(roles, contracts, role_aliases, defining_role, @private_interactions)
+  end
+end