under-os 1.1.0 → 1.2.0

data/spec/lib/under_os/page/matcher_spec.rb

@@ -50,6 +50,10 @@ describe UnderOs::Page::StylesMatcher do
       it "should not add score if the css-rule is wrong" do
         score_for(@view, 'view.some-class').should == 0
       end
+
+      it "should handle the * as the tag name" do
+        score_for(@view, '*').should == 1
+      end
     end
 
     describe 'IDs matching' do
@@ -107,7 +111,90 @@ describe UnderOs::Page::StylesMatcher do
       end
     end
 
-    describe 'multiple matches' do
+    describe "attribute matchers" do
+      before do
+        @view.id = "my-view"
+      end
+
+      def score_for(view, css_rule)
+        UnderOs::Page::StylesMatcher.new(css_rule).score_for(view)
+      end
+
+      describe "with the '=' operator" do
+        it "scores when the value matches exactly" do
+          score_for(@view, '[id="my-view"]').should == 1
+        end
+
+        it "doesn't count when the value does not match" do
+          score_for(@view, "[id='my']").should == 0
+        end
+      end
+
+      describe "with the '*=' operator" do
+        it "scores when the attribute includes the value" do
+          score_for(@view, '[id*=vie]').should == 1
+        end
+
+        it "doesn't count when the value doesn't match attribute" do
+          score_for(@view, '[id*=mismatch]').should == 0
+        end
+      end
+
+      describe "with the ^= operator" do
+        it "scores when the attribute starts with the value" do
+          score_for(@view, '[id^=my]').should == 1
+        end
+
+        it "doesn't count when the attribute doesn't start with the value" do
+          score_for(@view, '[id^=view]').should == 0
+        end
+      end
+
+      describe "with the $= operator" do
+        it "scores when the attribute ends with the value" do
+          score_for(@view, '[id$=view]').should == 1
+        end
+
+        it "doesn't count when the attribute doesn't ends with the value" do
+          score_for(@view, '[id$=my]').should == 0
+        end
+      end
+
+      describe "with the ~= operator" do
+        before { @view.id = "one two three" }
+
+        it "scores when the value is a token from the attribute" do
+          score_for(@view, '[id~=one]').should == 1
+          score_for(@view, '[id~=two]').should == 1
+          score_for(@view, '[id~=three]').should == 1
+        end
+
+        it "doesn't trigger on completely different strings" do
+          score_for(@view, '[id~=four]').should == 0
+        end
+
+        it "doesn't trigger on partial substrings" do
+          score_for(@view, '[id~=tw]').should == 0
+        end
+      end
+
+      describe "with the |= operator" do
+        it "scores when value is a dashed token of the attribute" do
+          score_for(@view, '[id|=my]').should == 1
+          score_for(@view, '[id|=view]').should == 1
+        end
+
+        it "doesn't trigger on completely different values" do
+          score_for(@view, '[id|=mismatch]').should == 0
+        end
+
+        it "doesn't trigger on partial matches" do
+          score_for(@view, '[id|=vie]').should == 0
+        end
+      end
+    end
+
+    describe 'multiple nested matches' do
       it "should count in all the matches" do
         @view.id = 'my-id'
         @view.className = 'class1 class2'
@@ -150,5 +237,24 @@ describe UnderOs::Page::StylesMatcher do
         score_for(@view, '.non-existing #my-view').should == 0
       end
     end
+
+    describe "multiple different matchers" do
+      before do
+        @view.id        = 'my-view'
+        @view.className = 'classy'
+      end
+
+      it "gets score out of multiple matchers if one of them is matching" do
+        score_for(@view, "view, input, form").should == 1
+      end
+
+      it "return 0 if none of the matchers are matching" do
+        score_for(@view, "input,select").should == 0
+      end
+
+      it "gets the max score if there are multiple matches" do
+        score_for(@view, "view,.classy,view#my-view").should == 2
+      end
+    end
   end
 end

data/spec/lib/under_os/ui/button_spec.rb

