mushin 0.20.0 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d775c97f25d67be4bf5097f4d9e8c929cd6d2d1
-  data.tar.gz: 2eb69bef12544766c94fc57cab9ddb99102b96c0
+  metadata.gz: f67105bfa6f8dbfbdfd3e60fe89e887a4d42cc68
+  data.tar.gz: 5084494b7f7bf55fd132c2afb600d6ffb8e48340
 SHA512:
-  metadata.gz: 98bea9dee28d88006ee3e7e0c01af2b84f5b79d36118d825026847f782dae77ecd530cda7962a407c463bcf6335d8c6fe0ec383bba148976c4540aa0e9deda58
-  data.tar.gz: d858b14ab9e0882a47fd5014c2319ae48eb288dae7279665d129ade60ea88a065b8ed5f0f439b0c55407e56d72374f376926fb4040ac36cebe0eb8db98db956f
+  metadata.gz: 29fbdd6ab06b156d45ffdec6efe6588c12a094009daab4bf8532182114721238ce593752249483b4f396144d5421c7fc654afb0c1f1a41fe9704ef972c8a9aaf
+  data.tar.gz: 746f1c42cb702705c4af1cef8b09b571cea51e879e254f0c3c09a429288c26177a4bd50ed4e38cf803f96a316dfb050fca2a89e7f1dbfe4b8552297947ffbff7

data/lib/mushin/main.rb

@@ -4,6 +4,7 @@ require 'set'
 #TODO release 1.0rc
 
 module Mushin
+  #TODO maybe use refinements instead of inheritance for `using Mushin::Ext`
   class Store < Mushin::Test::Sample::Ext
     def initialize(ext, opts = {}, params= {})
       @ext 	= ext 
@@ -20,7 +21,7 @@ module Mushin
 
   module Domain
     refine Class do 
-      #TODO apply advanced centerlized logging automatically via TracePoint, DEBUG log level
+      #TODO apply advanced centerlized logging automatically via TracePoint, DEBUG log level, to save space of the other logging and make it more standarized style
       #trace = TracePoint.new(:c_call) do |tp| #  p [tp.lineno, tp.defined_class, tp.method_id, tp.event]#end#trace.enable
       @@dsl_tree = Set.new
 
@@ -53,94 +54,100 @@ module Mushin
 	      def initialize &domain_block
 		@data = Hash.new #should be a HASH
 
-		# both CQRS command & CQRS query code here as well
-		@@dsl_tree.each do |context_set|
-
-		  context_set.each do |context_key, context_value|
-
-		    self.singleton_class.send :define_method, context_key do |&context_block|
-		      context_value.each do |construct_set|
-
-			construct_set.each do |construct_key, construct_value|
-			  $log.debug "construct_key #{construct_key} | construct_value #{construct_value}"
-
-			  self.singleton_class.send :define_method, construct_key do |data = Hash.new|
-			    query_data = []
-			    @stack = Mushin::Stack.new
-
-			    construct_value.each do |ext|
-			      ext[:params].each do |ext_key, ext_value|
-				data.each do |data_key, data_value|
-				  if data_key.to_sym == ext_value then
-				    $log.debug data_value
-				    ext[:params][ext_key] = data_value
-				  end
-				end
-			      end unless ext[:params].nil?
-
-			      ext[:opts].each do |key, value|
-				data.each do |data_key, data_value|
-				  if data_key.to_sym == value then
-				    ext[:opts][key] = data_value
-				  end
-				end
-			      end unless ext[:opts].nil?
-
-			      $log.debug "insert_before 0 into stack: #{ext[:ext]}, #{ext[:opts]}, #{ext[:params]}"
-			      @stack.insert_before 0, ext[:ext], ext[:opts], ext[:params]
+		#NOTE CQRS 
+		@@dsl_tree.each do |klass_context_set|
+		  klass_context_set.each do |klass_context_key, klass_context_value|
+		    self.singleton_class.send :define_method, klass_context_key do |&context_block|
+		      klass_context_value.each do |klass_construct_set|
+			$log.debug "the whole construct_set: #{klass_construct_set}"
+			klass_construct_set.each do |klass_construct_key, klass_construct_value|
+			  $log.debug "klass_construct_key #{klass_construct_key} | klass_construct_value #{klass_construct_value}"
+			  $log.debug "#{@@dsl_tree}"
+
+			  # creates an instance method with the name of the klass_construct_key
+			  self.singleton_class.send :define_method, klass_construct_key do |instance_hash = Hash.new|
+			    @stack 		= Mushin::Stack.new
+
+			    klass_construct_value.each do |klass_ext|
+			      ext_hash 		= Hash.new
+			      ext_hash[:ext] 	= klass_ext[:ext]
+			      ext_hash[:params] = Hash.new
+			      ext_hash[:opts] 	= Hash.new
+
+			      klass_opts_hash 	= klass_ext[:opts]
+			      klass_params_hash = klass_ext[:params]
+
+			      #NOTE provides an ext_hash via binding of instance_hash values to klass_hashs(opts & params) keys 
+			      instance_hash.each do |instance_hash_key, instance_hash_value|
+				ext_hash[:opts][klass_opts_hash.invert[instance_hash_key]] 	= instance_hash_value unless klass_opts_hash.invert[instance_hash_key].nil? 
+				ext_hash[:params][klass_params_hash.invert[instance_hash_key]] 	= instance_hash_value unless klass_params_hash.invert[instance_hash_key].nil? 
+			      end
+
+			      $log.debug "insert_before 0 into stack: #{ext_hash[:ext]}, #{ext_hash[:opts]}, #{ext_hash[:params]}"
+			      @stack.insert_before 0,  ext_hash[:ext], ext_hash[:opts], ext_hash[:params]
 			    end
 
