ruby_motion_query 0.4.0 → 0.4.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWZiNGJkMWFiMTc2YjliNjFhYjQxZWE4YTEwYmNkYWM1Yzg0NTViZA==
+    YWFmNzE0NjljMGNjYTRhYmYxYTIxMWQ3MGE1YTY1ODI0Y2E0M2EyNw==
   data.tar.gz: !binary |-
-    MjlhMTIzYmUwYmJiNDhhZjE2YWI3NTlkM2IwYzY4YzE1NjhhNTQwOA==
+    M2RjODk1NDgyMmQ2ODc1MDFlZjc2ODg3YWVkMzMwZTk5YWNiMTMxZA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MTM3YWEyYjY3YTMyZDVhZDk5NGZkZGRiODZiNzA1NzUxYzZjZTJlNTQyNDFk
-    NDc5MDIxNjFiY2UxMDhkY2ZkODJjNjhmMTI0NzYwNWFiMWRmYWJlZWIzYWIz
-    ZDUwYmNkN2U2YmZjMTYyOTVjNjkxNzQ1YWMyNDg0MjlmMWMzOGY=
+    Y2MxY2YyZGU0ZDdiZmQxNzAwNTk3NWFlNjA2NGUzNmJhMzVkYTMzMWUxN2Ri
+    NjBlNmZiYjEzNWY2Nzc2ZDcyZTlmNmU4NDZlOTk3MDM3ZmQ2MWExYjY3YjI2
+    ODkzZWFlNmI4ZThlODAzMTczYjU4MTAzOWI5YWI3Yjk3MzgzNTQ=
   data.tar.gz: !binary |-
-    YmExY2QwZDU1NTc3NjA3MGQ2MDFkMmE2ZWNhM2MyNDI2Y2Y2YjhiZmY0YjM0
-    NWQ1M2UzMDYzODBjZWM0ZTg5ZGE4NmJkYjUyZGY4ZGYzZGE0YjJmNmQxZGY0
-    NjczZWE1MmI3ZDIzZDZmNDk1Zjk1MjRhNzA2Mzg0ZjE0Mjc2MzM=
+    YjRlNjg1YjRkNzk5MmYwYzZiZWY2MjJmYTc5ZWRjZWRhZmZlMTVjZWZlNTVm
+    ZTQ3Yjg5M2I4YWJjZDM0MDk4ODBiMzJhYzUxOGRlOTI3NGIwYzZlOWJlOGE1
+    YzljNTlhMTkzMDZlNGVkMzE3MjhjZWEzM2U5M2RhMDY1NDQ5YTc=

data/README.md

@@ -26,7 +26,7 @@ A fast, muggle, nonpolluting, jQuery-like library for [RubyMotion](http://rubymo
 
 ----------
 
-**Tested only on iOS only, not OS X (nor is there any OS X specific code)**
+**Tested on iOS, not OS X (nor is there any OS X specific code)**
 
 ----------
 
@@ -183,6 +183,8 @@ Here are the commands available to you:
  > rmq create shared some_class_used_app_wide
  > rmq create lib some_class_used_by_multiple_apps
 
+ > rmq create collection_view_controller foos 
+
  # To test the create command without actually creating any files, do:
  > rmq create view my_view dry_run
 
@@ -354,6 +356,12 @@ 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
+
+# Get tags for a view
+your_view.rmq_data.tags
+# Also
+your_view.rmq_data.has_tag?(:foo)
+your_view.rmq_data.tag_names
 ```
 
 ### Actions
@@ -1102,6 +1110,16 @@ end
 rmq.append(YourView, :your_style)
 ```
 
+### Future features
+
+Future features that I plan on adding
+
+- rmq.push_sub_controller(my_controller) and rmq.pop_sub_controller and rmq.pop_this_controller
+- add borders to UIView styler: st.borders = {l: {w: 2, color: color.black}, r: {w: 2, color: color.black}}
+- add templates for: nav controller, tab controller, table controller, collection controller
+- add from_right, from_bottom, and centered to both st.frame and to move
+- add binding that combines KVO and events to bind an attribute of one object to the attribute of selected view(s), keeping both in sync, like so: rmq.append(UITextField).bind(@person, attr: :name, to: :text)
+
 
 ## Contact
 

data/bin/rmq

@@ -21,11 +21,13 @@ class RmqCommandLine
      > rmq create shared some_class_used_app_wide
      > rmq create lib some_class_used_by_multiple_apps
 
+     > rmq create collection_view_controller foos
+
      > rmq -h, --help
      > rmq -v, --version }
 
   class << self
