missile_emitter 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf6c9f891bd4545da18c8584625c67e4a2e6c7b9c38c3bf162e513c671fbaf0d
-  data.tar.gz: 5e9b5f13fb874d70ac01c703909990d4388601d537a3bb55ae2d04d10c689931
+  metadata.gz: 6f86e582ded328222839a9d72ee7acbd580e90bd1d98ac46da80c2a4a1cd5582
+  data.tar.gz: 609969e33ce1b457879f1a45396c378d116f39f06e29b482d28f69970ae716de
 SHA512:
-  metadata.gz: f09d6ee53a56dc5eb32d448bec065de6d7f675e5effb397992037df866acce8e676390c52aa1004c606c593d178a57253bb5c79d1b6612fce3c4a47e2c59a5bc
-  data.tar.gz: 894eca73d7255acd11ceb45f5e916feb77166e0faed9a9a920cf9c0ef4d6bd05b3539f4e2d7937750f4ee9630cbc7e9dac2e69e49a6324de481a25b11a027ce9
+  metadata.gz: 167addbf7b4fae490309320664467c40153973d6ec4d7b5b440452b9dd8547db1f15eca2a9716b8921630d518a8bdf5ca60de9d7daf611f8265fa8f6db538bda
+  data.tar.gz: eff5ffb62d6885be78f20bc7950321d307ccd038588d0f14cebc6e42ec17872f90225923c9847dd807290815dc2d85dfc92dc462fdcab111e7a86a2116f3e923

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    missile_emitter (0.2.0)
+    missile_emitter (0.3.0)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -102,13 +102,12 @@ me.age # => 36
 
 ```ruby
 module Searchable
-  # 搜索条件（klass => {keyword: block}）
-  # eg. {Person => {name_like: proc, older_than: proc}}
-  conditions = {}.with_indifferent_access
+  # 搜索条件（klass => {field: scope}）
+  # eg. {Person => {name_like: scope, older_than: scope}}
+  conditions = {}
 
   MissileEmitter do |klass, key, *, &block|
-    conditions[klass] ||= {}
-    conditions[klass][key] = block
+    (conditions[klass] ||= {}.with_indifferent_access)[key] = block
   end
 
   extend ActiveSupport::Concern
@@ -117,15 +116,13 @@ module Searchable
 
     define_singleton_method :search do |hash|
       hash.reduce all do |relation, (key, value)|
-        # Just for fun :)
-        relation = relation.extending do
-          define_method(:_) { value }
-        end
+        next relation if value.blank? # ignore empty value
 
-        if value.blank?
-          relation
-        elsif filter = conditions.fetch(self, {})[key]
-          relation.instance_exec(value, &filter)
+        if filter = conditions.fetch(self, {})[key]
+          relation.extending do
+            # Just for fun :)
+            define_method(:_) { value }
+          end.instance_exec(value, &filter)
         elsif column_names.include?(key)
           relation.where key => value
         else
@@ -151,12 +148,12 @@ end
 最后，在业务代码中使用：
 
 ```ruby
-# params: {name: 'Jerry', older_than: 18}
+# params: {name: 'Jerry', older_than: 18, sex: 'male'}
 Person.search params.slice(:name_like, :older_than, :sex)
