ruby_motion_query 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa33d32bc33a3a37c0b275b086ec98e68ad93087
-  data.tar.gz: 88136c1a620a6f49c3da516941224405627e6bfe
+  metadata.gz: 8c13477305c59894c43b5b220acb157aaf32bd34
+  data.tar.gz: f2ff2ecd3a1baa31fa47b9499c20711f9bcb7164
 SHA512:
-  metadata.gz: 56f9eeeb66eea90c517f495318da1709c3c93262365eef4f64fc1f49a3d2cbc7c375ea9f269e2f8ad51ea65500d8dfbc89f3d206224a3b2fb4abcb160a709bba
-  data.tar.gz: 715240b7ef7389f0440e5cddf8f9f22955911317544a185634bb46e7b16a66b3c254c72e9bf827b2eb8fb436195168da85b96432ce430bdfd212edd65c3ebb51
+  metadata.gz: 54f605689d32c537f42ef60f5d4c7b6cd70d354a9d2c8e6b708faa65616685dd04f21a9240dacf59c353f6eb2a39aadfc23d462205b19cc1f976c429fe83f1e8
+  data.tar.gz: 41b7414448a6763a076a5dc18ba98ea171c39d644d2e30e3ef5889605729303de2645da1e3e003027794f5ea51072573a3c3ba0f4023b4295845faf8d9cf2d86

data/README.md

@@ -21,6 +21,8 @@ One of RMQ's goal is to have the best [documentation][1] of any RubyMotion UI li
 
 <br />
 
