ruby_motion_query 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f9a3624a7543f1c6a828948bb3d2da590c8ad78
-  data.tar.gz: f377f2d6321fbe5a18b2e1fa4a8fedfff7023f63
+  metadata.gz: aa33d32bc33a3a37c0b275b086ec98e68ad93087
+  data.tar.gz: 88136c1a620a6f49c3da516941224405627e6bfe
 SHA512:
-  metadata.gz: 25be56991e401ba84649de80eccf69a45f7df4691507a7c1c5e8f1d2bb783bac5a8625608c0d757282bd8fe27bde29fe3afcf1d5b22eedba7b037f684c69a4a2
-  data.tar.gz: 9ccb416fa1ea67824729649c1b2e884682ec8b04feece7aec42f3dc2b705de0f2d3880a25d3a301ebc9dfd47fa6d86b20bc64df11c426ca975d6b5b313661fc7
+  metadata.gz: 56f9eeeb66eea90c517f495318da1709c3c93262365eef4f64fc1f49a3d2cbc7c375ea9f269e2f8ad51ea65500d8dfbc89f3d206224a3b2fb4abcb160a709bba
+  data.tar.gz: 715240b7ef7389f0440e5cddf8f9f22955911317544a185634bb46e7b16a66b3c254c72e9bf827b2eb8fb436195168da85b96432ce430bdfd212edd65c3ebb51

data/lib/ruby_motion_query.rb

@@ -5,6 +5,7 @@ end
 Motion::Project::App.setup do |app|
   parent = File.join(File.dirname(__FILE__), '..')
   files = [File.join(parent, 'motion/ruby_motion_query/stylesheet.rb')]
+  files << [File.join(parent, 'motion/ruby_motion_query/validation_event.rb')]
   files << [File.join(parent, 'motion/ruby_motion_query/stylers/ui_view_styler.rb')]
   files << File.join(parent, 'motion/ruby_motion_query/stylers/ui_control_styler.rb')
   files << Dir.glob(File.join(parent, "motion/**/*.rb"))

data/motion/ruby_motion_query/grid.rb

@@ -23,15 +23,15 @@ module RubyMotionQuery
 
   # A grid for layout.
   # There is an app grid at: rmq.app.grid
-  # You can also have a grid per stylesheet. If none exists, the app 
+  # You can also have a grid per stylesheet. If none exists, the app
   # grid will be used. rmq.stylesheet.grid (this will return app's if nil).
   # If you want to create a grid for your stylesheet, you can just dup the app one
   # like so (inside the stylesheet): self.grid = rmq.app.grid.dup
   # Then you can mod it: self.grid.num_columns = 6
   #
   # @example If you want your view to be from b2 to d3, you can do any of the following:
-  # 
-  #   #        a   b   c   d   e   
+  #
+  #   #        a   b   c   d   e
   #   #      ....................
   #   #    1 . a1  b1  c1  d1  e1
   #   #      .....------------...
@@ -39,17 +39,17 @@ module RubyMotionQuery
   #   #      .....|          |...
   #   #    3 . a3 |b3  c3  d3| e3
   #   #      .....------------...
-  #   #    4 . a4  b4  c4  d4  e4 
-  #   #      ....................      
+  #   #    4 . a4  b4  c4  d4  e4
+  #   #      ....................
   #   #    5 . a5  b5  c5  d5  e5
-  #   #      ....................      
+  #   #      ....................
   #
   #   st.frame = "b2:d3"
   #   st.origin = "b2:d3"
   #   st.frame = {grid: "b2", w: 100, h: 200}
   #   my_view.frame = some_grid['b2:d3']
   #   my_view.origin = some_grid['b2:d3']
-  #   rmq.append(UIView).layout('b2:d3')                       
+  #   rmq.append(UIView).layout('b2:d3')
   #
   # @example Create a new grid inside a stylesheet by duping the app's grid
   #   self.grid = rmq.app.grid.dup
@@ -74,8 +74,8 @@ module RubyMotionQuery
   # @example Log your grid
   #   rmq.app.grid.log
   #
