ruby_motion_query 0.4.1 → 0.5.0

data/motion/ruby_motion_query/position.rb

@@ -37,6 +37,58 @@ module RubyMotionQuery
       self
     end
 
+    def distribute(type = :vertical, params = {})
+      return 0 if selected.length == 0
+
+      margins = params[:margins]
+      margin = params[:margin] || 0
+      current_end = nil
+
+      selected.each_with_index do |view, i|
+        st = self.styler_for(view)
+        next if st.height == 0
+
+        view_margin = if (margins && margins[i])
+          margins[i]
+        else
+          margin
+        end
+
+        current_end = (st.top - view_margin) unless current_end
+
+        if type == :horizontal
+          st.left = current_end + view_margin
+          current_end = st.right
+        else
+          st.top = current_end + view_margin
+          current_end = st.bottom
+        end
+        
+      end
+
+      self
+    end
+
+    def resize_to_fit_subviews
+      selected.each do |view|
+        st = self.styler_for(view)
+
+        w = 0
+        h = 0
+
+        view.subviews.each do |subview|
+          sub_st = self.styler_for(subview)
+          w = [sub_st.right, w].max
+          h = [sub_st.bottom, h].max
+        end
+
+        st.width = w if st.width < w
+        st.height = h if st.height < h
+      end
+
+      self
+    end
+
     # @return [Array] or [CGSize]
     def location_in_root_view
       self.location_in(self.root_view)

data/motion/ruby_motion_query/selectors.rb

@@ -16,7 +16,6 @@ module RubyMotionQuery
       @_selectors
     end
 
-
     protected 
 
     def match_context(new_selectors)

data/motion/ruby_motion_query/stylers/ui_label_styler.rb

@@ -1,21 +1,21 @@
 module RubyMotionQuery
   module Stylers
 
-    class UILabelStyler < UIViewStyler 
-      def text=(value) ; @view.text = value ; end
+    class UILabelStyler < UIViewStyler
+      def text=(value) ; @view.setText value ; end
       def text ; @view.text ; end
 
-      def font=(value) ; @view.font = value ; end
+      def font=(value) ; @view.setFont value ; end
       def font ; @view.font ; end
 
-      def color=(value) ; @view.textColor = value ; end
+      def color=(value) ; @view.setTextColor value ; end
       def color ; @view.textColor ; end
 
-      def number_of_lines=(value) 
+      def number_of_lines=(value)
         value = 0 if value == :unlimited
-        @view.numberOfLines = value
+        @view.setNumberOfLines(value)
       end
-      def number_of_lines 
+      def number_of_lines
         if @view.numberOfLines == 0
           :unlimited
         else
@@ -23,10 +23,10 @@ module RubyMotionQuery
         end
       end
 
-      def text_alignment=(value) 
-        @view.textAlignment = TEXT_ALIGNMENTS[value] || value
+      def text_alignment=(value)
+        @view.setTextAlignment(TEXT_ALIGNMENTS[value] || value)
       end
-      def text_alignment 
+      def text_alignment
         @view.textAlignment
       end
 

data/motion/ruby_motion_query/stylers/ui_view_styler.rb

@@ -2,7 +2,7 @@ module RubyMotionQuery
   module Stylers
 
     # When you create a styler, always inherit UIViewStyler
-    class UIViewStyler 
+    class UIViewStyler
       def initialize(view)
         @view = view
       end
@@ -20,7 +20,7 @@ module RubyMotionQuery
       end
 
       def superview
-        @view.superview || rmq(@view).view_controller.view || rmq.window
+        @view.superview || rmq(@view).root_view || rmq.window
       end
       alias :parent :superview
 
@@ -49,6 +49,8 @@ module RubyMotionQuery
           f.size.height =h[:h] || h[:height] || f.size.height
 
           @view.frame = f
+        else
+          @view.frame = value
         end
       end
       def frame
@@ -68,7 +70,7 @@ module RubyMotionQuery
           value = [
             [h[:l], h[:t]],
             [
-              sbounds.size.width - h[:l] - h[:r], 
+              sbounds.size.width - h[:l] - h[:r],
               sbounds.size.height - h[:t] - h[:b]
             ]]
 
@@ -169,7 +171,7 @@ module RubyMotionQuery
       def center_y=(value)
         c = @view.center
         c.y = value
-        @view.center = c
+        @view.setCenter c
       end
       def center_y
         @view.center.y
@@ -181,7 +183,7 @@ module RubyMotionQuery
           case option
           when :horizontal
             # Not using parent.center.x here for orientation
-            self.center_x = parent.bounds.size.width / 2 
+            self.center_x = parent.bounds.size.width / 2
           when :vertical
             self.center_y = parent.bounds.size.height / 2
           else
@@ -191,39 +193,39 @@ module RubyMotionQuery
       end
 
       def background_color=(value)
-        @view.backgroundColor = value
+        @view.setBackgroundColor value
       end
       def background_color
         @view.backgroundColor
       end
-      
+
       def background_image=(value)
-        @view.backgroundColor = UIColor.colorWithPatternImage(value)
+        @view.setBackgroundColor UIColor.colorWithPatternImage(value)
       end
 
       def z_position=(index)
-        @view.layer.zPosition = index
+        @view.layer.setZPosition index
       end
       def z_position
         @view.layer.zPosition
       end
 
       def opaque=(value)
-        @view.layer.opaque = value
+        @view.layer.setOpaque value
       end
       def opaque
-        @view.layer.opaque
+        @view.layer.isOpaque
       end
 
       def hidden=(value)
-        @view.hidden = value
+        @view.setHidden value
       end
       def hidden
-        @view.hidden
+        @view.isHidden
       end
 
       def enabled=(value)
-        @view.enabled = value
+        @view.setEnabled value
       end
       def enabled
         @view.enabled
@@ -246,17 +248,24 @@ module RubyMotionQuery
       end
 
       def rotation=(new_angle)
-        radians = new_angle * Math::PI / 180 
+        radians = new_angle * Math::PI / 180
         @view.transform = CGAffineTransformMakeRotation(radians)
       end
 
       def content_mode=(value)
-        @view.contentMode = value
+        @view.setContentMode value
       end
       def content_mode
         @view.contentMode
       end
 
+      def clips_to_bounds=(value)
+        @view.setClipsToBounds value
+      end
+      def clips_to_bounds
+        @view.clipsToBounds
+      end
+
     end
   end
 end

data/motion/ruby_motion_query/stylesheet.rb

@@ -3,7 +3,8 @@ module RubyMotionQuery
 
     # @return [RMQ]
     def stylesheet=(value)
-      controller = view_controller
+      controller = self.weak_view_controller
+
       unless value.is_a?(RubyMotionQuery::Stylesheet)
         value = value.new(controller)
       end
@@ -16,7 +17,7 @@ module RubyMotionQuery
     def stylesheet
       @_stylesheet ||= begin
 
-        if self.view_controller && (ss = self.view_controller.rmq_data.stylesheet)
+        if self.weak_view_controller && (ss = self.weak_view_controller.rmq_data.stylesheet)
           ss
         elsif (prmq = self.parent_rmq) && prmq.stylesheet
           prmq.stylesheet
@@ -88,11 +89,11 @@ module RubyMotionQuery
 
     def apply_style_to_view(view, style_name)
       begin
-        stylesheet.__send__(style_name, styler_for(view))
+        stylesheet.public_send(style_name, styler_for(view))
         view.rmq_data.style_name = style_name
       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}(sv)' to #{stylesheet.class.name} class\n\n"
+          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"
         else
           raise e
         end
@@ -105,7 +106,7 @@ module RubyMotionQuery
     attr_reader :controller
 
     def initialize(controller)
-      @controller = WeakRef.new(controller)
+      @controller = RubyMotionQuery::RMQ.weak_ref(controller)
 
       unless Stylesheet.application_was_setup
         Stylesheet.application_was_setup = true
@@ -179,10 +180,36 @@ module RubyMotionQuery
       device.screen.applicationFrame.size
     end
 
+    def screen_width
+      screen_size.width
+    end
+
+    def screen_height
+      screen_size.height
+    end
+
     def screen_size
       device.screen.bounds.size
     end
 
+    def content_width
+      content_size.width
+    end
+
+    def content_height
+      content_size.height
+    end
+
+    # Content size of the controller's rootview, if it is a
+    # UIScrollView, UICollectionView, UITableView, etc
+    def content_size
+      if @controller.view.respond_to?(:contentSize)
+        @controller.view.contentSize
+      else
+        CGSizeZero
+      end
+    end
+
     def image
       RMQ.image
     end

data/motion/ruby_motion_query/subviews.rb

@@ -15,6 +15,8 @@ module RubyMotionQuery
 
       selected.each do |selected_view|
         created = false
+        appended = false
+
 
         if view_or_constant.is_a?(UIView)
           new_view = view_or_constant
@@ -23,6 +25,8 @@ module RubyMotionQuery
           new_view = create_view(view_or_constant, opts)
         end
 
+        new_view.rmq_data.view_controller = self.weak_view_controller
+
         subviews_added << new_view
 
         unless opts[:do_not_add]
@@ -33,13 +37,20 @@ module RubyMotionQuery
           else
             selected_view.addSubview(new_view)
           end
+
+          appended = true
         end
 
         if self.stylesheet
           apply_style_to_view(new_view, style) if style
         end
 
-        new_view.rmq_did_create(self.wrap(new_view)) if created
+        if created
+          new_view.rmq_did_create(self.wrap(new_view)) 
+          new_view.rmq_created
+        end
+        new_view.rmq_build
+        new_view.rmq_appended if appended
       end
 
       RMQ.create_with_array_and_selectors(subviews_added, selectors, @context, self)
@@ -86,6 +97,24 @@ module RubyMotionQuery
       add_subview view_or_constant, opts
     end
 
+    # Build a view, similar to create and append, but only inits an existing view. Usefull
+    # in collectionview cells for example
+    #
+    # @example
+    # # In your collectionview 
+    # rmq.build(cell) unless cell.reused
+    #
+    # # Then in your cell
+    #
+    # def rmq_build
+    #   rmq.append(UIView, :foo)
+    # end
+    def build(view, style = nil, opts = {})
+      opts[:do_not_add] = true
+      opts[:style] = style
+      add_subview view, opts
+    end
+
     protected
 
     def create_view(klass, opts)

data/motion/ruby_motion_query/traverse.rb

@@ -36,7 +36,7 @@ module RubyMotionQuery
     # @example
     #   rmq.all.log
     def all
-      self.view_controller.rmq.find
+      self.weak_view_controller.rmq.find
     end
 
     # @return [RMQ] A new rmq instance reducing selected views to those that match selectors provided
@@ -86,11 +86,12 @@ module RubyMotionQuery
     end
     alias :add_self :and_self
     
-    # @return [RMQ] The parent rmq instance 
+    # @return [RMQ] The parent rmq instance. This is useful when you want to go down
+    # into the tree, then move back up to do more work. Like jQuery's "end"
     #
     # @example
-    #   rmq(test_view).find(UIImageView).tag(:foo).end.find(UILabel).tag(:bar)
-    def end
+    #   rmq(test_view).find(UIImageView).tag(:foo).back.find(UILabel).tag(:bar)
+    def back
       self.parent_rmq || self
     end
 
@@ -244,32 +245,79 @@ module RubyMotionQuery
       end
     end
 
+    # This returns a weak ref to the controller. The controller may be destroyed and you will still have a pointer to it.
+    # Be mindful of that.
+    #
+    # When you call rmq within a controller or view, a new instance of RMQ is created with the selectors you may or may
+    # not have supplied. That instance will determine what view_controller it should use for stuff like traversing, 
+    # stylesheet, etc.
+    #
+    # * rmq method called in a controller: that controller is used
+    #
+    # * rmq method called in a view and that view is within the subview tree of a controller: that controller is used 
+    #
+    #
+    # * rmq method called in a view and that view is NOT within any subview tree of any controller (common in a UITableViewCell 
+    #   for example). In this case it will use the view's controller or the "current controller". Generally
+    #   that is what is desired, however there are some situations where another controller should be used. In that
+    #   situation create your own rmq instance and assign the controller you'd rather use
+    #
+    # * if an rmq instance was created from another rmq instance, it will attempt to the parent_rmq's controller, if it exists
+    #
     # @return [UIViewController] Controller of this rmq instance
     #
     # @example
-    #   rmq.view_controller
+    #   rmq(my_view).view_controller
     def view_controller
-      @_view_controller ||= begin
+      RMQ.weak_ref_to_strong_ref(self.weak_view_controller)
+    end
+
+    # Mostly used internally
+    # See #view_controller
+    def weak_view_controller
+      if @_view_controller
+        @_view_controller
+      else
         if @context.is_a?(UIViewController)
-          WeakRef.new(@context)
-        else
-          if vc = RMQ.controller_for_view(@context)
-            WeakRef.new(vc)
-          end
+          @context
+        else # view
+          vc = RMQ.controller_for_view(@context) ||
+            (self.parent_rmq && self.parent_rmq.weak_view_controller) ||
+            RMQ.app.current_view_controller
+
+          #debug.assert(vc.is_a?(UIViewController), 'Invalid controller in weak_view_controller') do
+            #{
+              #vc: vc, 
+              #context: @context, 
+              #parent_rmq: self.parent_rmq, 
+              #current_view_controller: RMQ.app.current_view_controller
+            #}
+          #end
+
+          self.view_controller = vc
+          @context.rmq_data.view_controller = @_view_controller if @context
+
+          @_view_controller
         end
       end
     end
+    def view_controller=(value)
+      @_view_controller = RubyMotionQuery::RMQ.weak_ref(value)
+    end
+    def weak_view_controller=(value)
+      @_view_controller = value
+    end
 
     # @return [UIView] Root view of this rmq instance's controller
     #
     # @example
     #   rmq.root_view
     def root_view
-      vc = self.view_controller
+      vc = self.weak_view_controller
       if RMQ.is_blank?(vc)
         self.context_or_context_view
       else
-        self.view_controller.view
+        vc.view
       end
     end