okuribito_rails 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2d7e46586d311e9b1a4450dd75feb25421986f6
-  data.tar.gz: dcd5eea9619016b46420c5465275d4f033695b41
+  metadata.gz: 7ab59e371027d7f29551fa04bfe3da3325057eb6
+  data.tar.gz: b89789424747262fecb03ba3ef863132f5dac4d4
 SHA512:
-  metadata.gz: 2e2e90bd648bc61d0f94586576770df8a5a6f78fddd2800ea396f1992050744b6d6f931a100ad05492aea968f13c49da1a66e09e442ebacba929f07681131203
-  data.tar.gz: 97e4c5a95fad8d200764649071a904ad0a1a7a44fa5aed166f646812cd91aa8a53d7df9ea53e6092f3b021fafe228d71e20e553d93aba6a1eec8603a9e1ed192
+  metadata.gz: dae11f8dd5f4a26d8e311f2c328c2f71d2cc7e46cfd105d43add8b1a2dd5099b9722a1b2715ef9b641a5450e626bca5d4690067c801a04e5f04058e70565f3c8
+  data.tar.gz: c384faa49d4613329831f3c0e4b756162d9b3ac3ac4e009e6c456c044f193dc97b8283ef4d6951c6d5a892b5b2e68d540203540edc76ff0f498ff873d2d4847c

data/app/controllers/okuribito_rails/method_call_situations_controller.rb

@@ -12,7 +12,7 @@ module OkuribitoRails
     private
 
     def method_call_situation_params
-      params.permit(:class_name, :method_name, :x_days_passed, :uncalled_method)
+      params.permit(:class_name, :method_name, :x_days_passed, :uncalled_method, :called_method)
     end
   end
 end

data/app/models/okuribito_rails/method_call_log.rb

@@ -6,8 +6,8 @@ module OkuribitoRails
     validates :method_symbol, presence: true, inclusion: { in: %w(. #) }
     validates :method_name, presence: true, length: { minimum: 1, maximum: 255 }
 
-    scope :with_class_name, ->(class_name) { where(class_name: class_name) }
-    scope :with_method_name, ->(method_name) { where(method_name: method_name) }
+    scope :with_class_name, ->(class_name) { where("class_name LIKE ?", "%#{class_name}%") }
+    scope :with_method_name, ->(method_name) { where("method_name LIKE ?", "%#{method_name}%") }
 
     def self.search(args)
       mcl = self

data/app/models/okuribito_rails/method_call_situation.rb

@@ -9,11 +9,12 @@ module OkuribitoRails
               presence: true,
               numericality: { only_integer: true, less_than_or_equal_to: 9_999 }
 
-    scope :with_class_name, ->(class_name) { where(class_name: class_name) }
-    scope :with_method_name, ->(method_name) { where(method_name: method_name) }
+    scope :with_class_name, ->(class_name) { where("class_name LIKE ?", "%#{class_name}%") }
+    scope :with_method_name, ->(method_name) { where("method_name LIKE ?", "%#{method_name}%") }
     scope :with_days_passed,
           ->(num) { where("created_at <= ?", Time.zone.today.days_ago(num).end_of_day) }
     scope :with_uncalled_method, -> { where(called_num: 0) }
+    scope :with_called_method, -> { where(called_num: 1..Float::INFINITY) }
 
     def self.search(args)
       mcs = self
@@ -21,6 +22,7 @@ module OkuribitoRails
       mcs = mcs.with_method_name(args[:method_name]) if args[:method_name].present?
       mcs = mcs.with_days_passed(args[:x_days_passed].to_i) if args[:x_days_passed].present?
       mcs = mcs.with_uncalled_method if args[:uncalled_method].present?
+      mcs = mcs.with_called_method if args[:called_method].present?
       mcs
     end
   end

data/app/views/okuribito_rails/method_call_situations/index.html.erb

@@ -14,9 +14,13 @@
         <%= number_field_tag :x_days_passed, params[:x_days_passed], placeholder: 0 %>
       </dt>
       <dt>
-        <label>Uncalled method</label>
+        <label>Uncalled</label>
         <%= check_box_tag :uncalled_method, true, params[:uncalled_method]  %>
       </dt>
+      <dt>
+        <label>Called</label>
+        <%= check_box_tag :called_method, true, params[:called_method]  %>
+      </dt>
       <dd>
         <button>Search</button>
       </dd>

data/lib/okuribito_rails/version.rb

@@ -1,3 +1,3 @@
 module OkuribitoRails
-  VERSION = "0.2.2".freeze
+  VERSION = "0.2.3".freeze
 end