ruby_motion_query 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9913c04791559fa0a0408ca563e38d8eea89c38d
-  data.tar.gz: 2a523d42844327abfe26e233697045ef1294049c
+  metadata.gz: 076402a0a8e41d928b775cb8319a0f0ba942c7a9
+  data.tar.gz: 3a41cd46bdc0deb04b462372d1390e41f4868621
 SHA512:
-  metadata.gz: bf40b66623205cb835426352ad33a2103bb37cbfea6dc4541a793711d6778052141d48e502767a01196fb6b8c27224413589f2fd3da94abf8dfd1ed56dc3b592
-  data.tar.gz: 474192216610a6115742b429c76d142f11fc99148e63823fe99567f077c3bda60ac3f4238b87d4b8df041cfafca128f000201564f9495039f1793ccdea54d13a
+  metadata.gz: fbfa05daa2ca2013f0402ec58ecc6ef0a9e4d0e3a7e656a43aaf8e3e75f74fd587a8d1fb31d3e8291f1a09bf03a150224abdf3ea3d08d3dce20bdebf382820db
+  data.tar.gz: 9eb821d64590ef1670c3dc4b97b0beb49ade5aecd765e8a75baee54953f1142a5cb93019eca3587f305b105dc7f7778f7d4574a7027dd20319b11ee3b58a67e6

data/motion/ruby_motion_query/actions.rb

@@ -155,5 +155,21 @@ module RubyMotionQuery
       self
     end
 
+    # For UIActivityIndicatorViews
+    def start_animating
+      selected.each do |view|
+        view.startAnimating if view.respond_to?(:startAnimating)
+      end
+      self
+    end
+
+    # For UIActivityIndicatorViews
+    def stop_animating
+      selected.each do |view|
+        view.stopAnimating if view.respond_to?(:startAnimating)
+      end
+      self
+    end
+
   end
 end

data/motion/ruby_motion_query/app.rb

@@ -83,6 +83,17 @@ module RubyMotionQuery
         NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, true)[0]
       end
 
+      # @return [NSTimer] NSTimer instance, fires once after <seconds>
+      def after(seconds, &callback)
+        NSTimer.scheduledTimerWithTimeInterval(seconds, target: callback, selector: 'call:', userInfo: nil, repeats: false)
+      end
+      alias delay after
+
+      # @return [NSTimer] NSTimer instance, set to repeat every <seconds>
+      def every(seconds, &callback)
+        NSTimer.scheduledTimerWithTimeInterval(seconds, target: callback, selector: 'call:', userInfo: nil, repeats: true)
+      end
+
       # Returns the current view controller in the app. If the current controller is a tab or
       # navigation controller, then it gets the current tab or topmost controller in the nav, etc
       #

data/motion/ruby_motion_query/color.rb

@@ -161,8 +161,13 @@ module RubyMotionQuery
 
     def self.from_base_color(values)
       base = values[:base] || values[:color]
-      r, g, b, a = Pointer.new('d'), Pointer.new('d'), Pointer.new('d'), Pointer.new('d')
-      base.getRed(r, green: g, blue: b, alpha: a)
+      begin
+        r, g, b, a = Pointer.new('d'), Pointer.new('d'), Pointer.new('d'), Pointer.new('d')
+        base.getRed(r, green: g, blue: b, alpha: a)
+      rescue
+        r, g, b, a = Pointer.new('f'), Pointer.new('f'), Pointer.new('f'), Pointer.new('f')
+        base.getRed(r, green: g, blue: b, alpha: a)
+      end
 
       r = values[:r] || values[:red] || r.value
       g = values[:g] || values[:green] || g.value

data/motion/ruby_motion_query/data.rb

@@ -32,6 +32,16 @@ module RubyMotionQuery
       end
     end
 
+    # *Do not* use this, use {RMQ#untag} instead:
+    # @example
+    #   rmq(my_view).untag(:foo, :bar)
+    # Do nothing if no tag supplied or tag not present
+    def untag(*tag_or_tags)
+      tag_or_tags.flatten.each do |tag_name|
+        tags.delete tag_name
+      end
+    end
+
     # Check if this view contains a specific tag
     #
     # @param tag_name name of tag to check

data/motion/ruby_motion_query/format.rb

@@ -24,7 +24,7 @@ module RubyMotionQuery
       #
       # See <http://www.unicode.org/reports/tr35/tr35-19.html#Date_Format_Patterns>
       # for more information about date format strings.