-    VALID_CREATE_TYPES = [:model, :controller, :view, :shared, :lib]
+    VALID_CREATE_TYPES = [:model, :controller, :view, :shared, :lib, :collection_view_controller]
 
     def create(template_or_app_name, name, options)
       @dry_run = true if options == 'dry_run'

data/motion/ruby_motion_query/color.rb

@@ -127,6 +127,10 @@ module RubyMotionQuery
       def from_hsva(h,s,v,a)
         UIColor.alloc.initWithHue(h, saturation: s, brightness: v, alpha: a)
       end
+
+      def random
+        from_rgba(rand(255), rand(255), rand(255), 1.0)
+      end
     end
 
   end

data/motion/ruby_motion_query/event.rb

@@ -44,7 +44,17 @@ module RubyMotionQuery
           o.delegate = opts[:delegate] if opts.include?(:delegate)
           o.numberOfTapsRequired = opts[:taps_required] if opts.include?(:taps_required)
           o.numberOfTouchesRequired = opts[:fingers_required] if opts.include?(:fingers_required)
-          # TODO, add the rest
+          o.maximumNumberOfTouches = opts[:maximum_number_of_touches] if opts.include?(:maximum_number_of_touches)
+          o.minimumNumberOfTouches = opts[:minimum_number_of_touches] if opts.include?(:minimum_number_of_touches)
+          o.allowableMovement = opts[:allowable_movement] if opts.include?(:allowable_movement)
+          o.minimumPressDuration = opts[:minimum_press_duration] if opts.include?(:minimum_press_duration)
+          o.direction = opts[:direction] if opts.include?(:direction)
+          o.rotation = opts[:rotation] if opts.include?(:rotation)
+          o.scale = opts[:scale] if opts.include?(:scale)
+
+          if opts.include?(:init)
+            opts[:init].call(@recognizer)
+          end
         end
       end
     end

data/motion/ruby_motion_query/events.rb

@@ -1,6 +1,85 @@
 module RubyMotionQuery
   class RMQ
+    # Adds an event/gesture to all selected views
+    #
     # @return [RMQ]
+    #
+    # on(event_or_gesture, options) do |sender, event|
+    #   # your code when event fires
+    # end
+    #
+    # Events for UIControl
+    #  :touch
+    #  :touch_up
+    #  :touch_down
+    #  :touch_start
+    #  :touch_stop
+    #  :change
+
+    #  :touch_down_repeat
+    #  :touch_drag_inside
+    #  :touch_drag_outside
+    #  :touch_drag_enter
+    #  :touch_drag_exit
+    #  :touch_up_inside
+    #  :touch_up_outside
+    #  :touch_cancel
+
+    #  :value_changed
+
+    #  :editing_did_begin
+    #  :editing_changed
+    #  :editing_did_change
+    #  :editing_did_end
+    #  :editing_did_endonexit
+
+    #  :all_touch
+    #  :all_editing
+
+    #  :application
+    #  :system
+    #  :all
+
+    # Gestures for UIView
+    #  :tap
+    #  :pinch
+    #  :rotate
+    #  :swipe
+    #  :pan
+    #  :long_press
+
+    # Options for gestures
+    #  :cancels_touches_in_view 
+    #  :delegate 
+    #  :taps_required 
+    #  :fingers_required 
+    #  :maximum_number_of_touches 
+    #  :minimum_number_of_touches 
+    #  :allowable_movement 
+    #  :minimum_press_duration 
+    #  :direction 
+    #  :rotation 
+    #  :scale 
+    #
+    # @example
+    # rmq.append(UIButton).on(:touch) do |sender|
+    #   # Do something when button is touched
+    # end
+    #
+    # @example
+    # rmq(my_view).on(:tap, taps_required: 2 ) do |sender, event|
+    #   # Do something when event fires
+    # end
+    #
+    # @example
+    # # These both are the same
+    # rmq(button).on(:tap, init: ->(recongnizer){recongnizer.numberOfTapsRequired = 2) do |sender|
+    #   puts 'tapped'
+    # end
+    #
+    # rmq(button).on(:tap, taps_required: 2) do |sender|
+    #   puts 'tapped'
+    # end
     def on(event, args = {}, &block)
       selected.each do |view|
         events(view).on(view, event, args, &block) 
@@ -9,6 +88,8 @@ module RubyMotionQuery
       self
     end
 
+    # Removes events/gestures from all views selected
+    #
     # @return [RMQ]
     def off(*events)
       selected.each do |view|
@@ -30,12 +111,16 @@ module RubyMotionQuery
       @event_set = {}
     end
 
+    def [](sdk_event_or_recognizer)
+      @event_set[sdk_event_or_recognizer]
+    end
+
     def has_events?
       !RMQ.is_blank?(@event_set)
     end
 
-    def has_event?(event)
-      @event_set.include?(event)
+    def has_event?(sdk_event_or_recognizer)
+      @event_set.include?(sdk_event_or_recognizer)
     end
 
     def on(view, event, args = {}, &block)

data/motion/ruby_motion_query/stylers/ui_view_styler.rb

@@ -250,6 +250,13 @@ module RubyMotionQuery
         @view.transform = CGAffineTransformMakeRotation(radians)
       end
 
+      def content_mode=(value)
+        @view.contentMode = value
+      end
+      def content_mode
+        @view.contentMode
+      end
+
     end
   end
 end

data/motion/ruby_motion_query/version.rb

@@ -1,3 +1,3 @@
 module RubyMotionQuery
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

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

@@ -0,0 +1,78 @@
+class <%= @name_camel_case %>Controller < UICollectionViewController
+  # In app_delegate.rb or wherever you use this controller, just call .new like so:
+  #   @window.rootViewController = <%= @name_camel_case %>Controller.new
+  #
+  # Or if you're adding using it in a navigation controller, do this
+  #  main_controller = <%= @name_camel_case %>Controller.new
+  #  @window.rootViewController = UINavigationController.alloc.initWithRootViewController(main_controller)
+
+  <%= @name.upcase %>_CELL_ID = "<%= @name_camel_case %>Cell"
+  
+  def self.new(args = {})
+    # Set layout 
+    layout = UICollectionViewFlowLayout.alloc.init
+    self.alloc.initWithCollectionViewLayout(layout)
+  end
+
+  def viewDidLoad
+    super
+
+    rmq.stylesheet = <%= @name_camel_case %>ControllerStylesheet
+
+    collectionView.tap do |cv|
+      cv.registerClass(<%= @name_camel_case %>Cell, forCellWithReuseIdentifier: <%= @name.upcase %>_CELL_ID)
+      cv.delegate = self
+      cv.dataSource = self
+      cv.allowsSelection = true
+      cv.allowsMultipleSelection = false
+      rmq(cv).apply_style :collection_view
+    end
+  end
+
+  # Remove if you are only supporting portrait
+  def supportedInterfaceOrientations
+    UIInterfaceOrientationMaskAll
+  end
+
+  # Remove if you are only supporting portrait
+  def willAnimateRotationToInterfaceOrientation(orientation, duration: duration)
+    rmq(:reapply_style).reapply_styles
+  end
+
+  def numberOfSectionsInCollectionView(view)
+    1
+  end
+ 
+  def collectionView(view, numberOfItemsInSection: section)
+    200 
+  end
+    
+  def collectionView(view, cellForItemAtIndexPath: index_path)
+    view.dequeueReusableCellWithReuseIdentifier(<%= @name.upcase %>_CELL_ID, forIndexPath: index_path).tap do |cell|
+      cell.setup_with(rmq)
+
+      # Update cell's data here
+    end
+  end
+
+  def collectionView(view, didSelectItemAtIndexPath: index_path)
+    cell = view.cellForItemAtIndexPath(index_path)
+    puts "Selected at section: #{index_path.section}, row: #{index_path.row}"
+  end
+
+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, 
+# then only reapply the tagged views, like so:
+def logo(st)
+  st.frame = {t: 10, w: 200, h: 96}
+  st.centered = :horizontal
+  st.image = image.resource('logo')
+  st.tag(:reapply_style)
+end
+
+# Then in willAnimateRotationToInterfaceOrientation
+rmq(:reapply_style).reapply_styles

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

@@ -0,0 +1,13 @@
+module <%= @name_camel_case %>CellStylesheet
+  def cell_size
+    [96, 96]
+  end
+
+  def <%= @name %>_cell(st)
+    st.frame = cell_size
+    st.background_color = color.random
+
+    # Style overall view here
+  end
+
+end

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

@@ -0,0 +1,26 @@
+class <%= @name_camel_case %>ControllerStylesheet < ApplicationStylesheet
+
+  include <%= @name_camel_case %>CellStylesheet
+
+  def setup
+    # Add sytlesheet specific setup stuff here.
+    # Add application specific setup stuff in application_stylesheet.rb
+
+    @margin = ipad? ? 12 : 8
+  end
+
+  def collection_view(st)
+    st.view.contentInset = [@margin, @margin, @margin, @margin]
+    st.background_color = color.white
+
+    st.view.collectionViewLayout.tap do |cl|
+      cl.itemSize = cell_size
+      #cl.scrollDirection = UICollectionViewScrollDirectionHorizontal
+      #cl.headerReferenceSize = cell_size
+      cl.minimumInteritemSpacing = @margin 
+      cl.minimumLineSpacing = @margin 
+      #cl.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight,
+      #cl.sectionInsert = [0,0,0,0]
+    end
+  end
+end

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

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

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

@@ -0,0 +1,9 @@
+describe '<%= @name_camel_case %>Controller' do
+
+  before do
+  end
+
+  after do
+  end
+
+end

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

@@ -0,0 +1,9 @@
+describe '<%= @name_camel_case %>Cell' do
+
+  before do
+  end
+
+  after do
+  end
+
+end

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

@@ -17,7 +17,7 @@ end
 # To style this view include its stylesheet at the top of each controller's 
 # stylesheet that is going to use it:
 #   class SomeStylesheet < ApplicationStylesheet 
-#     include <%= @stylesheet_name %>
+#     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 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_motion_query
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Todd Werth
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-09 00:00:00.000000000 Z
+date: 2013-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bacon
@@ -92,6 +92,12 @@ files:
 - motion/ruby_motion_query/traverse.rb
 - motion/ruby_motion_query/utils.rb
 - motion/ruby_motion_query/version.rb
+- templates/collection_view_controller/app/controllers/name_controller.rb
+- templates/collection_view_controller/app/stylesheets/name_cell_stylesheet.rb
+- templates/collection_view_controller/app/stylesheets/name_controller_stylesheet.rb
+- templates/collection_view_controller/app/views/name_cell.rb
+- templates/collection_view_controller/spec/controllers/name_controller.rb
+- templates/collection_view_controller/spec/views/name_cell.rb
 - templates/controller/app/controllers/name_controller.rb
 - templates/controller/app/stylesheets/name_controller_stylesheet.rb
 - templates/controller/spec/controllers/name_controller.rb