simple_slack 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38ba1647c531367aaa2c74a63c524420e07630dd
-  data.tar.gz: fb2b7c204be97041cea682716821bef548b8bb9c
+  metadata.gz: 13b40759d9819966ef20fb9327dbaf0cf1b89702
+  data.tar.gz: 91baadd84d1e5e3be391c356165d65ddb1557ab9
 SHA512:
-  metadata.gz: 383abb6063d7a6ec7b822718223eaa0be311183f880832c94a217791e94114ca624ea5a09821f9f591a7fe65684da702f5c829c2a7fc7213037186439af03e88
-  data.tar.gz: 961fcf8277697f99f18e7eeff34a3bc0fe99662e352d9c01473101a46f7b1a3a254c9946b24bbae48c5b958c0494e0b4c0f3611960f10a69c0c90b1e90f04c0d
+  metadata.gz: 55e423c0b8a876d36fe36ecfafc210081a0e2e5f973ac19511c620eaff181fd45f8cc42ceabca3245a1ca6822d6441cfe99da83121325f840626fabd6d7ffb4c
+  data.tar.gz: bfb07c56c760a97ad2c22e06e7f8317a1382c86fc1d442baacf2de388cff8687d63ad50eef7790f28dbef228dc9ecd97405f6666ef116c9c840865b2d6432d9d

data/lib/simple_slack/botter.rb

@@ -1,137 +1,138 @@
-class SimpleSlack::Botter
-  def initialize(token, client)
-    Slack.configure {|c| c.token = token }
-    @r_client = Slack.realtime
-    @client   = client
-    @channel, @text, @user = ["all"] * 3
-    @responce_channel, @responce_text, @responce_user = nil, nil, "slacker"
-  end
+module SimpleSlack
+  class Botter
+    def initialize(token, client)
+      Slack.configure {|c| c.token = token }
+      @r_client = Slack.realtime
+      @client   = client
+      @channel, @text, @user = ["all"] * 3
+      @responce_channel, @responce_text, @responce_user = nil, nil, "slacker"
+    end
 
-  def set_condition(channel: nil, text: nil, user: nil)
-    @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_condition(channel: nil, text: nil, user: nil)
+      @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)
-    @responce_channel = channel  if channel
-    @responce_text    = text     if text
-    @responce_user    = user     if user
-    if block_given?
-      @responce_block = Proc.new(&yield)
+    def set_responce(channel: nil , text: nil, user: nil)
+      @responce_channel = channel  if channel
+      @responce_text    = text     if text
+      @responce_user    = user     if user
+      if block_given?
+        @responce_block = Proc.new(&yield)
+      end
+      { channel: @responce_channel, user: @responce_user, text: @responce_text }
     end
-    { channel: @responce_channel, user: @responce_user, text: @responce_text }
-  end
 
-  def status
-    variables = instance_variables.map {|v| v.to_s }
-    variables.map {|v| { v.to_s => instance_variable_get(v) } }
-  end
+    def status
+      variables = instance_variables.map {|v| v.to_s }
+      variables.map {|v| { v.to_s => instance_variable_get(v) } }
+    end
 
-  def start
-    return p "not set params. need set_responce(channel: , text: , user: )" unless valid_params
-    @r_client.on :message do |data|
-      if fit_condition?(data)
-        send_responce(data)
+    def start
+      return p "not set params. need set_responce(channel: , text: , user: )" unless valid_params
+      @r_client.on :message do |data|
+        if fit_condition?(data)
+          send_responce(data)
+        end
       end
+      puts "client start!"
+      @r_client.start
     end
-    puts "client start!"
-    @r_client.start
-  end
 
-  private
+    private
 
-  def send_responce(data)
-    if @responce_block.nil?
-      @client.post.channel(to: @responce_channel, text: @responce_text, name: @responce_user)
-    else
-      responce = {}.tap do |res|
-        res[:user]    = @client.get.user(data["user"])[:name] rescue "unknown"
-        res[:channel] = @client.get.channel(data["channel"])[:name] rescue "unknown"
-        res[:text]    = data["text"]
+    def send_responce(data)
+      if @responce_block.nil?
+        @client.post.channel(to: @responce_channel, text: @responce_text, name: @responce_user)
+      else
+        responce = {}.tap do |res|
+          res[:user]    = @client.get.user(data["user"])[:name] rescue "unknown"
+          res[:channel] = @client.get.channel(data["channel"])[:name] rescue "unknown"
+          res[:text]    = data["text"]
+        end
+        @responce_block.call(data, responce)
       end