-      def date(date, *format_or_styles)
+      def date(date = nil, *format_or_styles)
         RubyMotionQuery::Format::Date.formatter(*format_or_styles).stringFromDate(date)
       end
 
@@ -35,6 +35,10 @@ module RubyMotionQuery
       def date_formatter(*format_or_styles)
         RubyMotionQuery::Format::Date.formatter(*format_or_styles)
       end
+
+      def add_datetime_style(style, format)
+        RubyMotionQuery::Format::Date.add_datetime_style(style, format)
+      end
     end
   end
 
@@ -108,6 +112,9 @@ module RubyMotionQuery
         @_date_formatters[styles.to_s] ||= begin
           date_formatter = NSDateFormatter.alloc.init
 
+          date_formatter.setDateStyle(NSDateFormatterNoStyle)
+          date_formatter.setDateStyle(NSDateFormatterNoStyle)
+
           styles.each do |style|
             if DATE_STYLES.has_key?(style)
               date_formatter.setDateStyle(DATE_STYLES.fetch(style))
@@ -120,6 +127,11 @@ module RubyMotionQuery
         end
       end
 
+      def add_datetime_style(style_name, format)
+        @_date_formatters ||= {}
+
+        @_date_formatters[[style_name].to_s] ||= formatter_from_format(format)
+      end
     end
   end
 end

data/motion/ruby_motion_query/position.rb

@@ -106,22 +106,26 @@ module RubyMotionQuery
       self
     end
 
-    def resize_to_fit_subviews
+    def resize_frame_to_fit_subviews(args = {})
       selected.each do |view|
-        w = 0
-        h = 0
+        view.rmq.layout(subviews_bottom_right(view, args))
+      end
 
-        view.subviews.each do |subview|
-          rect = subview.rmq.frame
-          w = [rect.right, w].max
-          h = [rect.bottom, h].max
-        end
+      self
+    end
+    alias :resize_to_fit_subviews :resize_frame_to_fit_subviews
 
-        rect = view.rmq.frame
-        w = rect.width if w == 0
-        h = rect.height if h == 0
+    def resize_content_to_fit_subviews(args = {})
+      selected.each do |view|
+        unless view.respond_to?(:contentSize)
+          puts "\n[RMQ ERROR]  resize_content_to_fit_subviews must be called on a view that supports `contentSize`. Called on #{view}\n\n"
+          next
+        end
 
-        view.rmq.layout(w: w, h: h)
+        view.rmq.style do |st|
+          bottom_right = subviews_bottom_right(view, args)
+          st.content_size = CGSizeMake(bottom_right[:w], bottom_right[:h])
+        end
       end
 
       self
@@ -142,5 +146,27 @@ module RubyMotionQuery
       out
     end
 
+    private
+
+    # Calculates the bottom right of a view using its subviews
+    #
+    # @return [Hash]
+    def subviews_bottom_right(view, args = {})
+      w = 0
+      h = 0
+
+      view.subviews.each do |subview|
+        rect = subview.rmq.frame
+        w = [rect.right, w].max
+        h = [rect.bottom, h].max
+      end
+
+      rect = view.rmq.frame
+      w = rect.width if (w == 0 || args[:only_height])
+      h = rect.height if (h == 0 || args[:only_width])
+
+      {w: (w + (args[:right] || 0)), h: (h + (args[:bottom] || 0))}
+    end
+
   end
 end

data/motion/ruby_motion_query/stylers/protocols/ui_text_input_traits.rb

@@ -5,16 +5,16 @@ module RubyMotionQuery
       # UITExtInputTraits protocol
       module UITextInputTraits
         def autocapitalization_type ; view.autocapitalizationType ; end
-        def autocapitalization_type=(v) ; view.autocapitalizationType = v ; end
+        def autocapitalization_type=(v) ; view.autocapitalizationType = AUTO_CAPITALIZATION_TYPES[v] || v ; end
 
         def autocorrection_type ; view.autocorrectionType ; end
-        def autocorrection_type=(v) ; view.autocorrectionType = v ; end
+        def autocorrection_type=(v) ; view.autocorrectionType = AUTO_CORRECTION_TYPES[v] || v ; end
 
         def enables_return_key_automatically ; view.enablesReturnKeyAutomatically ; end
         def enables_return_key_automatically=(v) ; view.enablesReturnKeyAutomatically = v ; end
 
         def keyboard_appearance ; view.keyboardAppearance ; end