@@ -1,5 +1,50 @@
-describe UnderOs::UI::Button do
-  it "should say its tagName is 'BUTTON'" do
-    UnderOs::UI::Button.new.tagName.should == 'BUTTON'
+describe "UnderOs::UI::Button" do
+  before do
+    @button = UnderOs::UI::Button.new(text: "Hello")
+  end
+
+  describe "constructor" do
+    it "builds an instance of the UnderOs::UI::Button" do
+      @button.class.should == UnderOs::UI::Button
+    end
+
+    it "wraps an UIButton instance" do
+      @button._.class.should == UIButton
+    end
+
+    it "assigns the BUTTON tag after it" do
+      @button.tagName.should == "BUTTON"
+    end
+  end
+
+  describe "#text" do
+    it "returns the button's label text" do
+      @button.text.should == "Hello"
+    end
+
+    it "allows to set a new value" do
+      @button.text = "New Label"
+      @button._.currentTitle.should == "New Label"
+    end
+  end
+
+  describe '#disabled' do
+    it "returns 'false' by default" do
+      @button.disabled.should == false
+    end
+
+    it "reads the value right of the ios entity" do
+      @button._.enabled = false
+      @button.disabled.should == true
+    end
+
+    it "allows to disable the inputs" do
+      @button.disabled = true
+      @button._.isEnabled.should == false
+    end
+
+    it "has a ruby-style alias" do
+      @button.disabled?.should == false
+    end
   end
 end

data/spec/lib/under_os/ui/div_spec.rb

@@ -0,0 +1,24 @@
+describe "UnderOs::UI::Div" do
+  before do
+    @div = UnderOs::UI::Div.new
+  end
+
+  describe "constructor" do
+    it "builds an UnderOs::UI::Div instance" do
+      @div.class.should == UnderOs::UI::Div
+    end
+
+    it "wraps a generic UIView element" do
+      @div._.class.should == UIView
+    end
+
+    it "has the DIV tag assigned to the element" do
+      @div.tagName.should == "DIV"
+    end
+
+    it "handles the usual options" do
+      div = UnderOs::UI::Div.new(id: 'my-div')
+      div.id.should == 'my-div'
+    end
+  end
+end

data/spec/lib/under_os/ui/form_spec.rb

