ruby_motion_query 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 076402a0a8e41d928b775cb8319a0f0ba942c7a9
-  data.tar.gz: 3a41cd46bdc0deb04b462372d1390e41f4868621
+  metadata.gz: f07e29c003088b2fdb825513424edf07e8673300
+  data.tar.gz: 17091f33590d403601b76abcb6053b101cde9bdb
 SHA512:
-  metadata.gz: fbfa05daa2ca2013f0402ec58ecc6ef0a9e4d0e3a7e656a43aaf8e3e75f74fd587a8d1fb31d3e8291f1a09bf03a150224abdf3ea3d08d3dce20bdebf382820db
-  data.tar.gz: 9eb821d64590ef1670c3dc4b97b0beb49ade5aecd765e8a75baee54953f1142a5cb93019eca3587f305b105dc7f7778f7d4574a7027dd20319b11ee3b58a67e6
+  metadata.gz: f08414538bd10286c20ee97834216cc562de28b5bf348d0443143b773469c1ca9e087c20b3dae73c969845f9fc81edf9d362e90993d9fa38d46c8e4b2336642b
+  data.tar.gz: 7f21906b0acc652fe1221f9b957c07139a5fb6785f0b6624e656e3229b7bca59d6e470e916ab8e578cffb1bb4601deb24bf33248754dbf35669c2e126c598f9f

data/motion/ext.rb

@@ -53,3 +53,54 @@ class UIViewController
     @_rmq_data ||= RubyMotionQuery::ControllerData.new
   end
 end