-        def keyboard_appearance=(v) ; view.keyboardAppearance = v ; end
+        def keyboard_appearance=(v) ; view.keyboardAppearance = KEYBOARD_APPEARANCES[v] || v ; end
 
         def keyboard_type ; view.keyboardType ; end
         def keyboard_type=(v) ; view.setKeyboardType(KEYBOARD_TYPES[v] || v) ; end

data/motion/ruby_motion_query/stylers/ui_activity_indicator_view.rb

@@ -0,0 +1,50 @@
+module RubyMotionQuery
+  module Stylers
+    class UIActivityIndicatorViewStyler < UIViewStyler
+
+      UI_ACTIVITY_INDICATOR_VIEW_STYLES = {
+        large: UIActivityIndicatorViewStyleWhiteLarge,
+        white_large: UIActivityIndicatorViewStyleWhiteLarge,
+        default: UIActivityIndicatorViewStyleWhite,
+        white: UIActivityIndicatorViewStyleWhite,
+        gray: UIActivityIndicatorViewStyleGray
+      }
+
+      def start_animating
+        @view.startAnimating
+      end
+      alias :start :start_animating
+
+      def stop_animating
+        @view.stopAnimating
+      end
+      alias :stop :stop_animating
+
+      def is_animating?
+        @view.isAnimating
+      end
+      alias :animating? :is_animating?
+
+      def hides_when_stopped=(value)
+        @view.hidesWhenStopped = value
+      end
+      def hides_when_stopped
+        @view.hidesWhenStopped
+      end
+
+      def activity_indicator_style=(value)
+        @view.activityIndicatorViewStyle = UI_ACTIVITY_INDICATOR_VIEW_STYLES[value] || value
+      end
+      def activity_indicator_style
+        @view.activityIndicatorViewStyle
+      end
+
+      def color=(value)
+        @view.color = value
+      end
+      def color
+        @view.color
+      end
+    end
+  end
+end

data/motion/ruby_motion_query/stylers/ui_button_styler.rb

@@ -52,6 +52,26 @@ module RubyMotionQuery
         @view.setBackgroundImage value, forState: UIControlStateHighlighted
       end
 
+      def background_image_selected=(value)
+        @view.setBackgroundImage value, forState: UIControlStateSelected
+      end
+
+      def adjust_image_when_highlighted=(value)
+        @view.adjustsImageWhenHighlighted = value
+      end
+
+      def adjust_image_when_highlighted
+        @view.adjustsImageWhenHighlighted
+      end
+
+      def selected=(value)
+        @view.setSelected(value)
+      end
+
+      def selected
+        @view.isSelected
+      end
+
       # Accepts UIEdgeInsetsMake OR and array of values to be the inset.
       # st.title_edge_insets = UIEdgeInsetsMake(0, 10.0, 0, 0)
       # OR

data/motion/ruby_motion_query/stylers/ui_label_styler.rb

@@ -13,6 +13,8 @@ module RubyMotionQuery
 
       def color=(value) ; @view.setTextColor value ; end
       def color ; @view.textColor ; end
+      alias :text_color :color
+      alias :text_color= :color=
 
       def number_of_lines=(value)
         value = 0 if value == :unlimited
@@ -27,7 +29,7 @@ module RubyMotionQuery
       end
 
       def line_break_mode=(value)
-        @view.lineBreakMode = value
+        @view.lineBreakMode = LINE_BREAK_MODES[value] || value
       end
       def line_break_mode
         @view.lineBreakMode
@@ -39,6 +41,8 @@ module RubyMotionQuery
       def text_alignment
         @view.textAlignment
       end
+      alias :text_align= :text_alignment=
+      alias :text_align :text_alignment
 
       def resize_to_fit_text
         @view.sizeToFit
@@ -54,6 +58,19 @@ module RubyMotionQuery
       def adjusts_font_size
         @view.adjustsFontSizeToFitWidth
       end
+      alias :adjusts_font_size_to_fit_width= :adjusts_font_size=
+      alias :adjusts_font_size_to_fit_width :adjusts_font_size
+
+      def resize_height_to_fit
+        @view.lineBreakMode = UILineBreakModeWordWrap
+        @view.numberOfLines = 0
+
+        attributed_text = NSAttributedString.alloc.initWithString(@view.text, attributes:{NSFontAttributeName => @view.font})
+        rect = attributed_text.boundingRectWithSize([@view.frame.size.width, Float::MAX], options:(NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingUsesFontLeading), context:nil)
+
+        expected_label_size = [@view.frame.size.width, rect.size.height.ceil]
+        @view.frame = [@view.frame.origin, expected_label_size]
+      end
     end
 
   end