@@ -0,0 +1,156 @@
+describe "UnderOs::UI::Form" do
+  before do
+    @form = UnderOs::UI::Form.new
+  end
+
+  describe "constructor" do
+    it "makes the UnderOs::UI::Form instances" do
+      @form.class.should == UnderOs::UI::Form
+    end
+
+    it "assigns the FORM tag for the element" do
+      @form.tagName.should == "FORM"
+    end
+
+    it "takes the usual HTML params" do
+      form = UnderOs::UI::Form.new(id: 'my-form')
+      form.id.should == 'my-form'
+    end
+  end
+
+  describe '#elements' do
+    before do
+      @view   = UnderOs::UI::View.new
+      @icon   = UnderOs::UI::Icon.new
+      @input  = UnderOs::UI::Input.new
+      @button = UnderOs::UI::Button.new
+
+      @form.append @view.append(@icon), @input, @button
+    end
+
+    it "returns inputs and buttons" do
+      @form.elements.should == [@icon, @input, @button]
+    end
+  end
+
+  describe "#inputs" do
+    it "returns an empty list when there is no input elements" do
+      @form.inputs.should == []
+    end
+
+    it "returns the list of the input elements only" do
+      v1 = UnderOs::UI::View.new
+      i1 = UnderOs::UI::Input.new
+      i2 = UnderOs::UI::Select.new
+      i3 = UnderOs::UI::Switch.new
+      i4 = UnderOs::UI::Textarea.new
+
+      @form.append v1.append(i1, i2), i3, i4
+
+      @form.inputs.should == [i1, i2, i3, i4]
+    end
+
+    class MyInput1 < UnderOs::UI::Input; end
+    class MyInput2 < MyInput1; end
+
+    it "handles subclasses of the inputs as well" do
+      i1 = MyInput1.new
+      i2 = MyInput2.new
+      i3 = UnderOs::UI::Input.new
+
+      @form.append i1, i2, i3
+
+      @form.inputs.should == [i1, i2, i3]
+    end
+  end
+
+  describe "#values" do
+    before do
+      @i1 = UnderOs::UI::Input.new(name: 'username', value: 'Nikolay')
+      @i2 = UnderOs::UI::Input.new(name: 'password', value: 'TheOsom')
+
+      @form.append @i1, @i2
+    end
+
+    it "returns a hash of the values" do
+      @form.values.should == {'username' => 'Nikolay', 'password' => 'TheOsom'}
+    end
+
+    it "skips inputs without names" do
+      @i2.name = nil
+      @form.values.should == {'username' => 'Nikolay'}
+    end
+
+    it "skips disabled inputs" do
+      @i1.disabled = true
+      @form.values.should == {'password' => 'TheOsom'}
+    end
+
+    it "handles nested hashes in the names" do
+      @i1.name = 'user[username]'
+      @i2.name = 'user[password]'
+
+      @form.values.should == {'user' => {'username' => 'Nikolay', 'password' => 'TheOsom'}}
+    end
+
+    it "handles the array names notation" do
+      @i1.name = 'fields[]'
+      @i2.name = 'fields[]'
+
+      @form.values.should == {'fields' => ['Nikolay', 'TheOsom']}
+    end
+
+    describe 'with a checkbox input' do
+      before do
+        @checkbox = UnderOs::UI::Switch.new(name: 'isawesome', value: 'true')
+        @form.append @checkbox
+      end
+
+      it "counts in checkboxes when they're switched on" do
+        @checkbox.checked = true
+        @form.values.should == {'username' => 'Nikolay', 'password' => 'TheOsom', 'isawesome' => 'true'}
+      end
+
+      it "skips the input if it's not ON" do
+        @checkbox.checked = false
+        @form.values.should == {'username' => 'Nikolay', 'password' => 'TheOsom'}
+      end
+    end
+  end
+
+  describe '#disable' do
+    before do
+      @icon   = UnderOs::UI::Icon.new
+      @input  = UnderOs::UI::Input.new
+      @button = UnderOs::UI::Button.new
+
+      @form.append @icon, @input, @button
+    end
+
+    it "disabled all the elements on the form" do
+      @form.disable
+
+      @icon.disabled.should   == true
+      @input.disabled.should  == true
+      @button.disabled.should == true
+    end
+  end
+
+  describe '#enable' do
+    before do
+      @icon   = UnderOs::UI::Icon.new(disabled: true)
+      @input  = UnderOs::UI::Input.new(disabled: true)
+      @button = UnderOs::UI::Button.new(disabled: true)
+
+      @form.append @icon, @input, @button
+    end
+
+    it "disabled all the elements on the form" do
+      @form.enable
+
+      @icon.disabled.should   == false
+      @input.disabled.should  == false
+      @button.disabled.should == false
+    end
+  end
+end

data/spec/lib/under_os/ui/icon_spec.rb

@@ -1,6 +1,21 @@
-describe UnderOs::UI::Icon do
+describe "UnderOs::UI::Icon" do
+  before do
+    @icon = UnderOs::UI::Icon.new
+  end
 
   describe '#initialize' do
+    it "builds the UnderOs::UI::Icon instances" do
+      @icon.class.should == UnderOs::UI::Icon
+    end
+
+    it "wraps an UIButton object" do
+      @icon._.class.should == UIButton
+    end
+
+    it "should assign correct tag name" do
+      @icon.tagName.should == 'ICON'
+    end
+
     it "should allow to initialize the icon with type" do
       icon = UnderOs::UI::Icon.new('ok')
       icon.type.should == 'ok'
@@ -10,10 +25,6 @@ describe UnderOs::UI::Icon do
       icon = UnderOs::UI::Icon.new(type: 'ok')
       icon.size.should == 20
     end
-
-    it "should assign correct tag name" do
-      UnderOs::UI::Icon.new.tagName.should == 'ICON'
-    end
   end
 
   describe '#type' do
@@ -23,4 +34,24 @@ describe UnderOs::UI::Icon do
     end
   end
 
+  describe '#disabled' do
+    it "returns 'false' by default" do
+      @icon.disabled.should == false
+    end
+
+    it "reads the value right of the ios entity" do
+      @icon._.enabled = false
+      @icon.disabled.should == true
+    end
+
+    it "allows to disable the inputs" do
+      @icon.disabled = true
+      @icon._.isEnabled.should == false
+    end
+
+    it "has a ruby-style alias" do
+      @icon.disabled?.should == false
+    end
+  end
+
 end

data/spec/lib/under_os/ui/input_spec.rb

@@ -16,6 +16,11 @@ describe UnderOs::UI::Input do
       @input.tagName.should == 'INPUT'
     end
 
+    it "should accept the 'name' option" do
+      input = UnderOs::UI::Input.new(name: 'some_name')
+      input.name.should == 'some_name'
+    end
+
     it "should accept the 'value' option" do
       input = UnderOs::UI::Input.new(value: 'boo hoo')
       input.value.should == 'boo hoo'
@@ -32,21 +37,28 @@ describe UnderOs::UI::Input do
     end
   end
 
-  # describe '#type' do
-  #   it "should handle the 'password' type correctly" do
-  #     @input.type = 'password'
-  #     @input._.secureTextEntry.should == true
-  #   end
+  describe '#type' do
+    # it "should handle the 'password' type correctly" do
+    #   @input.type = 'password'
+    #   @input._.secureTextEntry.should == true
+    # end
 
-  #   it "should convert the input type back" do
-  #     @input.type = 'password'
-  #     @input.type.should == 'password'
-  #   end
+    # it "should convert the input type back" do
+    #   @input.type = 'password'
+    #   @input.type.should == :password
+    # end
+
+    it "should return 'text' by default" do
+      @input.type.should == :text
+    end
+  end
 
-  #   it "should return 'text' by default" do
-  #     @input.type.should == 'text'
-  #   end
-  # end
+  describe '#name' do
+    it "should assign the name to an input field" do
+      @input.name = 'newname'
+      @input.name.should == 'newname'
+    end
+  end
 
   describe '#value' do
     it "should assign the value to the wrapped element" do
@@ -74,4 +86,24 @@ describe UnderOs::UI::Input do
     end
   end
 
+  describe '#disabled' do
+    it "returns 'false' by default" do
+      @input.disabled.should == false
+    end
+
+    it "reads the value right of the ios entity" do
+      @input._.enabled = false
+      @input.disabled.should == true
+    end
+
+    it "allows to disable the inputs" do
+      @input.disabled = true
+      @input._.isEnabled.should == false
+    end
+
+    it "has a ruby-style alias" do
+      @input.disabled?.should == false
+    end
+  end
+
 end

data/spec/lib/under_os/ui/select_spec.rb

@@ -3,6 +3,10 @@ describe UnderOs::UI::Select do
     @select  = UnderOs::UI::Select.new
   end
 
+  it "inherits fromthe UnderOs::UI::Input" do
+    (UnderOs::UI::Select < UnderOs::UI::Input).should == true
+  end
+
   describe '#initialize' do
     it "should make select instances" do
       @select.class.should == UnderOs::UI::Select

data/spec/lib/under_os/ui/slider_spec.rb

@@ -3,6 +3,10 @@ describe UnderOs::UI::Slider do
     @slider = UnderOs::UI::Slider.new
   end
 
+  it "inherits fromthe UnderOs::UI::Input" do
+    (UnderOs::UI::Slider < UnderOs::UI::Input).should == true
+  end
+
   describe '#initialize' do
     it "should spawn new sliders" do
       @slider.class.should == UnderOs::UI::Slider

data/spec/lib/under_os/ui/switch_spec.rb

@@ -3,6 +3,10 @@ describe UnderOs::UI::Switch do
     @switch = UnderOs::UI::Switch.new
   end
 
+  it "inherits fromthe UnderOs::UI::Input" do
+    (UnderOs::UI::Switch < UnderOs::UI::Input).should == true
+  end
+
   describe '#initialize' do
     it "should spawn new switchs" do
       @switch.class.should == UnderOs::UI::Switch