-  #   #   {:num_columns=>10, :num_rows=>13, :column_gutter=>10, :content_left_margin=>5, 
-  #   #   :content_right_margin=>5, :content_top_margin=>5, :content_bottom_margin=>5, 
+  #   #   {:num_columns=>10, :num_rows=>13, :column_gutter=>10, :content_left_margin=>5,
+  #   #   :content_right_margin=>5, :content_top_margin=>5, :content_bottom_margin=>5,
   #   #   :row_gutter=>10, :status_bar_bottom=>20, :nav_bar_bottom=>64}
   #
   #   #       a  b  c  d  e  f  g  h  i  j
@@ -94,8 +94,8 @@ module RubyMotionQuery
   #   #   12  .  .  .  .  .  .  .  .  .  .
   #
   class Grid
-    attr_reader :num_columns, :column_gutter, :content_left_margin, :content_right_margin, 
-                :content_bottom_margin, :content_top_margin, :num_rows, :row_gutter, 
+    attr_reader :num_columns, :column_gutter, :content_left_margin, :content_right_margin,
+                :content_bottom_margin, :content_top_margin, :num_rows, :row_gutter,
                 :status_bar_bottom, :nav_bar_bottom
 
     MAX_COLUMNS = 26
@@ -207,7 +207,7 @@ module RubyMotionQuery
           is_end_coord = coord.start_with?(':')
           parts = coord.split(':')
           parts.reject!{|o| o == ''}
-        
+
           case parts.length
             when 0
               nil
@@ -241,7 +241,7 @@ module RubyMotionQuery
                     {l: lefts[left_i], t: tops[top_i]}
                   end
                 else
-                  nil 
+                  nil
                 end
               elsif digits
                 if is_end_coord
@@ -319,6 +319,13 @@ module RubyMotionQuery
       to_h.inspect
     end
 
+    def show
+      rmq(rmq.window).append(GridHudView).attr(grid: self).layout(l: 0, t: 0, fr: 0, fb: 0).enable_interaction.on(:tap) do |sender|
+        rmq(sender).remove
+      end
+      puts '[RMQ] Tap to dismiss the grid overlay'
+    end
+
     def dup
       Grid.new(self.to_h)
     end
@@ -367,4 +374,43 @@ module RubyMotionQuery
     end
 
   end
+
+  class GridHudView < UIView
+    attr_accessor :grid
+
+    def rmq_build
+      @light_text_color = rmq.color.from_rgba(213,53,82,0.6).CGColor
+      @column_fill_color = rmq.color.from_rgba(213,53,82,0.1).CGColor
+      @background_color = rmq.color.from_rgba(255,255,255,0.4)
+
+      rmq(self).style do |st|
+        st.background_color = @background_color
+      end
+    end
+
+    def drawRect(rect)
+      super
+
+      return unless @grid
+
+      context = UIGraphicsGetCurrentContext()
+      screen_height = RMQ.device.screen_height
+      screen_width = RMQ.device.screen_width
+
+      CGContextSetTextMatrix(context, CGAffineTransformMake(1.0,0.0, 0.0, -1.0, 0.0, 0.0));
+      CGContextSelectFont(context, 'Courier New', 7, KCGEncodingMacRoman)
+
+      0.upto(@grid.num_rows - 1) do |r|
+        0.upto(@grid.num_columns - 1) do |c|
+          rec = @grid[[c, r]]
+          CGContextSetFillColorWithColor(context, @column_fill_color)
+          CGContextFillRect(context, rec.to_cgrect)
+          text = "#{(c+97).chr}#{r}"
+          CGContextSetFillColorWithColor(context, @light_text_color)
+          CGContextShowTextAtPoint(context, rec.origin.x + 1, rec.origin.y + 5, text, text.length)
+        end
+      end
+    end
+  end
+
 end

data/motion/ruby_motion_query/stylers/ui_label_styler.rb

@@ -5,6 +5,9 @@ module RubyMotionQuery
       def text=(value) ; @view.setText value ; end
       def text ; @view.text ; end
 
+      def attributed_text=(value) ; @view.attributedText = value ; end
+      def attributed_text ; @view.attributedText ; end
+
       def font=(value) ; @view.setFont value ; end
       def font ; @view.font ; end
 
@@ -23,6 +26,13 @@ module RubyMotionQuery
         end
       end
 
+      def line_break_mode=(value)
+        @view.lineBreakMode = value
+      end
+      def line_break_mode
+        @view.lineBreakMode
+      end
+
       def text_alignment=(value)
         @view.setTextAlignment(TEXT_ALIGNMENTS[value] || value)
       end

data/motion/ruby_motion_query/validation.rb

@@ -106,12 +106,29 @@ module RubyMotionQuery
 
     def valid?(data, options={})
       @options = options.merge(@options)
+
+      # shortcircuit for universal validation parameters
+      return true if universal_validation_checks(data, @options)
+
       @valid_status = @rule.call(data, @options)
     end
 
+    # this method shortcuts specific validation rules.  As such it should only be
+    # added to for universal validation needs.  It must be kept as efficient as possible.
+    def universal_validation_checks (data, options={})
+      # shortcircuit if debugging
+      return true if RubyMotionQuery::RMQ.debugging?
+      # allow blank data if specified
+      return true if (options[:allow_blank] && (data.nil? || data.empty?))
+      # allow whitelist data if specified
+      return true if (options[:white_list] && options[:white_list].include?(data))
+
+      false
+    end
+
     class << self
       # Validation Regex from jQuery validation -> https://github.com/jzaefferer/jquery-validation/blob/master/src/core.js#L1094-L1200
-      EMAIL = Regexp.new('^[a-zA-Z0-9.!#$%&\'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$')
+      EMAIL = Regexp.new('^[a-z0-9!#$%&\'*+\/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&\'*+\/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$')
       URL = Regexp.new('^(https?|s?ftp):\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&\'\(\)\*\+,;=]|:)*@)?(((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)(:\d*)?)(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&\'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&\'\(\)\*\+,;=]|:|@)*)*)?)?(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&\'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&\'\(\)\*\+,;=]|:|@)|\/|\?)*)?$')
       DATEISO = Regexp.new('^\d{4}[\/\-](0?[1-9]|1[012])[\/\-](0?[1-9]|[12][0-9]|3[01])$')
       NUMBER = Regexp.new('^-?(?:\d+|\d{1,3}(?:,\d{3})+)?(?:\.\d+)?$')
@@ -168,7 +185,8 @@ module RubyMotionQuery
           v = if opts[:exact_length] then (value.length == opts[:exact_length]) else true end
           v = v && value.length <= opts[:max_length]
           v = v && value.length >= opts[:min_length]
-        }
+        },
+        :custom => lambda { |value, opts| Validation.regex_match?(value, opts[:regex])},
       }
 
       # Add tags
@@ -182,11 +200,6 @@ module RubyMotionQuery
       #
       # @return [Boolean]
       def valid?(value, rule, options={})
-        # shortcircuit if debugging
-        return true if RubyMotionQuery::RMQ.debugging?
-        # shortcircuit for optionals
-        return true if (options[:allow_blank] && (value.nil? || value.empty?))
-
         Validation.new(rule).valid?(value, options)
       end
 
@@ -194,6 +207,12 @@ module RubyMotionQuery
         (value.to_s =~ regex) != nil
       end
 
+      def add_validator(rule, &block)
+        raise(ArgumentError, "add_validator requires a block") if block.nil?
+
+        @@validation_methods[rule] = block
+      end
+
     end
   end
 end

data/motion/ruby_motion_query/version.rb

@@ -1,5 +1,5 @@
 module RubyMotionQuery
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 
   class RMQ
     def version

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

@@ -6,7 +6,7 @@ class <%= @name_camel_case %>Cell < UICollectionViewCell
 
     q = rmq(self.contentView)
     # Add your subviews, init stuff here
-    # @foo = q.append(UILabel, :foo).get
+    # @foo = q.append!(UILabel, :foo)
   end
 
   def prepareForReuse

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

@@ -3,14 +3,14 @@ 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
+    # Customize your cell: Add your subviews, init stuff here
+    # @foo = q.append!(UILabel, :foo)
 
     # 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)
-    @name = q.build(self.textLabel, :cell_label).get
+    # @image = q.build!(self.imageView, :cell_image)
+    # @detail = q.build!(self.detailTextLabel, :cell_label_detail)
+    @name = q.build!(self.textLabel, :cell_label)
   end
 
   def update(data)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_motion_query
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Todd Werth
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-12 00:00:00.000000000 Z
+date: 2014-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bacon