under-os 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ff1789b7dfe17082f36cf9eea7c8c3444077716
-  data.tar.gz: 520c56f69fdc975f55be7e49d87f3742c12e4dca
+  metadata.gz: 97b21422505f0e6c41a9437eca6fc287e5c37db1
+  data.tar.gz: 163b49514385bce8995b306b5b087961b250ecc2
 SHA512:
-  metadata.gz: ea4aab7ec336bd41cde899ab86f4caeaa9d206cb7261915eb85157b97a117b628b41e204df63627ac9e18f36e99e0cedc70f876d7441a6cee27bfbe74afb2aef
-  data.tar.gz: 3e7eee7f55f17c5952b96741f2db01cd7ea38e2842476eca515f27a3e093cb8c5516bef93f8dd51cfbd86be60c398d1f1e861540ed63e6283e4183ed41ff9e2c
+  metadata.gz: b114c74edf769d28d294aa327c9382e6927bc690a13b4fd7331bb2ae371f29f34ba6131d92c81ad8f7cefc84c3bee9eb0a3d953247bf0ad4d07b64643eba5d0b
+  data.tar.gz: e3dec5a68e2a7abf834d910ba6b4fb30fddb365068f8a8e576ee7a365531d5f9e31c9561a2dce92498e26ba02f5d2efad97af3a7ad6467de5034b9d3e45f907d

data/.gitignore

@@ -1,3 +1,4 @@
 build
 .repl_history
 *.gem