data/spec/lib/under_os/ui/textarea_spec.rb

@@ -3,6 +3,10 @@ describe UnderOs::UI::Textarea do
     @textarea = UnderOs::UI::Textarea.new
   end
 
+  it "inherits fromthe UnderOs::UI::Input" do
+    (UnderOs::UI::Textarea < UnderOs::UI::Input).should == true
+  end
+
   describe '#initialize' do
     it "should spawn new textareas" do
       @textarea.class.should == UnderOs::UI::Textarea

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: under-os
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Nikolay Nemshilov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-26 00:00:00.000000000 Z
+date: 2014-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: motion-facon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A web-broser like wrapper over iOS
@@ -45,8 +45,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -124,6 +124,8 @@ files:
 - lib/under_os/ui/collection/item.rb
 - lib/under_os/ui/collection/layout.rb
 - lib/under_os/ui/collection/styles.rb
+- lib/under_os/ui/div.rb
+- lib/under_os/ui/form.rb
 - lib/under_os/ui/icon.rb
 - lib/under_os/ui/icon/awesome.rb
 - lib/under_os/ui/icon/engine.rb
@@ -148,7 +150,6 @@ files:
 - lib/under_os/ui/utils/animation.rb
 - lib/under_os/ui/utils/commons.rb
 - lib/under_os/ui/utils/dimensions.rb
-- lib/under_os/ui/utils/editable.rb
 - lib/under_os/ui/utils/events.rb
 - lib/under_os/ui/utils/manipulation.rb
 - lib/under_os/ui/utils/position.rb
@@ -186,6 +187,8 @@ files:
 - spec/lib/under_os/timer_spec.rb
 - spec/lib/under_os/ui/button_spec.rb
 - spec/lib/under_os/ui/collection_spec.rb
+- spec/lib/under_os/ui/div_spec.rb
+- spec/lib/under_os/ui/form_spec.rb
 - spec/lib/under_os/ui/icon_spec.rb
 - spec/lib/under_os/ui/image_spec.rb
 - spec/lib/under_os/ui/input_spec.rb
@@ -225,12 +228,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -267,6 +270,8 @@ test_files:
 - spec/lib/under_os/timer_spec.rb
 - spec/lib/under_os/ui/button_spec.rb
 - spec/lib/under_os/ui/collection_spec.rb
+- spec/lib/under_os/ui/div_spec.rb
+- spec/lib/under_os/ui/form_spec.rb
 - spec/lib/under_os/ui/icon_spec.rb
 - spec/lib/under_os/ui/image_spec.rb
 - spec/lib/under_os/ui/input_spec.rb

data/lib/under_os/ui/utils/editable.rb

@@ -1,43 +0,0 @@
-#
-# A little trait to handle the common editable fields API
-#
-module UnderOs::UI::Editable
-  KEYBOARDS = {
-    default:   UIKeyboardTypeDefault,
-    ascii:     UIKeyboardTypeASCIICapable,
-    numeric:   UIKeyboardTypeNumbersAndPunctuation,
-    url:       UIKeyboardTypeURL,
-    numbers:   UIKeyboardTypeNumberPad,
-    phone:     UIKeyboardTypePhonePad,
-    name:      UIKeyboardTypeNamePhonePad,
-    email:     UIKeyboardTypeEmailAddress,
-    decimal:   UIKeyboardTypeDecimalPad,
-    twitter:   UIKeyboardTypeTwitter,
-    search:    UIKeyboardTypeWebSearch
-  }
-
-  def value
-    @_.text
-  end
-
-  def value=(value)
-    @_.text = value
-  end
-
-  def placeholder
-    @_.placeholder
-  end
-
-  def placeholder=(value)
-    @_.placeholder = value
-  end
-
-  def keyboard
-    KEYBOARDS.detect{|n,v| v == @_.keyboardType }[0]
-  end
-
-  def keyboard=(keyboard)
-    keyboard = keyboard.to_sym if keyboard.is_a?(String)
-    @_.keyboardType = KEYBOARDS[keyboard] || keyboard
-  end
-end