mushin 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e80b77edeaa86c23fa83d52e191991a7c66325c1
-  data.tar.gz: 46ded24456a4fb628e295f9a48456754dd88b90a
+  metadata.gz: 140ed42cc5d343e6daf4d8996a0a35f7947c338f
+  data.tar.gz: 631d955207007eb2ea568a7fcc33c42dfb1c2f9c
 SHA512:
-  metadata.gz: 6040f8b9596de44e019ded4202b020259dbf06100105502d5e5978093160d433978ad03db8c869711a65f0dbe1c0d1679813e11c37ad31d98d5911500d978d32
-  data.tar.gz: 206abca21b7f550b5900ac9633bfac2b46847e59b8aaa55f57dd4340a9c3bf4a40450ed3490d90d781e2bbd9c7f684e323fa6ae8d826518378b1092e08807b09
+  metadata.gz: f636a201415bd0f160ca69a8709ede7069fb3540934f0056229dd44ab4e142cd9d08f1526a2b143207f21460a471fc04a45d0d0ceb70da43980c483b6e98d2af
+  data.tar.gz: d312a250c3943e31a8011345350531afed055ad6ece23bb73445c81989643b51f0f61a209443b6f51932c43c24bb3503dab6ef5e1eac63938c017f4da268963a

data/Rakefile

@@ -4,7 +4,7 @@ require "rake/testtask"
 Rake::TestTask.new(:test) do |t|
   t.libs << "test"
   t.libs << "lib"
-  t.test_files = FileList['test/**/*_test.rb']
+  t.test_files = FileList['spec/**/*_spec.rb']
 end
 
 task :default => :test

data/lib/mushin/domain.rb

@@ -1,114 +1,5 @@
-# 1- an access method :context is defined in DSLBuilder(thats a module avialable as class methods to the domain class of the application.
-# 2- the :context takes a name, &block and pass instance_eval it aganist an object created from DSLBuilder::Context
-# 3- DSLBuilder::Context initialize takes a context_name say "torrent_bots" and create an app_context_klass and creates an access method with the :context_name inside DSL 
-#
+require_relative 'dsl_builder'
 module Mushin
-  module DSLBuilder
-    class Context
-      attr_accessor :context_name
-      # defines a DSL::Klass of type Context based on :name
-      # Supplies the defined DSL::Klass with a method of the construct
-      def initialize context_name, &block
-	@context_name = context_name.capitalize
-
-	app_context_klass = Class.new(Object) do
-	  def initialize &block
-	    instance_eval &block
-	  end
-	end
-	# creates a context klass dynamically
-	DSL.const_set(context_name.capitalize, app_context_klass) unless DSL.const_defined?(context_name.capitalize)
-	# creates an access method inside DSL for the dynamically created context klass
-	DSL.send(:define_method, context_name) do |&block|
-	  DSL.const_get(context_name.capitalize).new &block unless context_name.nil?
-	end
-
-	instance_eval &block
-      end
-
-      # access method for DSLBuilder::Construct klass inside a context object &block
-      def construct name, &block
-	app_context_klass = DSL.const_get(@context_name)
-	Construct.new(name, app_context_klass, &block) #.instance_eval &block
-      end
-    end
-
-    class Construct
-      attr_accessor :name, :stack, :app_context_klass
-      def initialize name, app_context_klass, &block
-	@name 	= name.capitalize
-	@middlewares = []
-	@stack 	= Mushin::Stack.new
-	@app_context_klass = app_context_klass
-	
-	instance_eval &block
-	$log.info "middlewares after instance_eval"
-	$log.info  middlewares = @middlewares
-
-	app_construct_klass = Class.new(Object) do
-	  @@stack = Mushin::Stack.new
-	  @@env = {}
-	  @@ext_set = middlewares
-
-	  attr_accessor :env
-	  def initialize env = {}
-	    @env = env
-	    #p "merging #{@@env} with #{env_updates} for the result of #{env_updates.merge @@env}"
-	    #p "domaindsl construct is ready to activate calling the stack with #{env}"
-	  end
-	end # end of app_construct_klass 
-
-	DSL.const_set(name.capitalize, app_construct_klass) unless DSL.const_defined?(name.capitalize)
-	# Reopens most recent context klass and add method `def construct_name params; app_construct_class.new(params)`
-	# access method for DSL::Construct dynamic klass inside a context object &block
-	DSL.const_get(@app_context_klass.to_s).send(:define_method, name) do |env|
-	  # 1. populate :symbols inside opts and params with values from env
-	  @@ext_set.each do |ext|
-	    ext[:params].each do |key, value|
-	      env.each do |env_key, env_value|
-		if env_key.to_sym == value then
-		  ext[:params][key] = env_value
-		end
-	      end
-	    end
-
-	    ext[:opts].each do |key, value|
-	      env.each do |env_key, env_value|
-		if env_key.to_sym == value then
-		  ext[:opts][key] = env_value
-		end
-	      end
-	    end
-	    $log.info ext 
-	  end
-	  # 2. insert 
-	  @@ext_set.each do |ext|
-	    @@stack.insert_before 0, ext[:ext], ext[:opts], ext[:params]
-	  end
-	  # 3. call the stack
-	  @@stack.call
-
-	  DSL.const_get(name.capitalize).new env
-	end
-	#p DSL.constants
-      end
-
-      def use ext:, opts: {}, params: {}
-	@middlewares << {:ext => ext, :opts => opts, :params => params}
-	#p @middlewares
-	#	@stack.insert_before 0, ext, opts, params
-	#@stack.call
-	#@stack = Use.new(ext, opts, params, @stack)
-      end
-    end
-
-    def context name, &block
-      Context.new(name, &block) #.instance_eval &block
-    end
-  end
-
-  module DSL
-  end
 
   class Domain
     def self.inherited(subclass)
