ruby_motion_query 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c13477305c59894c43b5b220acb157aaf32bd34
-  data.tar.gz: f2ff2ecd3a1baa31fa47b9499c20711f9bcb7164
+  metadata.gz: 78e17a1432f6e663df4fbde26aa5b7d065ab3e13
+  data.tar.gz: a8aaddbde4902152465378ed69229d9acab88ccf
 SHA512:
-  metadata.gz: 54f605689d32c537f42ef60f5d4c7b6cd70d354a9d2c8e6b708faa65616685dd04f21a9240dacf59c353f6eb2a39aadfc23d462205b19cc1f976c429fe83f1e8
-  data.tar.gz: 41b7414448a6763a076a5dc18ba98ea171c39d644d2e30e3ef5889605729303de2645da1e3e003027794f5ea51072573a3c3ba0f4023b4295845faf8d9cf2d86
+  metadata.gz: 7a919b4152a20dae5566681fef722abc79ac12d04ecb8c1e7bea191b491d61c8daf642647f5d426c4938d0324e85895b92d225e92733530b8772ee7fccacfd96
+  data.tar.gz: 2ca7cf6db4c949637aca82f39316374dc53d4aa45d52debe3cbedf983fc3ed133cbbe71a4f62a3f1520b997c8f0a4d2fe6204105af914d194d162c535332cac4

data/bin/rmq

@@ -68,10 +68,17 @@ class RmqCommandLine
       (main)> exit
 
       Then try these:
+      > rake device_name='iPhone 4s'
+      > rake device_name='iPhone 5s'
+      > rake device_name='iPhone 5s' target=7.1
+      > rake device_name='iPhone 6 Plus'
+      > rake device_name='iPad Retina'
+      > rake device
+
+      Or for XCode 5.1
       > rake retina=3.5
-      > rake retina=4 
-      > rake device_family=ipad 
-      > rake device }
+      > rake retina=4
+      > rake device_family=ipad}
 
     end
 

data/motion/ruby_motion_query/animations.rb

@@ -277,8 +277,8 @@ module RubyMotionQuery
     end
 
     # @return [RMQ]
-    def start_spinner(style = UIActivityIndicatorViewStyleGray)
-      spinner = Animations.window_spinner(style)
+    def start_spinner(style = UIActivityIndicatorViewStyleGray, opts = {})
+      spinner = Animations.window_spinner({ style: style }.merge(opts))
       spinner.startAnimating
       @rmq.create_rmq_in_context(spinner)
     end
@@ -292,14 +292,14 @@ module RubyMotionQuery
 
     protected
 
-    def self.window_spinner(style = UIActivityIndicatorViewStyleGray)
+    def self.window_spinner(opts={})
       @_window_spinner ||= begin
-        window = RMQ.app.window
-        UIActivityIndicatorView.alloc.initWithActivityIndicatorStyle(style).tap do |o|
-          o.center = window.center
+        parent = opts.fetch(:parent, RMQ.app.window)
+        UIActivityIndicatorView.alloc.initWithActivityIndicatorStyle(opts.fetch(:style, UIActivityIndicatorViewStyleGray)).tap do |o|
           o.hidesWhenStopped = true
+          o.center = opts.fetch(:center, RMQ.app.window.center)
           o.layer.zPosition = NSIntegerMax
-          window.addSubview(o)
+          parent.addSubview(o)
         end
       end
     end

data/motion/ruby_motion_query/base.rb

@@ -5,7 +5,7 @@ module RubyMotionQuery
   # What's an rmq instance?
   # - an rmq instance is an array-like object containing UIViews
   # - rmq() never returns nil. If nothing is selected, it's an empty [ ] array-like
-  #   object   
+  #   object
   # - an rmq object always (almost always) returns either itself or a new
   #   rmq object. This is  how chaining works. You do not need to worry if
   #   an rmq is blank or not, everything  always works without throwing a
@@ -25,7 +25,7 @@ module RubyMotionQuery
     #
     # If rmq was called in a view, context will be that view. If it was called
     # in a UIViewController, it will be that controller. If it is called in another