+
+if RUBYMOTION_ENV == "development"
+  module Kernel
+    def rmq_live_stylesheets(interval = 0.5, debug=false)
+      @live_reload_debug = debug
+      if interval == false
+        @live_reload_timer.invalidate if @live_reload_timer
+        @live_reload_timer = nil
+        "Live reloading of RMQ stylesheets is now off."
+      else
+        enable_rmq_live_stylesheets(interval)
+      end
+    end
+
+    private
+
+    def enable_rmq_live_stylesheets(interval)
+      # Get list of stylesheet files
+      root_path = File.dirname(__FILE__).gsub(/motion$/,"")
+      path_query = "#{root_path}app/stylesheets/*.rb"
+      stylesheet_file_paths = Dir.glob(path_query)
+      stylesheet_file_paths.delete_if{|stylesheet| stylesheet =~ /application_stylesheet\.rb$/}
+
+      stylesheets = stylesheet_file_paths.inject({}) do |out, stylesheet_path_file|
+        klassname = File.basename(stylesheet_path_file, '.rb')
+        klassname.gsub!("_", " ").gsub!(/\b(?<!['’`])[a-z]/){ $&.capitalize }.gsub!(/\s/, "")
+        out[klassname] = {
+          path: stylesheet_path_file,
+          modified: File.mtime(stylesheet_path_file)
+        }
+        out
+      end
+
+      @live_reload_timer = RubyMotionQuery::App.every(interval) do
+        vc_rmq = rmq.view_controller.rmq
+        klass_name = vc_rmq.stylesheet.class.name
+        if stylesheet = stylesheets[klass_name]
+          if File.mtime(stylesheet[:path]) > stylesheet[:modified]
+            code = File.read(stylesheet[:path])
+            puts "Reloaded #{klass_name}." if @live_reload_debug
+            eval(code)
+            vc_rmq.all.reapply_styles
+            stylesheets[klass_name][:modified] = File.mtime(stylesheet[:path])
+          end
+        end
+      end
+
+      "Live reloading of RMQ stylesheets is now on."
+    end
+  end
+end

data/motion/ruby_motion_query/actions.rb

@@ -37,6 +37,7 @@ module RubyMotionQuery
           when UITextField          then view.text = new_data
           #when UINavigationBar      then
           #when UIScrollView         then
+          when UIProgressView       then view.setProgress(new_data, animated: true)
 
           # TODO, finish
           end
@@ -63,6 +64,7 @@ module RubyMotionQuery
           when UITextField          then view.text
           #when UINavigationBar      then
           #when UIScrollView         then
+          when UIProgressView       then view.progress
 
           # TODO, finish
           end

data/motion/ruby_motion_query/app.rb

@@ -32,6 +32,20 @@ module RubyMotionQuery
         UIApplication.sharedApplication.delegate
       end
 
+      # @return [UIApplication]
+      def get
+        UIApplication.sharedApplication
+      end
+
+      # Returns boolean of success of hiding
+      # Tested in the example app!
+      # @return [Boolean]
+      def hide_keyboard
+        self.get.sendAction(:resignFirstResponder, to:nil, from:nil, forEvent:nil)
+      end
+      alias :resign_responders :hide_keyboard
+      alias :end_editing :hide_keyboard
+
       # @return [Symbol] Environment the app is running it
       def environment
         @_environment ||= RUBYMOTION_ENV.to_sym
@@ -104,7 +118,7 @@ module RubyMotionQuery
         if root_view_controller || ((window = RMQ.app.window) && (root_view_controller = window.rootViewController))
           case root_view_controller
           when UINavigationController
-            root_view_controller.visibleViewController
+            current_view_controller(root_view_controller.visibleViewController)
           when UITabBarController
             current_view_controller(root_view_controller.selectedViewController)
           else

data/motion/ruby_motion_query/event.rb

@@ -29,6 +29,13 @@ module RubyMotionQuery
     end
 
     def handle_gesture_or_event
+      # Handle debounce logic
+      if @debounce_length
+        return if (@debounce_stamp + @debounce_length > Time.now)
+        # update timestamp
+        @debounce_stamp = Time.now
+      end
+
       case @block.arity
       when 2
         @block.call(@sender, self)
@@ -40,6 +47,11 @@ module RubyMotionQuery
     end
 
     def set_options(opts)
+      if opts[:debounce]
+        @debounce_length = opts[:debounce]
+        @debounce_stamp = Time.now
+      end    
+        
       if gesture?
         @recognizer.tap do |o|
           o.cancelsTouchesInView = opts[:cancels_touches_in_view] if opts.include?(:cancels_touches_in_view)
@@ -67,7 +79,7 @@ module RubyMotionQuery
           end
         end
       end
-    end
+    end #set_options
 
     def gesture?
       @gesture

data/motion/ruby_motion_query/image.rb

@@ -17,7 +17,14 @@ module RubyMotionQuery
 
       # @return [UIImage]
       def resource_for_device(file_base_name, opts = {})
-        resource( RMQ.device.four_inch? ? "#{file_base_name}-568h" : file_base_name, opts)
+        ext = if RMQ.device.five_point_five_inch?
+          "-736h"
+        elsif RMQ.device.four_point_seven_inch?
+          "-667h"
+        elsif RMQ.device.four_inch?
+          "-568h"
+        end
+        resource("#{file_base_name}#{ext}")
       end
 
       # @return [UIImage]

data/motion/ruby_motion_query/stylers/ui_button_styler.rb

@@ -6,7 +6,14 @@ module RubyMotionQuery
         @view.setTitle(value, forState: UIControlStateNormal)
       end
       def text
-        @view.title
+        @view.titleForState(UIControlStateNormal)
+      end
+
+      def attributed_text=(value)
+        @view.setAttributedTitle(value, forState: UIControlStateNormal)
+      end
+      def attributed_text
+        @view.attributedTitleForState(UIControlStateNormal)
       end
 
       def font=(value) ; @view.titleLabel.font = value ; end
@@ -16,14 +23,14 @@ module RubyMotionQuery
         @view.setTitleColor(value, forState: UIControlStateNormal)
       end
       def color
-        @view.titleColor
+        @view.titleColorForState(UIControlStateNormal)
       end
 
       def color_highlighted=(value)
         @view.setTitleColor(value, forState: UIControlStateHighlighted)
       end
       def color_highlighted
-        @view.titleColorforState(UIControlStateHighlighted)
+        @view.titleColorForState(UIControlStateHighlighted)
       end
 
       def tint_color=(value)
@@ -33,27 +40,43 @@ module RubyMotionQuery
         @view.tintColor
       end
 
-      def image=(value)
-        self.image_normal = value
-      end
       def image_normal=(value)
         @view.setImage value, forState: UIControlStateNormal
       end
+      def image_normal
+        @view.imageForState(UIControlStateNormal)
+      end
+      alias :image :image_normal
+      alias :image= :image_normal=
 
       def image_highlighted=(value)
-        @view.setImage value, forState: UIControlStateHighlighted
+        @view.setImage(value, forState: UIControlStateHighlighted)
+      end
+      def image_highlighted
+        @view.imageForState(UIControlStateHighlighted)
       end
 
       def background_image_normal=(value)
-        @view.setBackgroundImage value, forState: UIControlStateNormal
+        @view.setBackgroundImage(value, forState: UIControlStateNormal)
       end
+      def background_image_normal
+        @view.backgroundImageForState(UIControlStateNormal)
+      end
+      alias :background_image :background_image_normal
+      alias :background_image= :background_image_normal=
 
       def background_image_highlighted=(value)
-        @view.setBackgroundImage value, forState: UIControlStateHighlighted
+        @view.setBackgroundImage(value, forState: UIControlStateHighlighted)
+      end
+      def background_image_highlighted
+        @view.backgroundImageForState(UIControlStateHighlighted)
       end
 
       def background_image_selected=(value)
-        @view.setBackgroundImage value, forState: UIControlStateSelected
+        @view.setBackgroundImage(value, forState: UIControlStateSelected)
+      end
+      def background_image_selected
+        @view.backgroundImageForState(UIControlStateSelected)
       end
 
       def adjust_image_when_highlighted=(value)
@@ -98,12 +121,18 @@ module RubyMotionQuery
         @view.imageEdgeInsets
       end
 
-      def text_highlighted value
+      def text_highlighted=(value)
         @view.setTitle(value, forState:UIControlStateHighlighted)
       end
+      def text_highlighted
+        @view.titleForState(UIControlStateHighlighted)
+      end
 
-      def text_highlighted= value
-        @view.setTitle(value, forState:UIControlStateHighlighted)
+      def attributed_text_highlighted=(value)
+        @view.setAttributedTitle(value, forState: UIControlStateHighlighted)
+      end
+      def attributed_text_highlighted
+        @view.attributedTitleForState(UIControlStateHighlighted)
       end
 
     end

data/motion/ruby_motion_query/stylers/ui_date_picker_styler.rb

@@ -1,8 +1,25 @@
 module RubyMotionQuery
   module Stylers
 
-    class UIDatePickerStyler < UIControlStyler 
+    class UIDatePickerStyler < UIControlStyler
+
+    	DATE_PICKER_MODES = {
+    		time: UIDatePickerModeTime,
+   			date: UIDatePickerModeDate,
+   			date_and_time: UIDatePickerModeDateAndTime,
+   			date_time: UIDatePickerModeDateAndTime,
+   			count_down: UIDatePickerModeCountDownTimer,
+   			count_down_timer: UIDatePickerModeCountDownTimer,
+    	}
+
+    	def date_picker_mode=(value)
+    		@view.datePickerMode = DATE_PICKER_MODES[value] || value
+    	end
+
+      def date_picker_mode
+      	@view.datePickerMode
+      end
     end
 
   end
-end
+end

data/motion/ruby_motion_query/stylers/ui_table_view_styler.rb

@@ -33,6 +33,11 @@ module RubyMotionQuery
         end
       end
 
+      def background_color=(value)
+        @view.backgroundView = nil if @view.backgroundView
+        @view.setBackgroundColor value
+      end
+
       SEPARATOR_STYLES = {
         none: UITableViewCellSeparatorStyleNone,
         single: UITableViewCellSeparatorStyleSingleLine,

data/motion/ruby_motion_query/stylers/ui_view_styler.rb

@@ -392,6 +392,12 @@ module RubyMotionQuery
       end
       def shadow_path ; @view.layer.shadowPath ; end
 
+      def user_interaction_enabled=(value)
+        @view.setUserInteractionEnabled(!!value)
+      end
+      def user_interaction_enabled
+        @view.isUserInteractionEnabled
+      end
 
       # @deprecated - use frame hashs
       def left=(value)

data/motion/ruby_motion_query/stylesheet.rb

@@ -145,7 +145,7 @@ module RubyMotionQuery
         view.rmq_style_applied
       rescue NoMethodError => e
         if e.message =~ /.*#{style_name.to_s}.*/
-          puts "\n[RMQ ERROR]  style_name :#{style_name} doesn't exist for a #{view.class.name}. Add 'def #{style_name}(st)' to #{stylesheet.class.name} class\n\n"
+          $stderr.puts "\n[RMQ ERROR]  style_name :#{style_name} doesn't exist for a #{view.class.name}. Add 'def #{style_name}(st)' to #{stylesheet.class.name} class\n\n"
         else
           raise e
         end

data/motion/ruby_motion_query/subviews.rb

@@ -19,7 +19,6 @@ module RubyMotionQuery
     # @return [RMQ]
     def add_subview(view_or_constant, opts={})
       subviews_added = []
-      style = opts[:style]
 
       selected.each do |selected_view|
         created = false
@@ -63,11 +62,14 @@ module RubyMotionQuery
         new_view.rmq_appended if appended
 
         if self.stylesheet
-          apply_style_to_view(new_view, style) if style
+          apply_style_to_view(new_view, opts[:style]) if opts[:style]
         end
       end
 
-      RMQ.create_with_array_and_selectors(subviews_added, selectors, @context, self)
+      view = RMQ.create_with_array_and_selectors(subviews_added, selectors, @context, self)
+      opts[:block].call view if opts[:block]
+      opts[:raw_block].call view.get if opts[:raw_block]
+      view
     end
     alias :insert :add_subview
 
@@ -93,8 +95,9 @@ module RubyMotionQuery
     #   rmq.append(UIImageView)
     #
     # @return [RMQ]
-    def append(view_or_constant, style=nil, opts = {})
+    def append(view_or_constant, style=nil, opts = {}, &block)
       opts[:style] = style
+      opts[:block] = block if block
       add_subview(view_or_constant, opts)
     end
 
@@ -103,16 +106,42 @@ module RubyMotionQuery
     # @example
     #   @my_button = rmq.append! UIButton
     #   @my_label = rmq.append!(UILabel, :my_label)
-    def append!(view_or_constant, style=nil, opts = {})
+    def append!(view_or_constant, style=nil, opts = {}, &block)
+      opts[:raw_block] = block if block
       append(view_or_constant, style, opts).get
     end
 
+    # Same as append, but will look for a view with the same name and reapply styles
+    # to it if it finds one. If it doesn't, it'll append as normal.
+    #
+    # @example
+    #   @my_button = rmq.find_or_append(UIButton, :my_button)
+    #   @my_button = rmq.find_or_append(UIButton, :my_button) # Only one created
+    def find_or_append(view_or_constant, style=nil, opts = {}, &block)
+      if style && (q = self.find(style)) && q.length > 0
+        view_or_constant = q.get
+      end
+
+      append(view_or_constant, style, opts, &block)
+    end
+
+    # Same as append!, but will look for a view with the same name and reapply styles
+    # to it if it finds one. If it doesn't, it'll append! as normal.
+    #
+    # @example
+    #   @my_button = rmq.find_or_append!(UIButton, :my_button)
+    #   @my_button = rmq.find_or_append!(UIButton, :my_button) # Only one created
+    def find_or_append!(view_or_constant, style=nil, opts = {}, &block)
+      find_or_append(view_or_constant, style, opts, &block).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 = {})
+    def unshift(view_or_constant, style=nil, opts = {}, &block)
       opts[:at_index] = 0
       opts[:style] = style
+      opts[:block] = block if block
       add_subview view_or_constant, opts
     end
     alias :prepend :unshift
@@ -122,7 +151,8 @@ module RubyMotionQuery
     # @example
     #   @my_button = rmq.prepend! UIButton
     #   @my_label = rmq.prepend!(UILabel, :my_label)
-    def unshift!(view_or_constant, style=nil, opts = {})
+    def unshift!(view_or_constant, style=nil, opts = {}, &block)
+      opts[:raw_block] = block if block
       unshift(view_or_constant, style, opts).get
     end
     alias :prepend! :unshift!
@@ -147,10 +177,11 @@ module RubyMotionQuery
     #     end
     #   end
     #
-    def create(view_or_constant, style = nil, opts = {})
+    def create(view_or_constant, style = nil, opts = {}, &block)
       # TODO, refactor so that add_subview uses create, not backwards like it is now
       opts[:do_not_add] = true
       opts[:style] = style
+      opts[:block] = block if block
       add_subview view_or_constant, opts
     end
 
@@ -158,7 +189,8 @@ module RubyMotionQuery
     #
     # @example
     #   @my_button = rmq.create! UIButton
-    def create!(view_or_constant, style=nil, opts = {})
+    def create!(view_or_constant, style=nil, opts = {}, &block)
+      opts[:raw_block] = block if block
       create(view_or_constant, style, opts).get
     end
 
@@ -174,9 +206,10 @@ module RubyMotionQuery
     # def rmq_build
     #   rmq.append(UIView, :foo)
     # end
-    def build(view, style = nil, opts = {})
+    def build(view, style = nil, opts = {}, &block)
       opts[:do_not_add] = true
       opts[:style] = style
+      opts[:block] = block if block
       add_subview view, opts
     end
 
@@ -184,7 +217,8 @@ module RubyMotionQuery
     #
     # @example
     #   @my_cell = rmq.build! cell
-    def build!(view, style = nil, opts = {})
+    def build!(view, style = nil, opts = {}, &block)
+      opts[:raw_block] = block if block
       build(view, style, opts).get
     end
 

data/motion/ruby_motion_query/utils.rb

@@ -18,6 +18,16 @@ module RubyMotionQuery
         end
       end
 
+      # Converts any string to a friendly symbol version.
+      # Example:  RubyMotionQuery::RMQ.symbolize("This is a TEST!!")
+      # #=> :this_is_a_test
+      #
+      # @param [String]
+      # @return [Symbol]
+      def symbolize(s)
+        s.to_s.gsub(/\s+/,"_").gsub(/\W+/,"").downcase.to_sym
+      end
+
       # @param view
       # @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)

data/motion/ruby_motion_query/version.rb

@@ -1,5 +1,5 @@
 module RubyMotionQuery
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 
   class RMQ
     def version

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_motion_query
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Todd Werth
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-19 00:00:00.000000000 Z
+date: 2015-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bacon