@@ -117,6 +8,7 @@ module Mushin
     end
 
     def initialize &block
+      $log.info "Domain object #{self} is going to instance_eval"
       instance_eval &block
     end
   end

data/lib/mushin/dsl.rb

@@ -0,0 +1,9 @@
+module Mushin
+  # DSL module holds one klass and one access method along with 
+  # one neseted klass and one nested access method
+  module DSL
+    def self.inherited(other)
+      puts other
+    end
+  end
+end

data/lib/mushin/dsl_builder.rb

@@ -0,0 +1,120 @@
+require 'mushin'
+require_relative 'dsl'
+
+module Mushin
+
+  module DSLBuilder
+
+    # The DSLBuilder context access method
+    def context context_keyword, &block
+      Context.new context_keyword, &block
+    end
+
+    class Context
+
+      # attr for a dsl context constructor class
+      attr_accessor :app_dsl_context_klass
+
+      def initialize context_keyword, &block
+	@app_dsl_context_klass = app_dsl_context_access_method_and_klass(context_keyword, Mushin::DSL)
+	instance_eval &block
+      end
+
+      def construct construct_keyword, &block
+	Construct.new construct_keyword, @app_dsl_context_klass, &block
+      end
+
+      def app_dsl_context_access_method_and_klass(context_keyword, parent_klass)
+	$log.info "dynamically building app dsl context access method for: #{context_keyword}, inside: #{parent_klass}".reverse_color
+	parent_klass.class_eval do
+	  define_method(context_keyword) do |&block|
+	    p context_keyword
+	    parent_klass.const_get(context_keyword.capitalize).new &block #if block_given?
+	  end
+	end
+
+	k = Class.new do
+	  def initialize &block
+	    instance_eval &block
+	    p "shit in klass #{self}"
+	  end
+	end
+	parent_klass.const_set(context_keyword.capitalize, k) unless parent_klass.const_defined?(context_keyword.capitalize)   
+
+	return parent_klass.const_get(context_keyword.capitalize)
+      end
+
+      class Construct
+	attr_accessor :context_klass, :construct_klass, :ext_set
+
+	def initialize construct_keyword, context_klass, &block
+	  @construct_keyword = construct_keyword
+	  @context_klass = context_klass
+	  @ext_set = []
+	  instance_eval &block
+
+
+	  @construct_klass = dsl_construct_access_method_and_klass(@construct_keyword, @ext_set, @context_klass)
+	  #konstructor = @construct_klass.new
+
+	end
+
+	def use args = {}
+	  p "**********************"
+	  p args
+	  p "************will replace with actual values from konstuctor object args**********"
+	  @ext_set << args
+	end
+
+	def dsl_construct_access_method_and_klass(construct_keyword, ext_set, parent_klass)
+	  $log.info "dynamically building app dsl construct access method for: #{construct_keyword}, inside: #{parent_klass}"
+
+	  parent_klass.class_eval do
+	    define_method(construct_keyword) do |args = {}|
+	      p "here replace :symbols with values"
+	      p args
+	      ext_set.each do |ext|
+		ext[:params].each do |key, value|
+		  args.each do |env_key, env_value|
+		    if env_key.to_sym == value then
+		      ext[:params][key] = env_value
+		    end
+		  end
+		end unless ext[:params].nil?
+
+		ext[:opts].each do |key, value|
+		  args.each do |env_key, env_value|
+		    if env_key.to_sym == value then
+		      ext[:opts][key] = env_value
+		    end
+		  end
+		end unless ext[:opts].nil?
+		$log.info ext 
+	      end
+
+	      parent_klass.const_get(construct_keyword.capitalize).new args, ext_set
+	    end
+	  end
+
+	  k = Class.new do
+	    attr_accessor :stack
+	    def initialize args={}, ext_set
+	      p "construct dynamic klass"
+	      @stack = Mushin::Stack.new
+	      ext_set.each do |ext|
+		p "inside the stack"
+		p ext
+		@stack.insert_before 0, ext[:ext], ext[:opts], ext[:params]
+	      end
+	      @stack.call
+	    end
+	  end
+	  parent_klass.const_set(construct_keyword.capitalize, k) unless parent_klass.const_defined?(construct_keyword.capitalize)   
+
+
+	  return parent_klass.const_get(construct_keyword.capitalize)
+	end
+      end # end of Construct klass
+    end # end of Context klass
+  end # end of DSLBuilder module
+end