-# 参数值值不为空的情况下，等价于：
+# 参数值不为空的情况下，等价于：
 Person.where('name like ?', "%#{params[:name_like]}%")
       .where('age >= ?', params[:older_than])
       .where(sex: params[:sex])
 ```
 
-总而言之，使用导弹发射器之后，可以很方便的在类定义级别实现声明式DSL，具体怎么用，就留给你自己慢慢挖掘啦。
+总而言之，使用导弹发射器，可以方便的在类定义级别实现声明式DSL（示例参见 [`attributes.rb`](https://github.com/coding-class-club/missile_emitter/blob/master/lib/missile_emitter/attributes.rb) 、[`searchable.rb`](https://github.com/coding-class-club/missile_emitter/blob/master/lib/missile_emitter/searchable.rb)），至于更多的用法，就留给你自己慢慢挖掘啦。

data/lib/missile_emitter.rb

@@ -18,7 +18,7 @@ module MissileEmitter
     def exec(namespace, &block)
       raise Error.new("需要提供代码块") unless block_given?
 
-      context = block.binding.eval 'self'
+      context = block.binding.receiver
 
       raise Error.new("只能再具名模块中调用") unless context.instance_of?(Module) && context.name
 
@@ -39,10 +39,10 @@ module MissileEmitter
       container = !ns.empty? && namespace ? constantize(ns) : Kernel
       action = container == Kernel ? 'define_method' : 'define_singleton_method'
 
-      container.send action, name do |&missile|
-        klass = missile.binding.eval 'self'
+      container.send action, name do |*args, &missile|
+        klass = missile.binding.receiver
         battle_field = BattleField.new klass, MissileEmitter.mapping[context]
-        battle_field.emit! &missile
+        battle_field.emit! *args, &missile
 
         context
       end
@@ -87,6 +87,7 @@ module MissileEmitter
         end
       end
     end
+
   end
 
 end

data/lib/missile_emitter/attributes.rb

@@ -0,0 +1,18 @@
+module MissileEmitter
+  module Attributes
+    MissileEmitter do |klass, field, default, *, &block|
+      attribute = "@#{field}" # 构造实例变量名称，如：name => @name
+      # 动态定义实例⽅法
+      klass.define_method field do
+        if instance_variable_defined?(attribute)
+          instance_variable_get attribute
+        else
+          #返回声明的默认值，同样考虑传递Proc的情况
+          block ? instance_eval(&block) : default
+        end
+      end
+      # 写值⽅法
+      attr_writer field
+    end
+  end
+end

data/lib/missile_emitter/battle_field.rb

@@ -1,12 +1,12 @@
 module MissileEmitter
   class BattleField < BasicObject
 
-    def initialize(context, callable)
-      @context, @handler = context, callable
+    def initialize(context, *extras, callable)
+      @context, @extras, @handler = context, extras, callable
     end
 
     def method_missing(*args, &block)
-      @handler.call @context, *args, &block
+      @handler.call @context, *@extras, *args, &block
     end
 
     alias_method :emit!, :instance_eval

data/lib/missile_emitter/searchable.rb

@@ -0,0 +1,34 @@
+module MissileEmitter
+  module Searchable
+    
+    # 搜索条件（klass => {field: scope}）
+    # eg. {Person => {name_like: scope, older_than: scope}}
+    conditions = {}
+
+    MissileEmitter do |klass, key, *, &block|
+      (conditions[klass] ||= {}.with_indifferent_access)[key] = block
+    end
+
+    extend ActiveSupport::Concern
+
+    included do
+
+      define_singleton_method :search do |hash|
+        hash.reduce all do |relation, (key, value)|
+          next relation if value.blank? # ignore empty value
+
+          if filter = conditions.fetch(self, {})[key]
+            relation.extending do
+              # Just for fun :)
+              define_method(:_) { value }
+            end.instance_exec(value, &filter)
+          elsif column_names.include?(key)
+            relation.where key => value
+          else
+            relation
+          end
+        end
+      end
+    
+  end
+end

data/lib/missile_emitter/version.rb

@@ -1,3 +1,3 @@
 module MissileEmitter
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/missile_emitter.gemspec

@@ -5,7 +5,7 @@ require "missile_emitter/version"
 Gem::Specification.new do |spec|
   spec.name          = "missile_emitter"
   spec.version       = MissileEmitter::VERSION
-  spec.authors       = ["coding-class.com"]
+  spec.authors       = ["Jerry Chen"]
   spec.email         = ["code@coding-class.com"]
 
   spec.summary       = %q{Ruby元编程辅助工具}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: missile_emitter
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
-- coding-class.com
+- Jerry Chen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-17 00:00:00.000000000 Z
+date: 2019-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,7 +86,9 @@ files:
 - bin/console
 - bin/setup
 - lib/missile_emitter.rb
+- lib/missile_emitter/attributes.rb
 - lib/missile_emitter/battle_field.rb
+- lib/missile_emitter/searchable.rb
 - lib/missile_emitter/version.rb
 - missile_emitter.gemspec
 homepage: https://github.com/coding-class-club/missile_emitter