enchanted_quill 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e82c15520eb37dad77de33e4bc2c73aca9d7855
-  data.tar.gz: 38318ca27d68557f57e53952a0995a993e5a6b5d
+  metadata.gz: 91177bce7fa1321490c18a528fa9008bb68be745
+  data.tar.gz: 488e366244ce71ed25bec2f29af7c85c5743c330
 SHA512:
-  metadata.gz: 5d47b6625a959651a9a7cd06fb6d345431ac57c7e9648b4eb478a030c019d4532ab981c8e705682f6ae4ddc867193677ff29fcd5578c1522a58b5388147c2643
-  data.tar.gz: 32438a3e4f8169319164a3b0e766143989c5002c35f2073d0469d683d87fed511c047636d79890afe11caef688a12acad69738ec1ed07b0eb955d1bda0095725
+  metadata.gz: 18b796b45e53b0f895c6e46d655cf39fe99595e105caf5ef2442e723baadea73fc2e87e1227b01c0eb7460ae9ac50e3f0c57079d3df8e28479670fd063c92588
+  data.tar.gz: 6db53c4284d5ffcba63aa54a38dfe3d150eb596060bfdc8f6652e8413f20a6846dc656a94b60138860c96d5053f12f0b7a0c3f5dc4d33e5fba0d33bd33628e88

data/lib/enchanted_quill/label.rb

@@ -19,6 +19,12 @@ module EnchantedQuill
       end
     end
 
+    def awakeFromNib
+      super.tap do
+        update_text_storage
+      end
+    end
+
     def drawTextInRect(rect)
       range               = NSMakeRange(0, text_storage.length)
       text_container.size = rect.size
@@ -326,7 +332,9 @@ module EnchantedQuill
 
       attributed_text = attributedText
       if attributed_text.nil? || attributed_text.length == 0
+        clear_active_elements
         text_storage.setAttributedString(NSAttributedString.alloc.initWithString(''))
+        setNeedsDisplay
         return
       end
 
@@ -334,20 +342,14 @@ module EnchantedQuill
       mut_attr_string = add_default_attributes(mut_attr_string)
 
       if parse_text
-        @selected_element = nil
-        @active_elements  = {}
-
-        Dispatch::Queue.concurrent.async do
-          parse_text_and_extract_active_elements(mut_attr_string)
-          active_elements_values = @active_elements.values.flatten.compact
-
-          if active_elements_values.count > 0
-            Dispatch::Queue.main.async do
-              add_link_attribute(mut_attr_string)
-              text_storage.setAttributedString(mut_attr_string)
-              setNeedsDisplay
-            end
-          end
+        clear_active_elements
+        parse_text_and_extract_active_elements(mut_attr_string)
+        active_elements_values = @active_elements.values.flatten.compact
+
+        if active_elements_values.count > 0
+          add_link_attribute(mut_attr_string)
+          text_storage.setAttributedString(mut_attr_string)
+          setNeedsDisplay
         end
       end
 
@@ -355,6 +357,11 @@ module EnchantedQuill
       setNeedsDisplay
     end
 
+    def clear_active_elements
+      @selected_element = nil
+      @active_elements  = {}
+    end
+
     def text_origin(rect)
       used_rect          = layout_manager.usedRectForTextContainer(text_container)
       @height_correction = (rect.size.height - used_rect.size.height) / 2

data/lib/enchanted_quill/parser.rb

@@ -4,7 +4,7 @@ module EnchantedQuill
     HASHTAG_REGEX  = "(?:^|\\s|$)#[\\p{L}0-9_]*"
     MENTION_REGEX  = "(?:^|\\s|$|[.])@[\\p{L}0-9_]*"
     URL_REGEX      = "(^|[\\s.:;?\\-\\]<\\(])" +
-                     "((https?://|www.|pic.)[-\\w;/?:@&=+$\\|\\_.!~*\\|'()\\[\\]%#,☺]+[\\w/#](\\(\\))?)" +
+                     "((https?://|www\\.|pic\\.)[-\\w;/?:@&=+$\\|\\_.!~*\\|'()\\[\\]%#,☺]+[\\w/#](\\(\\))?)" +
                      "(?=$|[\\s',\\|\\(\\).:;?\\-\\[\\]>\\)])"
 
     TYPE_WITH_REGEX = {

data/lib/enchanted_quill/version.rb

@@ -1,3 +1,3 @@
 module EnchantedQuill
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enchanted_quill
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Elom Gomez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-11 00:00:00.000000000 Z
+date: 2016-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake