ruby_motion_query 0.3.0 → 0.3.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWQyYzBmYzcxMmJhZDQwMGYzZDU1ZWFiYWRjNDBlMmM1YTU4YjY5Ng==
+    YWNlNGE2M2YwYzFkYTMyZTFmZDNkN2MwMGQ3NjM3YWFlNzc1M2VlMQ==
   data.tar.gz: !binary |-
-    YjA0YzdiMDkwN2YzOWY1NDAwMDNlNzIwMzQxYTA1Njc3ZmY1NTBiZA==
+    YmUwYjFlZGU4ODlkMDIzMzUwOTc0ZTYyMjg0ODQxNmYwOTg4ZjMzMA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZThjYTAzM2U3ZGExYzBkY2I2NmZmY2NiZDRjYjc5MjZmNzVhY2Y1Mzg5MGQ1
-    ZTU3MmY5OTkzMTQ5YjQzYmRmNzQ0MzI2MTQxZWRlYmYyNzljNzViN2Q3YWE3
-    MjIyODE5YTg3NTllMTYzN2E5ZjA4ZTNlYjVjZmUwZjgwNzE2MGE=
+    NjBhZGY2ZjMwZTI5M2M5MWI5NDc3NWY0YjdjOTkzN2Y0YmY0N2JiN2M3ZGI0
+    NGFiNzNjZTQ0OGEzZDQ4OWQ3ZTQ5MzNmMTIxYzE0ODhjMzdkYjVmMzAyMzIx
+    MTQ5NjAwZjI3ODZhY2NjNmUxYTcxODdkZGQwOGUxMWY1MWE4MDA=
   data.tar.gz: !binary |-
-    ZjU3MWUzYzFiZDFmYzkzYTA2ZjViYTQ2OTVkZTdjNDQ5NWY2NTBhNTcyODAy
-    MGM0MzE4ODI5ZjkxNDcyNzdiYzJiZDZiZDRmZjIyMzY1ZWVkMzAwMjdjYmMz
-    ZWYxZTM4M2VkODA2Mzk4OWQyNTY4NTA4ZjdmODNkZmI3NTA1ZGI=
+    MjQxYjUwNDFlYzJiNWJkNDE5OGYyZDE2ZTdiMmViYjkyN2NkZmRlOTQ3Mzcz
+    ZGM1N2VkNDc5MTJhYzAyYjM2NjAyYTZiZDE5ZjUzODRlMTNiM2Y5NWEyOTY3
+    YTc2MDIzODE0MGEyZGM2ZDNmMDZjYWI5N2FlMTk2YTQ5ZjI3MmU=

data/README.md

@@ -39,6 +39,12 @@ RMQ **doesn't require any** other wrapper or gem.
 
 Some of the code in RMQ came from BubbleWrap and Sugarcube. Not too much but some did. I thank you BubbleWrap and Sugarcube teams for your work.
 
+## Quick Start
+- `gem install ruby_motion_query`
+- `rmq create my_app`
+- `cd my_app`
+- `bundle`
+- `rake retina=4`
 
 ## Installation
 
@@ -287,9 +293,15 @@ The internal store of events in a UIView. It's rmq.events, you won't use it too
 ```ruby
 # Add tags
 rmq(my_view).tag(:your_tag)
+rmq(my_view).clear_tags.tag(:your_new_tag)
 
 rmq(my_view).find(UILabel).tag(:selected, :customer)
 
+# You can optionally store a value in the tag, which can be super useful in some rare situations
+rmq(my_view).tag(your_tag: 22)
+rmq(my_view).tag(your_tag: 22, your_other_tag: 'Hello world')
+
+
 # You can use a tag or tags as selecors
 rmq(:selected).hide
 rmq(:your_tag).and(:selected).hide
@@ -306,7 +318,7 @@ rmq(my_view).toggle_enabled
 rmq(my_text_field).focus # or .become_first_responder
 ```
 
-### Subviews
+### Subviews - appending, creating, etc
 
 ```ruby
 rmq.append(UILabel) # Creates a UILabel in the current controller
@@ -334,6 +346,27 @@ rmq.root_view
 rmq.view_controller
 ```
 
+#### 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. 
+This is very handy for stuff like table cells:
+
+```ruby
+# In your controller that is a delegate for a UITableView
+def tableView(table_view, cellForRowAtIndexPath: index_path)
+  cell = tableView.dequeueReusableCellWithIdentifier(CELL_IDENTIFIER) || begin 
+    rmq.create(StoreCell, :store_cell)
+  end
+end
+
+# Your cell
+class StoreCell < UITableViewCell 
+  def rmq_did_create(self_in_rmq)
+    self_in_rmq.append(UILabel, :title_label) # <- this works even though this object isn't in a controller
+  end
+end
+```
+
 ### Animate
 
 ```ruby

data/bin/rmq

@@ -0,0 +1,37 @@
+#!/usr/bin/env ruby
+
+unless ARGV.length > 0
+  puts 'RMQ - Invalid command, do something like this: rmq create my_new_app'
+  exit
+end
+
+
+action = ARGV[0]
+value = ARGV[1]
+
+case action
+when 'create'
+  `motion create --template=git@github.com:infinitered/rmq-template.git #{value}`
+
+  puts %{
+Complete. Things you should do:
+> cd #{value}
+> bundle
+> rake spec
+> rake
+(main)> exit
+
+Then try these:
+> rake retina=3.5
+> rake retina=4 
+> rake device_family=ipad 
+> rake device }
+
+when 'api'
+  `open http://rdoc.info/github/infinitered/rmq`
+when 'docs'
+  `open http://infinitered.com/rmq`
+else
+  puts 'RMQ - Invalid action'
+
+end

data/motion/ext.rb

@@ -4,12 +4,14 @@ class UIView
   end
 
   # Override in your view if you want to setup subviews after your view has 
-  # been created by rmq, usually through an #append
+  # been created by rmq, usually through an #append or #create
+  #
+  # @param [RMQ] rmq that created your view
   #
   # In your view
   # @example
-  #   def rmq_did_create
-  #     rmq(self).tap do |q|
+  #   def rmq_did_create(self_in_rmq)
+  #     self_in_rmq.tap do |q|
   #       q.append(UILabel, :section_title)
   #       q.append(UIButton, :buy_button).on(:tap) do |sender|
   #         # do  something
@@ -24,11 +26,16 @@ class UIView
   # In this example an instance of YourView is created, :your_style is applied
   # then rmq_did_create is called on the instance that was just created. In that
   # order.
-  def rmq_did_create
+  def rmq_did_create(self_in_rmq)
   end
 
-  protected
-
+  # 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
   def rmq(*selectors)
     RubyMotionQuery::RMQ.create_with_selectors(selectors, self)
   end
@@ -39,7 +46,7 @@ class UIViewController
     if RubyMotionQuery::RMQ.cache_controller_rmqs && selectors.length == 0
       rmq_data.rmq ||= RubyMotionQuery::RMQ.create_with_selectors(selectors, self)
     else
-      RubyMotionQuery::RMQ.create_with_selectors(selectors, self)
+      RubyMotionQuery::RMQ.create_with_selectors(selectors, self, rmq_data.rmq)
     end
   end
 

data/motion/ruby_motion_query/base.rb

@@ -16,7 +16,7 @@ module RubyMotionQuery
   #   controller that the view is currently in or to the current screen's
   #   controller
   class RMQ
-    attr_accessor :context, :parent_rmq
+    attr_accessor :context
 
     def initialize
       @selected_dirty = true
@@ -61,12 +61,44 @@ module RubyMotionQuery
       @_selected
     end
 
+    # Wraps 1 or more views in an rmq instance.
+    #
+    # 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
+    #
+    # @example
+    #   q = RubyMotionQuery::RMQ.new
+    #
+    #   # Bad
+    #   q(my_view).view_controller 
+    #
+    #   # Good
+    #   q.wrap(my_view).view_controller
+    def wrap(*views)
+      views.flatten!
+      views.select!{ |v| v.is_a?(UIView) }
+      RMQ.create_with_array_and_selectors(views, views, views.first, self)
+    end
+
+
+    # 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
+      @_parent_rmq
+    end
+    def parent_rmq=(value)
+      @_parent_rmq = value
+    end
+
     # The view(s) this rmq was derived from
     #
     # @return [Array]
     def origin_views
-      if @parent_rmq
-        @parent_rmq.selected
+      if pq = self.parent_rmq
+        pq.selected
       else
         [self.view_controller.view]
       end

data/motion/ruby_motion_query/color.rb

@@ -96,7 +96,7 @@ module RubyMotionQuery
       #   color.from_hex('#ffffff')
       #   color.from_hex('ffffff')
       def from_hex(hex_color)
-        hex_color.gsub!("#", "")   
+        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) }

data/motion/ruby_motion_query/data.rb

@@ -17,8 +17,18 @@ module RubyMotionQuery
     #   rmq(my_view).tag(:foo)
     def tag(*tag_or_tags)
       tag_or_tags.flatten!
-      tag_or_tags.each do |tag_name|
-        tags[tag_name] = 1
+      tag_or_tags = tag_or_tags.first if tag_or_tags.length == 1
+
+      if tag_or_tags.is_a?(Array)
+        tag_or_tags.each do |tag_name|
+          tags[tag_name] = 1
+        end
+      elsif tag_or_tags.is_a?(Hash)
+        tag_or_tags.each do |tag_name, tag_value|
+          tags[tag_name] = tag_value 
+        end
+      elsif tag_or_tags.is_a?(Symbol)
+        tags[tag_or_tags] = 1
       end
     end
 

data/motion/ruby_motion_query/factory.rb

@@ -15,18 +15,20 @@ module RubyMotionQuery
     class << self
 
       # @return [RMQ]
-      def create_with_selectors(selectors, context)
+      def create_with_selectors(selectors, context, parent_rmq = nil)
         RMQ.new.tap do |o|
           o.context = context
+          o.parent_rmq = parent_rmq
           o.selectors = selectors
         end
       end
 
       # @return [RMQ]
-      def create_with_array_and_selectors(array, selectors, context)
+      def create_with_array_and_selectors(array, selectors, context, parent_rmq = nil) # TODO, convert to opts
         RMQ.new.tap do |o|
           o.context = context
           o.selectors = selectors
+          o.parent_rmq = parent_rmq
           o.selected = array # Must be last
         end
       end

data/motion/ruby_motion_query/stylers/ui_button_styler.rb

@@ -19,6 +19,13 @@ module RubyMotionQuery
         @view.titleColor
       end
 
+      def tint_color=(value)
+        @view.tintColor = value
+      end
+      def tint_color
+        @view.tintColor
+      end
+
       def image_normal=(value)
         @view.setImage value, forState: UIControlStateNormal
       end
@@ -27,6 +34,14 @@ module RubyMotionQuery
         @view.setImage value, forState: UIControlStateHighlighted
       end
 
+      def background_image_normal=(value)
+        @view.setBackgroundImage value, forState: UIControlStateNormal
+      end
+
+      def background_image_highlighted=(value)
+        @view.setBackgroundImage value, forState: UIControlStateHighlighted
+      end
+
     end
   end
 end

data/motion/ruby_motion_query/stylers/ui_view_styler.rb

@@ -30,26 +30,24 @@ module RubyMotionQuery
 
       def frame=(value)
         if value == :full # Thanks teacup for the name
-          value = self.superview.bounds
+          @view.frame = self.superview.bounds
         elsif value.is_a?(Hash)
+          f = @view.frame
           h = value
-          h[:l] ||= (h[:left] || 0)
-          h[:t] ||= (h[:top] || 0)
-          h[:w] ||= (h[:width] || 0)
-          h[:h] ||= (h[:height] || 0)
 
-          value = [[h[:l], h[:t]], [h[:w], h[:h]]]
-        end
+          f.origin.x = h[:l] || h[:left] || f.origin.x
+          f.origin.y = h[:t] || h[:top] || f.origin.y
+          f.size.width = h[:w] || h[:width] || f.size.width
+          f.size.height =h[:h] || h[:height] || f.size.height
 
-        @view.frame = value
+          @view.frame = f
+        end
       end
       def frame
         @view.frame
       end
 
       def padded=(value)
-        #st.padded = {l: 10, t: 10, b:10, r: 10}
-
         if value.is_a?(Hash)
           h = value
           h[:l] ||= (h[:left] || 0)
@@ -68,7 +66,6 @@ module RubyMotionQuery
 
           @view.frame = value
         end
-
       end
 
       def left=(value)

data/motion/ruby_motion_query/stylesheet.rb

@@ -7,14 +7,20 @@ module RubyMotionQuery
       unless value.is_a?(RubyMotionQuery::Stylesheet)
         value = value.new(controller)
       end
+      @_stylesheet = value
       controller.rmq_data.stylesheet = value
       self
     end
 
-    # @return [String]
+    # @return [RubyMotionQuery::Stylesheet]
     def stylesheet
       @_stylesheet ||= begin
-        self.view_controller.rmq_data.stylesheet if self.view_controller
+
+        if self.view_controller && (ss = self.view_controller.rmq_data.stylesheet)
+          ss
+        elsif (prmq = self.parent_rmq) && prmq.stylesheet
+          prmq.stylesheet
+        end
       end
     end
 

data/motion/ruby_motion_query/subviews.rb

@@ -24,22 +24,25 @@ module RubyMotionQuery
         end
 
         subviews_added << new_view
-        if at_index = opts[:at_index]
-          selected_view.insertSubview(new_view, atIndex: at_index)
-        elsif below_view = opts[:below_view]
-          selected_view.insertSubview(new_view, belowSubview: below_view)
-        else
-          selected_view.addSubview(new_view)
+
+        unless opts[:do_not_add]
+          if at_index = opts[:at_index]
+            selected_view.insertSubview(new_view, atIndex: at_index)
+          elsif below_view = opts[:below_view]
+            selected_view.insertSubview(new_view, belowSubview: below_view)
+          else
+            selected_view.addSubview(new_view)
+          end
         end
 
         if self.stylesheet
           apply_style_to_view(new_view, style) if style
         end
 