data/lib/mushin/test_helper.rb

@@ -9,8 +9,9 @@ module Mushin
 	end
 
 	def call(env)
-
-	  $log.info "#{self} ext is called with the following options: #{@opts} & params: #{@params}; and env: #{env}"
+	  $log.info "-----------------------------------------------------------------------"
+	  $log.info "Ext: #{self} is called with the following options: #{@opts} & params: #{@params}; and env: #{env}".red 
+	  $log.info "-----------------------------------------------------------------------"
 
 	  # Inbound maniuplation
 	  env = Hash.new if env.nil?

data/lib/mushin/version.rb

@@ -1,3 +1,3 @@
 module Mushin
-  VERSION = "0.8.0"
+  VERSION = "0.9.0"
 end

data/lib/mushin.rb

@@ -10,5 +10,28 @@ require_relative "mushin/test_helper"
 
 $log = Logger.new(STDOUT)
 
-#module Mushin
-#end
+class String
+  def black;          "\e[30m#{self}\e[0m" end
+  def red;            "\e[31m#{self}\e[0m" end
+  def green;          "\e[32m#{self}\e[0m" end
+  def brown;          "\e[33m#{self}\e[0m" end
+  def blue;           "\e[34m#{self}\e[0m" end
+  def magenta;        "\e[35m#{self}\e[0m" end
+  def cyan;           "\e[36m#{self}\e[0m" end
+  def gray;           "\e[37m#{self}\e[0m" end
+
+  def bg_black;       "\e[40m#{self}\e[0m" end
+  def bg_red;         "\e[41m#{self}\e[0m" end
+  def bg_green;       "\e[42m#{self}\e[0m" end
+  def bg_brown;       "\e[43m#{self}\e[0m" end
+  def bg_blue;        "\e[44m#{self}\e[0m" end
+  def bg_magenta;     "\e[45m#{self}\e[0m" end
+  def bg_cyan;        "\e[46m#{self}\e[0m" end
+  def bg_gray;        "\e[47m#{self}\e[0m" end
+
+  def bold;           "\e[1m#{self}\e[22m" end
+  def italic;         "\e[3m#{self}\e[23m" end
+  def underline;      "\e[4m#{self}\e[24m" end
+  def blink;          "\e[5m#{self}\e[25m" end
+  def reverse_color;  "\e[7m#{self}\e[27m" end
+end

data/samples/sample2.rb