data/motion/ruby_motion_query/stylers/ui_scroll_view_styler.rb

@@ -1,6 +1,14 @@
 module RubyMotionQuery
   module Stylers
 
+    INDICATOR_STYLES = {
+      default: UIScrollViewIndicatorStyleDefault,
+      black: UIScrollViewIndicatorStyleBlack,
+      dark: UIScrollViewIndicatorStyleBlack,
+      white: UIScrollViewIndicatorStyleWhite,
+      light: UIScrollViewIndicatorStyleWhite
+    }
+
     class UIScrollViewStyler < UIViewStyler
       def paging=(value) ; @view.pagingEnabled = value ; end
       def paging ; @view.isPagingEnabled ; end
@@ -32,6 +40,8 @@ module RubyMotionQuery
       def scroll_indicator_insets=(value); @view.scrollIndicatorInsets = value; end
       def scroll_indicator_insets; @view.scrollIndicatorInsets; end
 
+      def indicator_style=(value); @view.indicatorStyle = INDICATOR_STYLES[value] || value; end
+      def indicator_style; @view.indicatorStyle; end
 
     end
 

data/motion/ruby_motion_query/stylers/ui_segmented_control_styler.rb

@@ -1,8 +1,20 @@
 module RubyMotionQuery
   module Stylers
+    class UISegmentedControlStyler < UIControlStyler
 
-    class UISegmentedControlStyler < UIControlStyler 
-    end
+      def prepend_segments=(value)
+        if value.class == Array
+          value.each_with_index do |title, index|
+            @view.insertSegmentWithTitle(title, atIndex:index, animated:false)
+          end
+        elsif value.class == String
+          @view.insertSegmentWithTitle(value, atIndex:0, animated:false)
+        else
+          raise "#{__method__} takes an array or string."
+        end
+      end
+      alias :unshift= :prepend_segments=
 
+    end
   end
-end
+end

data/motion/ruby_motion_query/stylers/ui_table_view_cell_styler.rb

@@ -19,7 +19,49 @@ module RubyMotionQuery
         @view.accessoryView
       end
 
+      def text_color ; @view.textLabel.textColor ; end
+      def text_color=(v) ; @view.textLabel.textColor = v ; end
+      alias :color :text_color
+      alias :color= :text_color=
+
+      def detail_text_color
+        if @view.detailTextLabel
+          @view.detailTextLabel.textColor
+        end
+      end
+
+      def detail_text_color=(v)
+        if @view.detailTextLabel
+          @view.detailTextLabel.textColor = v
+        end
+      end
+      alias :detail_color :text_color
+      alias :detail_color= :text_color=
+
+      def font ; @view.textLabel.font ; end
+      def font=(v) ; @view.textLabel.font = v ; end
+
+      def detail_font
+        @view.detailTextLabel.font if @view.detailTextLabel
+      end
+
+      def detail_font=(v)
+        if @view.detailTextLabel
+          @view.detailTextLabel.font = v
+        end
+      end
+
+      def selection_style ; @view.selectionStyle ; end
+      def selection_style=(v) ; @view.selectionStyle = v ; end
+
+      def separator_inset=(value)
+        @view.separatorInset = value
+      end
+      def separator_inset
+        @view.separatorInset
+      end
+
     end
 
   end
-end
+end

data/motion/ruby_motion_query/stylers/ui_table_view_styler.rb

@@ -22,6 +22,17 @@ module RubyMotionQuery
         @view.rowHeight = value
       end
 