-        new_view.rmq_did_create if created
+        new_view.rmq_did_create(self.wrap(new_view)) if created
       end
 
-      RMQ.create_with_array_and_selectors(subviews_added, selectors, @context)
+      RMQ.create_with_array_and_selectors(subviews_added, selectors, @context, self)
     end
     alias :insert :add_subview
 
@@ -54,6 +57,30 @@ module RubyMotionQuery
     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
+    #
+    # @return [RMQ] wrapping the view that was just create
+    #
+    # @example
+    #   def tableView(table_view, cellForRowAtIndexPath: index_path)
+    #     cell = tableView.dequeueReusableCellWithIdentifier(CELL_IDENTIFIER) || begin 
+    #       rmq.create(StoreCell, :store_cell)
+    #     end
+    #   end
+    #
+    #   class StoreCell < UITableViewCell 
+    #     def rmq_did_create(self_in_rmq)
+    #       self_in_rmq.append(UILabel, :title_label)
+    #     end
+    #   end
+    #
+    def create(view_or_constant, style = nil)
+      # TODO, refactor so that add_subview uses create, not backwards like it is now
+      add_subview view_or_constant, style: style, do_not_add: true
+    end
+
     protected
 
     def create_view(klass)

data/motion/ruby_motion_query/tags.rb

@@ -1,6 +1,17 @@
 module RubyMotionQuery
   class RMQ
 
+    # Add tags
+    # @example
+    #    rmq(my_view).tag(:your_tag)
+    #    rmq(my_view).clear_tags.tag(:your_new_tag)
+    #    rmq(my_view).find(UILabel).tag(:selected, :customer)
+    #
+    # You can optionally store a value in the tag, which can be super useful in some rare situations
+    # @example
+    #    rmq(my_view).tag(your_tag: 22)
+    #    rmq(my_view).tag(your_tag: 22, your_other_tag: 'Hello world')
+    #
     # @return [RMQ]
     def tag(*tag_or_tags)
       selected.each do |view|
@@ -9,7 +20,15 @@ module RubyMotionQuery
       self
     end
 
-    # See /lib/data.rb for the rest of the tag stuff
+    # @return [RMQ]
+    def clear_tags
+      selected.each do |view|
+        view.rmq_data.tags.clear
+      end
+      self
+    end
+
+    # See /motion/data.rb for the rest of the tag stuff
 
   end
 end

data/motion/ruby_motion_query/traverse.rb

@@ -27,9 +27,7 @@ module RubyMotionQuery
       if opts[:return_array]
         out
       else
-        rmq = RMQ.create_with_array_and_selectors(out, selectors, @context)
-        rmq.parent_rmq = self
-        rmq
+        RMQ.create_with_array_and_selectors(out, selectors, @context, self)
       end
     end
 
@@ -77,11 +75,11 @@ module RubyMotionQuery
     # @example
     #   rmq(my_view).children.and_self
     def and_self
-      if @parent_rmq
-        out = @parent_rmq.selected.dup
+      if self.parent_rmq
+        out = self.parent_rmq.selected.dup
         out << selected
         out.flatten!
-        RMQ.create_with_array_and_selectors(out, selectors, @context)
+        RMQ.create_with_array_and_selectors(out, selectors, @context, self)
       else
         self
       end
@@ -93,7 +91,7 @@ module RubyMotionQuery
     # @example
     #   rmq(test_view).find(UIImageView).tag(:foo).end.find(UILabel).tag(:bar)
     def end
-      @parent_rmq || self
+      self.parent_rmq || self
     end
 
     # @return [RMQ] rmq instance selecting the parent of the selected view(s)
@@ -253,9 +251,11 @@ module RubyMotionQuery
     def view_controller
       @_view_controller ||= begin
         if @context.is_a?(UIViewController)
-          @context
+          WeakRef.new(@context)
         else
-          RMQ.controller_for_view(@context)
+          if vc = RMQ.controller_for_view(@context)
+            WeakRef.new(vc)
+          end
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_motion_query
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.5
 platform: ruby
 authors:
 - Todd Werth
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-20 00:00:00.000000000 Z
+date: 2013-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bacon
@@ -39,10 +39,11 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: RubyMotionQuery - RMQ - A light, nonpolluting, jQuery-like library for
-  RubyMotion
+description: RubyMotionQuery - RMQ - A fast, non-magical, non-polluting, jQuery-like
+  library for RubyMotion
 email: todd@infinitered.com
-executables: []
+executables:
+- rmq
 extensions: []
 extra_rdoc_files: []
 files:
@@ -90,6 +91,7 @@ files:
 - motion/ruby_motion_query/tags.rb
 - motion/ruby_motion_query/traverse.rb
 - motion/ruby_motion_query/utils.rb
+- bin/rmq
 homepage: http://infinitered.com/rmq
 licenses:
 - MIT