-    # object, it will be current controller's rmq instance and thus context will be 
+    # object, it will be current controller's rmq instance and thus context will be
     # that controller
     def context=(value)
       if value
@@ -87,7 +87,7 @@ module RubyMotionQuery
 
     # Wraps 1 or more views in an rmq instance.
     #
-    # Normally you select a view or views using rmq(my_view). Which doesn't 
+    # Normally you select a view or views using rmq(my_view). Which doesn't
     # work if you have an instance of a RMQ, in which case it isn't a method.
     # In some cases you want to save an instance of rmq and use it like the rmq
     # method, for this you'd use #wrap
@@ -96,7 +96,7 @@ module RubyMotionQuery
     #   q = RubyMotionQuery::RMQ.new
     #
     #   # Bad
-    #   q(my_view).view_controller 
+    #   q(my_view).view_controller
     #
     #   # Good
     #   q.wrap(my_view).view_controller
@@ -107,7 +107,7 @@ module RubyMotionQuery
     end
 
 
-    # Untested and I don' think it's getting set right in some situations 
+    # Untested and I don' think it's getting set right in some situations
     #
     # @return [RMQ] rmq that created this rmq, if any
     def parent_rmq
@@ -129,7 +129,7 @@ module RubyMotionQuery
       end
     end
 
-    # Returns a view or array of views. 
+    # Returns a view or array of views.
     # Normally used to get the only view in selected.
     #
     # @example
@@ -151,19 +151,19 @@ module RubyMotionQuery
       end
     end
 
-    # Is this rmq a root instance? 
+    # Is this rmq a root instance?
     #
     # Which means it only has 1 selected view, and that view
-    # is the view you called rmq in. Which is a tad confusing, but if you call *just* rmq inside a 
+    # is the view you called rmq in. Which is a tad confusing, but if you call *just* rmq inside a
     # view, then only that view will be *selected* and this rmq will be *root*. If you call rmq
     # inside a controller, only controller.view will be selected and the rma instance will be a root.
     def root?
       (selected.length == 1) && (selected.first == @context)
     end
 
-    # The context is where rmq was created (not the selectors). 
+    # The context is where rmq was created (not the selectors).
     #
-    # Normally you are inside a controller or a UIView when you execute the rmq method. 
+    # Normally you are inside a controller or a UIView when you execute the rmq method.
     #
     # @return [UIView] the controller's view or the view you are in when calling rmq
     def context_or_context_view
@@ -182,14 +182,14 @@ module RubyMotionQuery
     #   (main)> rmq.all
     #   => RMQ 172658240. 26 selected. selectors: []. .log for more info
     def inspect
-      out = "RMQ #{self.object_id}. #{self.count} selected. selectors: #{self.selectors.to_s}. .log for more info"
+      out = "RMQ #{self.object_id}. #{self.count} selected. selectors: #{self.selectors}. .log for more info"
       out << "\n[#{selected.first}]" if self.count == 1
       out
     end
 
     # Super useful in the console. log outputs to the console a table of the selected views
     #
-    # @param :wide outputs wide format (really wide, but awesome: rmq.all.log :wide). :tree outputs the 
+    # @param :wide outputs wide format (really wide, but awesome: rmq.all.log :wide). :tree outputs the
     # log in a tree form
     #
     # @return [String]
@@ -227,7 +227,7 @@ module RubyMotionQuery
     #   rmq.all.log :wide
     def log(opt = nil)
       if opt == :tree
-        puts tree_to_s(selected) 
+        puts tree_to_s(selected)
         return
       end
 
@@ -240,7 +240,7 @@ module RubyMotionQuery
       out << line.chop if wide
       out << line
 
-      selected.each do |view| 
+      selected.each do |view|
         out << " #{view.object_id.to_s.ljust(12)}|"
         out << " #{view.class.name[0..21].ljust(22)}|"
         out << " #{(view.rmq_data.style_name || '')[0..23].ljust(24)}|"
@@ -266,7 +266,7 @@ module RubyMotionQuery
         out << line unless wide
       end
 
-      out << "RMQ #{self.object_id}. #{self.count} selected. selectors: #{self.selectors.to_s}"
+      out << "RMQ #{self.object_id}. #{self.count} selected. selectors: #{self.selectors}"
 
       puts out
     end
