ayadn 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00656e4af8c792c9b5230d9da9bb4bc64513da1a
-  data.tar.gz: 458d524340d6dbd9fc7fc6f9bf705f32777baa71
+  metadata.gz: 4887bcdeae96ce84899aa3ebaf4da316c0113b43
+  data.tar.gz: abfa9e72b28407bc4fbf358638a6f799b63be5ab
 SHA512:
-  metadata.gz: 74744be16e5315052c51407642389e27d045667067270402359d6b081aafd4fd8567ef2f636a17d1b4837d4331181b2c2f4f0b7599179f23b7246e736f160907
-  data.tar.gz: ffcc6b1211f8666f99d4b7bd6a911d08909a75ad4bd81a8209817225354251bc897e37d9a146b330fafecc7b8a7c1c35ab2f3acfa3b498363f9d820791b114cd
+  metadata.gz: 06e1c4314efd90a6ad3085ee89b229596922ebe3da3181ed018bdd419721ac82f3c693694493b10e4ff68c374e7647f5dc2b9ca6f9833d61f1f2c88fe98c164f
+  data.tar.gz: 8faf6206ac2a723787faea00a91c043d18f38946b475f31c0aa85a7be96c38b3fef1df7ed7c8ee1db1dd52eb777c6a2687e30a5e2a8febc7acddedd5684b1eaf

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 1.0.5
+
+- Fixed the colorization for mentions
+- Added tests for colorization
+
 # 1.0.4
 
 - Fixed 'reply to an indexed stream' for Ruby < 2.1

data/lib/ayadn/scroll.rb

@@ -36,7 +36,7 @@ module Ayadn
           if Databases.has_new?(stream, 'unified')
             show(stream, options)
           end
-          unless stream['meta']['max_id'].nil?
+          unless stream['meta']['max_id'].nil?   #check if there isn't lost posts
             Databases.save_max_id(stream)
             options = options_hash(stream)
           end

data/lib/ayadn/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Ayadn
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

data/lib/ayadn/workers.rb

@@ -276,8 +276,6 @@ module Ayadn
       users_hash
     end
 
-    private
-
     def colorize_text(text, mentions)
       handles = Array.new
       mentions.each {|username| handles << "@#{username}"}
@@ -290,7 +288,14 @@ module Ayadn
           if word =~ /#\w+/
             words << word.gsub(/#([A-Za-z0-9_]{1,255})(?![\w+])/, '#\1'.color(hashtag_color))
           elsif word =~ /@\w+/
-            if handles.include?(word) || word =~ /@\w+[:]/
+            splitted = word.split(/[:\-;,?!'&`^=+<>*%()]/) if word =~ /[:\-;,?!'&`^=+<>*%()]/
+            if splitted
+              splitted.each {|d| @str = d if d =~ /@\w+/}
+              @str = word if @str.nil?
+            else
+              @str = word
+            end
+            if handles.include?(@str.downcase)
               words << word.gsub(/@([A-Za-z0-9_]{1,20})(?![\w+])/, '@\1'.color(mention_color))
             else
               words << word
@@ -305,6 +310,8 @@ module Ayadn
       sentences.join("\n")
     end
 
+    private
+
     def init_table
       Terminal::Table.new do |t|
         t.style = { :width => Settings.options[:formats][:table][:width] }

data/spec/mock/regex.json

@@ -0,0 +1,188 @@
+{
+  "meta": {
+    "code": 200
+  },
+  "data": {
+    "created_at": "2014-04-07T20:13:45Z",
+    "num_stars": 0,
+    "num_replies": 0,
+    "entities": {
+      "mentions": [
+        {
+          "pos": 13,
+          "id": "185581",
+          "len": 10,
+          "name": "aya_tests"
+        },
+        {
+          "pos": 34,
+          "id": "185581",
+          "len": 10,
+          "name": "aya_tests"
+        },
+        {
+          "pos": 52,
+          "id": "185581",
+          "len": 10,
+          "name": "aya_tests"
+        },
+        {
+          "pos": 113,
+          "id": "185581",
+          "len": 10,
+          "name": "aya_tests"
+        },
+        {
+          "pos": 141,
+          "id": "185581",
+          "len": 10,
+          "name": "aya_tests"
+        }
+      ],
+      "hashtags": [
+        {
+          "name": "test",
+          "len": 5,
+          "pos": 0
+        },
+        {
+          "name": "regex",
+          "len": 6,
+          "pos": 6
+        },
+        {
+          "name": "true",
+          "len": 5,
+          "pos": 26
+        },
+        {
+          "name": "true",
+          "len": 5,
+          "pos": 46
+        },
+        {
+          "name": "true",
+          "len": 5,
+          "pos": 63
+        },
+        {
+          "name": "false",
+          "len": 6,
+          "pos": 79
+        },
+        {
+          "name": "false",
+          "len": 6,
+          "pos": 105
+        },
+        {
+          "name": "true",
+          "len": 5,
+          "pos": 130
+        },
+        {
+          "name": "true",
+          "len": 5,
+          "pos": 156
+        }
+      ],
+      "links": [
+
+      ]
+    },
+    "text": "#test #regex\n@aya_tests's #true \n(@aya_tests) #true\n@AyA_TeSts #true\n@aya_test #false\naya@aya_tests.yolo #false\n-@aya_tests:ohai! #true\ntext,@aya_tests,txt #true",
+    "num_reposts": 0,
+    "canonical_url": "https://alpha.app.net/aya_tests/post/27981025",
+    "source": {
+      "link": "http://www.ayadn-app.net",
+      "name": "Ayadn",
+      "client_id": "hFsCGArAjgJkYBHTHbZnUvzTmL4vaLHL"
+    },
+    "machine_only": false,
+    "user": {
+      "username": "aya_tests",
+      "avatar_image": {
+        "url": "https://d2rfichhc2fb9n.cloudfront.net/image/5/wtcnGHTyeGX988iObjlCFHdHEM17InMiOiJzMyIsImIiOiJhZG4tdXNlci1hc3NldHMiLCJrIjoiYXNzZXRzL3VzZXIvMDcvMDEvODAvMDcwMTgwMDAwMDAwMDAwMC5qcGciLCJvIjoiIn0",
+        "width": 322,
+        "is_default": false,
+        "height": 322
+      },
+      "description": {
+        "text": "Experimental account for running tests.",
+        "entities": {
+          "mentions": [
+
+          ],
+          "hashtags": [
+
+          ],
+          "links": [
+
+          ]
+        }
+      },
+      "locale": "fr_FR",
+      "created_at": "2013-11-02T17:06:51Z",
+      "id": "185581",
+      "canonical_url": "https://alpha.app.net/aya_tests",
+      "cover_image": {
+        "url": "https://d2rfichhc2fb9n.cloudfront.net/image/5/kZ-JRmTbmd3WVPswTJ8Nwxzkf917InMiOiJzMyIsImIiOiJ0YXBwLWFzc2V0cyIsImsiOiJpL1UvaS9ZL1VpWW5xRFNvTUtyTEhLNXA0OHN2NkxmTmRVMC5qcGciLCJvIjoiIn0",
+        "width": 960,
+        "is_default": true,
+        "height": 260
+      },
+      "timezone": "Europe/Berlin",
+      "counts": {
+        "following": 15,
+        "posts": 758,
+        "followers": 13,
+        "stars": 5
+      },
+      "type": "human",
+      "annotations": [
+        {
+          "type": "net.chimpli.media",
+          "value": {
+            "image": "29487",
+            "audio": "29489",
+            "video": "29488"
+          }
+        }
+      ],
+      "name": "@ericd's tests account"
+    },
+    "you_reposted": false,
+    "id": "27981025",
+    "you_starred": false,
+    "thread_id": "27981025",
+    "annotations": [
+      {
+        "type": "com.ayadn.user",
+        "value": {
+          "username": "aya_tests",
+          "avatar_image": {
+            "url": "https://d2rfichhc2fb9n.cloudfront.net/image/5/wtcnGHTyeGX988iObjlCFHdHEM17InMiOiJzMyIsImIiOiJhZG4tdXNlci1hc3NldHMiLCJrIjoiYXNzZXRzL3VzZXIvMDcvMDEvODAvMDcwMTgwMDAwMDAwMDAwMC5qcGciLCJvIjoiIn0",
+            "width": 322,
+            "is_default": false,
+            "height": 322
+          },
+          "id": "185581",
+          "name": "@ericd's tests account"
+        }
+      },
+      {
+        "type": "com.ayadn.client",
+        "value": {
+          "url": "http://ayadn-app.net",
+          "version": "1.0.4",
+          "author": {
+            "username": "ericd",
+            "email": "eric@aya.io",
+            "id": "69904",
+            "name": "Eric Dejonckheere"
+          }
+        }
+      }
+    ]
+  }
+}

data/spec/unit/workers_spec.rb

@@ -21,6 +21,7 @@ describe Ayadn::Workers do
 
   let(:data) { JSON.parse(File.read("spec/mock/stream.json")) }
   let(:checkins) { JSON.parse(File.read("spec/mock/checkins.json")) }
+  let(:regex_post) { JSON.parse(File.read("spec/mock/regex.json")) }
 
   describe "#build_posts" do
     it "builds posts hash from stream" do
@@ -144,4 +145,12 @@ describe Ayadn::Workers do
     end
   end
 
+  describe "#colorize_text" do
+    it "colorizes mentions and hashtags" do
+      text = regex_post['data']['text']
+      mentions = regex_post['data']['entities']['mentions']
+      expect(Ayadn::Workers.new.colorize_text(text, mentions)).to eq "\e[36m#test\e[0m \e[36m#regex\e[0m\n@aya_tests's \e[36m#true\e[0m\n(@aya_tests) \e[36m#true\e[0m\n@AyA_TeSts \e[36m#true\e[0m\n@aya_test \e[36m#false\e[0m\naya@aya_tests.yolo \e[36m#false\e[0m\n-@aya_tests:ohai! \e[36m#true\e[0m\ntext,@aya_tests,txt \e[36m#true\e[0m"
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ayadn
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Eric Dejonckheere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-06 00:00:00.000000000 Z
+date: 2014-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -234,6 +234,7 @@ files:
 - spec/mock/index.db
 - spec/mock/pagination.db
 - spec/mock/posted.json
+- spec/mock/regex.json
 - spec/mock/stream.json
 - spec/mock/users.db
 - spec/spec_helper.rb
@@ -282,6 +283,7 @@ test_files:
 - spec/mock/index.db
 - spec/mock/pagination.db
 - spec/mock/posted.json
+- spec/mock/regex.json
 - spec/mock/stream.json
 - spec/mock/users.db
 - spec/spec_helper.rb