missile_emitter 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a38fa6f5f01a264e3fc00d72befbe12a29e05aec1acf6ef2a79bfe5d4c0373f
-  data.tar.gz: 2e3a55d5fcf2b5d1e2c11d8bebda500e5908ee59bb44d142483e3a31efe288be
+  metadata.gz: 46ab698e7bba2e8af0eaf93d8a9882ff522a5acca5d17de5308737558a0476c0
+  data.tar.gz: d63ad0e9764163f14abf3a326c528be00963b7ab95bd6775387e4c9e27801b95
 SHA512:
-  metadata.gz: dafcb49660a89127302f3f93710155594937aec1aff16a10d183b4aa609a77a8c4356e001cba112c9edd891057b37c76da2f7680854925789e94fc11d1434e58
-  data.tar.gz: 1c2bea2657c924bab830ead79cc0b48a7f7155e53f6caa0c389a6c241501a570f50ea209b87688726c9924581d61b0ac1edd231f1d9d1c160c6be2d8f4f81133
+  metadata.gz: c22c26896d40b8d2e5fae943de2d20d67bf96b43b349aefc3e2e447513403f2d8aef593da3b1334a8112c61236cde307682a16d7883b2b6d4330f702183fd4f0
+  data.tar.gz: 0b23e86509f97ca64343e1c1b44bae62b99c5508451c09b0f85cd13455be774a438f8a6ebea8b932985b1f8cab471caa3fbc20ee23fb70773a798013b25b0b8a

data/README.md

@@ -102,22 +102,20 @@ me.age # => 36
 
 ```ruby
 module Searchable
-
-  extend ActiveSupport::Concern
-
-  included do
-    # 使用 class attribute 保存搜索条件
-    class_attribute :conditions, {}
-  end
+  # 搜索条件（klass => {keyword: block}）
+  # eg. {Person => {name_like: proc, older_than: proc}}
+  conditions = {}.with_indifferent_access
 
   MissileEmitter do |klass, key, *, &block|
-    # 保存声明的每一个关键字，以及搜索算法
-    klass.conditions[key] = block
+    conditions[klass] ||= {}
+    conditions[klass][key] = block
   end
 
-  class_methods do
+  extend ActiveSupport::Concern
+
+  included do
 
-    def search(hash)
+    define_singleton_method :search do |hash|
       hash.reduce all do |relation, (key, value)|
         # Just for fun :)
         relation = relation.extending do
@@ -126,7 +124,7 @@ module Searchable
 
         if value.blank?
           relation
-        elsif filter = mapping[key]
+        elsif filter = conditions.fetch(self, {})[key]
           relation.instance_exec(value, &filter)
         elsif column_names.include?(key)
           relation.where key => value
@@ -136,8 +134,6 @@ module Searchable
       end
     end
 
-  end
-
 end
 ```
 

data/lib/missile_emitter/version.rb

@@ -1,3 +1,3 @@
 module MissileEmitter
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/missile_emitter.rb

@@ -1,7 +1,10 @@
 require "missile_emitter/version"
 require "missile_emitter/battle_field"
 
-require "pry" rescue nil
+begin 
+  require "pry" 
+rescue LoadError
+end
 
 module MissileEmitter
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: missile_emitter
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - coding-class.com