-			    if context_key == "query" then
-			      $log.debug "construct_key #{construct_key} | construct_value #{construct_value}"
-			      $log.debug "this method returns a Hash of all the requested shit "
+			    if klass_context_key == "query" then
+			      # CQRS Query
+			      $log.debug "klass_construct_key #{klass_construct_key} | klass_construct_value #{klass_construct_value}"
 			      @stack.insert_before 0, Mushin::Store, {}, {}
 			      stack_data = @stack.call
-			      store(data_key: construct_key.to_sym, data_value: stack_data)
+			      store(data_key: klass_construct_key.to_sym, data_value: stack_data)
 			    else
+			      # CQRS Command 
 			      @stack.call
 			    end
 			  end
 			end
 		      end
+
 		      instance_eval &context_block
 
-		      context_set[context_key].each do |construct_hash|
-			construct_hash.keys.each do |method_key| 
+		      klass_context_set[klass_context_key].each do |klass_construct_hash|
+			klass_construct_hash.keys.each do |method_key| 
 			  instance_eval("undef :#{method_key}")
 			end
-			$log.debug "construct_key #{context_key} is undef-ed"
+			$log.debug "construct_key #{klass_context_key} is undef-ed"
 		      end
+
 		    end
 		  end
 		end
-
-		if !domain_block.nil? then 
-		  instance_eval &domain_block 
-		else
-		  fail "a domain_block is required"
-		end
+		(!domain_block.nil?) ? (instance_eval &domain_block;) : (fail "a domain_block is required";)
 	      end
 	    end
 	  end 
-
-	  if !construct_block.nil? then 
-	    instance_eval &construct_block 
-	    @context_hash[@context_keyword] << @construct_hash
-	    undef :use
-	  else
-	    fail "construct_block please"
-	  end
+	  (!construct_block.nil?) ? (instance_eval &construct_block; @context_hash[@context_keyword] << @construct_hash; undef :use;) : (fail "construct_block please";)
 	end 
-
-	if !context_block.nil? then 
-	  instance_eval &context_block 
-	  @@dsl_tree << @context_hash
-	  undef :construct
-	else
-	  fail "context_block please"
-	end
-
+	#TODO maybe i can define @@dsl_tree as an instance attribute and use it normally from inside the :initialize method of the object
+	(!context_block.nil?) ? (instance_eval &context_block; @@dsl_tree << @context_hash; undef :construct;) : (fail "context_block please";)
       end 
     end
   end
 end
+
+=begin
+			      #$log.info "klass_ext_key: #{klass_ext_key}, klass_ext_value:  #{klass_ext_value}, instance_hash: #{instance_hash}" 
+			      #
+			      [klass_opts_hash, klass_params_hash].each do |klass_hash|
+				instance_hash.each do |instance_hash_key, instance_hash_value|
+				  ext_hash[klass_hash.invert[instance_hash_key]] = instance_hash_value unless klass_hash.invert[instance_hash_key].nil? 
+				end
+			      end
+
+			      [klass_ext[:params], klass_ext[:opts]].each do |klass_ext_hash|
+				klass_ext_hash.each do |klass_ext_key, klass_ext_value|
+				  # this is an important log, figure it out to solve this!
+				  $log.info "klass_ext_key: #{klass_ext_key}, klass_ext_value:  #{klass_ext_value}, instance_hash: #{instance_hash}" 
+
+				  ext_instance_data.each do |data_key, data_value|
+				    if data_key.to_sym == klass_ext_value then
+				      $log.debug data_value
+				      #ext[:params][ext_key] = data_value
+				      instance_ext_hash[:params][klass_ext_key.to_sym] = data_value
+				    end
+				  end
+				end
+			      end unless klass_ext[:opts].nil? || klass_ext[:params].nil?
+=end
+

data/lib/mushin/version.rb

@@ -1,3 +1,3 @@
 module Mushin
-  VERSION = "0.20.0"
+  VERSION = "0.21.0"
 end

data/samples/sample3.rb