@@ -0,0 +1,114 @@
+module Mushin
+  # 1- an access method :context is defined in DSLBuilder(thats a module avialable as class methods to the domain class of the application.
+  # 2- the :context takes a name, &block and pass instance_eval it aganist an object created from DSLBuilder::Context
+  # 3- DSLBuilder::Context initialize takes a context_name say "torrent_bots" and create an app_context_klass and creates an access method with the :context_name inside DSL 
+  #
+  module DSLBuilder
+    class Context
+      attr_accessor :context_name
+      # defines a DSL::Klass of type Context based on :name
+      # Supplies the defined DSL::Klass with a method of the construct
+      def initialize context_name, &block
+	@context_name = context_name.capitalize
+
+	app_context_klass = Class.new(Object) do
+	  def initialize &block
+	    instance_eval &block
+	  end
+	end
+	# creates a context klass dynamically
+	DSL.const_set(context_name.capitalize, app_context_klass) unless DSL.const_defined?(context_name.capitalize)
+	# creates an access method inside DSL for the dynamically created context klass
+	DSL.send(:define_method, context_name) do |&block|
+	  DSL.const_get(context_name.capitalize).new &block unless context_name.nil?
+	end
+
+	instance_eval &block
+      end
+
+      # access method for DSLBuilder::Construct klass inside a context object &block
+      def construct name, &block
+	app_context_klass = DSL.const_get(@context_name)
+	Construct.new(name, app_context_klass, &block) #.instance_eval &block
+      end
+    end
+
+    class Construct
+      attr_accessor :name, :stack, :app_context_klass
+      def initialize name, app_context_klass, &block
+	@name 	= name.capitalize
+	@middlewares = []
+	@stack 	= Mushin::Stack.new
+	@app_context_klass = app_context_klass
+
+	instance_eval &block
+	$log.info "middlewares after instance_eval"
+	$log.info  middlewares = @middlewares
+
+	app_construct_klass = Class.new(Object) do
+	  @@stack = Mushin::Stack.new
+	  @@env = {}
+	  @@ext_set = middlewares
+	  $log.info "@@ext_set"
+	  $log.info @@ext_set
+
+	  attr_accessor :env
+	  def initialize env = {}
+	    @env = env
+	    #p "merging #{@@env} with #{env_updates} for the result of #{env_updates.merge @@env}"
+	    #p "domaindsl construct is ready to activate calling the stack with #{env}"
+	  end
+	end # end of app_construct_klass 
+
+	DSL.const_set(name.capitalize, app_construct_klass) unless DSL.const_defined?(name.capitalize)
+	# Reopens most recent context klass and add method `def construct_name params; app_construct_class.new(params)`
+	# access method for DSL::Construct dynamic klass inside a context object &block
+	DSL.const_get(@app_context_klass.to_s).send(:define_method, name) do |env|
+	  # 1. populate :symbols inside opts and params with values from env
+	  @@ext_set.each do |ext|
+	    ext[:params].each do |key, value|
+	      env.each do |env_key, env_value|
+		if env_key.to_sym == value then
+		  ext[:params][key] = env_value
+		end
+	      end
+	    end
+
+	    ext[:opts].each do |key, value|
+	      env.each do |env_key, env_value|
+		if env_key.to_sym == value then
+		  ext[:opts][key] = env_value
+		end
+	      end
+	    end
+	    $log.info ext 
+	  end
+	  # 2. insert 
+	  @@ext_set.each do |ext|
+	    @@stack.insert_before 0, ext[:ext], ext[:opts], ext[:params]
+	  end
+	  # 3. call the stack
+	  @@stack.call
+
+	  DSL.const_get(name.capitalize).new env
+	end
+	#p DSL.constants
+      end
+
+      def use ext:, opts: {}, params: {}
+	@middlewares << {:ext => ext, :opts => opts, :params => params}
+	#p @middlewares
+	#	@stack.insert_before 0, ext, opts, params
+	#@stack.call
+	#@stack = Use.new(ext, opts, params, @stack)
+      end
+    end
+
+    def context name, &block
+      Context.new(name, &block) #.instance_eval &block
+    end
+  end
+
+  module DSL
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mushin
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - zotherstupidguy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-23 00:00:00.000000000 Z
+date: 2016-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -129,6 +129,8 @@ files:
 - exe/mushin
 - lib/mushin.rb
 - lib/mushin/domain.rb
+- lib/mushin/dsl.rb
+- lib/mushin/dsl_builder.rb
 - lib/mushin/ext.rb
 - lib/mushin/generator.rb
 - lib/mushin/stack.rb
@@ -136,6 +138,7 @@ files:
 - lib/mushin/version.rb
 - mushin.gemspec
 - samples/sample1.rb
+- samples/sample2.rb
 homepage: http://mushin-rb.github.io/
 licenses:
 - MIT