ruby_motion_query 0.4.1 → 0.5.0

data/motion/ruby_motion_query/utils.rb

@@ -1,12 +1,11 @@
 module RubyMotionQuery
   class RMQ
-
     class << self
       # @return [Boolean]
       def is_class?(o)
         # This line fails in spec, causes exit without message. It works fine in production
         #(o.class == Class) && (defined?(o) == 'constant')
-        
+
         # So I'm doing this instead
         !!(o.respond_to?(:name) && o.name.to_s[0] =~ /[A-Z]/)
       end
@@ -24,19 +23,63 @@ module RubyMotionQuery
       end
 
       # @param view
-      # @return [UIViewController] The controller the view it is sitting in, or nil if it's not sitting anywhere in particular 
+      # @return [UIViewController] The controller the view it is sitting in, or nil if it's not sitting anywhere in particular
       def controller_for_view(view)
-        # Non-recursive for speed
-        while view
-          view = view.nextResponder
-          if view.is_a?(UIViewController)
-            break
-          elsif !view.is_a?(UIView)
-            view = nil
+        #debug.assert(view.nil? || view.is_a?(UIView), 'Invalid view in controller for view', {view: view})
+
+        if view && (vc = view.rmq_data.view_controller)
+          vc
+        else
+          # Non-recursive for speed
+          while view
+            view = view.nextResponder
+            if view.is_a?(UIViewController)
+              break
+            elsif view.is_a?(UIView)
+              if vc = view.rmq_data.view_controller
+                view = vc
+                break
+              end
+            else
+              view = nil
+            end
           end
+
+          view
+
         end
+      end
+
+      # @deprecated this has been fixed in 2.17, so this method is no longer needed.
+      #
+      # 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))
+      end
+
+      # @deprecated this has been fixed in 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)
+      end
 
-        view
+      # 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{}
       end
 
       # Mainly used for console and logging

data/motion/ruby_motion_query/version.rb

@@ -1,3 +1,9 @@
 module RubyMotionQuery
-  VERSION = "0.4.1"
+  VERSION = "0.5.0"
+
+  class RMQ
+    def version
+      RubyMotionQuery::VERSION
+    end
+  end
 end

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

@@ -49,7 +49,7 @@ class <%= @name_camel_case %>Controller < UICollectionViewController
     
   def collectionView(view, cellForItemAtIndexPath: index_path)
     view.dequeueReusableCellWithReuseIdentifier(<%= @name.upcase %>_CELL_ID, forIndexPath: index_path).tap do |cell|
-      cell.setup_with(rmq)
+      rmq.build(cell) unless cell.reused
 
       # Update cell's data here
     end

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

@@ -1,6 +1,6 @@
 module <%= @name_camel_case %>CellStylesheet
   def cell_size
-    [96, 96]
+    {w: 96, h: 96}
   end
 
   def <%= @name %>_cell(st)

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

@@ -14,12 +14,11 @@ class <%= @name_camel_case %>ControllerStylesheet < ApplicationStylesheet
     st.background_color = color.white
 
     st.view.collectionViewLayout.tap do |cl|
-      cl.itemSize = cell_size
+      cl.itemSize = [cell_size[:w], cell_size[:h]]
       #cl.scrollDirection = UICollectionViewScrollDirectionHorizontal
-      #cl.headerReferenceSize = cell_size
+      #cl.headerReferenceSize = [cell_size[:w], cell_size[:h]]
       cl.minimumInteritemSpacing = @margin 
       cl.minimumLineSpacing = @margin 
-      #cl.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight,
       #cl.sectionInsert = [0,0,0,0]
     end
   end

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

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

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

@@ -1,4 +1,6 @@
 class <%= @name_camel_case %>ControllerStylesheet < ApplicationStylesheet
+  # Add your view stylesheets here. You can then override styles if needed, example:
+  # include FooStylesheet
 
   def setup
     # Add sytlesheet specific setup stuff here.

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

@@ -1,13 +1,11 @@
 class <%= @name_camel_case %> < UIView
 
-  def rmq_did_create(self_in_rmq)
+  def rmq_build
 
-    self_in_rmq.tap do |q|
-      q.apply_style :<%= @name %>
+    rmq.apply_style :<%= @name %>
 
-      # Add subviews here, like so:
-      #q.append(UILabel, :some_label)
-    end
+    # Add subviews here, like so:
+    #rmq.append(UILabel, :some_label)
 
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_motion_query
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Todd Werth
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-23 00:00:00.000000000 Z
+date: 2013-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bacon
@@ -57,6 +57,7 @@ files:
 - motion/ruby_motion_query/base.rb
 - motion/ruby_motion_query/color.rb
 - motion/ruby_motion_query/data.rb
+- motion/ruby_motion_query/debug.rb
 - motion/ruby_motion_query/device.rb
 - motion/ruby_motion_query/enumerablish.rb
 - motion/ruby_motion_query/event.rb