-      @responce_block.call(data, responce)
     end
-  end
 
-  def fit_condition?(data)
-    fit_params?(@channel, data["channel"]) && fit_params?(@user, data["user"]) && fit_params?(@text, data["text"])
-  end
+    def fit_condition?(data)
+      fit_params?(@channel, data["channel"]) && fit_params?(@user, data["user"]) && fit_params?(@text, data["text"])
+    end
 
-  def fit_params?(set_params, res_param)
-    return true if set_params == "all"
-    case set_params
-    when String
-      set_params == res_param
-    when Array
-      set_params.any? {|param| fit_params?(param, res_param) }
-    when Regexp
-      set_params =~ res_param
-    when Hash
-      set_params[:id] == res_param
-    else
-      false
+    def fit_params?(set_params, res_param)
+      return true if set_params == "all"
+      case set_params
+      when String
+        set_params == res_param
+      when Array
+        set_params.any? {|param| fit_params?(param, res_param) }
+      when Regexp
+        set_params =~ res_param
+      when Hash
+        set_params[:id] == res_param
+      else
+        false
+      end
     end
-  end
 
-  def set_condition_channel(channel)
-    return nil   if channel.nil?
-    return "all" if channel.to_s == "all" rescue false
-    case channel
-    when String
-      @client.get.channel(channel)
-    when Array
-      channel.map {|ch| @client.get.channel(ch.to_s) }
-    when Hash
-      channel
-    when Symbol
-      @client.get.channel(channel.to_s)
-    else
-      "error: invalid Object"
+    def set_condition_channel(channel)
+      return nil   if channel.nil?
+      return "all" if channel.to_s == "all" rescue false
+      case channel
+      when String
+        @client.get.channel(channel)
+      when Array
+        channel.map {|ch| @client.get.channel(ch.to_s) }
+      when Hash
+        channel
+      when Symbol
+        @client.get.channel(channel.to_s)
+      else
+        "error: invalid Object"
+      end
     end
-  end
 
-  def set_condition_user(user)
-    return nil   if user.nil?
-    return "all" if user.to_s == "all" rescue false
-    case user
-    when String
-      @client.get.user(user)
-    when Array
-      user.map {|u| set_condition_user(u) }
-    when Hash
-      user
-    when Symbol
-      @client.get.user(user.to_s)
-    else
-      "error: invalid Object"
+    def set_condition_user(user)
+      return nil   if user.nil?
+      return "all" if user.to_s == "all" rescue false
+      case user
+      when String
+        @client.get.user(user)
+      when Array
+        user.map {|u| set_condition_user(u) }
+      when Hash
+        user
+      when Symbol
+        @client.get.user(user.to_s)
+      else
+        "error: invalid Object"
+      end
     end
-  end
 
-  def set_condition_text(text)
-    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")
-    when Array
-      text.map {|t| set_condition_text(t) }
-    when Regexp
-      text
-    else
-      text.to_s rescue nil
+    def set_condition_text(text)
+      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")
+      when Array
+        text.map {|t| set_condition_text(t) }
+      when Regexp
+        text
+      else
+        text.to_s rescue nil
+      end
     end
-  end
 
-  def set_responce_channel(channel)
-    set_condition_channel(channel)
-  end
+    def set_responce_channel(channel)
+      set_condition_channel(channel)
+    end
 
-  def valid_params
-    return true if @responce_block
-    variables = ["@responce_channel", "@responce_text"]
-    variables.none? {|v| instance_variable_get(v).nil? }
+    def valid_params
+      return true if @responce_block
+      variables = ["@responce_channel", "@responce_text"]
+      variables.none? {|v| instance_variable_get(v).nil? }
+    end
   end