+.bundle

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    under-os (1.0.0)
+    under-os (1.1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     motion-facon (0.5.0.1)
-    rake (10.1.0)
+    rake (10.1.1)
 
 PLATFORMS
   ruby

data/app/layouts/inputs.html

@@ -1,5 +1,9 @@
 <page title="Inputs Demo">
-  <input placeholder="Tap here" />
+  <input id="i1" type="text" placeholder="Plain text" />
+  <input id="i2" type="password" placeholder="Password" />
+  <input id="i3" type="email" placeholder="your@email.com" />
+  <input id="i4" type="phone" placeholder="+0431431431" />
+
   <textarea>some value</textarea>
 
   <slider min="0" max="100" value="40" />

data/app/pages/http_page.rb

@@ -9,7 +9,7 @@ class HttpPage < UnderOs::Page
   end
 
   def search
-    @search.hide_keyboard
+    @search.blur
     @locker.show
 
     UnderOs::HTTP.get search_url do |response|

data/app/styles/inputs.css

@@ -1,26 +1,39 @@
 input {
   left: 10;
-  top:  100;
   width: 300;
-  height: 40;
+  height: 30;
 }
 
+input#i1 {
+  top: 55;
+}
+
+input#i2 {
+  top: 95;
+}
+
+input#i3 {
+  top: 135;
+}
+input#i4 {
+  top: 175;
+}
 textarea {
-  left: 10;
-  top:  150;
-  width: 300;
+  top:    215;
+  left:   10;
+  width:  300;
   height: 100;
 }
 
 slider {
   left: 10;
-  top:  300;
+  top:  330;
   width: 200;
 }
 
 switch {
   left: 250;
-  top:  300;
+  top:  330;
 }
 
 progress {

data/lib/under_os/page/matcher.rb

@@ -6,10 +6,15 @@ class UnderOs::Page::StylesMatcher
   end
 
   def initialize(css_rule)
-    css_rule = css_rule.strip
-    rules    = css_rule.scan(/([\S]+)/).map(&:first)
-    @rule    = parse(rules.pop)
-    @parent  = rules.size == 0 ? false : self.class.new(rules.join(' '))
+    css_rules = css_rule.strip.split(/\s*,\s*/)
+
+    if css_rules.size == 1
+      rules    = css_rules[0].scan(/([\S]+)/).map(&:first)
+      @rule    = parse(rules.pop)
+      @parent  = rules.size == 0 ? false : self.class.new(rules.join(' '))
+    else
+      @multiple_matchers = css_rules.map{ |rule| self.class.new(rule) }
+    end
   end
 
   def match(view)
@@ -17,40 +22,72 @@ class UnderOs::Page::StylesMatcher
   end
 
   def score_for(view)
+    return summary_score_for(view) if @multiple_matchers
+
     id_score    = id_score_for(view)
     tag_score   = tag_score_for(view)
     class_score = class_score_for(view)
+    attrs_score = attrs_score_for(view)
+    total_score = id_score + tag_score + class_score + attrs_score
 
-    return 0 if @rule[:id]  && id_score     == 0
-    return 0 if @rule[:tag] && tag_score    == 0
-    return 0 if @rule[:classes].size > 0 && class_score == 0
-    return 0 if (this_score = id_score + tag_score + class_score) == 0
-
-    parent_score = parent_score_for(view)
+    total_score = 0 if id_score    == 0 && @rule[:id]
+    total_score = 0 if tag_score   == 0 && @rule[:tag]
+    total_score = 0 if class_score == 0 && @rule[:classes].size != 0
+    total_score = 0 if attrs_score == 0 && @rule[:attrs].size != 0
 
-    return 0 if @parent && parent_score == 0
+    if @parent && total_score != 0
+      parent_score = parent_score_for(view)
+      total_score  = parent_score == 0 ? 0 : total_score + parent_score
+    end
 
-    parent_score + this_score
+    total_score
   end
 
 private
 
+  def summary_score_for(view)
+    @multiple_matchers.map{ |matcher| matcher.score_for(view) }.max
+  end
+
   def id_score_for(view)
     @rule[:id] == view.id ? 1 : 0
   end
 
   def tag_score_for(view)
-    @rule[:tag] == view.tagName ? 1 : 0
+    @rule[:tag] == '*' || @rule[:tag] == view.tagName ? 1 : 0
   end
 
   def class_score_for(view)
+    return 0 if @rule[:classes].size == 0
     match = @rule[:classes] & view.classNames
     match.size == @rule[:classes].size ? match.size : 0
   end
 
-  def parent_score_for(view)
-    return 0 if ! @parent
+  def attrs_score_for(view)
+    score = 0; return 0 if @rule[:attrs].size == 0
+
+    @rule[:attrs].each do |key, value, operand|
+      attr = view.respond_to?(key) && view.__send__(key)
+      attr = attr.to_s if attr.is_a?(Symbol) || attr.is_a?(Numeric)
+
+      if attr && attr.is_a?(String)
+        matches = case operand
+        when '='  then attr == value
+        when '*=' then attr.include?(value)
+        when '^=' then attr.starts_with?(value)
+        when '$=' then attr.ends_with?(value)
+        when '~=' then attr.split(' ').include?(value)
+        when '|=' then attr.split('-').include?(value)
+        end
+
+        score += 1 if matches
+      end
+    end
+
+    score
+  end
 
+  def parent_score_for(view)
     parent = view; score = 0
 
     while parent = parent.parent
@@ -63,7 +100,7 @@ private
 
   def parse(string)
     {}.tap do |rule|
-      if m = string.match(/^([a-z]+)/)
+      if m = string.match(/^([a-z\*]+)/)
         rule[:tag] = m[1].upcase
       else
         rule[:tag] = false # so it wouldn't match nil
@@ -77,6 +114,14 @@ private
 
       if m = string.scan(/(\.)([a-z_\-0-9]+)/)
         rule[:classes] = m.map{|c| c[1]}
+      else
+        rule[:classes] = []
+      end
+
+      if m = string.scan(/\[\s*([a-z]+)\s*([*^$~|]{0,1}=)\s*('|")?(.+?)(\3)?\s*\]/)
+        rule[:attrs] = m.map{|c| [c[0], c[3], c[1]] }
+      else
+        rule[:attrs] = []
       end
     end
   end

data/lib/under_os/parser/css.rb

@@ -3,7 +3,7 @@ class UnderOs::Parser::CSS
     style = style.gsub(/\/\*[\s\S]+?\*\//, '').strip
 
     {}.tap do |result|
-      style.scan(/(\A|\})([a-z0-9_\-\.\s#:,]+)\{([^}]+)/).map do |rule|
+      style.scan(/(\A|\})([a-z0-9_\*\-\.\s#:,]+)\{([^}]+)/).map do |rule|
         values = parse_styles(rule[2])
 
         rule[1].split(',').each do |css_rule|

data/lib/under_os/ui/button.rb

@@ -4,7 +4,9 @@ class UnderOS::UI::Button < UnderOS::UI::View
   def initialize(options={})
     super
 
-    self.text  = options.delete(:text) || ''
+    self.text = options.delete(:text) || ''
+    self.disable if options[:disabled]
+
     @_.showsTouchWhenHighlighted = true
     @_.setBackgroundImage(options.delete(:image), forState:UIControlStateNormal) if options[:image]
     @_.sizeToFit
@@ -19,4 +21,22 @@ class UnderOS::UI::Button < UnderOS::UI::View
     repaint
   end
 
+  def disabled
+    ! @_.isEnabled
+  end
+
+  alias :disabled? :disabled
+
+  def disabled=(value)
+    @_.enabled = ! value
+  end
+
+  def disable
+    self.disabled = true
+  end
+
+  def enable
+    self.disabled = false
+  end
+
 end

data/lib/under_os/ui/div.rb

@@ -0,0 +1,3 @@
+class UnderOs::UI::Div < UnderOs::UI::View
+  tag :div
+end

data/lib/under_os/ui/form.rb

@@ -0,0 +1,60 @@
+class UnderOs::UI::Form < UnderOs::UI::View
+  tag :form
+
+  def elements
+    find('*').select do |view|
+      view.is_a?(UnderOs::UI::Input) || view._.is_a?(UIButton)
+    end
+  end
+
+  def inputs
+    find('*').select do |view|
+      view.is_a?(UnderOs::UI::Input)
+    end
+  end
+
+  def values
+    {}.tap do |values|
+      inputs.each do |input|
+        next if input.disabled || ! input.name || (input.is_a?(UnderOs::UI::Switch) && !input.checked)
+
+        hash = values; key = nil
+        keys = input.name.scan(/[^\[]+/)
+
+        # getting throught the smth[smth][smth][] in the name
+        while keys.size > 1
+          key = keys.shift
+          key = key.slice(0, key.size-1) if key.ends_with?(']')
+
+          hash[key] = keys[0] == ']' ? [] : {} if ! hash[key]
+          hash = hash[key]
+        end
+
+        key = keys.shift
+        key = key.slice(0, key.size-1) if key.ends_with?(']')
+
+        if hash.is_a?(Array)
+          hash << input.value
+        else
+          hash[key] = input.value
+        end
+      end
+    end
+  end
+
+  def disable
+    elements.each(&:disable)
+    self
+  end
+
+  def enable
+    elements.each(&:enable)
+    self
+  end
+
+  def focus
+    if input = inputs.first
+      input.focus
+    end
+  end
+end

data/lib/under_os/ui/icon.rb

@@ -11,6 +11,7 @@ class UnderOs::UI::Icon < UnderOs::UI::View
 
     self.type = options.delete(:type) || :bug
     self.size = options.delete(:size) || 20
+    self.disable if options[:disabled]
 
     @_.sizeToFit
     @_.showsTouchWhenHighlighted = true
@@ -39,4 +40,22 @@ class UnderOs::UI::Icon < UnderOs::UI::View
     @_.setFont self.class.engine.font(size)
     @_.sizeToFit
   end
+
+  def disabled
+    ! @_.isEnabled
+  end
+
+  alias :disabled? :disabled
+
+  def disabled=(value)
+    @_.enabled = ! value
+  end
+
+  def disable
+    self.disabled = true
+  end
+
+  def enable
+    self.disabled = false
+  end
 end

data/lib/under_os/ui/input.rb

@@ -1,41 +1,140 @@
 class UnderOs::UI::Input < UnderOs::UI::View
-  include UnderOs::UI::Editable
-
   wraps UITextField, tag: 'input'
 
   def initialize(options={})
     super
 
-    # self.type        = options[:type]        if options[:type]
+    self.type        = options[:type]        if options[:type]
+    self.name        = options[:name]        if options[:name]
     self.value       = options[:value]       if options[:value]
     self.placeholder = options[:placeholder] if options[:placeholder]
     self.keyboard    = options[:keyboard]    if options[:keyboard]
+    self.disabled    = true                  if options[:disabled]
+
+    @_.delegate = self if @_.respond_to?(:delegate=)
 
-    @_.delegate      = self
+    if @_.class == UITextField
+      @_.addTarget self, action: :handle_focus,  forControlEvents:UIControlEventEditingDidBegin
+      @_.addTarget self, action: :handle_change, forControlEvents:UIControlEventEditingChanged
+      @_.addTarget self, action: :handle_blur,   forControlEvents:UIControlEventEditingDidEnd
+    end
   end
 
-  # FIXME apparently there is a problem with this property in rubymotion
-  # def type
-  #   if @_.secureTextEntry
-  #     :password
-  #   else
-  #     :text
-  #   end
-  # end
+  def name
+    @name
+  end
 
-  # def type=(type)
-  #   case type.to_sym
-  #   when :password then @_.secureTextEntry = true
-  #   end
-  # end
+  def name=(text)
+    @name = text
+  end
 
-  def textFieldShouldReturn(textField)
-    hide_keyboard
-    false
+  def value
+    @_.text
+  end
+
+  def value=(value)
+    @_.text = value
+  end
+
+  def placeholder
+    @_.placeholder
+  end
+
+  def placeholder=(value)
+    @_.placeholder = value
+  end
+
+  def type
+    if @_.respond_to?(:secureTextEntry) && @_.secureTextEntry
+      :password
+    else
+      keyboard == :default ? :text : keyboard
+    end
+  end
+
+  def type=(type)
+    case type.to_sym
+    when :password then @_.secureTextEntry = true
+    else self.keyboard = type
+    end
+  end
+
+  def keyboard
+    KEYBOARDS.index(@_.keyboardType)
+  end
+
+  def keyboard=(keyboard)
+    keyboard = keyboard.to_sym if keyboard.is_a?(String)
+    keyboard = KEYBOARDS[keyboard] || keyboard
+
+    raise "Unknown keyboard type: #{keyboard}" if keyboard.is_a?(Symbol)
+
+    @_.keyboardType = keyboard
   end
 
   def hide_keyboard
+    puts "DEPRECATED: please use the `#blur` method instead of `#hide_keyboard`"
+    blur
+  end
+
+  KEYBOARDS = {
+    default:   UIKeyboardTypeDefault,
+    text:      UIKeyboardTypeDefault,
+    ascii:     UIKeyboardTypeASCIICapable,
+    numeric:   UIKeyboardTypeNumbersAndPunctuation,
+    url:       UIKeyboardTypeURL,
+    numbers:   UIKeyboardTypeNumberPad,
+    phone:     UIKeyboardTypePhonePad,
+    name:      UIKeyboardTypeNamePhonePad,
+    email:     UIKeyboardTypeEmailAddress,
+    decimal:   UIKeyboardTypeDecimalPad,
+    twitter:   UIKeyboardTypeTwitter,
+    search:    UIKeyboardTypeWebSearch
+  }
+
+  def disabled
+    ! @_.isEnabled
+  end
+
+  alias :disabled? :disabled
+
+  def disabled=(value)
+    @_.enabled = ! value
+  end
+
+  def disable
+    self.disabled = true
+  end
+
+  def enable
+    self.disabled = false
+  end
+
+  def focus
+    @_.becomeFirstResponder
+  end
+
+  def blur
     @_.resignFirstResponder
   end
 
+# delegate
+
+  def textFieldShouldReturn(textField)
+    blur
+  end
+
+protected
+
+  def handle_focus
+    emit('focus')
+  end
+
+  def handle_change
+    emit('change')
+  end
+
+  def handle_blur
+    emit('blur')
+  end
 end

data/lib/under_os/ui/scroll.rb

@@ -1,4 +1,4 @@
-class Scroll < UnderOs::UI::View
+class UnderOs::UI::Scroll < UnderOs::UI::View
   wraps UIScrollView, tag: :scroll
 
   def initialize(options={})

data/lib/under_os/ui/select.rb

@@ -1,15 +1,12 @@
-class UnderOs::UI::Select < UnderOs::UI::View
+class UnderOs::UI::Select < UnderOs::UI::Input
   wraps UIPickerView, tag: :select
 
   def initialize(options={})
     super
 
     self.options = options.delete(:options) if options[:options]
-    self.value   = options.delete(:value)   if options[:value]
+    @_.showsSelectionIndicator = true       if options[:lense]
 
-    #@_.showsSelectionIndicator = true       if options[:lense]
-
-    @_.delegate   = self
     @_.dataSource = self
   end
 
@@ -44,7 +41,7 @@ class UnderOs::UI::Select < UnderOs::UI::View
   def value=(value)
     prev_val = @value
     @value = Array(value).map(&:to_s)
-    emit :change if @value != prev_val
+    handle_change if @value != prev_val
 
     @value.each_with_index do |value, group|
       i = 0;

data/lib/under_os/ui/slider.rb

@@ -1,6 +1,4 @@
-class UnderOs::UI::Slider < UnderOs::UI::View
-  include UnderOs::UI::Editable
-
+class UnderOs::UI::Slider < UnderOs::UI::Input
   wraps UISlider, tag: 'slider'
 
   def initialize(options={})
@@ -8,10 +6,9 @@ class UnderOs::UI::Slider < UnderOs::UI::View
 
     self.min   = options[:min]   if options[:min]
     self.max   = options[:max]   if options[:max]
-    self.value = options[:value] if options[:value]
 
     @_.continuous = options.delete(:track) || true # track the changes as they go
-    @_.addTarget self, action: :fire_change_event, forControlEvents:UIControlEventValueChanged
+    @_.addTarget self, action: :handle_change, forControlEvents:UIControlEventValueChanged
   end
 
   def value
@@ -37,13 +34,4 @@ class UnderOs::UI::Slider < UnderOs::UI::View
   def max=(value)
     @_.maximumValue = value.to_f
   end
-
-private
-
-  def fire_change_event
-    if @_prev_value != @_.value
-      @_prev_value = @_.value
-      emit :change
-    end
-  end
 end

data/lib/under_os/ui/switch.rb

@@ -1,13 +1,10 @@
-class UnderOs::UI::Switch < UnderOs::UI::View
-  include UnderOs::UI::Editable
-
+class UnderOs::UI::Switch < UnderOs::UI::Input
   wraps UISwitch, tag: 'switch'
 
   def initialize(options={})
     super
-
-    self.value   = options[:value]   if options[:value]
     self.checked = options[:checked] if options[:checked]
+    @_.addTarget self, action: :handle_change, forControlEvents:UIControlEventValueChanged
   end
 
   def value

data/lib/under_os/ui/textarea.rb

@@ -1,14 +1,19 @@
-class UnderOs::UI::Textarea < UnderOs::UI::View
-  include UnderOs::UI::Editable
-
+class UnderOs::UI::Textarea < UnderOs::UI::Input
   wraps UITextView, tag: 'textarea'
 
-  def initialize(options={})
-    super
+  alias :text= :value= # to get values from the HTML layouts
+
+# delegate
 
-    self.value       = options[:value]       if options[:value]
-    self.keyboard    = options[:keyboard]    if options[:keyboard]
+  def textViewDidBeginEditing(textView)
+    handle_focus
   end
 
-  alias :text= :value= # to get values from the HTML layouts
+  def textViewDidChange(textView)
+    handle_change
+  end
+
+  def textViewDidEndEditing(textView)
+    handle_blur
+  end
 end

data/lib/under_os.rb

@@ -1,5 +1,5 @@
 module UnderOs
-  VERSION='1.1.0'
+  VERSION='1.2.0'
 end
 
 UOS = UnderOS = UnderOs