@@ -3,7 +3,8 @@ require_relative './../lib/mushin'
 module Sample
   class TBP < Mushin::Test::Sample::Ext; end
   class SSD < Mushin::Test::Sample::Ext; end
-  class SSDS < Mushin::Test::Sample::Ext
+
+  class ExtA < Mushin::Test::Sample::Ext
     def initialize(ext, opts = {}, params= {})
       @ext 	= ext 
       @opts    	= opts 
@@ -12,27 +13,28 @@ module Sample
 
     def call(env)
       env ||= Hash.new 
-      env[:SSDS_middlewareEnvKey] = "SSDS"
+      p "XXXXXXXXX #{self}, params: #{@params}  opts: #{@opts} XXXXXXXXXXXXXX"
+
+      env[:ExtA_params] 	= @params[:seeders]
+      env[:ExtA_opts] 		= @opts[:ssd_path]
       @ext.call(env)
-      #super
-      #return env
     end
   end
 
-  class SSDA < Mushin::Test::Sample::Ext
+  class ExtB < Mushin::Test::Sample::Ext
     def initialize(ext, opts = {}, params= {})
-      @ext 		= ext 
+      @ext 	= ext 
       @opts    	= opts 
       @params  	= params 
     end
 
     def call(env)
       env ||= Hash.new 
-      env[:nana] = "nana_what"
-      env[:SSDA_middlewareEnvKey] = "SSDA"
+      p "XXXXXXXXX #{self}, params: #{@params}  opts: #{@opts} XXXXXXXXXXXXXX"
+
+      env[:ExtB_opts] 		= @opts[:ssd_path]
+      env[:ExtB_params] 	= @params[:seeders]
       @ext.call(env)
-      env[:superman_real_nameB] = "where are you now dada"
-      #return env
     end
   end
 
@@ -55,30 +57,15 @@ module Sample
     end
 
     context "query" do
-      construct 'xyz' do
-	use ext: Sample::SSDS, params: {"seeders" => :seeders}, opts: {"ssd_path"=> :keyword}
-	use ext: Sample::SSDA, params: {"seeders" => :seeders}, opts: {"ssd_path"=> :keyword}
+      construct 'torrentsA' do
+	use ext: Sample::ExtA, params: {:seeders => :seeders_valueA}, opts: {:ssd_path => :path_valueA}
+	use ext: Sample::ExtB, params: {:seeders => :seeders_valueB}, opts: {:ssd_path => :path_valueB}
       end
-
-      construct 'torrentsC' do
-	use ext: Sample::SSDS, params: {"seeders" => :seeders}, opts: {"ssd_path"=> :keyword}
-	use ext: Sample::SSDA, params: {"seeders" => :seeders}, opts: {"ssd_path"=> :keyword}
-      end
-
       construct 'torrentsB' do
-	use ext: Sample::SSDS, params: {"seeders" => :seeders}, opts: {"ssd_path"=> :keyword}
-	use ext: Sample::SSDA, params: {"seeders" => :seeders}, opts: {"ssd_path"=> :keyword}
+	use ext: Sample::ExtA, params: {:seeders => :seeders_valueA}, opts: {:ssd_path => :path_valueA}
+	use ext: Sample::ExtB, params: {:seeders => :seeders_valueB}, opts: {:ssd_path => :path_valueB}
       end
     end
-
-    #    context "ztorrent_bots" do
-    #      construct "zrutracker" do
-    #	use ext: "zRUTracker", params: "params", opts: "opts" 
-    #      end
-    #      construct "zxy" do
-    #	use ext: "zTPB", params: "params", opts: "opts" 
-    #      end
-    #    end
   end
 
   class App
@@ -92,9 +79,9 @@ module Sample
       end
 
       query do
-	xyz keyword: "xyz query that shitxyzxyzxyz", seeders: "30"
-	torrentsC keyword: "torrentsC nononononon", seeders: "30"
-	torrentsB keyword: "torrentsB nononononon", seeders: "30"
+	torrentsA  path_valueA: "this is a torrentsA pathvalueA", seeders_valueA: "30torrentA", path_valueB: "this is torrentsA pathvalueB", seedersvalueB: "30torrentB"
+	torrentsB  path_value: "this is a torrentsB pathvalue", seeders_value: "30torrentB"
+	#torrentsB keyword: "torrentsB nononononon", seeders: "30"
       end
 
       #=begin 
@@ -125,8 +112,8 @@ module Sample
     #p mydomain.store[:love]
     #p mydomain.store[:xyz]
     #p mydomain.store[:torrentsB][:nana]
-    p mydomain.store[:torrentsC]
-    p mydomain.store[:torrentsB]
+    #p mydomain.store[:torrentsC]
+    #p mydomain.store[:torrentsB]
     p mydomain.store
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mushin
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.21.0
 platform: ruby
 authors:
 - zotherstupidguy