@@ -274,9 +274,7 @@ module RubyMotionQuery
     def tree_to_s(selected_views, depth = 0)
       out = ""
 
-      selected_views.each do |view| 
-        first = (view == selected_views.first)
-        last = (view == selected_views.last)
+      selected_views.each do |view|
 
         if depth == 0
           out << "\n"
@@ -290,7 +288,7 @@ module RubyMotionQuery
 
         out << " #{view.class.name[0..21]}"
         out << "  ( #{view.rmq_data.style_name[0..23]} )" if view.rmq_data.style_name
-        out << "  #{view.object_id.to_s}"
+        out << "  #{view.object_id}"
         out << "  [ #{view.rmq_data.tag_names.join(',')} ]" if view.rmq_data.tag_names.length > 0
 
         if view.origin
@@ -309,11 +307,11 @@ module RubyMotionQuery
       out
     end
 
-    protected 
+    protected
     def extract_views_from_selectors(view_container, working_selectors)
       unless RMQ.is_blank?(working_selectors)
         working_selectors.delete_if do |selector|
-          if selector.is_a?(UIView) 
+          if selector.is_a?(UIView)
             view_container << selector
             true
           end
@@ -339,7 +337,7 @@ module RubyMotionQuery
       if (nr = view.nextResponder) && nr.is_a?(UIView)
         out << nr
         all_superviews_for(nr, out)
-      end     
+      end
       out
     end
 

data/motion/ruby_motion_query/data.rb

@@ -1,6 +1,6 @@
 module RubyMotionQuery
   class ViewData
-    attr_accessor :events, :style_name, :built
+    attr_accessor :events, :built
 
     # @return [Hash] Array of tag names assigned to to this view
     def tags
@@ -12,11 +12,6 @@ module RubyMotionQuery
       tags.keys
     end
 
-    def validation_errors; @_validation_errors ||= {}; end
-    def validation_errors=(value); @_validation_errors = value; end
-    def validations; @_validations ||= []; end
-    def validations=(value); @_validations = value; end
-
     # *Do not* use this, use {RMQ#tag} instead:
     # @example
     #   rmq(my_view).tag(:foo)
@@ -49,6 +44,36 @@ module RubyMotionQuery
       end
     end
 
+    # @deprecated - use styles
+    def style_name
+      styles.first
+    end
+
+    # Sets first style name, this is only here for backwards compatibility and as
+    # a convenience method
+    def style_name=(value)
+      styles[0] = value
+    end
+
+    #view.rmq_data.styles
+    def styles
+      @_styles ||= []
+    end
+
+    #view.rmq_data.has_style?(:style_name_here)
+    def has_style?(name = nil)
+      if name
+        styles.include?(name)
+      else
+        RMQ.is_blank?(@_styles)
+      end
+    end
+
+    def validation_errors; @_validation_errors ||= {}; end
+    def validation_errors=(value); @_validation_errors = value; end
+    def validations; @_validations ||= []; end
+    def validations=(value); @_validations = value; end
+
     def view_controller=(value)
       #RubyMotionQuery::RMQ.debug.assert(value.is_a?(UIViewController), 'Invalid controller in ViewData', { controller: value })
 

data/motion/ruby_motion_query/device.rb

@@ -13,10 +13,6 @@ 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"`

data/motion/ruby_motion_query/enumerablish.rb

@@ -16,8 +16,10 @@ module RubyMotionQuery
     #   rmq(UILabel)[3]
     #   or
     #   rmq(UILabel)[1..5]
-    def [](i)
-      RMQ.create_with_array_and_selectors([selected[i]], @selectors, @context)
+    #   or
+    #   rmq(UILabel)[2,3]
+    def [](*args)
+      RMQ.create_with_array_and_selectors(Array(selected[*args]), @selectors, @context)
     end
     alias :eq :[]
 

data/motion/ruby_motion_query/font.rb

@@ -53,11 +53,10 @@ module RubyMotionQuery
       #
       # @example
       #   font = rmq.font.font_with_name('Helvetica Neue', 18)
-      def font_with_name(name, size)
-        # TODO, should rename this to just with_name, so it's rmq.font.with_name
+      def with_name(name, size)
         UIFont.fontWithName(name, size: size)
       end
-      alias :with_name :font_with_name
+      alias :font_with_name :with_name #for backwards compatibility
 
       # Use this in the console to get a list of font families
       # @return [Array]

data/motion/ruby_motion_query/grid.rb

@@ -272,7 +272,7 @@ module RubyMotionQuery
       end.freeze
     end
 
-    # TODO, do this when orientation changes
+    # This typically is not needed anywhere
     def clear_cache
       @grid_hash = {}
       @_usable_width = nil
@@ -317,7 +317,7 @@ module RubyMotionQuery
         out << left_m
         out << r.to_s.rjust(4)
 
-        0.upto(@num_columns - 1).each do |c|
+        0.upto(@num_columns - 1).each do
           out << "  ."
         end
       end
@@ -417,8 +417,6 @@ module RubyMotionQuery
       return unless @grid
 
       context = UIGraphicsGetCurrentContext()
-      screen_height = RMQ.device.screen_height
-      screen_width = RMQ.device.screen_width
 
       CGContextSetTextMatrix(context, CGAffineTransformMake(1.0,0.0, 0.0, -1.0, 0.0, 0.0));
       CGContextSelectFont(context, 'Courier New', 7, KCGEncodingMacRoman)

data/motion/ruby_motion_query/image.rb

@@ -27,7 +27,7 @@ module RubyMotionQuery
         cached = true if cached.nil?
 
         if cached
-          UIImage.imageNamed("#{file_base_name}.#{ext}") 
+          UIImage.imageNamed("#{file_base_name}.#{ext}")
         else
           file_base_name << '@2x' if RMQ.device.retina?
           file = NSBundle.mainBundle.pathForResource(file_base_name, ofType: ext)
@@ -42,10 +42,14 @@ module RubyMotionQuery
       #
       # @return [UIImage]
       def resource_resizable(file_base_name, opts)
-        # TODO, also alloow short syntax, t: instead of top: etc
-        ext = opts[:ext] || DEFAULT_IMAGE_EXT
         image = resource(file_base_name, opts)
-        image.resizableImageWithCapInsets([opts[:top], opts[:left], opts[:bottom], opts[:right]], resizingMode: UIImageResizingModeStretch) 
+
+        frame = [ opts[:top]    || opts[:t],
+                  opts[:left]   || opts[:l],
+                  opts[:bottom] || opts[:b],
+                  opts[:right]  || opts[:r]
+        ]
+        image.resizableImageWithCapInsets(frame, resizingMode: UIImageResizingModeStretch)
       end
 
       # Note: FROM Sugarcube, thanks Sugarcube

data/motion/ruby_motion_query/inspector.rb

@@ -5,7 +5,7 @@ module RubyMotionQuery
       if existing.length > 0
         existing.remove
       end
-      
+
       puts 'The currently selected views will be assigned to $q'
 
       rmq(window).append(InspectorView).get.update(selected)
@@ -14,8 +14,8 @@ module RubyMotionQuery
   end
 
   class InspectorView < UIView
-    # A note about this code. InspectorView will be sitting in the Window, not 
-    # the current controller. So when you do this rmq(UIButton), that is on the 
+    # A note about this code. InspectorView will be sitting in the Window, not
+    # the current controller. So when you do this rmq(UIButton), that is on the
     # current controller. rmq(self).find(UIButton) would be the buttons in the
     # inspector.
 
@@ -28,7 +28,7 @@ module RubyMotionQuery
 
       rmq.stylesheet = InspectorStylesheet
       @self_rmq.apply_style(:inspector_view)
-      
+
       @hud = @self_rmq.append(InspectorHud, :hud).on(:tap) do |sender, rmq_event|
         select_at rmq_event.location_in(sender)
       end.get
@@ -37,7 +37,7 @@ module RubyMotionQuery
 
       rmq(root_view).animate(
         animations: ->(q){ q.apply_style :root_view_scaled },
-        after: ->(finished, q) do 
+        after: ->(finished, q) do
           @self_rmq.animations.fade_in
           dim_nav
         end
@@ -45,12 +45,12 @@ module RubyMotionQuery
 
       @stats = @self_rmq.append! UILabel, :stats
 
-      @self_rmq.append(UIButton, :close_button).on(:touch) do |sender|
+      @self_rmq.append(UIButton, :close_button).on(:touch) do
         rmq(root_view).animate(
           animations: ->(q){ q.apply_style(:root_view) },
           after: ->(finished, inner_q){ rmq.stylesheet = @puppets_stylesheet })
 
-        @self_rmq.animations.drop_and_spin(after: ->(finished, inner_q) do 
+        @self_rmq.animations.drop_and_spin(after: ->(finished, inner_q) do
           inner_q.remove
         end)
 
@@ -59,35 +59,35 @@ module RubyMotionQuery
         show_nav_in_all_its_glory
       end
 
-      @self_rmq.append(UIButton, :grid_button).on(:touch) do |sender|
+      @self_rmq.append(UIButton, :grid_button).on(:touch) do
         @hud.draw_grid = !@hud.draw_grid
         redisplay
       end
 
-      @self_rmq.append(UIButton, :grid_x_button).on(:touch) do |sender|
+      @self_rmq.append(UIButton, :grid_x_button).on(:touch) do
         @hud.draw_grid_x = !@hud.draw_grid_x
         redisplay
       end
 
-      @self_rmq.append(UIButton, :grid_y_button).on(:touch) do |sender|
+      @self_rmq.append(UIButton, :grid_y_button).on(:touch) do
         @hud.draw_grid_y = !@hud.draw_grid_y
         redisplay
       end
 
-      @self_rmq.append(UIButton, :dim_button).on(:touch) do |sender|
+      @self_rmq.append(UIButton, :dim_button).on(:touch) do
         @hud.dimmed = !@hud.dimmed
         redisplay
       end
 
-      @self_rmq.append(UIButton, :outline_button).on(:touch) do |sender|
+      @self_rmq.append(UIButton, :outline_button).on(:touch) do
         @hud.views_outlined = !@hud.views_outlined
         redisplay
       end
 
-      @self_rmq.find(UIButton).distribute :horizontal, margin: 5 
+      @self_rmq.find(UIButton).distribute :horizontal, margin: 5
 
       @tree_zoomed = false
-      @tree_q = @self_rmq.append(UIScrollView, :tree).on(:tap) do |sender|
+      @tree_q = @self_rmq.append(UIScrollView, :tree).on(:tap) do
         zoom_tree
       end
     end
@@ -111,7 +111,7 @@ module RubyMotionQuery
     end
 
     def zoom_tree
-      rmq.animate do |q|
+      rmq.animate do
         if @tree_zoomed
           @tree_q.apply_style(:tree)
         else
@@ -140,7 +140,7 @@ module RubyMotionQuery
 
       @hud.selected_views = []
       root_view = rmq.root_view
-      
+
       if tapped_at
         @hud.selected.each do |view|
           rect = view.convertRect(view.bounds, toView: root_view)
@@ -209,7 +209,7 @@ module RubyMotionQuery
         st.frame = {l: left, w: w, h: h}
 
         st.border_color = rmq.color.from_rgba(34,202,250,0.7).CGColor
-        st.border_width = 0.5 
+        st.border_width = 0.5
         st.background_color = rmq.stylesheet.tree_node_background_color
 
       end.enable_interaction.on(:tap) do |sender|
@@ -225,14 +225,14 @@ module RubyMotionQuery
       out = %(
         style_name: :#{view.rmq_data.style_name || ''}
         #{rmq(view).frame.inspect}
-        #{view.class.name} - object_id: #{view.object_id.to_s}
+        #{view.class.name} - object_id: #{view.object_id}
       ).strip
       rmq(@stats).show.get.text = out
     end
   end
 
   class InspectorHud < UIView
-    attr_accessor :selected, :selected_views, :dimmed, :views_outlined, 
+    attr_accessor :selected, :selected_views, :dimmed, :views_outlined,
       :draw_grid_x, :draw_grid, :draw_grid_y
 
     def rmq_build
@@ -273,7 +273,6 @@ module RubyMotionQuery
       # Fixes upside down issue
       CGContextSetTextMatrix(context, CGAffineTransformMake(1.0,0.0, 0.0, -1.0, 0.0, 0.0))
 
-      w = rmq.window
       grid = rmq.stylesheet.grid
       root_view = rmq.root_view
 
@@ -305,7 +304,7 @@ module RubyMotionQuery
           0.upto(grid.num_columns - 1) do |c|
             rec = grid[[c, r]]
             CGContextSetFillColorWithColor(context, @column_fill_color)
-            CGContextFillRect(context, rec.to_cgrect) 
+            CGContextFillRect(context, rec.to_cgrect)
             text = "#{(c+97).chr}#{r}"
             CGContextSetFillColorWithColor(context, @light_text_color)
             CGContextShowTextAtPoint(context, rec.origin.x + 1, rec.origin.y + 5, text, text.length)
@@ -319,7 +318,7 @@ module RubyMotionQuery
           rec = view.frame
           rec.origin = rmq(view).location_in(root_view)
           #rec.origin = view.origin
-          
+
           if @selected_views.include?(view)
             CGContextSetFillColorWithColor(context, @view_selected_background_color.CGColor)
             CGContextSetStrokeColorWithColor(context, @selected_outline_color)
@@ -327,7 +326,7 @@ module RubyMotionQuery
             CGContextSetFillColorWithColor(context, @view_background_color)
             CGContextSetStrokeColorWithColor(context, @outline_color)
           end
-          
+
           if @dimmed
             CGContextFillRect(context, rec)
           end

data/motion/ruby_motion_query/rect.rb

@@ -24,7 +24,7 @@ module RubyMotionQuery
     # Always applied in this order, regardless of the hash order:
     #   grid
     #   l, t, w, h
-    #   previous
+    #   prev, next
     #   from_right, from_bottom
     #   right, bottom
     #   left and right applied together (will change width)

data/motion/ruby_motion_query/selectors.rb

@@ -11,12 +11,12 @@ module RubyMotionQuery
     # @return [Array] The selectors, which is what you used for the query
     # @example
     #  (main)> rmq(UILabel, UIImageView).selectors
-    #  => [UILabel, UIImageView] 
+    #  => [UILabel, UIImageView]
     def selectors
       @_selectors
     end
 
-    protected 
+    protected
 
     def match_context(new_selectors)
       match(context_or_context_view, new_selectors)
@@ -30,7 +30,7 @@ module RubyMotionQuery
           return true if match_hash(view, selector)
         elsif selector.is_a?(Symbol)
           # TODO, make this faster
-          return true if (view.rmq_data.style_name == selector) || view.rmq_data.has_tag?(selector)
+          return true if (view.rmq_data.has_style?(selector)) || view.rmq_data.has_tag?(selector)
         elsif selector.is_a?(Integer)
           # TODO, make this hugely faster
           return true if view.object_id == selector
@@ -48,7 +48,7 @@ module RubyMotionQuery
     private
 
     def match_hash(view, hash)
-      # TODO, check speed, and do sub hashes for stuff like origin 
+      # TODO, check speed, and do sub hashes for stuff like origin
       # it's probably pretty slow
       hash.each do |k,v|
         return true if view.respond_to?(k) && (view.send(k) == v)

data/motion/ruby_motion_query/stylers/ui_control_styler.rb

@@ -1,7 +1,42 @@
 module RubyMotionQuery
   module Stylers
 
-    class UIControlStyler < UIViewStyler 
+    class UIControlStyler < UIViewStyler
+      def content_vertical_alignment=(value)
+        @view.contentVerticalAlignment = value
+      end
+
+      def content_vertical_alignment
+        @view.contentVerticalAlignment
+      end
+
+      def content_horizontal_alignment=(value)
+        @view.contentHorizontalAlignment = value
+      end
+
+      def content_horizontal_alignment
+        @view.contentHorizontalAlignment
+      end
+
+      def selected=(value)
+        @view.selected = value
+      end
+
+      def selected
+        @view.isSelected
+      end
+
+      def highlighted=(value)
+        @view.highlighted = value
+      end
+
+      def highlighted
+        @view.isHighlighted
+      end
+
+      def state
+        @view.state
+      end
     end
 
   end

data/motion/ruby_motion_query/stylers/ui_table_view_cell_styler.rb

@@ -1,8 +1,8 @@
 module RubyMotionQuery
   module Stylers
 
-    class UITableViewCellStyler < UIViewStyler 
-      
+    class UITableViewCellStyler < UIViewStyler
+
       def accessory_type=(value)
         @view.accessoryType = value
       end
@@ -11,7 +11,15 @@ module RubyMotionQuery
         @view.accessoryType
       end
 
+      def accessory_view=(value)
+        @view.accessoryView = value
+      end
+
+      def accessory_view
+        @view.accessoryView
+      end
+
     end
 
   end
-end
+end

data/motion/ruby_motion_query/stylers/ui_text_view_styler.rb

@@ -8,6 +8,15 @@ module RubyMotionQuery
       def attributed_text ; view.attributedText ; end
       def attributed_text=(v) ; view.attributedText = v ; end
 
+      def editable ; view.isEditable ; end
+      def editable=(v) ; view.editable = !!v ; end
+
+      def selectable ; view.isSelectable ; end
+      def selectable=(v) ; view.selectable = !!v ; end
+
+      def data_detector_types ; view.dataDetectorTypes ; end
+      def data_detector_types=(v) ; view.dataDetectorTypes = (DETECTOR_TYPES[v] || v) ; end
+
       def font ; view.font ; end
       def font=(v) ; view.font = v ; end
 
@@ -16,6 +25,15 @@ module RubyMotionQuery
       alias :color :text_color
       alias :color= :text_color=
 
+      DETECTOR_TYPES = {
+        phone:    UIDataDetectorTypePhoneNumber,
+        link:     UIDataDetectorTypeLink,
+        addresss: UIDataDetectorTypeAddress,
+        event:    UIDataDetectorTypeCalendarEvent,
+        none:     UIDataDetectorTypeNone,
+        all:      UIDataDetectorTypeAll
+      }
+
     end
   end
 end

data/motion/ruby_motion_query/stylers/ui_view_styler.rb

@@ -297,7 +297,7 @@ module RubyMotionQuery
         @view.setEnabled value
       end
       def enabled
-        @view.enabled
+        @view.isEnabled
       end
 
       def scale=(amount)
@@ -354,12 +354,13 @@ module RubyMotionQuery
       def border_width=(value)
         @view.layer.borderWidth = value
       end
+
       def border_width
         @view.layer.borderWidth
       end
 
       def border_color=(value)
-        if value.is_a?(UICachedDeviceRGBColor)
+        if is_color(value)
           @view.layer.setBorderColor(value.CGColor)
         else
           @view.layer.setBorderColor value
@@ -370,6 +371,11 @@ module RubyMotionQuery
         @view.layer.borderColor
       end
 
+      def border=(options)
+        self.border_width = options.fetch(:width)
+        self.border_color = options.fetch(:color)
+      end
+
       def corner_radius=(value = 2)
         @view.clipsToBounds = true
         @view.layer.cornerRadius = value
@@ -399,6 +405,11 @@ module RubyMotionQuery
       def alpha ; view.alpha ; end
       def alpha=(v) ; view.alpha = v ; end
 
+      private
+
+      def is_color(value)
+        [UICachedDeviceRGBColor, UIDeviceRGBColor].include?(value.class)
+      end
     end
   end
 end

data/motion/ruby_motion_query/stylesheet.rb

@@ -25,26 +25,67 @@ module RubyMotionQuery
       end
     end
 
+    # @example
+    #   rmq(view).apply_style(:style_name_here)
+    #   rmq(view).apply_style(:style_name_here, :another_style, :yet_another_style)
+    #   rmq(view).apply_styles(:style_name_here, :another_style, :yet_another_style) # Alias
+    #
     # @return [RMQ]
-    def apply_style(style_name)
-      selected.each do |selected_view|
-        apply_style_to_view selected_view, style_name
+    def apply_style(*style_names)
+      if style_names
+        selected.each do |selected_view|
+          style_names.each do |style_name|
+            apply_style_to_view selected_view, style_name
+          end
+        end
       end
       self
     end
+    alias :apply_styles :apply_style
 
+    # Pass a block to apply styles, an inline way of applynig a style
+    # @example
+    #   rmq(view).style{|st| st.background_color = rmq.color.blue}
     # @return [RMQ]
-    def style()
+    def style
       selected.each do |view|
         yield(styler_for(view))
       end
       self
     end
 
+    # @example
+    #   rmq(view).styles
+    #
+    # @return style_names as an array
+    def styles
+      out = selected.map do |view|
+        view.rmq_data.styles
+      end
+      out.flatten!.uniq!
+      out
+    end
+
+    # @example
+    #   foo = rmq(view).has_style?(:style_name_here)
+    #
+    # @return true if all selected views has the style
+    def has_style?(style_name)
+      selected.each do |view|
+        return false unless view.rmq_data.has_style?(style_name)
+      end
+      true
+    end
+
+    # Reapplies all styles in order. User rmq(view).styles to see the styles applied to a view(s)
+    # @example
+    #   rmq.all.reapply_styles
+    #   rmq(viewa, viewb, viewc).reapply_styles
+    #
     # @return [RMQ]
     def reapply_styles
       selected.each do |selected_view|
-        if style_name = selected_view.rmq_data.style_name
+        selected_view.rmq_data.styles.each do |style_name|
           apply_style_to_view selected_view, style_name
         end
       end
@@ -99,7 +140,7 @@ module RubyMotionQuery
     def apply_style_to_view(view, style_name)
       begin
         stylesheet.public_send(style_name, styler_for(view))
-        view.rmq_data.style_name = style_name
+        view.rmq_data.styles << style_name unless view.rmq_data.has_style?(style_name)
         view.rmq_style_applied
       rescue NoMethodError => e
         if e.message =~ /.*#{style_name.to_s}.*/

data/motion/ruby_motion_query/validation.rb

@@ -60,7 +60,7 @@ module RubyMotionQuery
       selected.each do |view|
         view.rmq_data.validations.each do |validation|
           unless validation.valid_status
-            default_error = "Validation Error - input requires valid #{validation.rule_name.to_s}."
+            default_error = "Validation Error - input requires valid #{validation.rule_name}."
             rule_message  = view.rmq_data.validation_errors[validation.rule_name] || default_error
             errors.push(rule_message)
           end
@@ -71,24 +71,16 @@ module RubyMotionQuery
 
     # @return [Array] of views where validations have failed
     def invalid
-      invalid = []
-      selected.each do |view|
-        view.rmq_data.validations.each do |validation|
-          invalid.push(view) unless validation.valid_status
-        end
+      selected.reject do |view|
+        view.rmq_data.validations.map{ |validation| validation.valid_status }.reduce(:&)
       end
-      return invalid
     end
 
-    # @return [Array] of views where validations have failed
+    # @return [Array] of views where validations have not failed
     def valid
-      invalid = []
-      selected.each do |view|
-        view.rmq_data.validations.each do |validation|
-          invalid.push(view) if validation.valid_status
-        end
+      selected.select do |view|
+        view.rmq_data.validations.map{ |validation| validation.valid_status }.reduce(:&)
       end
-      return invalid
     end
 
   end # End RMQ

data/motion/ruby_motion_query/version.rb

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

data/templates/view/app/views/name.rb

@@ -7,9 +7,9 @@ class <%= @name_camel_case %> < UIView
     # Add subviews here, like so:
     # q.append(UILabel, :some_label)
     # -or-
-    # @submit_button = q.append(UIButon, :submit).get
+    # @submit_button = q.append(UIButton, :submit).get
     # -or-
-    # @submit_button = q.append! UIButon, :submit
+    # @submit_button = q.append! UIButton, :submit
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_motion_query
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Todd Werth
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-03 00:00:00.000000000 Z
+date: 2014-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bacon
@@ -146,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: RubyMotionQuery - RMQ