-
 end

data/lib/simple_slack/client.rb

@@ -4,26 +4,28 @@ require 'simple_slack/poster'
 require 'simple_slack/botter'
 require 'simple_slack/toggl'
 
-class SimpleSlack::Client
-  def initialize(token = ENV['SLACK_API_TOKEN'])
-    @token = token
-    Slack.configure { |config| config.token = @token }
-    @slack = Slack.client
-  end
+module SimpleSlack
+  class Client
+    def initialize(token = ENV['SLACK_API_TOKEN'])
+      @token = token
+      Slack.configure { |config| config.token = @token }
+      @slack = Slack.client
+    end
 
-  def get
-    @getter ||= SimpleSlack::Getter.new(@slack)
-  end
+    def get
+      @getter ||= SimpleSlack::Getter.new(@slack)
+    end
 
-  def post
-    @poster ||= SimpleSlack::Poster.new(@slack, self)
-  end
+    def post
+      @poster ||= SimpleSlack::Poster.new(@slack, self)
+    end
 
-  def bot
-    @botter ||= SimpleSlack::Botter.new(@token, self)
-  end
+    def bot
+      @botter ||= SimpleSlack::Botter.new(@token, self)
+    end
 
-  def toggl(toggl_api_token = ENV['TOGGL_API_TOKEN'])
-    @toggl  ||= SimpleSlack::Toggl.new(toggl_api_token, self)
+    def toggl(toggl_api_token = ENV['TOGGL_API_TOKEN'])
+      @toggl  ||= SimpleSlack::Toggl.new(toggl_api_token, self)
+    end
   end
 end

data/lib/simple_slack/getter.rb

@@ -1,111 +1,111 @@
-class SimpleSlack::Getter
-  def initialize(slack)
-    @slack = slack
-  end
-
-  # use options for
-  # :is_channel, :creator, :members, :topic, :purpose, :num_members, etc
-  def channels(options = [])
-    channels = @slack.channels_list
-    channels["channels"].map do |channel|
-      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, options = [])
-    key.to_s =~ /\AC.{8}\Z/ ? key_id = key : key_name = key
-    channel_list = channels(options)
-    if key_id
-      channel_list.find{|ch| ch[:id]   == key_id   }
-    elsif key_name
-      channel_list.find{|ch| ch[:name] == key_name }
+module SimpleSlack
+  class Getter
+    def initialize(slack)
+      @slack = slack
     end
-  end
 
-  # use options for
-  # :real_name, :is_admin, :is_bot, etc...
-  def users(options = [])
-    users = @slack.users_list
-    users["members"].map do |user|
-      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
+    # use options for
+    # :is_channel, :creator, :members, :topic, :purpose, :num_members, etc
+    def channels(options = [])
+      channels = @slack.channels_list
+      channels["channels"].map do |channel|
+        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 user(key, options = [])
-    key.to_s =~ /\AU.{8}\Z/ ? key_id = key : key_name = key
-    user_list = users(options)
-    if key_id
-      user_list.find{|user| user[:id]   == key_id }
-    elsif key_name
-      user_list.find{|user| user[:name] == key_name }
+    def channel(key, options = [])
+      key.to_s =~ /\AC.{8}\Z/ ? key_id = key : key_name = key
+      channel_list = channels(options)
+      if key_id
+        channel_list.find{|ch| ch[:id]   == key_id   }
+      elsif key_name
+        channel_list.find{|ch| ch[:name] == key_name }
+      end
     end
-  end
 
-  # 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)
+    # use options for
+    # :real_name, :is_admin, :is_bot, etc...
+    def users(options = [])
+      users = @slack.users_list
+      users["members"].map do |user|
+        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
-  end
 
-  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 }
+    def user(key, options = [])
+      key.to_s =~ /\AU.{8}\Z/ ? key_id = key : key_name = key
+      user_list = users(options)
+      if key_id
+        user_list.find{|user| user[:id]   == key_id }
+      elsif key_name
+        user_list.find{|user| user[:name] == key_name }
+      end
     end
-  end
 
