bluepotion 0.1.6 → 0.1.7

data/lib/project/ruby_motion_query/rmq/config.rb

@@ -0,0 +1,9 @@
+class RMQ
+  def self.caching_enabled?
+    !!@caching_enabled
+  end
+
+  def self.caching_enabled=(value)
+    @caching_enabled = value
+  end
+end

data/lib/project/ruby_motion_query/rmq/event_wrappers/rmq_keyboard_action.rb

@@ -0,0 +1,12 @@
+class RMQKeyboardAction
+  def initialize(&block)
+    @done_callback = block
+  end
+
+  def onEditorAction(view, action_id, key_event)
+    if action_id == Potion::EditorInfo::IME_ACTION_DONE
+      @done_callback.call if @done_callback
+    end
+    false
+  end
+end

data/lib/project/ruby_motion_query/rmq/event_wrappers/rmq_number_picker_change.rb

@@ -0,0 +1,12 @@
+class RMQNumberPickerChange
+  attr_accessor :change_block
+
+  def initialize(&block)
+    @change_block = block
+  end
+
+  def onValueChange(picker, old_val, new_val)
+    @change_block.call(picker, old_val, new_val)
+  end
+
+end

data/lib/project/ruby_motion_query/rmq/events.rb

@@ -5,7 +5,9 @@ class RMQ
       when :click, :tap, :touch
         handle_click(view, &block)
       when :change
-        handle_change(view, &block)
+        handle_change(view, args, &block)
+      when :done
+        handle_done(view, &block)
       else
         raise "[RMQ ERROR] Unrecognized event: #{event}"
       end
@@ -25,13 +27,22 @@ class RMQ
     end
   end
 
-  def handle_change(view, &block)
+  def handle_change(view, args, &block)
     # Seek bar change
     if view.respond_to? :setOnSeekBarChangeListener
       view.onSeekBarChangeListener = RMQSeekChange.new(args, &block)
     # Text change
-    elsif view.respond_to? :addTextChangeListener
+    elsif view.respond_to? :addTextChangedListener
       view.addTextChangedListener(RMQTextChange.new(&block))
+    elsif view.respond_to? :setOnValueChangedListener
+      view.onValueChangedListener = RMQNumberPickerChange.new(&block)
+    end
+  end
+
+  def handle_done(view, &block)
+    # Keyboard done button pressed
+    if view.respond_to? :setOnEditorActionListener
+      view.onEditorActionListener = RMQKeyboardAction.new(&block)
     end
   end
 

data/lib/project/ruby_motion_query/rmq/factory.rb

@@ -22,11 +22,16 @@ class RMQ
     #
     # @return [RMQ]
     def create_with_selectors(working_selectors, originated_from, working_parent_rmq = nil)
-      q = RMQ.new
-      q.originated_from = originated_from
-      q.parent_rmq = working_parent_rmq
-      q.selectors = working_selectors
-      q
+      #if working_parent_rmq && (working_parent_rmq.selectors.length == 1)
+        #working_parent_rmq.selectors[0].rmq(working_selectors)
+      #else
+        q = RMQ.new
+        q.originated_from = originated_from
+
+        q.parent_rmq = working_parent_rmq
+        q.selectors = working_selectors
+        q
+      #end
     end
 
     # This is used internally, to get a new rmq instance, just call "rmq" in your view or controller or

data/lib/project/ruby_motion_query/rmq/selectors.rb

@@ -18,18 +18,19 @@ class RMQ
     #    return true unless view.rmq_data.has_tag?
 
     new_selectors.each do |selector|
-      if selector.is_a?(Java::Lang::Integer)
-        if view.id == selector
+      if selector.is_a?(Symbol)
+        rd = view.rmq_data
+        if (rd.has_style?(selector)) || rd.has_tag?(selector)
           out = true
           break
         end
-      elsif selector == :tagged
-        if view.rmq_data.has_tag?
+      elsif selector.is_a?(Java::Lang::Integer)
+        if view.id == selector
           out = true
           break
         end
-      elsif selector.is_a?(Symbol)
-        if (view.rmq_data.has_style?(selector)) || view.rmq_data.has_tag?(selector)
+      elsif selector == :tagged
+        if view.rmq_data.has_tag?
           out = true
           break
         end

data/lib/project/ruby_motion_query/rmq/styles.rb

@@ -37,11 +37,24 @@ class RMQ
 
   def apply_style(*style_names)
     if style_names
-      selected.each do |selected_view|
-        style_names.each do |style_name|
-          apply_style_to_view selected_view, style_name
+      if style_names.length == 1 && selected.length == 1
+        apply_style_to_view selected.first, style_names.first
+      else
+        selected.each do |selected_view|
+          style_names.each do |style_name|
+            apply_style_to_view selected_view, style_name
+          end
         end
       end