+### Requires SDK 7 or higher, and iOS 7 or higher
+
 ## Quick Start
 
 ```

data/motion/ext.rb

@@ -16,6 +16,7 @@ class UIView
   # @deprecated No longer needed, use rmq_build
   def rmq_did_create(self_in_rmq)
   end
+
   def rmq_created
   end
 
@@ -26,6 +27,9 @@ class UIView
   def rmq_appended
   end
 
+  def rmq_style_applied
+  end
+
   # Technically my_view.rmq is the same as rmq(my_view), so it may seem enticing to use,
   # but the really nice thing about rmq is its consistent API, and doing this
   # for one view: my_view.rmq and this for two views: rmq(my_view, my_other_view) sucks

data/motion/ruby_motion_query/actions.rb

@@ -16,8 +16,8 @@ module RubyMotionQuery
     # For example, text for UILabel, image for UIImageView
     #
     # @return [RMQ]
-    def data(new_data = nil)
-      if new_data
+    def data(new_data = :rmq_not_provided)
+      if new_data != :rmq_not_provided
         selected.each do |view|
           case view
           when UILabel              then view.setText new_data # set is faster than =
@@ -33,8 +33,8 @@ module RubyMotionQuery
           #when UIStepper            then
           #when UITabBar             then
           #when UITableViewCell      then
-          when UITextView           then view.setText new_data
-          when UITextField           then view.setText new_data
+          when UITextView           then view.text = new_data
+          when UITextField          then view.text = new_data
           #when UINavigationBar      then
           #when UIScrollView         then
 
@@ -80,7 +80,7 @@ module RubyMotionQuery
     # @example
     #   rmq(my_view).data = 'some data'
     def data=(new_data)
-      data(new_data)
+      self.data(new_data)
     end
 
     # @return [RMQ]

data/motion/ruby_motion_query/animations.rb

@@ -46,7 +46,7 @@ module RubyMotionQuery
 
         UIView.animateWithDuration(
           opts[:duration] || 0.3,
-          delay: opts[:delay] || 0,
+          delay: opts[:delay] || 0.0,
           options: opts[:options] || UIViewAnimationOptionCurveEaseInOut,
           animations: animations_lambda,
           completion: after_lambda

data/motion/ruby_motion_query/app.rb

@@ -85,11 +85,13 @@ module RubyMotionQuery
             root_view_controller.visibleViewController
           when UITabBarController
             current_view_controller(root_view_controller.selectedViewController)
-          else 
+          else
             if root_view_controller.respond_to?(:visibleViewController)
               current_view_controller(root_view_controller.visibleViewController)
             elsif root_view_controller.respond_to?(:topViewController)
               current_view_controller(root_view_controller.topViewController)
+            elsif root_view_controller.respond_to?(:frontViewController)
+              current_view_controller(root_view_controller.frontViewController)
             elsif root_view_controller.childViewControllers.count > 0
               current_view_controller(root_view_controller.childViewControllers.first)
             else

data/motion/ruby_motion_query/data.rb

@@ -1,6 +1,6 @@
 module RubyMotionQuery
   class ViewData
-    attr_accessor :events, :style_name
+    attr_accessor :events, :style_name, :built
 
     # @return [Hash] Array of tag names assigned to to this view
     def tags

data/motion/ruby_motion_query/device.rb

@@ -13,27 +13,64 @@ module RubyMotionQuery
 
   class Device
     class << self
+      def ios_eight?
+        @_ios_eight ||= screen.respond_to?(:coordinateSpace)
+      end
+
+      # Find out what version of iOS you're using.
+      # `rmq.device.is_version? 8`
+      # `rmq.device.is_version? "7.1"`
+      #
+      # @return [Boolean]
+      def is_version? version
+        !!ios_version.match("^#{version}")
+      end
+
+      def ios_version
+        UIDevice.currentDevice.systemVersion
+      end
+
       # @return [UIScreen]
       def screen
         UIScreen.mainScreen
       end
 
+      def size_a
+        @_size_a ||= screen.bounds.size.to_a.sort
+      end
+
+      # Width is the width of the device, regardless of its orientation.
+      # This is static. If you want the width with the correct orientation, use
+      # screen_width
+      #
       # @return [Numeric]
       def width
-        @_width ||= Device.screen.bounds.size.width
+        size_a[0]
+      end
+      def width_landscape
+        size_a[1]
       end
 
+      # Height is the height of the device, regardless of its orientation.
+      # This is static. If you want the height with the correct orientation, use
+      # screen_height
+      #
       # @return [Numeric]
       def height
-        @_height ||= Device.screen.bounds.size.height
+        size_a[1]
+      end
+      def height_landscape
+        size_a[0]
       end
 
+      # @return [Numeric]
       def screen_width
-        portrait? ? screen.bounds.size.width : screen.bounds.size.height
+        portrait? ? width : width_landscape
       end
 
+      # @return [Numeric]
       def screen_height
-        portrait? ? screen.bounds.size.height : screen.bounds.size.width
+        portrait? ? height : height_landscape
       end
 
       def ipad?
@@ -51,11 +88,26 @@ module RubyMotionQuery
         @_simulator
       end
 
+      def three_point_five_inch?
+        @_three_point_five_inch = (Device.height == 480.0) if @_three_point_five_inch.nil?
+        @_three_point_five_inch
+      end
+
       def four_inch?
         @_four_inch = (Device.height == 568.0) if @_four_inch.nil?
         @_four_inch
       end
 
+      def four_point_seven_inch?
+        @_four_point_seven_inch = (Device.height == 667.0) if @_four_point_seven_inch.nil?
+        @_four_point_seven_inch
+      end
+
+      def five_point_five_inch?
+        @_five_point_five_inch = (Device.height == 736.0) if @_five_point_five_inch.nil?
+        @_five_point_five_inch
+      end
+
       def retina?
         if @_retina.nil?
           main_screen = Device.screen
@@ -67,16 +119,41 @@ module RubyMotionQuery
 
       # @return :unknown or from ORIENTATIONS
       def orientation
-        orientation = UIApplication.sharedApplication.statusBarOrientation
-        ORIENTATIONS[orientation] || :unknown
+        if @custom_orientation
+          @custom_orientation
+        else
+          orientation = UIApplication.sharedApplication.statusBarOrientation
+          ORIENTATIONS[orientation] || :unknown
+        end
+      end
+
+      # You can manually set the orientation, if set it RMQ won't automatically get the
+      # orientation from the sharedApplication. If you want the automatic orientation to work again
+      # set this to nil
+      #
+      # For options of what to set it to, see RubyMotionQuery::Device::ORIENTATIONS
+      #
+      # You can set this to :landscape, which isn't real option, but it will automatically
+      # get converted to :landscape_left
+      def orientation=(value)
+        if value
+          if value == :landscape
+            value = :landscape_left
+          elsif !value.is_a?(Symbol)
+            value = ORIENTATIONS[value] || :unknown
+          end
+        end
+        @custom_orientation = value
       end
 
       def landscape?
-        Device.orientation == :landscape_left || Device.orientation == :landscape_right
+        orientated = orientation
+        orientated == :landscape || orientated == :landscape_left || orientated == :landscape_right
       end
 
       def portrait?
-        Device.orientation == :portrait || Device.orientation == :unknown
+        orientated = orientation
+        orientated == :portrait || orientated == :unknown
       end
 
       def orientations

data/motion/ruby_motion_query/enumerablish.rb

@@ -1,6 +1,6 @@
-module RubyMotionQuery 
+module RubyMotionQuery
   class RMQ
-    # I'm purposly not including Enumerable, 
+    # I'm purposly not including Enumerable,
     # please use to_a if you want one
 
 
@@ -67,10 +67,12 @@ module RubyMotionQuery
 
     # @return [RMQ]
     def first
+      # TODO, check if it fails with nil
       RMQ.create_with_array_and_selectors([selected.first], @selectors, @context)
     end
     # @return [RMQ]
     def last
+      # TODO, check if it fails with nil
       RMQ.create_with_array_and_selectors([selected.last], @selectors, @context)
     end
 

data/motion/ruby_motion_query/events.rb

@@ -134,6 +134,8 @@ module RubyMotionQuery
       raise "[RMQ Error]  Event already exists on this object: #{event}. Remove first, using .off" if @event_set[event]
 
       if rmqe = event_instance(view, event, block)
+        view.userInteractionEnabled = true
+
         rmqe.set_options(args) if rmqe.respond_to? :set_options
 
         @event_set[event] = rmqe

data/motion/ruby_motion_query/grid.rb

@@ -116,6 +116,7 @@ module RubyMotionQuery
 
     def initialize(params)
       @grid_hash = {}
+      @grid_hash_landscape = {}
 
       self.num_columns = params[:num_columns]
       self.num_rows = params[:num_rows]
@@ -185,84 +186,90 @@ module RubyMotionQuery
     #
     # @return hash with any combination of l:, t:, w:, or :h. Or nil if invalid
     def [](coord)
-      @grid_hash[coord] ||= begin
-        if coord.is_a?(Array)
+      if Device.landscape?
+        @grid_hash_landscape[coord] ||= calc_coord(coord)
+      else
+        @grid_hash[coord] ||= calc_coord(coord)
+      end
+    end
 
-          l = column_lefts[coord[0]]
-          t = row_tops[coord[1]]
-          case coord.length
-          when 2
-            RubyMotionQuery::Rect.new([l, t, column_width, row_height])
-          when 4
-            RubyMotionQuery::Rect.new([l, t, coord[2], coord[3]])
-          else
-            nil
-          end
+    private def calc_coord(coord)
+      if coord.is_a?(Array)
 
+        l = column_lefts[coord[0]]
+        t = row_tops[coord[1]]
+        case coord.length
+        when 2
+          RubyMotionQuery::Rect.new([l, t, column_width, row_height])
+        when 4
+          RubyMotionQuery::Rect.new([l, t, coord[2], coord[3]])
         else
-          return nil unless coord
-
-          # TODO this needs refactoring once the full tests are done
-          coord.gsub!(/\s/, '')
-          is_end_coord = coord.start_with?(':')
-          parts = coord.split(':')
-          parts.reject!{|o| o == ''}
+          nil
+        end
 
-          case parts.length
-            when 0
-              nil
-            when 1
-              lefts = column_lefts
-              tops = row_tops
-
-              p1 = parts.first
-              digits = p1.gsub(/\D/, '')
-              if digits == ''
-                digits = nil
-              else
-                top_i = digits.to_i
-                top_i = (tops.length - 1) if top_i >= tops.length
-              end
+      else
+        return nil unless coord
 
-              letter = p1.gsub(/\d/, '')
-              if letter == ''
-                letter = nil
-              else
-                letter.downcase!
-                left_i = (letter.ord - 97)
-                left_i = (lefts.length - 1) if left_i >= lefts.length
-              end
+        # TODO this needs refactoring once the full tests are done
+        coord.gsub!(/\s/, '')
+        is_end_coord = coord.start_with?(':')
+        parts = coord.split(':')
+        parts.reject!{|o| o == ''}
 
-              if digits && letter
-                if lefts.length > left_i && tops.length > top_i
-                  if is_end_coord
-                    {r: lefts[left_i] + column_width, b: tops[top_i] + row_height}
-                  else
-                    {l: lefts[left_i], t: tops[top_i]}
-                  end
-                else
-                  nil
-                end
-              elsif digits
-                if is_end_coord
-                  {b: tops[top_i] + row_height}
-                else
-                  {t: tops[top_i]}
-                end
-              elsif letter
+        case parts.length
+          when 0
+            nil
+          when 1
+            lefts = column_lefts
+            tops = row_tops
+
+            p1 = parts.first
+            digits = p1.gsub(/\D/, '')
+            if digits == ''
+              digits = nil
+            else
+              top_i = digits.to_i
+              top_i = (tops.length - 1) if top_i >= tops.length
+            end
+
+            letter = p1.gsub(/\d/, '')
+            if letter == ''
+              letter = nil
+            else
+              letter.downcase!
+              left_i = (letter.ord - 97)
+              left_i = (lefts.length - 1) if left_i >= lefts.length
+            end
+
+            if digits && letter
+              if lefts.length > left_i && tops.length > top_i
                 if is_end_coord
-                  {r: lefts[left_i] + column_width}
+                  {r: lefts[left_i] + column_width, b: tops[top_i] + row_height}
                 else
-                  {l: lefts[left_i]}
+                  {l: lefts[left_i], t: tops[top_i]}
                 end
               else
                 nil
               end
-            when 2
-              self[parts.first].merge(self[":#{parts.last}"])
-          end
-        end.freeze
-      end
+            elsif digits
+              if is_end_coord
+                {b: tops[top_i] + row_height}
+              else
+                {t: tops[top_i]}
+              end
+            elsif letter
+              if is_end_coord
+                {r: lefts[left_i] + column_width}
+              else
+                {l: lefts[left_i]}
+              end
+            else
+              nil
+            end
+          when 2
+            self[parts.first].merge(self[":#{parts.last}"])
+        end
+      end.freeze
     end
 
     # TODO, do this when orientation changes
@@ -272,6 +279,12 @@ module RubyMotionQuery
       @_column_width = nil
       @_usable_height = nil
       @_row_height = nil
+
+      @grid_hash_landscape = {}
+      @_usable_width_landscape = nil
+      @_column_width_landscape = nil
+      @_usable_height_landscape = nil
+      @_row_height_landscape = nil
     end
 
     def to_h
@@ -331,11 +344,16 @@ module RubyMotionQuery
     end
 
     def usable_width
-      @_usable_width ||= (RMQ.device.screen_width - (@column_gutter * (@num_columns - 1)) - @content_left_margin - @content_right_margin)
+      unless @_usable_width
+        unusable = (@column_gutter * (@num_columns - 1)) + @content_left_margin + @content_right_margin
+        @_usable_width_landscape = Device.width_landscape - unusable
+        @_usable_width = Device.width - unusable
+      end
+      Device.landscape? ? @_usable_width_landscape : @_usable_width
     end
 
     def column_width
-      @_column_width ||= usable_width / @num_columns
+      usable_width / @num_columns
     end
 
     def column_lefts
@@ -353,11 +371,16 @@ module RubyMotionQuery
     end
 
     def usable_height
-      @_usable_height ||= (RMQ.device.screen_height - (@row_gutter * (@num_rows - 1)) - @content_top_margin - @content_bottom_margin)
+      unless @_usable_height
+        unusable = (@row_gutter * (@num_rows - 1)) + @content_top_margin + @content_bottom_margin
+        @_usable_height_landscape = Device.height_landscape - unusable
+        @_usable_height = Device.height - unusable
+      end
+      Device.landscape? ? @_usable_height_landscape : @_usable_height
     end
 
     def row_height
-      @_row_height ||= usable_height / @num_rows
+      usable_height / @num_rows
     end
 
     def row_tops

data/motion/ruby_motion_query/rect.rb

@@ -46,12 +46,12 @@ module RubyMotionQuery
     # rmq(my_view).frame = "a1:b5"
     # rmq(my_view, my_other_view).frame = {grid: "b2", w: 100, h: 200}
     # rmq(my_view, my_other_view).frame = {g: "b2", w: 100, h: 200}
-    # 
+    #
     # @example with padding
     # rmq(my_view).frame = {grid: "b2:d14", padding: 5}
     # rmq(my_view).frame = {grid: "b2:d14", padding: {l: 5, t: 0, r: 5, b:0}}
     def frame=(value)
-      selected.each do |view| 
+      selected.each do |view|
         RubyMotionQuery::Rect.update_view_frame(view, value)
       end
     end
@@ -65,7 +65,7 @@ module RubyMotionQuery
     end
 
     def bounds=(value)
-      selected.each do |view| 
+      selected.each do |view|
         RubyMotionQuery::Rect.bounds_for_view(view).update(value, self.grid).apply_to_bounds
       end
     end
@@ -73,7 +73,7 @@ module RubyMotionQuery
   end
 
 
-  # RMQ Rect   
+  # RMQ Rect
   #
   #    *******************---*******---***************************   value options
   #    *                   |         |                           *   -------------
@@ -81,31 +81,31 @@ module RubyMotionQuery
   #    *                   |         |                           *   signed Integer
   #    *                  top        |                           *   Float
   #    *                   |         |                           *   String
-  #    *                   |         |                           *   
-  #    *                  ---        |                           *   also                    
+  #    *                   |         |                           *
+  #    *                  ---        |                           *   also
   #    *              ***************|*****   ---                *   -----------------------
   #    *              * view         |    *    |                 *   :full
-  #    *              *              |    *    |                 *   :right_of_prev  (:rop)         
+  #    *              *              |    *    |                 *   :right_of_prev  (:rop)
   #    *              *           bottom  *    |                 *   :left_of_prev   (:lop)
-  #    *              *              |    *    |                 *   :below_prev     (:bp)  
+  #    *              *              |    *    |                 *   :below_prev     (:bp)
   #    *|--- left ---|*              |    *    |                 *   :above_prev     (:ap)
   #    *              *              |    * height               *   :grid           (:g)
   #    *              *              |    *    |                 *   :padding        (:p)
-  #    *              *              |    *    |                 *     int or hash: l,t,b,r 
-  #    *|-------------------- right -+---|*    |                 *                 
-  #    *              *              |    *    |                 *   abbreviations           
+  #    *              *              |    *    |                 *     int or hash: l,t,b,r
+  #    *|-------------------- right -+---|*    |                 *
+  #    *              *              |    *    |                 *   abbreviations
   #    *              *              |    * |--+--from_right----|*   -----------------------
-  #    *              *             ---   *    |                 *   :l, :t, :w, :h         
+  #    *              *             ---   *    |                 *   :l, :t, :w, :h
   #    *              ***************---***   ---                *   :r, :b
   #    *                              |                          *   :fr, fb
-  #    *              |------ width - + -|                       *   
+  #    *              |------ width - + -|                       *
   #    *                              |                          *   :centered options
   #    *                              |                          *   -----------------------
   #    *                          from_bottom                    *   :horizontal
   #    *                              |                          *   :vertical
-  #    *                              |                          *   :both                  
-  #    *                             ---                         *   
-  #    ***********************************************************       
+  #    *                              |                          *   :both
+  #    *                             ---                         *
+  #    ***********************************************************
   #
   class Rect
     attr_reader :view
@@ -148,14 +148,14 @@ module RubyMotionQuery
           a = rect_hash_to_rect_array(view, existing_rect, o, grid)
           CGRectMake(a[0], a[1], a[2], a[3])
         elsif o == :full
-          if view
-            view.superview.bounds
+          if view && (sv = view.superview)
+            sv.bounds
           else
-            rmq.rootview.bounds
+            rmq.root_view.bounds
           end
         elsif o.is_a?(RubyMotionQuery::Rect)
           o.to_cgrect
-        elsif grid && o.is_a?(String) 
+        elsif grid && o.is_a?(String)
           a = rect_hash_to_rect_array(view, existing_rect, {grid: o}, grid)
           CGRectMake(a[0], a[1], a[2], a[3])
         elsif o.is_a?(Array)
@@ -215,7 +215,7 @@ module RubyMotionQuery
 
         # Previous
         if prev_view = previous_view(view)
-          if params_g && (prev_sv = prev_view.superview) 
+          if params_g && (prev_sv = prev_view.superview)
 
             previous_root_view_point = vc.view.convertPoint(prev_view.origin, fromView: prev_sv)
 
@@ -252,13 +252,13 @@ module RubyMotionQuery
             # Horrible horrible hack, TODO fix. This is here because
             # the root_view's height isn't changed until after viewDidLoad when
             # vc.edgesForExtendedLayout = UIRectEdgeNone.
-            # Not sure how often people use UIRectEdgeNone as I never do, 
+            # Not sure how often people use UIRectEdgeNone as I never do,
             # perhaps an edge case that should be isolated in some wayo
             # I hate to have to check and calc this every time
             if vc && !not_in_root_view && (vc.edgesForExtendedLayout == UIRectEdgeNone)
-              sv_size = CGSizeMake(sv.size.width, rmq.device.screen_height - 64)  
+              sv_size = CGSizeMake(sv.bounds.size.width, rmq.device.screen_height - 64)
             else
-              sv_size = sv.size
+              sv_size = sv.bounds.size
             end
           end
         end
@@ -349,10 +349,10 @@ module RubyMotionQuery
     end
 
     def update(params, grid = nil)
-      # Doing all of the updates to the Rect in singleton for performance. 
+      # Doing all of the updates to the Rect in singleton for performance.
       # It would be better to be done inside an actual Rect instance, but that
       # would require creating a lot of temporary objects.
-      # TODO performance and see if there is any real loss bringing 
+      # TODO performance and see if there is any real loss bringing
       # object_to_cg_rect into Rect instance
       #
       # If we did it that way, then we'd create a new instance, then appy the
@@ -404,7 +404,7 @@ module RubyMotionQuery
 
     def from_bottom
       if @view && (sv = @view.superview)
-        sv.size.height - bottom
+        sv.bounds.size.height - bottom
       end
     end
     alias :fb :from_bottom
@@ -413,15 +413,15 @@ module RubyMotionQuery
       @width
     end
     alias :w :width
-    
+
     def height
       @height
     end
     alias :h :height
 
     def z_order
-      if @view
-        @view.superview.subviews.to_a.index(@view) # is there a better way??
+      if @view && (sv = @view.superview)
+        sv.subviews.to_a.index(@view) # is there a better way??
       end
     end
 
@@ -515,17 +515,17 @@ module RubyMotionQuery
       wh = i_f_to_s(rmq.app.window.size.height.round(2))
 
       if @view && (sv = @view.superview)
-        sw = i_f_to_s(sv.size.width.round(2))
-        sh = i_f_to_s(sv.size.height.round(2))
+        sw = i_f_to_s(sv.bounds.size.width.round(2))
+        sh = i_f_to_s(sv.bounds.size.height.round(2))
       end
 
       out = %(
- *****************---*******---**************************  
+ *****************---*******---**************************
  *                 |         |                          *    window
  *          #{ t} top        |                          *    {w: #{ww}, h: #{wh}}
  *                 |         |                          *
- *                ---        |                          *    superview 
- *            ***************|*****   ---               *    {w: #{sw}, h: #{sh}} 
+ *                ---        |                          *    superview
+ *            ***************|*****   ---               *    {w: #{sw}, h: #{sh}}
  *            *              |    *    |                *
  *            *              |    *    |                *
  *            *     #{ b} bottom  *    |                *    view

data/motion/ruby_motion_query/stylers/ui_button_styler.rb

@@ -19,6 +19,13 @@ module RubyMotionQuery
         @view.titleColor
       end
 
+      def color_highlighted=(value)
+        @view.setTitleColor(value, forState: UIControlStateHighlighted)
+      end
+      def color_highlighted
+        @view.titleColorforState(UIControlStateHighlighted)
+      end
+
       def tint_color=(value)
         @view.tintColor = value
       end

data/motion/ruby_motion_query/stylers/ui_text_view_styler.rb

@@ -1,9 +1,20 @@
 module RubyMotionQuery
   module Stylers
-    class UITextViewStyler < UIViewStyler
+    class UITextViewStyler < UIScrollViewStyler
 
-      def font=(value) ; @view.font = value ; end
-      def font ; @view.font ; end
+      def text ; view.text ; end
+      def text=(v) ; view.text = v ; end
+
+      def attributed_text ; view.attributedText ; end
+      def attributed_text=(v) ; view.attributedText = v ; end
+
+      def font ; view.font ; end
+      def font=(v) ; view.font = v ; end
+
+      def text_color ; view.textColor ; end
+      def text_color=(v) ; view.textColor = v ; end
+      alias :color :text_color
+      alias :color= :text_color=
 
     end
   end

data/motion/ruby_motion_query/stylers/ui_view_styler.rb

@@ -77,11 +77,19 @@ module RubyMotionQuery
       alias :parent :superview
 
       def super_height
-        @view.superview.frame.size.height
+        if @view.superview
+          @view.superview.frame.size.height
+        else
+          0
+        end
       end
 
       def super_width
-        @view.superview.frame.size.width
+        if @view.superview
+          @view.superview.frame.size.width
+        else
+          0
+        end
       end
 
       def tag(tags)
@@ -363,6 +371,7 @@ module RubyMotionQuery
       end
 
       def corner_radius=(value = 2)
+        @view.clipsToBounds = true
         @view.layer.cornerRadius = value
       end
 
@@ -387,6 +396,9 @@ module RubyMotionQuery
         @view.rmq_data.validation_errors = values
       end
 
+      def alpha ; view.alpha ; end
+      def alpha=(v) ; view.alpha = v ; end
+
     end
   end
 end

data/motion/ruby_motion_query/stylesheet.rb

@@ -75,9 +75,17 @@ module RubyMotionQuery
         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
-        when UIControl            then Stylers::UIControlStyler.new(view)
         else
-          Stylers::UIViewStyler.new(view)
+          if view.respond_to?(:rmq_styler)
+            # If you're creating an RMQ plug-in that is a view you can set your styler by adding this method
+            view.rmq_styler
+          else
+            if view.is_a?(UIControl)
+              Stylers::UIControlStyler.new(view)
+            else
+              Stylers::UIViewStyler.new(view)
+            end
+          end
         end
       end
     end
@@ -92,6 +100,7 @@ module RubyMotionQuery
       begin
         stylesheet.public_send(style_name, styler_for(view))
         view.rmq_data.style_name = style_name
+        view.rmq_style_applied
       rescue NoMethodError => e
         if e.message =~ /.*#{style_name.to_s}.*/
           puts "\n[RMQ ERROR]  style_name :#{style_name} doesn't exist for a #{view.class.name}. Add 'def #{style_name}(st)' to #{stylesheet.class.name} class\n\n"
@@ -171,43 +180,45 @@ module RubyMotionQuery
     end
 
     def four_inch?
-      RMQ.device.four_inch?
+      device.four_inch?
     end
 
     def retina?
-      RMQ.device.retina?
+      device.retina?
     end
 
     def window
       RMQ.app.window
     end
 
-    # TODO, cache, then clear when orientation changes
+    # @deprecated - use device_width
     def app_width
-      portrait? ? app_size.width : app_size.height
+      device.width
     end
+    alias :device_width :app_width
 
-    # TODO, cache, then clear when orientation changes
+    # @deprecated - use device_height
     def app_height
-      portrait? ? app_size.height : app_size.width
+      device.height
     end
+    alias :device_width :app_width
 
+    # @deprecated - use device_width and device_height in your stylesheets
     def app_size
-      device.screen.applicationFrame.size
+      CGSizeMake(device.width, device.height)
     end
 
-    # TODO, cache, then clear when orientation changes
     def screen_width
-      portrait? ? screen_size.width : screen_size.height
+      device.screen_width
     end
 
-    # TODO, cache, then clear when orientation changes
     def screen_height
-      portrait? ? screen_size.height : screen_size.width
+      device.screen_height
     end
 
+    # @deprecated - use screen_width and screen_height in your stylesheets
     def screen_size
-      device.screen.bounds.size
+      CGSizeMake(screen_width, screen_height)
     end
 
     def content_width

data/motion/ruby_motion_query/subviews.rb

@@ -24,7 +24,7 @@ module RubyMotionQuery
       selected.each do |selected_view|
         created = false
         appended = false
-
+        built = false
 
         if view_or_constant.is_a?(UIView)
           new_view = view_or_constant
@@ -33,7 +33,14 @@ module RubyMotionQuery
           new_view = create_view(view_or_constant, opts)
         end
 
-        new_view.rmq_data.view_controller = self.weak_view_controller
+        rmq_data = new_view.rmq_data
+
+        unless rmq_data.built
+          rmq_data.built = true # build only once
+          built = true
+        end
+
+        rmq_data.view_controller = self.weak_view_controller
 
         subviews_added << new_view
 
@@ -53,7 +60,7 @@ module RubyMotionQuery
           new_view.rmq_did_create(self.wrap(new_view))
           new_view.rmq_created
         end
-        new_view.rmq_build
+        new_view.rmq_build if built
         new_view.rmq_appended if appended
 
         if self.stylesheet

data/motion/ruby_motion_query/version.rb

@@ -1,5 +1,5 @@
 module RubyMotionQuery
-  VERSION = "0.7.1"
+  VERSION = "0.8.0"
 
   class RMQ
     def version

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_motion_query
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Todd Werth
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-13 00:00:00.000000000 Z
+date: 2014-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bacon
@@ -151,4 +151,3 @@ signing_key:
 specification_version: 4
 summary: RubyMotionQuery - RMQ
 test_files: []
-has_rdoc: