ruby_motion_query 0.5.7 → 0.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e5ff3ba1784ba4853de389ef894f7f88133be26
-  data.tar.gz: 3c8c609b0d461f2e381b5a17598eed68548cda93
+  metadata.gz: aa133628d3efe0e1beb494c8ef295c3a7cdab391
+  data.tar.gz: edc16ec2f3ec05282b28ca648ffe3b59ad85c53e
 SHA512:
-  metadata.gz: b66320409149b8836ae9cbb1ef7453b365ffe9961216254a1c21429b5000df8b397d0390160a94f6b5ce0f12f1016e2c802fea0c457e4b03264f2f40dc0fedbb
-  data.tar.gz: cbc448fef154692862a6b52b477bab49a3fa9d270fde94140010089990e1521c847c241187faecf25f7c782ba4aaad87c08ad24c95e85c4b47ab5ed4ebb656a7
+  metadata.gz: 026d4488d133248e345a94ba44ed8f4f288d4bb5dc13e734528dd0d5fc934a82452f0ddf0e8b142560f5328b3f71cd6e85f883ec4af42f9236044ac7b6c842fb
+  data.tar.gz: f19f35abb82757fc11d29e4c39e6ce9a425d5ce44d252f522e5c6db4c495b4420ef58b527dc925b338d015af3cdad5c16b113e32b76b0c242b8f97dd22c7d09a

data/README.md

@@ -100,9 +100,7 @@ for **bleeding edge**, add this to your `Gemfile`:
 
 ## Deprecation
 
-- **RubyMotionQuery::RMQ.weak_ref(object)** - no longer needed post RubyMotion 2.18
 - **UIView#rmq_did_create(self_in_rmq)** - *Use rmq_build instead*
-- **RubyMotionQuery::RMQ.weak_ref_to_strong_ref(object)** - no longer needed post RubyMotion 2.24
 
 <br />
 
@@ -295,11 +293,11 @@ end
 
 ----
 
-* build: takes an existing view, applies the style if it exists, then calls rmq_build method
-* create: creates the view when given the class, or uses an existing view you pass it, then does a [build]
-* append: [create] + appends the view to the end of the subview tree or to then end of the children of a view (if called on an rmq object with that view in it)
-* prepend: Same as [append], but inserts the view to beginning of the subview tree (overall or view's children)
-* insert: Same as [append], but inserts the view at the index of the subview tree (overall or view's children)
+* **build**: takes an existing view, applies the style if it exists, then calls rmq_build method
+* **create**: creates the view when given the class, or uses an existing view you pass it, then does a [build]
+* **append**: [create] + appends the view to the end of the subview tree or to then end of the children of a view (if called on an rmq object with that view in it)
+* **prepend**: Same as [append], but inserts the view to beginning of the subview tree (overall or view's children)
+* **insert**: Same as [append], but inserts the view at the index of the subview tree (overall or view's children)
 
 ```ruby
 rmq.append(UILabel) # Creates a UILabel in the current controller
@@ -327,6 +325,27 @@ rmq.root_view
 rmq.view_controller
 ```
 
+Often when appending a subview, you assign the view to a instance variable, like so:
+
+```ruby
+@name = rmq.append(UILabel, :name).get
+```
+
+The **.get** returns the actual view. Without it you'll get a reference to an rmq instance, which is how
+chaining works.
+
+This is such a common pattern, an RMQ user (https://github.com/shreeve) created append!, which I've included into RMQ.
+The ! version of append or create returns the view directly:
+
+```ruby
+@name = rmq.append!(UILabel, :name)
+# Or the even shorter:
+@name = rmq.append! UILabel, :name
+```
+
+
+
+
 #### Create a view
 If you want to create a view but not add it to the subviews of any other view, you can
 use #create. It's basically #append without the actual appending.
@@ -559,6 +578,10 @@ If you see Event, just remember that's either an event or gesture. I decided to
 :pinch
 :rotate
 :swipe
+:swipe_up
+:swipe_down
+:swipe_left
+:swipe_right
 :pan
 :long_press
 ```
@@ -638,6 +661,16 @@ rmq(my_text_field).focus # or .become_first_responder
 
 ----
 
+The most basic:
+
+```ruby
+rmq.animate do |q|
+  rmq(UIButton).nudge r: 40
+end
+```
+
+Some more options, this time it is animating a selected view:
+
 ```ruby
 rmq(my_view).animate(
   duration: 0.3,
@@ -674,6 +707,8 @@ rmq(selectors).animate(
 
 ----
 
+See animate above.
+
 #### Current animations included:
 
 ```ruby
@@ -684,6 +719,8 @@ rmq(my_view).animations.fade_out(duration: 0.8)
 
 rmq(my_view).animations.blink
 rmq(my_view).animations.throb
+rmq(my_view).animations.sink_and_throb
+rmq(my_view).animations.land_and_sink_and_throb
 rmq(my_view).animations.drop_and_spin
 
 rmq.animations.start_spinner

data/motion/ext.rb

@@ -26,10 +26,6 @@ class UIView
   def rmq_appended
   end
 
-  # I intend for this to be protected
-  # Do not call rmq from outside a view. Because of some weirdness with table cells
-  # and event blocks this has to be public (later I want to figure out why exactly).
-  #
   # 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/animations.rb

@@ -4,8 +4,9 @@ module RubyMotionQuery
     # Animate
     #
     # @return [RMQ]
-    def animate(opts = {})
-      animations_callback = (opts[:animations] || opts[:changes])
+    def animate(opts = {}, &block)
+      
+      animations_callback = (block || opts[:animations] || opts[:changes])
       after_callback = (opts[:completion] || opts[:after])
       return self unless animations_callback
 
@@ -87,15 +88,15 @@ module RubyMotionQuery
 
     # @return [RMQ]
     def throb(opts = {})
-      opts.merge!({
+      opts = {
         duration: 0.4,
         animations: ->(cq) {
           cq.style {|st| st.scale = 1.0}
         }
-      })
+      }.merge(opts)
 
       out = @rmq.animate(
-        duration: 0.1,
+        duration: opts[:duration_out] || 0.1,
         animations: ->(q) {
           q.style {|st| st.scale = 1.1}
         },
@@ -110,15 +111,15 @@ module RubyMotionQuery
 
     # @return [RMQ]
     def sink_and_throb(opts = {})
-      opts.merge!({
+      opts = {
         duration: 0.3,
         animations: ->(cq) {
          cq.animations.throb(duration: 0.6)
         }
-      })
+      }.merge(opts)
 
       out = @rmq.animate(
-        duration: 0.1,
+        duration: opts[:duration_out] || 0.1,
         animations: ->(q) {
           q.style {|st| st.scale = 0.9}
         },
@@ -139,7 +140,7 @@ module RubyMotionQuery
         st.hidden = false
       end
 
-      opts.merge!({
+      opts = {
         duration: 0.5,
         animations: ->(cq) {
           cq.style do |st| 
@@ -152,7 +153,7 @@ module RubyMotionQuery
             last_completion_rmq.animations.throb
           end
         }
-      })
+      }.merge(opts)
 
       @rmq.animate(opts)
     end
@@ -160,7 +161,7 @@ module RubyMotionQuery
     # @return [RMQ]
     def drop_and_spin(opts = {})
       remove_view = opts[:remove_view]
-      opts.merge!({
+      opts = {
         duration: 0.4 + (rand(8) / 10),
         options: UIViewAnimationOptionCurveEaseIn|UIViewAnimationOptionBeginFromCurrentState,
         animations: ->(cq) {
@@ -182,7 +183,7 @@ module RubyMotionQuery
             end
           end
         }
-      })
+      }.merge(opts)
 
       @rmq.animate(opts)
     end

data/motion/ruby_motion_query/color.rb

@@ -6,7 +6,7 @@ module RubyMotionQuery
     end
 
     # @return [Color]
-    def color 
+    def color
       Color
     end
   end
@@ -17,55 +17,55 @@ module RubyMotionQuery
   #   # In a stylesheet, you can just use color. Anywhere else these would be
   #   # rmq.color.clear, etc
   #
-  #   color.clear      
-  #   color.white      
-  #   color.light_gray 
-  #   color.gray       
-  #   color.dark_gray  
-  #   color.black      
-  #               
-  #   color.red        
-  #   color.green      
-  #   color.blue       
-  #   color.yellow     
-  #   color.orange     
-  #   color.purple     
-  #   color.brown      
-  #   color.cyan       
-  #   color.magenta    
-  #               
-  #   color.table_view 
+  #   color.clear
+  #   color.white
+  #   color.light_gray
+  #   color.gray
+  #   color.dark_gray
+  #   color.black
+  #
+  #   color.red
+  #   color.green
+  #   color.blue
+  #   color.yellow
+  #   color.orange
+  #   color.purple
+  #   color.brown
+  #   color.cyan
+  #   color.magenta
+  #
+  #   color.table_view
   #   color.scroll_view
-  #   color.flipside   
-  #   color.under_page 
-  #   color.light_text 
-  #   color.dark_text  
+  #   color.flipside
+  #   color.under_page
+  #   color.light_text
+  #   color.dark_text
   class Color < UIColor
 
     class << self
-      alias :clear         :clearColor                           
-      alias :white         :whiteColor                           
-      alias :light_gray    :lightGrayColor                       
-      alias :gray          :grayColor                            
-      alias :dark_gray     :darkGrayColor                        
-      alias :black         :blackColor                           
-                                                                 
-      alias :red           :redColor                             
-      alias :green         :greenColor                           
-      alias :blue          :blueColor                            
-      alias :yellow        :yellowColor                          
-      alias :orange        :orangeColor                          
-      alias :purple        :purpleColor                          
-      alias :brown         :brownColor                           
-      alias :cyan          :cyanColor                            
-      alias :magenta       :magentaColor                         
-                                                                 
-      alias :table_view    :groupTableViewBackgroundColor        
-      alias :scroll_view   :scrollViewTexturedBackgroundColor    
-      alias :flipside      :viewFlipsideBackgroundColor          
-      alias :under_page    :underPageBackgroundColor             
-      alias :light_text    :lightTextColor                       
-      alias :dark_text     :darkTextColor                        
+      alias :clear         :clearColor
+      alias :white         :whiteColor
+      alias :light_gray    :lightGrayColor
+      alias :gray          :grayColor
+      alias :dark_gray     :darkGrayColor
+      alias :black         :blackColor
+
+      alias :red           :redColor
+      alias :green         :greenColor
+      alias :blue          :blueColor
+      alias :yellow        :yellowColor
+      alias :orange        :orangeColor
+      alias :purple        :purpleColor
+      alias :brown         :brownColor
+      alias :cyan          :cyanColor
+      alias :magenta       :magentaColor
+
+      alias :table_view    :groupTableViewBackgroundColor
+      alias :scroll_view   :scrollViewTexturedBackgroundColor
+      alias :flipside      :viewFlipsideBackgroundColor
+      alias :under_page    :underPageBackgroundColor
+      alias :light_text    :lightTextColor
+      alias :dark_text     :darkTextColor
 
       # Add your own standard color
       #
@@ -96,21 +96,21 @@ module RubyMotionQuery
       #   color.from_hex('#ffffff')
       #   color.from_hex('ffffff')
       def from_hex(hex_color)
-        hex_color = hex_color.gsub("#", "")   
-        case hex_color.size 
+        hex_color = hex_color.gsub("#", "")
+        case hex_color.size
           when 3
             colors = hex_color.scan(%r{[0-9A-Fa-f]}).map{ |el| (el * 2).to_i(16) }
           when 6
-            colors = hex_color.scan(%r<[0-9A-Fa-f]{2}>).map{ |el| el.to_i(16) }        
+            colors = hex_color.scan(%r<[0-9A-Fa-f]{2}>).map{ |el| el.to_i(16) }
           else
             raise ArgumentError
-        end 
+        end
         if colors.size == 3
           from_rgba(colors[0], colors[1], colors[2], 1.0)
         else
           raise ArgumentError
-        end 
-      end 
+        end
+      end
 
       # @return [UIColor]
       #
@@ -134,5 +134,4 @@ module RubyMotionQuery
     end
 
   end
-
 end

data/motion/ruby_motion_query/device.rb

@@ -39,7 +39,8 @@ module RubyMotionQuery
       end
 
       def simulator?
-        @_simulator ||= !(UIDevice.currentDevice.model =~ /simulator/i).nil?
+        @_simulator = !(UIDevice.currentDevice.model =~ /simulator/i).nil? if @_simulator.nil?
+        @_simulator
       end
 
       def four_inch?
@@ -47,7 +48,7 @@ module RubyMotionQuery
         @_four_inch
       end
 
-      def retina?()
+      def retina?
         if @_retina.nil?
           main_screen = Device.screen
           @_retina = !!(main_screen.respondsToSelector('displayLinkWithTarget:selector:') && main_screen.scale == 2.0)

data/motion/ruby_motion_query/event.rb

@@ -52,6 +52,14 @@ module RubyMotionQuery
           o.rotation = opts[:rotation] if opts.include?(:rotation)
           o.scale = opts[:scale] if opts.include?(:scale)
 
+          case event
+            when :swipe_up then o.direction = UISwipeGestureRecognizerDirectionUp
+            when :swipe_down then o.direction = UISwipeGestureRecognizerDirectionDown
+            when :swipe_left then o.direction = UISwipeGestureRecognizerDirectionLeft
+            when :swipe_right then o.direction = UISwipeGestureRecognizerDirectionRight
+          end
+
+
           if opts.include?(:init)
             opts[:init].call(@recognizer)
           end
@@ -127,6 +135,10 @@ module RubyMotionQuery
       pinch: UIPinchGestureRecognizer,
       rotate: UIRotationGestureRecognizer,
       swipe: UISwipeGestureRecognizer,
+      swipe_up: UISwipeGestureRecognizer,
+      swipe_down: UISwipeGestureRecognizer,
+      swipe_left: UISwipeGestureRecognizer,
+      swipe_right: UISwipeGestureRecognizer,
       pan: UIPanGestureRecognizer,
       long_press: UILongPressGestureRecognizer
     }

data/motion/ruby_motion_query/events.rb

@@ -45,6 +45,10 @@ module RubyMotionQuery
     #  :pinch
     #  :rotate
     #  :swipe
+    #  :swipe_up
+    #  :swipe_down
+    #  :swipe_left
+    #  :swipe_right
     #  :pan
     #  :long_press
 

data/motion/ruby_motion_query/position.rb

@@ -7,7 +7,7 @@ module RubyMotionQuery
     #   rmq(my_view).resize(h: 10, w: 100)
     #
     # @return [RMQ]
-    def layout(opts) 
+    def layout(opts)
       # TODO, add centered and from_bottom and from_top, and bottom and top
       # TODO, add animate option
       left = opts[:left] || opts[:l] || opts[:x]
@@ -28,7 +28,7 @@ module RubyMotionQuery
     alias :resize :layout
 
     # @return [RMQ]
-    def nudge(opts) 
+    def nudge(opts)
       left = opts[:left] || opts[:l] || 0
       right = opts[:right] || opts[:r] || 0
       up = opts[:up] || opts[:u] || 0
@@ -61,7 +61,12 @@ module RubyMotionQuery
 
       selected.each_with_index do |view, i|
         st = self.styler_for(view)
-        next if st.height == 0
+
+        if type == :vertical
+          next if st.height == 0
+        else
+          next if st.width == 0
+        end
 
         view_margin = if (margins && margins[i])
           margins[i]
@@ -69,16 +74,15 @@ module RubyMotionQuery
           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
+        if type == :vertical
+          current_end = (st.top - view_margin) unless current_end
           st.top = current_end + view_margin
           current_end = st.bottom
+        else
+          current_end = (st.left - view_margin) unless current_end
+          st.left = current_end + view_margin
+          current_end = st.right
         end
-        
       end
 
       self

data/motion/ruby_motion_query/stylers/ui_button_styler.rb

@@ -45,6 +45,19 @@ module RubyMotionQuery
         @view.setBackgroundImage value, forState: UIControlStateHighlighted
       end
 
+      # Accepts UIEdgeInsetMake OR and array of values to be the inset.
+      # st.title_edge_insets = UIEdgeInsetsMake(0, 10.0, 0, 0)
+      # OR
+      # st.title_edge_insets = [0, 10.0, 0, 0]
+      def title_edge_insets=(value)
+        inset = UIEdgeInsetsMake(value[0], value[1], value[2], value[3]) if value.is_a? Array
+        @view.setTitleEdgeInsets(inset)
+      end
+
+      def title_edge_insets
+        @view.titleEdgeInsets
+      end
+
     end
   end
 end

data/motion/ruby_motion_query/stylers/ui_view_styler.rb

@@ -75,6 +75,17 @@ module RubyMotionQuery
         @view.frame
       end
 
+      # Sets the frame using the Window's coordinates
+      def absolute_frame=(value)
+        self.frame = value
+
+        f = @view.frame
+        window_point = @view.convertPoint(f.origin, fromView: nil)
+        f.origin.x += window_point.x
+        f.origin.y += window_point.y
+        @view.frame = f
+      end
+
       def padded=(value)
         if value.is_a?(Hash)
           h = value

data/motion/ruby_motion_query/subviews.rb

@@ -2,12 +2,20 @@
 module RubyMotionQuery
   class RMQ
 
+    # Removes the selected views from their parent's (superview) subview array
+    #
+    # @example
+    #   rmq(a_view, another_view).remove
+    #
     # @return [RMQ]
     def remove
       selected.each { |view| view.removeFromSuperview }
       self
     end
 
+    # This is used by build, create, and append. You really shouldn't use it
+    # directly. Although it's totally fine if you do
+    #
     # @return [RMQ]
     def add_subview(view_or_constant, opts={})
       subviews_added = []
@@ -41,28 +49,60 @@ module RubyMotionQuery
           appended = true
         end
 
-        if self.stylesheet
-          apply_style_to_view(new_view, style) if style
-        end
-
         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
+
+        if self.stylesheet
+          apply_style_to_view(new_view, style) if style
+        end
       end
 
       RMQ.create_with_array_and_selectors(subviews_added, selectors, @context, self)
     end
     alias :insert :add_subview
 
+    # Performs a create, then appends view to the end of the subview array of the 
+    # views you have selected (or the rootview if you have nothing selected).
+    #
+    # When you build, create, or append a view, the method rmq_build is called
+    # inside the view. If you are creating a your own subclass of a UIView, then
+    # that is a good place to do your initialization. Your view is created, then 
+    # appended, then rmq_build is called, then the style is applied (if it exists)
+    #
+    # @example 
+    #   # Creating a new view instance then append it. Passing in the class 
+    #   # to create
+    #   rmq.append(UIButton, :my_button_style)
+    #   @title = rmq.append(ULabel, :title).get
+    #
+    #   # You can also pass in an existing view
+    #   my_view = UIView.alloc.initWithFrame([[0,0],[10,10]])
+    #   rmq.append(my_view, :my_style)
+    # 
+    #   # Stylename is optional
+    #   rmq.append(UIImageView)
+    #
     # @return [RMQ]
     def append(view_or_constant, style=nil, opts = {})
       opts[:style] = style
       add_subview(view_or_constant, opts)
     end
 
+    # Same as append, but instantly returns the view, without having to use .get
+    #
+    # @example
+    #   @my_button = rmq.append! UIButton
+    #   @my_label = rmq.append!(UILabel, :my_label)
+    def append!(view_or_constant, style=nil, opts = {})
+      append(view_or_constant, style, opts).get
+    end
+
+    # Just like append, but inserts the view at index 0 of the subview array
+    #
     # @return [RMQ]
     def unshift(view_or_constant, style=nil, opts = {})
       opts[:at_index] = 0
@@ -71,9 +111,20 @@ module RubyMotionQuery
     end
     alias :prepend :unshift
 
+    # Same as prepend, but instantly returns the view, without having to use .get
+    #
+    # @example
+    #   @my_button = rmq.prepend! UIButton
+    #   @my_label = rmq.prepend!(UILabel, :my_label)
+    def unshift!(view_or_constant, style=nil, opts = {})
+      unshift(view_or_constant, style, opts).get
+    end
+    alias :prepend! :unshift!
+
     # Creates a view then returns an rmq with that view in it. It does not add that 
-    # view to the view tree. This is useful for stuff like creating table cells. You
-    # can use the rmq_did_create method, just like you do when you append a subview
+    # view to the view tree (append does this). This is useful for stuff like creating
+    # table cells. You can use the rmq_did_create method, just like you do when you 
+    # append a subview
     #
     # @return [RMQ] wrapping the view that was just create
     #
@@ -97,6 +148,14 @@ module RubyMotionQuery
       add_subview view_or_constant, opts
     end
 
+    # Same as create, but instantly returns the view, without having to use .get
+    #
+    # @example
+    #   @my_button = rmq.create! UIButton
+    def create!(view_or_constant, style=nil, opts = {})
+      create(view_or_constant, style, opts).get
+    end
+
     # Build a view, similar to create and append, but only inits an existing view. Usefull
     # in collectionview cells for example
     #

data/motion/ruby_motion_query/utils.rb

@@ -50,41 +50,38 @@ module RubyMotionQuery
         end
       end
 
-      # @deprecated this is no longer needed in RubyMotion >= 2.19. In a later version this will be
-      # changed to simply be a wrapper of RubyMotion's WeakRef
-      #
-      #
       # Creates a weak reference to an object. Unlike WeakRef.new provided by RubyMotion, this will
       # not wrap a weak ref inside another weak ref (which causes bugs).
       #
-      # This is fairly performant. It's about twice as slow as WeakRef.new. However, you can
-      # create a million weak refs in about 651 miliseconds, compared to 319 for WeakRef.new
-      #
       # Creating a WeakRef with a literal like a string will cause your app to crash
       # instantly, it's fun, try it. Only create weak refs of variables
       #
       # @example
       # foo = RubyMotionQuery::RMQ.weak_ref(bar)
       def weak_ref(o)
-        weak = WeakRef.new(weak_ref_to_strong_ref(o))
-        #WeakRef.new(o) # For future release
+        if is_object_weak_ref?(o)
+          o
+        else
+          WeakRef.new(o)
+        end
+      end
+
+      # Gets a strong reference from a weak reference
+      def weak_ref_to_strong_ref(weak_ref)
+        weak_ref.tap{} # This is a hack but it works, is there a better way?
+      end
+
+      # Is an object a weak_ref
+      def is_object_weak_ref?(o)
+        o.respond_to?(:weakref_alive?) # This is the only way to do this currently
       end
 
       # @deprecated this has been fixed in RubyMotion 2.17, so this method is no longer needed.
-      #
-      # This gets around a bug in RubyMotion
-      # Hopefully I can remove this quickly. Only use this for complex objects that have no comparison
-      # other than that they are the exact same object. For example, strings compare their contents.
       def weak_ref_is_same_object?(a, b)
-        (a.class == b.class) && (a.object_id == b.object_id)
-        #a == b # For future release
-      end
+        # This was the workaround that isn't needed anymore, for your reference:
+        #(a.class == b.class) && (a.object_id == b.object_id)
 
-      # @deprecated, this has been fixed in RubyMotion 2.24, so this method is no longer needed.
-      # Gets a strong reference from a weak reference
-      def weak_ref_to_strong_ref(weak_ref)
-        # This is a hack but it works, is there a better way?
-        weak_ref.tap{}
+        a == b
       end
 
       # Mainly used for console and logging

data/motion/ruby_motion_query/version.rb

@@ -1,5 +1,5 @@
 module RubyMotionQuery
-  VERSION = "0.5.7"
+  VERSION = "0.5.8"
 
   class RMQ
     def version

data/templates/collection_view_controller/app/controllers/name_controller.rb

@@ -7,9 +7,9 @@ class <%= @name_camel_case %>Controller < UICollectionViewController
   #  @window.rootViewController = UINavigationController.alloc.initWithRootViewController(main_controller)
 
   <%= @name.upcase %>_CELL_ID = "<%= @name_camel_case %>Cell"
-  
+
   def self.new(args = {})
-    # Set layout 
+    # Set layout
     layout = UICollectionViewFlowLayout.alloc.init
     self.alloc.initWithCollectionViewLayout(layout)
   end
@@ -42,11 +42,11 @@ class <%= @name_camel_case %>Controller < UICollectionViewController
   def numberOfSectionsInCollectionView(view)
     1
   end
- 
+
   def collectionView(view, numberOfItemsInSection: section)
-    200 
+    200
   end
-    
+
   def collectionView(view, cellForItemAtIndexPath: index_path)
     view.dequeueReusableCellWithReuseIdentifier(<%= @name.upcase %>_CELL_ID, forIndexPath: index_path).tap do |cell|
       rmq.build(cell) unless cell.reused
@@ -64,8 +64,8 @@ end
 
 __END__
 
-# You don't have to reapply styles to all UIViews, if you want to optimize, 
-# another way to do it is tag the views you need to restyle in your stylesheet, 
+# You don't have to reapply styles to all UIViews, if you want to optimize,
+# another way to do it is tag the views you need to restyle in your stylesheet,
 # then only reapply the tagged views, like so:
 def logo(st)
   st.frame = {t: 10, w: 200, h: 96}

data/templates/collection_view_controller/app/stylesheets/name_controller_stylesheet.rb

@@ -17,9 +17,9 @@ class <%= @name_camel_case %>ControllerStylesheet < ApplicationStylesheet
       cl.itemSize = [cell_size[:w], cell_size[:h]]
       #cl.scrollDirection = UICollectionViewScrollDirectionHorizontal
       #cl.headerReferenceSize = [cell_size[:w], cell_size[:h]]
-      cl.minimumInteritemSpacing = @margin 
-      cl.minimumLineSpacing = @margin 
-      #cl.sectionInsert = [0,0,0,0]
+      cl.minimumInteritemSpacing = @margin
+      cl.minimumLineSpacing = @margin
+      #cl.sectionInset = [0,0,0,0]
     end
   end
 end

data/templates/collection_view_controller/app/views/name_cell.rb

@@ -1,13 +1,12 @@
-class <%= @name_camel_case %>Cell < UICollectionViewCell 
+class <%= @name_camel_case %>Cell < UICollectionViewCell
   attr_reader :reused
 
   def rmq_build
     rmq(self).apply_style :<%= @name %>_cell
 
-    rmq(self.contentView).tap do |q|
-      # Add your subviews, init stuff here
-      # @foo = q.append(UILabel, :foo).get
-    end
+    q = rmq(self.contentView)
+    # Add your subviews, init stuff here
+    # @foo = q.append(UILabel, :foo).get
   end
 
   def prepareForReuse

data/templates/controller/app/controllers/name_controller.rb

@@ -23,8 +23,8 @@ end
 
 __END__
 
-# You don't have to reapply styles to all UIViews, if you want to optimize, 
-# another way to do it is tag the views you need to restyle in your stylesheet, 
+# You don't have to reapply styles to all UIViews, if you want to optimize,
+# another way to do it is tag the views you need to restyle in your stylesheet,
 # then only reapply the tagged views, like so:
 def logo(st)
   st.frame = {t: 10, w: 200, h: 96}

data/templates/table_view_controller/app/views/name_cell.rb

@@ -1,12 +1,12 @@
-class <%= @name_camel_case %>Cell < UITableViewCell 
+class <%= @name_camel_case %>Cell < UITableViewCell
 
   def rmq_build
     q = rmq(self.contentView)
 
     # Add your subviews, init stuff here
     # @foo = q.append(UILabel, :foo).get
-    
-    # Or use the built-in table cell controls, if you don't use 
+
+    # Or use the built-in table cell controls, if you don't use
     # these, they won't exist at runtime
     # q.build(self.imageView, :cell_image)
     # q.build(self.detailTextLabel, :cell_label_detail)

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

@@ -1,23 +1,24 @@
 class <%= @name_camel_case %> < UIView
 
   def rmq_build
-
-    rmq.apply_style :<%= @name %>
+    q = rmq(self)
+    q.apply_style :<%= @name %>
 
     # Add subviews here, like so:
-    #rmq.append(UILabel, :some_label)
-
+    # q.append(UILabel, :some_label)
+    # -or-
+    # @submit_button = q.append(UIButon, :submit).get
   end
 
 end
 
 
-# To style this view include its stylesheet at the top of each controller's 
+# To style this view include its stylesheet at the top of each controller's
 # stylesheet that is going to use it:
-#   class SomeStylesheet < ApplicationStylesheet 
+#   class SomeStylesheet < ApplicationStylesheet
 #     include <%= @name_camel_case %>Stylesheet
 
 # Another option is to use your controller's stylesheet to style this view. This
-# works well if only one controller uses it. If you do that, delete the 
+# works well if only one controller uses it. If you do that, delete the
 # view's stylesheet with:
 #   rm app/stylesheets/views/<%= @name %>.rb

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_motion_query
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.8
 platform: ruby
 authors:
 - Todd Werth
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-26 00:00:00.000000000 Z
+date: 2014-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bacon