+      def background_image=(value)
+        @view.backgroundView = UIImageView.alloc.initWithImage(value)
+      end
+      def background_image
+        if @view.backgroundView
+          @view.backgroundView.image
+        else
+          nil
+        end
+      end
+
       SEPARATOR_STYLES = {
         none: UITableViewCellSeparatorStyleNone,
         single: UITableViewCellSeparatorStyleSingleLine,

data/motion/ruby_motion_query/stylers/ui_text_field_styler.rb

@@ -25,6 +25,7 @@ module RubyMotionQuery
       def text_color ; view.textColor ; end
       def text_color=(v) ; view.textColor = v ; end
       alias :color :text_color
+      alias :color= :text_color=
 
       def text_alignment ; view.textAlignment ; end
       def text_alignment=(v) ; view.textAlignment = TEXT_ALIGNMENTS[v] || v ; end
@@ -35,6 +36,8 @@ module RubyMotionQuery
       # Sizing the Text Field's Text
       def adjusts_font_size_to_fit_width ; view.adjustsFontSizeToFitWidth ; end
       def adjusts_font_size_to_fit_width=(v) ; view.adjustsFontSizeToFitWidth = v ; end
+      alias :adjusts_font_size= :adjusts_font_size_to_fit_width=
+      alias :adjusts_font_size :adjusts_font_size_to_fit_width
 
       def minimum_font_size ; view.minimumFontSize ; end
       def minimum_font_size=(v) ; view.minimumFontSize = v ; end
@@ -70,13 +73,13 @@ module RubyMotionQuery
       def left_view=(v) ; view.leftView = v ; end
 
       def left_view_mode ; view.leftViewMode ; end
-      def left_view_mode=(v) ; view.leftViewMode = v ; end
+      def left_view_mode=(v); view.leftViewMode = TEXT_FIELD_MODES[v] || v ; end
 
       def right_view ; view.rightView ; end
       def right_view=(v) ; view.rightView = v ; end
 
       def right_view_mode ; view.rightViewMode ; end
-      def right_view_mode=(v) ; view.rightViewMode = v ; end
+      def right_view_mode=(v); view.rightViewMode = TEXT_FIELD_MODES[v] || v ; end
     end
   end
 end

data/motion/ruby_motion_query/stylers/ui_text_view_styler.rb

@@ -20,6 +20,9 @@ module RubyMotionQuery
       def font ; view.font ; end
       def font=(v) ; view.font = v ; end
 
+      def text_alignment ; view.textAlignment ; end
+      def text_alignment=(v) ; view.textAlignment = TEXT_ALIGNMENTS[v] || v ; end
+
       def text_color ; view.textColor ; end
       def text_color=(v) ; view.textColor = v ; end
       alias :color :text_color

data/motion/ruby_motion_query/stylers/ui_view_styler.rb

@@ -4,6 +4,7 @@ module RubyMotionQuery
     TEXT_ALIGNMENTS = {
       left: NSTextAlignmentLeft,
       center: NSTextAlignmentCenter,
+      centered: NSTextAlignmentCenter,
       right: NSTextAlignmentRight,
       justified: NSTextAlignmentJustified,
       natural: NSTextAlignmentNatural
@@ -25,6 +26,13 @@ module RubyMotionQuery
       alphabet: UIKeyboardTypeASCIICapable
     }
 
+    KEYBOARD_APPEARANCES = {
+      default: UIKeyboardAppearanceDefault,
+      dark: UIKeyboardAppearanceDark,
+      light: UIKeyboardAppearanceLight,
+      alert: UIKeyboardAppearanceAlert
+    }
+
     RETURN_KEY_TYPES = {
       default: UIReturnKeyDefault,
       go: UIReturnKeyGo,
@@ -53,6 +61,53 @@ module RubyMotionQuery
       rounded: UITextBorderStyleRoundedRect
     }
 
+    TEXT_FIELD_MODES = {
+      never: UITextFieldViewModeNever,
+      while_editing: UITextFieldViewModeWhileEditing,
+      unless_editing: UITextFieldViewModeUnlessEditing,
+      always: UITextFieldViewModeAlways
+    }
+
+    LINE_BREAK_MODES = {
+      word_wrapping: NSLineBreakByWordWrapping,
+      word_wrap: NSLineBreakByWordWrapping,
+      char_wrapping: NSLineBreakByCharWrapping,
+      char_wrap: NSLineBreakByCharWrapping,
+      clipping: NSLineBreakByClipping,
+      truncating_head: NSLineBreakByTruncatingHead,
+      truncating_tail: NSLineBreakByTruncatingTail,
+      truncating_middle: NSLineBreakByTruncatingMiddle
+    }
+
+    AUTO_CORRECTION_TYPES = {
+      default: UITextAutocorrectionTypeDefault,
+      no: UITextAutocorrectionTypeNo,
+      yes: UITextAutocorrectionTypeYes,
+    }
+
+    AUTO_CAPITALIZATION_TYPES = {
+      none: UITextAutocapitalizationTypeNone,
+      words: UITextAutocapitalizationTypeWords,
+      sentences: UITextAutocapitalizationTypeSentences,
+      all: UITextAutocapitalizationTypeAllCharacters
+    }
+
+    CONTENT_MODE_TYPES = {
+      scale_to_fill: UIViewContentModeScaleToFill,
+      scale_aspect_fit: UIViewContentModeScaleAspectFit,
+      scale_aspect_fill: UIViewContentModeScaleAspectFill,
+      redraw: UIViewContentModeRedraw,
+      center: UIViewContentModeCenter,
+      top: UIViewContentModeTop,
+      bottom: UIViewContentModeBottom,
+      left: UIViewContentModeLeft,
+      right: UIViewContentModeRight,
+      top_left: UIViewContentModeTopLeft,
+      top_right: UIViewContentModeTopRight,
+      bottom_left: UIViewContentModeBottomLeft,
+      bottom_right: UIViewContentModeBottomRight
+    }
+
     # When you create a styler, always inherit UIViewStyler
     class UIViewStyler
       def initialize(view)
@@ -233,7 +288,7 @@ module RubyMotionQuery
       end
 
       def content_mode=(value)
-        @view.setContentMode value
+        @view.setContentMode(CONTENT_MODE_TYPES[value] || value)
       end
       def content_mode
         @view.contentMode
@@ -271,10 +326,10 @@ module RubyMotionQuery
       end
 
       def border_color=(value)
-        if is_color(value)
+        if value.is_a?(UIColor)
           @view.layer.setBorderColor(value.CGColor)
         else
-          @view.layer.setBorderColor value
+          @view.layer.setBorderColor(value)
         end
       end
 
@@ -316,7 +371,26 @@ module RubyMotionQuery
       def alpha ; view.alpha ; end
       def alpha=(v) ; view.alpha = v ; end
 
+      def shadow_color=(c)
+        c = c.CGColor if c.kind_of?(UIColor)
+        @view.layer.shadowColor = c
+      end
+      def shadow_color ; @view.layer.shadowColor ; end
+
+      def shadow_offset=(offset)
+        @view.layer.shadowOffset = offset
+      end
+      def shadow_offset ; @view.layer.shadowOffset ; end
 
+      def shadow_opacity=(opacity)
+        @view.layer.shadowOpacity = opacity
+      end
+      def shadow_opacity ; @view.layer.shadowOpacity ; end
+
+      def shadow_path=(path)
+        @view.layer.shadowPath = path
+      end
+      def shadow_path ; @view.layer.shadowPath ; end
 
 
       # @deprecated - use frame hashs
@@ -454,11 +528,23 @@ module RubyMotionQuery
         end
       end
 
-      private
+      #param is a hash of locations and colors: { locations: [], colors: [] }
+      def background_gradient=(options)
+        colors = options.fetch(:colors).collect { |c| c.CGColor }
+        locations = options.fetch(:locations)
 
-      def is_color(value)
-        [UICachedDeviceRGBColor, UIDeviceRGBColor].include?(value.class)
+        CAGradientLayer.alloc.init.tap do |layer|
+          layer.colors = colors
+          layer.locations = locations
+          if view.layer.sublayers
+            view.layer.replaceSublayer(view.layer.sublayers[0], with: layer)
+          else
+            view.layer.insertSublayer(layer, atIndex: 0)
+          end
+          view.layer.sublayers[0].frame = view.bounds
+        end
       end
+
     end
   end
 end

data/motion/ruby_motion_query/stylesheet.rb

@@ -97,24 +97,25 @@ module RubyMotionQuery
       # memoize this, however if you do that, make sure the dev doesn't retain them in a var
       custom_stylers(view) || begin
         case view
-        when UILabel              then Stylers::UILabelStyler.new(view)
-        when UIButton             then Stylers::UIButtonStyler.new(view)
-        when UIImageView          then Stylers::UIImageViewStyler.new(view)
-        when UITableView          then Stylers::UITableViewStyler.new(view)
-        when UISwitch             then Stylers::UISwitchStyler.new(view)
-        when UIDatePicker         then Stylers::UIDatePickerStyler.new(view)
-        when UISegmentedControl   then Stylers::UISegmentedControlStyler.new(view)
-        when UIRefreshControl     then Stylers::UIRefreshControlStyler.new(view)
-        when UIPageControl        then Stylers::UIPageControlStyler.new(view)
-        when UIProgressView       then Stylers::UIProgressViewStyler.new(view)
-        when UISlider             then Stylers::UISliderStyler.new(view)
-        when UIStepper            then Stylers::UIStepperStyler.new(view)
-        when UITabBar             then Stylers::UITabBarStyler.new(view)
-        when UITableViewCell      then Stylers::UITableViewCellStyler.new(view)
-        when UITextView           then Stylers::UITextViewStyler.new(view)
-        when UITextField          then Stylers::UITextFieldStyler.new(view)
-        when UINavigationBar      then Stylers::UINavigationBarStyler.new(view)
-        when UIScrollView         then Stylers::UIScrollViewStyler.new(view)
+        when UILabel                 then Stylers::UILabelStyler.new(view)
+        when UIButton                then Stylers::UIButtonStyler.new(view)
+        when UIActivityIndicatorView then Stylers::UIActivityIndicatorViewStyler.new(view)
+        when UIImageView             then Stylers::UIImageViewStyler.new(view)
+        when UITableView             then Stylers::UITableViewStyler.new(view)
+        when UISwitch                then Stylers::UISwitchStyler.new(view)
+        when UIDatePicker            then Stylers::UIDatePickerStyler.new(view)
+        when UISegmentedControl      then Stylers::UISegmentedControlStyler.new(view)
+        when UIRefreshControl        then Stylers::UIRefreshControlStyler.new(view)
+        when UIPageControl           then Stylers::UIPageControlStyler.new(view)
+        when UIProgressView          then Stylers::UIProgressViewStyler.new(view)
+        when UISlider                then Stylers::UISliderStyler.new(view)
+        when UIStepper               then Stylers::UIStepperStyler.new(view)
+        when UITabBar                then Stylers::UITabBarStyler.new(view)
+        when UITableViewCell         then Stylers::UITableViewCellStyler.new(view)
+        when UITextView              then Stylers::UITextViewStyler.new(view)
+        when UITextField             then Stylers::UITextFieldStyler.new(view)
+        when UINavigationBar         then Stylers::UINavigationBarStyler.new(view)
+        when UIScrollView            then Stylers::UIScrollViewStyler.new(view)
         # TODO, all the controls are done, but missing some views, add
         else
           if view.respond_to?(:rmq_styler)

data/motion/ruby_motion_query/subviews.rb

@@ -199,6 +199,11 @@ module RubyMotionQuery
           #o.setTitle('Ok', forState: UIControlStateNormal)
           o.opaque = true
         end
+      elsif (klass == UIActivityIndicatorView) || klass < UIActivityIndicatorView
+        klass.alloc.initWithActivityIndicatorStyle(UIActivityIndicatorViewStyleWhite).tap do |o|
+          o.hidden = false
+          o.opaque = true
+        end
       elsif reuse_identifier = opts[:reuse_identifier]
         style = opts[:cell_style] || UITableViewCellStyleDefault
         klass.alloc.initWithStyle(style, reuseIdentifier: reuse_identifier).tap do |o|

data/motion/ruby_motion_query/tags.rb

@@ -20,6 +20,13 @@ module RubyMotionQuery
       self
     end
 
+    def untag(*tag_or_tags)
+      selected.each do |view|
+        view.rmq_data.untag(tag_or_tags)
+      end
+      self
+    end
+
     # @return [RMQ]
     def clear_tags
       selected.each do |view|

data/motion/ruby_motion_query/validation.rb

@@ -130,8 +130,12 @@ module RubyMotionQuery
       TIME = Regexp.new('^(20|21|22|23|[01]\d|\d)((:[0-5]\d){1,2})$')
       # Future Password strength validations -> http://stackoverflow.com/questions/5142103/regex-for-password-strength
       USZIP = Regexp.new('^\d{5}(-\d{4})?$')
+      # UK Postal Code regex from: http://stackoverflow.com/a/7259020/814123
+      UKZIP = Regexp.new('^(GIR ?0AA|[A-PR-UWYZ]([0-9]{1,2}|([A-HK-Y][0-9]([0-9ABEHMNPRV-Y])?)|[0-9][A-HJKPS-UW]) ?[0-9][ABD-HJLNP-UW-Z]{2})$')
       # 7 or 10 digit number, delimiters are spaces, dashes, or periods
       USPHONE = Regexp.new('^(?:(?:\+?1\s*(?:[.-]\s*)?)?(?:(\s*([2-9]1[02-9]|[2-9][02-8]1|[2-9][02-8][02-9]‌​)\s*)|([2-9]1[02-9]|[2-9][02-8]1|[2-9][02-8][02-9]))\s*(?:[.-]\s*)?)?([2-9]1[02-‌​9]|[2-9][02-9]1|[2-9][02-9]{2})\s*(?:[.-]\s*)?([0-9]{4})$')
+      # International Phone numbers
+      INTLPHONE = Regexp.new('^(\(?\+?[0-9]*\)?)?[0-9_\- \(\)]*$')
       # Strong password (at least [8 chars, 1 upper, 1 lower, 1 number])
       STRONGPW = Regexp.new('^(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9]).{8,}$')
       # Has at least 1 uppercase letter
@@ -150,7 +154,9 @@ module RubyMotionQuery
         :ipv4 => lambda { |value, opts| Validation.regex_match?(value, IPV4)},
         :time => lambda { |value, opts| Validation.regex_match?(value, TIME)},
         :uszip => lambda { |value, opts| Validation.regex_match?(value, USZIP)},
+        :ukzip => lambda { |value, opts| Validation.regex_match?(value.upcase, UKZIP)},
         :usphone => lambda { |value, opts| Validation.regex_match?(value, USPHONE)},
+        :intlphone => lambda { |value, opts| Validation.regex_match?(value, INTLPHONE)},
         :strong_password => lambda { |value, opts| Validation.regex_match?(value, STRONGPW)},
         :has_upper => lambda { |value, opts| Validation.regex_match?(value, HASUPPER)},
         :has_lower => lambda { |value, opts| Validation.regex_match?(value, HASLOWER)},

data/motion/ruby_motion_query/version.rb

@@ -1,5 +1,5 @@
 module RubyMotionQuery
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 
   class RMQ
     def version

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_motion_query
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Todd Werth
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-23 00:00:00.000000000 Z
+date: 2015-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bacon
@@ -75,6 +75,7 @@ files:
 - motion/ruby_motion_query/rect.rb
 - motion/ruby_motion_query/selectors.rb
 - motion/ruby_motion_query/stylers/protocols/ui_text_input_traits.rb
+- motion/ruby_motion_query/stylers/ui_activity_indicator_view.rb
 - motion/ruby_motion_query/stylers/ui_button_styler.rb
 - motion/ruby_motion_query/stylers/ui_control_styler.rb
 - motion/ruby_motion_query/stylers/ui_date_picker_styler.rb
@@ -108,24 +109,24 @@ files:
 - templates/collection_view_controller/app/stylesheets/name_controller_stylesheet.rb
 - templates/collection_view_controller/app/views/name_cell.rb
 - templates/collection_view_controller/spec/controllers/name_controller_spec.rb
-- templates/collection_view_controller/spec/views/name_cell.rb
+- templates/collection_view_controller/spec/views/name_cell_spec.rb
 - templates/controller/app/controllers/name_controller.rb
 - templates/controller/app/stylesheets/name_controller_stylesheet.rb
 - templates/controller/spec/controllers/name_controller_spec.rb
 - templates/lib/lib/name.rb
-- templates/lib/spec/lib/name.rb
+- templates/lib/spec/lib/name_spec.rb
 - templates/model/app/models/name.rb
-- templates/model/spec/models/name.rb
+- templates/model/spec/models/name_spec.rb
 - templates/shared/app/shared/name.rb
-- templates/shared/spec/shared/name.rb
+- templates/shared/spec/shared/name_spec.rb
 - templates/table_view_controller/app/controllers/name_controller.rb
 - templates/table_view_controller/app/stylesheets/name_controller_stylesheet.rb
 - templates/table_view_controller/app/views/name_cell.rb
 - templates/table_view_controller/spec/controllers/name_controller_spec.rb
-- templates/table_view_controller/spec/views/name_cell.rb
+- templates/table_view_controller/spec/views/name_cell_spec.rb
 - templates/view/app/stylesheets/name_stylesheet.rb
 - templates/view/app/views/name.rb
-- templates/view/spec/views/name.rb
+- templates/view/spec/views/name_spec.rb
 homepage: http://rubymotionquery.com
 licenses:
 - MIT
@@ -146,8 +147,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: RubyMotionQuery - RMQ
 test_files: []
+has_rdoc: