simple_slack 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8f344b296820615de0402a7f345674d3d84665a
-  data.tar.gz: 71f732e48ecdcb47064905ba57e5bcb601ff0629
+  metadata.gz: ce3b8f3eb317bfeb9a76992379ed8b1f76a3d744
+  data.tar.gz: 28a3b0188ba80a3558464ff196311017f7789fa9
 SHA512:
-  metadata.gz: d326bce4004b25366cc9cf4d0b357f671b6350a06a55244475112d2327c948f0b2e852b156fdc4b4d962c76ace83da1189c4f999eef57cf5c1cf5df2604ea4ee
-  data.tar.gz: fca6923f149dda30718fd0f025c732d28e7177eacf91af321295f073c40e63f1a06395ae16b01da75a719ef3cfd28b38d0ecc61c85b147e3909ae7aeb5149d71
+  metadata.gz: cf83868cb60a91e183058da8add0743aa948e0a002ee6dcc07fc71f688c12fb5ebd696bd2cc43be5bcb2e04137b1c71ed93664ce03f15781cfdc3b67169746bc
+  data.tar.gz: 0f39c119c8e1d9c23d84efdf3ca35ff184721436f448ae3d0e0ecbabe964b36d4054266dc76b802e38597191057c8e8fe4e9a086ff54f15150d62848caa9c22e

data/lib/simple_slack/botter.rb

@@ -11,6 +11,7 @@ class SimpleSlack::Botter
     @channel = set_condition_channel(channel) if channel
     @user    = set_condition_user(user)       if user
     @text    = set_condition_text(text)       if text
+    { channel: @channel, user: @user, text: @text }
   end
 
   def set_responce(channel: nil , text: nil, user: nil)
@@ -20,6 +21,7 @@ class SimpleSlack::Botter
     if block_given?
       @responce_block = Proc.new(&yield)
     end
+    { channel: @responce_channel, user: @responce_user, text: @responce_text }
   end
 
   def status
@@ -74,7 +76,8 @@ class SimpleSlack::Botter
   end
 
   def set_condition_channel(channel)
-    return nil if channel.nil?
+    return nil   if channel.nil?
+    return "all" if channel.to_s == "all" rescue false
     case channel
     when String
       @client.get.channel(channel)
@@ -90,7 +93,8 @@ class SimpleSlack::Botter
   end
 
   def set_condition_user(user)
-    return nil if user.nil?
+    return nil   if user.nil?
+    return "all" if user.to_s == "all" rescue false
     case user
     when String
       @client.get.user(user)
@@ -106,7 +110,8 @@ class SimpleSlack::Botter
   end
 
   def set_condition_text(text)
-    return nil if text.nil?
+    return nil   if text.nil?
+    return "all" if text.to_s == "all" rescue false
     case text
     when String
       text.gsub(/\p{blank}/,"\s").strip.split("\s")

data/lib/simple_slack/getter.rb

@@ -3,72 +3,89 @@ class SimpleSlack::Getter
     @slack = slack
   end
 
-  def channels
+  # use options for
+  # :is_channel, :creator, :members, :topic, :purpose, :num_members, etc
+  def channels(options = [])
     channels = @slack.channels_list
     channels["channels"].map do |channel|
-      { id: channel["id"], name: channel["name"] }
+      add_params = options.empty? ?  {} : options_to_hash(options, channel)
+      { id: channel["id"], name: channel["name"] }.merge(add_params)
     end.sort_by {|ch| ch[:name] }
   end
 
-  def channel(key)
+  def channel(key, options = [])
     key.to_s =~ /\AC.{8}\Z/ ? key_id = key : key_name = key
-    @channel_list ||= channels
+    channel_list = channels(options)
     if key_id
-      @channel_list.find{|ch| ch[:id]   == key_id   }
+      channel_list.find{|ch| ch[:id]   == key_id   }
     elsif key_name
-      @channel_list.find{|ch| ch[:name] == key_name }
-    else
-      "not found"
+      channel_list.find{|ch| ch[:name] == key_name }
     end
   end
 
-  def users
+  # use options for
+  # :real_name, :is_admin, :is_bot, etc...
+  def users(options = [])
     users = @slack.users_list
     users["members"].map do |user|
-      { id: user["id"], name: user["name"] }
+      add_params = options.empty? ? {} : options_to_hash(options, user)
+      { id: user["id"], name: user["name"] }.merge(add_params)
     end.sort_by {|ch| ch[:name] }
   end
 
-  def user(key)
+  def user(key, options = [])
     key.to_s =~ /\AU.{8}\Z/ ? key_id = key : key_name = key
-    @user_list ||= users
+    user_list = users(options)
     if key_id
-      @user_list.find{|user| user[:id]   == key_id }
+      user_list.find{|user| user[:id]   == key_id }
     elsif key_name
-      @user_list.find{|user| user[:name] == key_name }
-    else
-      "not found"
+      user_list.find{|user| user[:name] == key_name }
     end
   end
 
-  def images
-    image_list = users["members"].map do |user|
-      { id: user["id"], image: user["profile"]["image_24"] }
+  # use options for
+  # :image_24, :image_32, :image_48, image_72, etc...
+  def images(options = [])
+    users = @slack.users_list
+    users["members"].map do |user|
+      add_params = options.empty? ? {} : options_to_hash(options, user["profile"])
+      { id: user["id"], name: user["name"], image: user["profile"]["image_24"] }.merge(add_params)
     end
   end
 
-  def image(id)
-    @image_list ||= images
-    @image_list.find{|user| user[:id] == id }
+  def image(key, options = [])
+    key.to_s =~ /\AU.{8}\Z/ ? key_id = key : key_name = key
+    image_list = images(options)
+    if key_id
+      image_list.find{|user| user[:id]   == key_id }
+    elsif key_name
+      image_list.find{|user| user[:name] == key_name }
+    end
   end
 
-  def ims
+  # use options for
+  # :created, :is_im, :is_org_shared, :is_user_deleted
+  def ims(options = [])
     im_list = @slack.im_list
-    im_list["ims"].map do |info|
-      im_user = if info["user"] == "USLACKBOT"
-                  { id: info["user"], name: "owner" }
+    im_list["ims"].map do |im|
+      im_user = if im["user"] == "USLACKBOT"
+                  { id: im["user"], name: "slackbot" }
                 else
-                  user(info["user"])
+                  user(im["user"])
                 end
-      { id: info["id"], user: im_user }
+      add_params = options.empty? ? {} : options_to_hash(options, im)
+      { id: im["id"], user: im_user }.merge(add_params)
     end
   end
 
-  def im(key)
-    im_user = user(key)
-    @im_list ||= ims
-
-    @im_list.find{|info| info[:user][:id] == im_user[:id] }
+  def im(key, options = [])
+    key.to_s =~ /\AU.{8}\Z/ ? key_id = key : key_name = key
+    im_list = ims(options)
+    if key_id
+      im_list.find{|im| im[:user][:id]   == key_id }
+    elsif key_name
+      im_list.find{|im| im[:user][:name] == key_name }
+    end
   end
 
   def chats
@@ -78,4 +95,17 @@ class SimpleSlack::Getter
   def chat
     "yet"
   end
+
+  private
+
+  def options_to_hash(options, type = {})
+    marged_option = {}
+    options.each do |op|
+      marged_option.merge!({ op.to_sym => type[op.to_s] })
+    end
+
+    marged_option
+  end
+
+
 end

data/lib/simple_slack/poster.rb

@@ -4,42 +4,50 @@ class SimpleSlack::Poster
     @simple_slack = simple_slack
   end
 
-  def channel(to: , text: , name: "slacker")
-    to.to_s =~ /\AC0.{7}\Z/ ?  id = to : id = convert_channel(to)
-    send_chat(username: name, channel: id, text: text)
+  def channel(to: , text: , name: "slacker", **options)
+    id = convert_channel_to_id(to.to_s)
+    send_chat({ username: name, channel: id, text: text }.merge(options))
   end
 
   def user(to: , text: , name: "slacker")
     "yet"
   end
 
-  def chat(channel: nil, user: nil, text: , name: "slacker")
+  def chat(channel: nil, user: nil, text: , name: "slacker", **options)
     if channel
-      self.channel(to: channel, text: text, name: name)
+      self.channel({ to: channel, text: text, name: name }.merge(options))
     elsif user
       "yet"
     end
   end
 
   def im(to: , text: , name: "slacker")
-    to.to_s =~ /\AD0.{7}\Z/ ?  id = to : id = convert_im(to)
+    id = convert_im_to_id(to.to_s)
     send_chat(username: name, channel: id, text: text)
   end
 
   private
 
-  def send_chat(username: , channel: , text: , icon_emoji: ":ghost:")
-    result = @slack.chat_postMessage(username: username, channel: channel, text: text, icon_emoji: icon_emoji)
+  def send_chat(username: , channel: , text: , icon_emoji: ":ghost:", **options)
+    result = @slack.chat_postMessage({ username: username, channel: channel, text: text, icon_emoji: icon_emoji }.merge(options))
     result["ok"]
   end
 
-  def convert_channel(name)
-    channel = @simple_slack.get.channel(name)
-    channel[:id]
+  def convert_channel_to_id(key)
+    channel = @simple_slack.get.channel(key)
+    if channel
+      channel[:id]
+    else
+      raise "チャンネルが見つかりませんでした。"
+    end
   end
 
-  def convert_im(name)
-    im = @simple_slack.get.im(name)
-    im[:id]
+  def convert_im_to_id(key)
+    im = @simple_slack.get.im(key)
+    if im
+      im[:id]
+    else
+      raise "IMが見つかりませんでした。"
+    end
   end
 end

data/lib/simple_slack/version.rb

@@ -1,3 +1,3 @@
 module SimpleSlack
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_slack
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - toririn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-22 00:00:00.000000000 Z
+date: 2016-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler