enchanted_quill 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0acda1f620d492a00ec94da0194dd2cd6979ef05
-  data.tar.gz: ce035a4864e66ff434009c6812b40436d096198a
+  metadata.gz: 3e82c15520eb37dad77de33e4bc2c73aca9d7855
+  data.tar.gz: 38318ca27d68557f57e53952a0995a993e5a6b5d
 SHA512:
-  metadata.gz: cad4c2332d6d46346636eb969146f59f8d43f071c526001b7f87ae0993b29e0ae3df29726146add7120aaa3ccd469bd208226aadc084e7a7fc2547d49c4ed1d3
-  data.tar.gz: db11c830f8dfef3a6941353e476de629edaca2525cd11485204ecf78fc7eff79875d959f84c061ac0cc3293ebbd3ff1c622b5f95200d28cc632e7b37b5513567
+  metadata.gz: 5d47b6625a959651a9a7cd06fb6d345431ac57c7e9648b4eb478a030c019d4532ab981c8e705682f6ae4ddc867193677ff29fcd5578c1522a58b5388147c2643
+  data.tar.gz: 32438a3e4f8169319164a3b0e766143989c5002c35f2073d0469d683d87fed511c047636d79890afe11caef688a12acad69738ec1ed07b0eb955d1bda0095725

data/lib/enchanted_quill/element_creator.rb

@@ -8,8 +8,8 @@ module EnchantedQuill
 
       mentions.each do |mention|
         if mention.range.length > 2
-          range = NSMakeRange(mention.range.location + 1, mention.range.length - 1)
-          word  = text.substringWithRange(range)
+          range = NSMakeRange(mention.range.location, mention.range.length)
+          word  = text.substringWithRange(range).strip
 
           if word[0] == '@'
             word = word[1..-1]
@@ -28,8 +28,8 @@ module EnchantedQuill
 
       hashtags.each do |hashtag|
         if hashtag.range.length > 2
-          range = NSMakeRange(hashtag.range.location + 1, hashtag.range.length - 1)
-          word  = text.substringWithRange(range)
+          range = NSMakeRange(hashtag.range.location, hashtag.range.length)
+          word  = text.substringWithRange(range).strip
 
           if word[0] == '#'
             word = word[1..-1]
@@ -48,8 +48,8 @@ module EnchantedQuill
 
       categories.each do |category|
         if category.range.length > 2
-          range = NSMakeRange(category.range.location + 1, category.range.length - 1)
-          word  = text.substringWithRange(range)
+          range = NSMakeRange(category.range.location, category.range.length)
+          word  = text.substringWithRange(range).strip
 
           if word[0] == '{' && word[-1] == '}'
             word = word[1..-2]

data/lib/enchanted_quill/label.rb

@@ -28,6 +28,65 @@ module EnchantedQuill
       layout_manager.drawGlyphsForGlyphRange(range, atPoint: new_origin)
     end
 
+    def layoutSubviews
+      super
+      text_container.size = self.bounds.size
+    end
+
+    def setPreferredMaxLayoutWidth(preferred_max_layout_width)
+      super
+      update_text_container_size(self.bounds.size)
+    end
+
+    def setFrame(frame)
+      super
+      update_text_container_size(frame.size)
+    end
+
+    def setBounds(bounds)
+      super
+      update_text_container_size(bounds.size)
+    end
+
+    def update_text_container_size(size)
+	    container_size = size
+	    width  = [size.width, self.preferredMaxLayoutWidth].min
+      height = 0
+	    text_container.size = CGSizeMake(width, height)
+    end
+
+
+    # Override UILabel Methods
+    def textRectForBounds(bounds, limitedToNumberOfLines: num_of_lines)
+	    required_rect = rect_fitting_text_for_container_size(bounds.size, for_number_of_line: num_of_lines)
+	    text_container.size = required_rect.size
+	    required_rect
+    end
+
+    def rect_fitting_text_for_container_size(size, for_number_of_line: num_of_lines)
+      text_container.size = size;
+      text_container.maximumNumberOfLines = num_of_lines
+      text_bounds = layout_manager.boundingRectForGlyphRange(NSMakeRange(0, layout_manager.numberOfGlyphs),
+                      inTextContainer: text_container)
+      total_lines = text_bounds.size.height / self.font.lineHeight
+
+      height = text_bounds.size.height
+      if num_of_lines > 0 && (num_of_lines < total_lines)
+        height -= (total_lines - num_of_lines) * self.font.lineHeight
+      elsif (num_of_lines > 0 && (num_of_lines > total_lines))
+        height += (num_of_lines - total_lines) * self.font.lineHeight
+      end
+
+      width  = text_bounds.size.width.ceil
+      height = (attributedText && attributedText.mutableString.blank?) ? 0 : height.ceil
+      CGRectMake(text_bounds.origin.x, text_bounds.origin.y, width, height)
+    end
+
+    # Override UIView methods
+    def requiresConstraintBasedLayout
+      true
+    end
+
     def customize(&block)
       @customizing = true
       block.call(self)
@@ -239,6 +298,7 @@ module EnchantedQuill
         text_storage.addLayoutManager(layout_manager)
         layout_manager.addTextContainer(text_container)
         text_container.lineFragmentPadding = 0
+        text_container.maximumNumberOfLines = 0
         self.userInteractionEnabled = true
       end
     end
@@ -266,22 +326,31 @@ module EnchantedQuill
 
       attributed_text = attributedText
       if attributed_text.nil? || attributed_text.length == 0
-        text_storage.setAttributedString(NSAttributedString.alloc.init)
+        text_storage.setAttributedString(NSAttributedString.alloc.initWithString(''))
         return
       end
 
       mut_attr_string = add_line_break(attributed_text)
+      mut_attr_string = add_default_attributes(mut_attr_string)
 
       if parse_text
         @selected_element = nil
-        active_elements.each do |type, _|
-          @active_elements[type] = []
+        @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
         end
-
-        parse_text_and_extract_active_elements(mut_attr_string)
       end
 
-      add_link_attribute(mut_attr_string)
       text_storage.setAttributedString(mut_attr_string)
       setNeedsDisplay
     end
@@ -293,8 +362,7 @@ module EnchantedQuill
       CGPointMake(rect.origin.x, glyph_origin_y)
     end
 
-    # add link attribute
-    def add_link_attribute(mut_attr_string)
+    def add_default_attributes(mut_attr_string)
       range_pointer = Pointer.new(NSRange.type)
       attributes = mut_attr_string.attributesAtIndex(0, effectiveRange: range_pointer).dup
 
@@ -302,8 +370,17 @@ module EnchantedQuill
       attributes[NSForegroundColorAttributeName] = self.textColor
 
       mut_attr_string.addAttributes(attributes, range: range_pointer[0])
+      mut_attr_string
+    end
 
-      attributes[NSForegroundColorAttributeName] = mention_color
+    # add link attribute
+    def add_link_attribute(mut_attr_string)
+      range_pointer = Pointer.new(NSRange.type)
+      attributes = mut_attr_string.attributesAtIndex(0, effectiveRange: range_pointer).dup
+
+      attributes[NSFontAttributeName] = self.font
+      attributes[NSForegroundColorAttributeName] = self.textColor
+      mut_attr_string.addAttributes(attributes, range: range_pointer[0])
 
       active_elements.each do |type, elements|
         case type

data/lib/enchanted_quill/version.rb

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

metadata

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