komonjo 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 379a36019341bb032cc54179b83fa534dd3e1b60
-  data.tar.gz: 7cda8018351ce8edd97f8a005260d221d2a8bb77
+  metadata.gz: f27280d78b56494a76dcd495c4b74521db4ae7a6
+  data.tar.gz: 2283531da1e02b6eef9fdc6c2b423cd5af9f3d04
 SHA512:
-  metadata.gz: 7c34fc0cb26ae30e1ff13714bedfc6128fe402687a382fb095aad731b81d6d0bc721c970c041cda348c98a1605adc1e9961dc899bb575d7835f8fdbb37f9b256
-  data.tar.gz: d117ddb72f8702e3b11be1a3a56f0365020e269541466f6d408582fda172de9b812078b421f80a4350757fba3a43194db6d4bdda46c7c9b2f7afbfd7abada927
+  metadata.gz: 727b7c90c75d729b28e35e58265287e093af7b3b76f079dc2668a2fa133a6c99b695ea55cb8fef89112f610e5631e125b0a375bc10a47004e8a548feeaae8013
+  data.tar.gz: d94f268833c81914e6886b1a929c22ec3efcafd9c789fef980be1dc018e84807df5b5749d79519e5e41a07086a781a62ebc4fb952e05d25b64f10de3d2434240

data/.rubocop.yml

@@ -17,3 +17,5 @@ Metrics/LineLength:
   Enabled: false
 Style/StringLiterals:
   Enabled: false
+Style/TrailingComma:
+  Enabled: false

data/lib/komonjo.rb

@@ -1,23 +1,44 @@
+require 'json'
+
 require 'komonjo/extensions/hash_extensions'
 
 require 'komonjo/client'
 require 'komonjo/version'
+
 require 'komonjo/connections/slack_connection'
+
 require 'komonjo/extensions/to_json'
+
 require 'komonjo/gateways/channels_gateway'
 require 'komonjo/gateways/users_gateway'
 require 'komonjo/gateways/messages_gateway'
 require 'komonjo/gateways/emojis_gateway'
+
 require 'komonjo/models/api/response_base'
+require 'komonjo/models/filters/base'
+require 'komonjo/models/filters/emoji_filter'
+require 'komonjo/models/filters/reply_filter'
+require 'komonjo/models/filters/url_filter'
+require 'komonjo/models/mixins/emoji_containable'
+require 'komonjo/models/mixins/reply_containable'
+require 'komonjo/models/mixins/url_containable'
 require 'komonjo/models/channel'
 require 'komonjo/models/message'
+require 'komonjo/models/partial_message'
+require 'komonjo/models/partial_message_factory'
 require 'komonjo/models/profile'
 require 'komonjo/models/user'
 require 'komonjo/models/emoji'
+
+require 'komonjo/resources/base'
+require 'komonjo/resources/message'
+
 require 'komonjo/mocks/slack_mock'
+
 require 'komonjo/services/slack_service'
 require 'komonjo/services/channels_service'
 require 'komonjo/services/users_service'
 require 'komonjo/services/login_service'
 require 'komonjo/services/messages_service'
 require 'komonjo/services/emojis_service'
+

data/lib/komonjo/gateways/messages_gateway.rb

@@ -5,21 +5,29 @@ module Komonjo
     # Merge history and users
     class MessagesGateway
       using HashExtensions
-      def initialize(history, users)
+      attr_reader :history, :users, :emojis
+
+      def initialize(history, users, emojis)
         @history = history.map { |e| Hash[e.symbolize_keys] }
         @users = users.map do |e|
-          ret = Hash[e.symbolize_keys]
-          ret[:profile] = Hash[ret[:profile].symbolize_keys]
-          ret
+          h = Hash[e.symbolize_keys]
+          h[:profile] = Hash[h[:profile].symbolize_keys]
+          Komonjo::Model::User.create(h)
+        end
+        @emojis = emojis.map do |(name, url)|
+          Komonjo::Model::Emoji.create(name, url)
         end
       end
 
       def messages
-        @history.map do |e|
+        history.map do |e|
           next e unless e[:user]
           Komonjo::Model::Message.create(e).tap do |message|
             message.user = find_user(e[:user])
             message.text = CGI.unescapeHTML(message.text)
+            message.partial_messages.each do |e|
+              e.embed(embed_data)
+            end
           end
         end
       end
@@ -27,9 +35,16 @@ module Komonjo
       private
 
       def find_user(user_id)
-        user = @users.find { |e| e[:id] == user_id }
-        raise "unknown user: #{user_id}" unless user
-        Komonjo::Model::User.create(user)
+        @users.find { |e| e.id == user_id }.tap do |e|
+          raise "unknown user: #{user_id}" unless e
+        end
+      end
+
+      def embed_data
+        @embed_data ||= {
+          users: users,
+          emojis: emojis,
+        }
       end
     end
   end

data/lib/komonjo/mocks/slack_mock.rb

@@ -19,7 +19,7 @@ module Komonjo
 
         def channels_history(channel_name)
           [{ type: 'message', user: 'id001', channel: channel_name,
-             text: 'Hello, world' },
+             text: '<@id001> hello :bow:' },
            { type: 'message', user: 'id002', channel: channel_name,
              text: 'This is Komonjo' }]
         end

data/lib/komonjo/models/filters/base.rb

@@ -0,0 +1,33 @@
+module Komonjo
+  module Model
+    module Filter
+      module Base
+        def match(text)
+          return false unless text
+          text.match(pattern)
+        end
+
+        def parse(text)
+          m = text.match(pattern)
+          if text.index(pattern) == 0
+            _, b = text.split(pattern, 2)
+            return [
+              { text: m[0], matched: true },
+              { text: b, matched: false },
+            ].delete_if { |e| e[:text].nil? || e[:text] == "" }
+          end
+          a, c = text.split(pattern, 2)
+          return [
+            { text: a, matched: false },
+            { text: m[0], matched: true },
+            { text: c, matched: false },
+          ].delete_if { |e| e[:text].nil? || e[:text] == "" }
+        end
+
+        def pattern
+          //
+        end
+      end
+    end
+  end
+end

data/lib/komonjo/models/filters/emoji_filter.rb

@@ -0,0 +1,17 @@
+module Komonjo
+  module Model
+    module Filter
+      module EmojiFilter
+        extend Base
+
+        def self.pattern
+          @pattern ||= /:\S+?:/
+        end
+
+        def self.mixin
+          Komonjo::Model::Mixin::EmojiContainable
+        end
+      end
+    end
+  end
+end

data/lib/komonjo/models/filters/reply_filter.rb

@@ -0,0 +1,18 @@
+module Komonjo
+  module Model
+    module Filter
+      # URLFilter
+      module ReplyFilter
+        extend Base
+
+        def self.pattern
+          @pattern ||= %r{<@\S+?>}
+        end
+
+        def self.mixin
+          Komonjo::Model::Mixin::ReplyContainable
+        end
+      end
+    end
+  end
+end

data/lib/komonjo/models/filters/url_filter.rb

@@ -0,0 +1,18 @@
+module Komonjo
+  module Model
+    module Filter
+      # URLFilter
+      module URLFilter
+        extend Base
+
+        def self.pattern
+          @pattern ||= %r{<https?://\S+?>}
+        end
+
+        def self.mixin
+          Komonjo::Model::Mixin::URLContainable
+        end
+      end
+    end
+  end
+end

data/lib/komonjo/models/message.rb

@@ -14,6 +14,23 @@ module Komonjo
         end
       end
 
+      def partial_messages
+        @partial_messages ||=
+          begin
+            ret = []
+            tmp = first_partial_message
+            while tmp
+              ret << tmp
+              tmp = tmp.next
+            end
+            ret
+          end
+      end
+
+      def first_partial_message
+        @first_partial_message ||= PartialMessageFactory.build(text)
+      end
+
       def timestamp
         Time.at(@ts.to_f).strftime('%Y-%m-%d %H:%M:%S')
       end
@@ -35,7 +52,8 @@ module Komonjo
       end
 
       def text_markdown
-        "\t- #{@text}\n"
+        t = partial_messages.map(&:markdown).join
+        "\t- #{t}\n"
       end
 
       def to_json(*args)

data/lib/komonjo/models/mixins/emoji_containable.rb

@@ -0,0 +1,18 @@
+module Komonjo
+  module Model
+    module Mixin
+      module EmojiContainable
+        def type
+          :emoji
+        end
+
+        def embed(data)
+          name = text[1..-2]
+          data[:emojis].any? do |e|
+            @markdown = "![emoji:#{e.name}](#{e.url})" if e.name == name
+          end
+        end
+      end
+    end
+  end
+end

data/lib/komonjo/models/mixins/reply_containable.rb

@@ -0,0 +1,18 @@
+module Komonjo
+  module Model
+    module Mixin
+      module ReplyContainable
+        def type
+          :reply
+        end
+
+        def embed(data)
+          id = text[2..-2]
+          data[:users].any? do |u|
+            @markdown = "@#{u.name}" if u.id == id
+          end
+        end
+      end
+    end
+  end
+end

data/lib/komonjo/models/mixins/url_containable.rb

@@ -0,0 +1,17 @@
+module Komonjo
+  module Model
+    module Mixin
+      # URLContainable
+      module URLContainable
+        def type
+          :url
+        end
+
+        def embed(_)
+          url = text[1..-2]
+          @markdown = "[#{url}](#{url})"
+        end
+      end
+    end
+  end
+end

data/lib/komonjo/models/partial_message.rb

@@ -0,0 +1,56 @@
+module Komonjo
+  module Model
+    class PartialMessage
+      attr_accessor :next
+      attr_reader   :text
+      attr_reader   :filters
+      attr_reader   :markdown
+
+      def initialize(text, filters)
+        @text = text
+        @markdown = text
+        @filters = filters
+        parse
+      end
+
+      def parse
+        f = filters.find { |e| e.match(text) }
+        return unless f
+        arr = f.parse(text)
+        case arr.size
+        when 1
+          a, = arr
+          @text = a[:text]
+          extend f.mixin
+        when 2
+          a, b = arr
+          @text = a[:text]
+          if a[:matched]
+            extend f.mixin
+            @next = PartialMessage.new(b[:text], filters)
+            @next.parse
+          else
+            @next = PartialMessage.new(b[:text], filters).tap do |e|
+              e.extend f.mixin
+            end
+          end
+        when 3
+          a, b, c = arr
+          @text = a[:text]
+          @next = PartialMessage.new(b[:text], filters).tap do |e|
+            e.extend f.mixin
+            e.next = PartialMessage.new(c[:text], filters).tap(&:parse)
+          end
+        end
+        self
+      end
+
+      def type
+        :text
+      end
+
+      def embed(*)
+      end
+    end
+  end
+end

data/lib/komonjo/models/partial_message_factory.rb

@@ -0,0 +1,18 @@
+
+module Komonjo
+  module Model
+    module PartialMessageFactory
+      def self.build(text)
+        Komonjo::Model::PartialMessage.new(text, filters)
+      end
+
+      def self.filters
+        @filters ||= [
+          Komonjo::Model::Filter::ReplyFilter,
+          Komonjo::Model::Filter::URLFilter,
+          Komonjo::Model::Filter::EmojiFilter,
+        ]
+      end
+    end
+  end
+end

data/lib/komonjo/resources/base.rb

@@ -0,0 +1,6 @@
+module Komonjo
+  module Resource
+    class Base
+    end
+  end
+end

data/lib/komonjo/resources/message.rb

@@ -0,0 +1,29 @@
+module Komonjo
+  module Resource
+    # Resource representation for Komonjo::Model::Message
+    class Message < Base
+      attr_reader :model
+
+      def initialize(model)
+        @model = model
+      end
+
+      def as_json
+        {
+          markdown: model.markdown,
+          ts: model.ts,
+          type: model.type,
+          channel: model.channel,
+          user: model.user,
+          text: model.text,
+          edited: model.edited,
+          subtype: model.subtype,
+        }
+      end
+
+      def to_json(*args)
+        as_json.to_json(*args)
+      end
+    end
+  end
+end

data/lib/komonjo/services/messages_service.rb

@@ -10,7 +10,8 @@ module Komonjo
         connection = connection(@api_token)
         history = connection.channels_history(opts)
         users = connection.users_list
-        gateway = Komonjo::Gateway::MessagesGateway.new(history, users)
+        emojis = connection.emoji_list
+        gateway = Komonjo::Gateway::MessagesGateway.new(history, users, emojis)
         gateway.messages
       end
     end

data/lib/komonjo/version.rb

@@ -1,3 +1,3 @@
 module Komonjo
-  VERSION = "0.1.8".freeze
+  VERSION = "0.1.9".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: komonjo
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - hkdnet
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-19 00:00:00.000000000 Z
+date: 2016-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-api
@@ -110,9 +110,20 @@ files:
 - lib/komonjo/models/api/response_base.rb
 - lib/komonjo/models/channel.rb
 - lib/komonjo/models/emoji.rb
+- lib/komonjo/models/filters/base.rb
+- lib/komonjo/models/filters/emoji_filter.rb
+- lib/komonjo/models/filters/reply_filter.rb
+- lib/komonjo/models/filters/url_filter.rb
 - lib/komonjo/models/message.rb
+- lib/komonjo/models/mixins/emoji_containable.rb
+- lib/komonjo/models/mixins/reply_containable.rb
+- lib/komonjo/models/mixins/url_containable.rb
+- lib/komonjo/models/partial_message.rb
+- lib/komonjo/models/partial_message_factory.rb
 - lib/komonjo/models/profile.rb
 - lib/komonjo/models/user.rb
+- lib/komonjo/resources/base.rb
+- lib/komonjo/resources/message.rb
 - lib/komonjo/services/channels_service.rb
 - lib/komonjo/services/emojis_service.rb
 - lib/komonjo/services/login_service.rb