+
+      # TODO, remove this hack once RMA is fixed
+      #tproc = proc do |style_name|
+        #apply_style_to_view @apply_style_selected_view, style_name
+      #end
+      #selected.each do |selected_view|
+        #@apply_style_selected_view = selected_view
+        #style_names.each &tproc
+      #end
     end
     self
   end
@@ -49,12 +62,15 @@ class RMQ
 
   def apply_style_to_view(view, style_name)
     #begin
-      styler = self.styler_for(view)
-      self.stylesheet.send(style_name, styler)
-      styler.finalize
-
-      view.rmq_data.styles << style_name unless view.rmq_data.has_style?(style_name)
-      view.rmq_style_applied
+      if sheet = self.stylesheet
+        styler = self.styler_for(view)
+        sheet.send(style_name, styler)
+        styler.finalize
+        styler.cleanup
+
+        view.rmq_data.styles << style_name unless view.rmq_data.has_style?(style_name)
+        view.rmq_style_applied
+      end
     #rescue NoMethodError => e
       #if e.message =~ /.*#{style_name.to_s}.*/
         #$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"
@@ -78,7 +94,14 @@ class RMQ
     out.flatten!.uniq
   end
 
-
+  def reapply_styles
+    selected.each do |selected_view|
+      selected_view.rmq_data.styles.each do |style_name|
+        apply_style_to_view selected_view, style_name
+      end
+    end
+    self
+  end
 
 end
 

data/lib/project/ruby_motion_query/rmq/subviews.rb

@@ -30,7 +30,6 @@ class RMQ
         built = true
       end
 
-      rmq_data.activity = self.activity
       rmq_data.screen = self.screen
 
       subviews_added << new_view
@@ -68,14 +67,14 @@ class RMQ
   alias :insert :add_subview
 
   def tag_all_from_resource_entry_name(view)
-    view.rmq.find.each do |view|
+    @@tag_all_from_resource_entry_name_tproc ||= proc do |view|
       if ren = view.resource_entry_name
         view.rmq_data.tag(ren.to_sym)
       end
     end
+    view.rmq.find.each &@@tag_all_from_resource_entry_name_tproc
   end
 
-
   # Removes the selected views from their parent's (superview) subview array
   #
   # @example

data/lib/project/ruby_motion_query/rmq/traverse.rb

@@ -28,6 +28,8 @@ class RMQ
       else
         RMQ.app.current_screen
       end
+    elsif @originated_from.respond_to?(:dummy_workaround_for_kind_of) # TODO, kind_of? doesn't seem to work, verify. Workaround here
+      @originated_from
     else
       RMQ.app.current_screen
     end
@@ -41,7 +43,8 @@ class RMQ
     if @originated_from.is_a?(Android::App::Activity)
       @originated_from.root_view
     else
-      self.controller.root_view
+      c = self.controller
+      c.root_view if c
     end
   end
 
@@ -66,8 +69,16 @@ class RMQ
     end
   end
 
+  def only_root_view_selected?
+    selected.length == 1 && selected[0].rmq_data.is_screen_root_view
+  end
+
   def all
-    wrap(root_view).find
+    if only_root_view_selected?
+      self.find
+    else
+      self.wrap(self.root_view).find
+    end
   end
 
   def children(*working_selectors)
@@ -91,10 +102,38 @@ class RMQ
   def find(*working_selectors)
     normalize_selectors(working_selectors)
 
-    #if working_selectors.length == 1 && self.selected.length == 1 && working_selectors.first.is_a?(Java::Lang::Integer)
-        #return selected_first.findViewById(r(:id, working_selectors.first))
-    #end
+    if RMQ.caching_enabled?
+      self_selected = self.selected
+      if working_selectors.length == 1 && self_selected.length == 1
+        single_selected = self_selected[0]
+        #if single_seleced.rmq_data.cache_queries
+        single_selector = working_selectors[0]
+        #if single_selector.is_a?(Symbol)
+          if cached = single_selected.rmq_data.query_cache[single_selector]
+            #mp "cached #{single_selector}"
+            return cached
+          else
+            q = filter(uniq: true) do |view|
+              sbvws = all_subviews_for(view)
+
+              if RMQ.is_blank?(working_selectors)
+                sbvws
+              else
+                sbvws.inject([]) do |out, subview|
+                  out << subview if match(subview, working_selectors)
+                  out
+                end
+              end
+            end # filter
+
+            single_selected.rmq_data.query_cache[single_selector] = q
+            return q
+          end
+        #end
+      end
+    end
 
+    # Repeating this inline for performance, TODO, measure and refactor
     filter(uniq: true) do |view|
       sbvws = all_subviews_for(view)
 
@@ -107,7 +146,6 @@ class RMQ
         end
       end
     end # filter
-
   end
 
   def find!(*args) # Do not alias this, strange bugs happen where classes don't have methods

data/lib/project/ruby_motion_query/rmq_color.rb