-  # 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 |im|
-      im_user = if im["user"] == "USLACKBOT"
-                  { id: im["user"], name: "slackbot" }
-                else
-                  user(im["user"])
-                end
-      add_params = options.empty? ? {} : options_to_hash(options, im)
-      { id: im["id"], user: im_user }.merge(add_params)
+    # 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
-  end
 
-  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 }
+    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
-  end
 
-  def chats
-    "yet"
-  end
+    # 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 |im|
+        im_user = if im["user"] == "USLACKBOT"
+                    { id: im["user"], name: "slackbot" }
+                  else
+                    user(im["user"])
+                  end
+        add_params = options.empty? ? {} : options_to_hash(options, im)
+        { id: im["id"], user: im_user }.merge(add_params)
+      end
+    end
 
-  def chat
-    "yet"
-  end
+    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
 
-  private
+    def chats
+      "yet"
+    end
 
-  def options_to_hash(options, type = {})
-    marged_option = {}
-    options.each do |op|
-      marged_option.merge!({ op.to_sym => type[op.to_s] })
+    def chat
+      "yet"
     end
 
-    marged_option
-  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
 end

data/lib/simple_slack/poster.rb

@@ -1,67 +1,69 @@
-class SimpleSlack::Poster
-  def initialize(slack, simple_slack)
-    @slack = slack
-    @simple_slack = simple_slack
-  end
+module SimpleSlack
+  class Poster
+    def initialize(slack, simple_slack)
+      @slack = slack
+      @simple_slack = simple_slack
+    end
 
-  def channels(to: , text: , name: "slacker", **options)
-    to.all? do |t|
-      id = convert_channel_to_id(t.to_s)
+    def channels(to: , text: , name: "slacker", **options)
+      to.all? do |t|
+        id = convert_channel_to_id(t.to_s)
+        send_chat({ username: name, channel: id, text: text }.merge(options))
+      end
+    end
+
+    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
-  end
 
-  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 user(to: , text: , name: "slacker")
-    "yet"
-  end
+    def chat(channel: nil, user: nil, text: , name: "slacker", **options)
+      if channel
+        self.channel({ to: channel, text: text, name: name }.merge(options))
+      elsif user
+        "yet"
+      end
+    end
 
-  def chat(channel: nil, user: nil, text: , name: "slacker", **options)
-    if channel
-      self.channel({ to: channel, text: text, name: name }.merge(options))
-    elsif user
-      "yet"
+    def ims(to: , text: , name: "slacker", **options)
+      to.all? do |t|
+        id = convert_im_to_id(t.to_s)
+        send_chat({ username: name, channel: id, text: text }.merge(options))
+      end
     end
-  end
 
-  def ims(to: , text: , name: "slacker", **options)
-    to.all? do |t|
-      id = convert_im_to_id(t.to_s)
+    def im(to: , text: , name: "slacker", **options)
+      id = convert_im_to_id(to.to_s)
       send_chat({ username: name, channel: id, text: text }.merge(options))
     end
-  end
 
-  def im(to: , text: , name: "slacker", **options)
-    id = convert_im_to_id(to.to_s)
-    send_chat({ username: name, channel: id, text: text }.merge(options))
-  end
+    private
 
-  private
-
-  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 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_to_id(key)
-    channel = @simple_slack.get.channel(key)
-    if channel
-      channel[:id]
-    else
-      raise "チャンネルが見つかりませんでした。"
+    def convert_channel_to_id(key)
+      channel = @simple_slack.get.channel(key)
+      if channel
+        channel[:id]
+      else
+        raise "チャンネルが見つかりませんでした。"
+      end
     end
-  end
 
-  def convert_im_to_id(key)
-    im = @simple_slack.get.im(key)
-    if im
-      im[:id]
-    else
-      raise "IMが見つかりませんでした。"
+    def convert_im_to_id(key)
+      im = @simple_slack.get.im(key)
+      if im
+        im[:id]
+      else
+        raise "IMが見つかりませんでした。"
+      end
     end
   end
 end

data/lib/simple_slack/version.rb

@@ -1,3 +1,3 @@
 module SimpleSlack
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_slack
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - toririn