@@ -114,7 +114,8 @@ class RMQColorFactory
     end
 
     def from_rgba(r, g, b, a)
-      RMQColor.argb(a, r, b, g)
+      android_a = a * 255
+      RMQColor.argb(android_a, r, g, b)
     end
   end
 

data/lib/project/ruby_motion_query/rmq_device.rb

@@ -43,5 +43,11 @@ class RMQDevice
       #TODO
     end
 
+    def unique_id
+      # This is no simple task... and can sometimes be nil based on device implementation
+      # This does seem, however, to be the best answer for now.
+      Android::Provider::Settings::Secure.getString(find.app.getContentResolver, "android_id")
+    end
+
   end
 end

data/lib/project/ruby_motion_query/rmq_resource.rb

@@ -22,5 +22,13 @@ class RMQResource
     def layout(name)
       self.find("layout", name)
     end
+
+    # the string value all up inside your 'res/values/strings.xml' (or nil)
+    def string(name=nil)
+      return nil unless name
+      resource_id = find(:string, name)
+      return nil if resource_id.nil? || resource_id == 0
+      PMApplication.current_application.resources.getString(resource_id)
+    end
   end
 end

data/lib/project/ruby_motion_query/rmq_screen_data.rb

@@ -1,3 +1,8 @@
 class RMQScreenData
   attr_accessor :stylesheet, :cached_rmq
+
+  def cleanup
+    @cached_rmq = nil
+    @stylesheet = nil
+  end
 end

data/lib/project/ruby_motion_query/rmq_stylesheet.rb

@@ -1,15 +1,41 @@
 class RMQStylesheet
-  attr_accessor :controller
-
-  def initialize(controller)
+  def initialize(parent_screen)
     unless RMQStylesheet.application_was_setup
       RMQStylesheet.application_was_setup = true
       application_setup
     end
-    @controller = controller
+    @screen = parent_screen
     setup
   end
 
+  # @ deprecated
+  def controller=(value)
+    @screen = value
+  end
+  # @ deprecated
+  def controller
+    @screen
+  end
+
+  def screen
+    @screen
+  end
+
+  def find(*working_selectors) # Not calling rmq below for performance reasons (one less method invocation)
+    if @screen
+      @screen.rmq(working_selectors)
+    else
+      super
+    end
+  end
+  def rmq(*working_selectors)
+    if @screen
+      @screen.rmq(working_selectors)
+    else
+      super
+    end
+  end
+
   def application_setup
     # Override to do your overall setup for your applications. This
     # is where you want to add your custom fonts and colors

data/lib/project/ruby_motion_query/rmq_validation.rb

@@ -116,8 +116,8 @@ module RubyMotionQuery
     HASUPPER = '^(?=.*[A-Z]).+$'
     # Has at least 1 lowercase letter
     HASLOWER = '^(?=.*[a-z]).+$'
-    # Has some kind of value not just whitespace (doesn't require data to be stripped)
-    PRESENCE = '\S+'
+    # is just whitespace
+    NOT_PRESENCE = '^\s*$' #Needed for android presence madness
 
     @@validation_methods = {
       :email => lambda { |value, opts| value.toString.matches(EMAIL)},
@@ -134,7 +134,7 @@ module RubyMotionQuery
       :strong_password => lambda { |value, opts| value.toString.matches(STRONGPW)},
       :has_upper => lambda { |value, opts| value.toString.matches(HASUPPER)},
       :has_lower => lambda { |value, opts| value.toString.matches(HASLOWER)},
-      :presence => lambda { |value, opts| value.toString.matches(PRESENCE)},
+      :presence => lambda { |value, opts| !value.toString.matches(NOT_PRESENCE)},
       :length => lambda { |value, opts|
         opts = {
           exact_length: nil,

data/lib/project/ruby_motion_query/rmq_view_data.rb

@@ -1,10 +1,42 @@
 class RMQViewData
-  attr_accessor :events, :built, :is_screen_root_view, :activity, :screen
+  attr_accessor :events, :built, :is_screen_root_view, :screen, :cached_rmq #, :cache_queries
 
   def screen_root_view?
     !@is_screen_root_view.nil?
   end
 
+  def cleanup
+    clear_query_cache
+    if @cached_rmq
+      @cached_rmq.selectors = nil
+      @cached_rmq.parent_rmq = nil
+      @cached_rmq = nil
+    end
+    @events = nil
+    @screen = nil
+    @_tags = nil
+    @_styles = nil
+    @_validation_errors = nil
+    @validation_errors = nil
+    @is_screen_root_view = false
+    @built = false
+    nil
+  end
+
+  def query_cache
+    @_query_cache ||= {}
+  end
+
+  def clear_query_cache
+    @query_cache = {}
+  end
+
+  def activity
+    if @screen
+      @screen.getActivity
+    end
+  end
+
   # @return [Hash] Array of tag names assigned to to this view
   def tags
     @_tags ||= {}