under-os 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fd9a1ae79f101e53c35741c6935b5eca5353da6
-  data.tar.gz: 44943f17a76499bd0bb3b3fc80f5b52cb0ea5c5d
+  metadata.gz: 5ff1789b7dfe17082f36cf9eea7c8c3444077716
+  data.tar.gz: 520c56f69fdc975f55be7e49d87f3742c12e4dca
 SHA512:
-  metadata.gz: 1ac6a73d2fe135c0df1cce46b4b20880dbd4a826f857fa25a308b6d4d62f3465369a446ef7c92c98b5253129bf9f52379bcfd59a246a8c6a0da53170581008d3
-  data.tar.gz: 27607c0bf2e284d6cc39cd06b45e6f71913329dbcbc14b1225b29f731c0af8755d2bd75ec8bc166e2ef6765e3643d406de9c258f67d37e5dffbaeb69691f84b5
+  metadata.gz: ea4aab7ec336bd41cde899ab86f4caeaa9d206cb7261915eb85157b97a117b628b41e204df63627ac9e18f36e99e0cedc70f876d7441a6cee27bfbe74afb2aef
+  data.tar.gz: 3e7eee7f55f17c5952b96741f2db01cd7ea38e2842476eca515f27a3e093cb8c5516bef93f8dd51cfbd86be60c398d1f1e861540ed63e6283e4183ed41ff9e2c

data/.travis.yml

@@ -0,0 +1,3 @@
+language: objective-c
+install: bundle install
+script: bundle exec rake spec

data/Gemfile

@@ -1,2 +1,3 @@
 source 'https://rubygems.org'
+
 gemspec

data/Gemfile.lock

@@ -1,16 +1,18 @@
 PATH
   remote: .
   specs:
-    under-os (0.0.0)
+    under-os (1.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    motion-facon (0.5.0.1)
     rake (10.1.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  motion-facon
   rake
   under-os!

data/README.md

@@ -1,11 +1,11 @@
-# Under OS
+# Under OS [![Build Status](https://travis-ci.org/under-os/under-os.png)](https://travis-ci.org/under-os/under-os) [![Code Climate](https://codeclimate.com/github/under-os/under-os.png)](https://codeclimate.com/github/under-os/under-os)
 
-An experiment to build a thin web-like wrapper over iOS using rubymotion
+[UnderOS](http://under-os.com) is an experiment in building a thin web-like wrapper over iOS using rubymotion
 
-The idea is to use incapsulation instead of monkey patching and build the
+The idea is to use encapsulation instead of monkey patching and build the
 entire development platform correctly and from scratch.
 
-The result should be a webbish like ifrastructure that uses ruby instead
+The result should be a _webbish_ infrastructure that uses ruby instead
 of JavaScript and compiles into native code in the end.
 
 That's gonna be legendary!
@@ -37,14 +37,6 @@ Now, Run it!
 cd test && rake
 ```
 
-## What's What
-
-* `app/layouts` - where you keep your HTML layouts
-* `app/pages` - where the page scripts live
-* `app/styles` - where the CSS files go
-* `app/models` - where your data models chill
-* `app/views` - where you keep your custom views/components classes
-
 
 # Copyright & License
 

data/Rakefile

@@ -5,6 +5,7 @@ require 'bundler'
 Bundler.require
 
 require 'under-os'
+require 'motion-facon' if ARGV[0] == 'spec'
 
 Motion::Project::App.setup do |app|
   app.name       = 'uos-demo'

data/app/layouts/home.html

@@ -1,14 +1,13 @@
 <page title="Home">
   <view id="buttons">
-    <button id="b1" data-page="stuff">Various Stuff</button>
-    <button id="b2" data-page="calculator">Calculator Demo</button>
-    <button id="b3" data-page="inputs">Inputs Demo</button>
-    <button id="b4" data-page="sidebars">Sidebar Demo</button>
-    <button id="b5" data-page="scrolls">Scrolls Demo</button>
-    <button id="b6" data-page="navbar">Navbar Demo</button>
-    <button id="b7" data-page="alerts">Alerts Demo</button>
-    <button id="b8" data-page="lockers">Lockers Demo</button>
-    <button id="b9" data-page="http">HTTP Demo</button>
-    <button id="b10" data-page="collections">Collections</button>
+    <button id="b1" data-page="calculator">Calculator Demo</button>
+    <button id="b2" data-page="inputs">Inputs Demo</button>
+    <button id="b3" data-page="sidebars">Sidebar Demo</button>
+    <button id="b4" data-page="scrolls">Scrolls Demo</button>
+    <button id="b5" data-page="navbar">Navbar Demo</button>
+    <button id="b6" data-page="alerts">Alerts Demo</button>
+    <button id="b7" data-page="lockers">Lockers Demo</button>
+    <button id="b8" data-page="http">HTTP Demo</button>
+    <button id="b9" data-page="collections">Collections</button>
   </view>
 </page>

data/app/pages/collections_page.rb

@@ -5,5 +5,11 @@ class CollectionsPage < UnderOs::Page
     @collection.on :item do |item, index|
       item.children[0].text = "##{index + 1}"
     end
+    @collection.on :select do |item|
+      item.addClass 'selected'
+    end
+    @collection.on :unselect do |item|
+      item.removeClass 'selected'
+    end
   end
 end

data/app/pages/http_page.rb

@@ -13,7 +13,11 @@ class HttpPage < UnderOs::Page
     @locker.show
 
     UnderOs::HTTP.get search_url do |response|
-      @result.load parse_first_image_url(response.body) do
+      if image_url = parse_first_image_url(response)
+        @result.load image_url do
+          @locker.hide
+        end
+      else
         @locker.hide
       end
     end
@@ -22,12 +26,13 @@ class HttpPage < UnderOs::Page
   def search_url
     query = @search.value
     query = 'puppy' if query.empty?
+    query = String.new(query).url_encode
 
-    "https://www.google.com.au/search?q=#{query}&source=lnms&tbm=isch"
+    "https://ajax.googleapis.com/ajax/services/search/images?v=1.0&q=#{query}"
   end
 
-  def parse_first_image_url(html)
-    html.scan(/imgurl=(http:\/\/[^&]+)/)[0][0]
+  def parse_first_image_url(response)
+    response.json["responseData"]["results"][0]["url"] rescue nil # ftw!
   end
 
 end

data/app/styles/collections.css

@@ -17,3 +17,7 @@ collection item label {
   border-radius: 2px;
   text-align:    center;
 }
+
+collection item.selected label {
+  background: yellow;
+}

data/lib/under-os.rb

@@ -8,16 +8,14 @@ Motion::Project::App.instance_eval do
       Dir.glob(File.dirname(__FILE__) + '/**/*.rb').reverse.each do |file|
         app.files.insert(0, file) if file != __FILE__
       end
-    end
 
-    setup_before_under_os *args do |app|
       app.resources_dirs << File.dirname(__FILE__) + "/assets"
       app.resources_dirs << "app/styles/"  if File.exists?("app/styles")
       app.resources_dirs << "app/layouts/" if File.exists?("app/layouts")
 
       app.fonts << "fontawesome-webfont.ttf"
-
-      instance_exec app, &block
     end
+
+    setup_before_under_os *args, &block
   end
 end

data/lib/under_os/color.rb

@@ -94,26 +94,28 @@ class UnderOs::Color
 
     def color_from_string(name)
       name = name.downcase.strip
-      name = 'clear'     if name == 'transparent'
-      name = 'darkGray'  if name == 'darkgray'
-      name = 'lightGray' if name == 'lightgray'
+      name = ALIASES[name] || name
 
       return UIColor.send("#{name}Color") if IOS_COLORS.include?(name)
 
       name = HTML_COLORS[name] || name
       name = "#" + name[1]*2 + name[2]*2 + name[3]*2 if name =~ /^#[abcdef0-9]{3}$/
 
-      r, g, b, a = if name =~ /^#[abcdef0-9]{6}$/
-        hex_2_rgb(name)
-      elsif m = name.match(/^rgb\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d*)\s*\)$/)
+      r, g, b, a = color_2_rgba(name)
+
+      color_from_array(r, g, b, a || 1.0)
+    end
+
+    def color_2_rgba(color)
+      if color =~ /^#[abcdef0-9]{6}$/
+        hex_2_rgb(color)
+      elsif m = color.match(/^rgb\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d*)\s*\)$/)
         [m[1].to_i, m[2].to_i, m[3].to_i]
-      elsif m = name.match(/^rgba\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d*)\s*,\s*([\d\.]+)\s*\)$/)
+      elsif m = color.match(/^rgba\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d*)\s*,\s*([\d\.]+)\s*\)$/)
         [m[1].to_i, m[2].to_i, m[3].to_i, m[4].to_f]
       else
-        raise "Malformed color spec: #{name.inspect}"
+        raise "Malformed color spec: #{color.inspect}"
       end
-
-      color_from_array(r, g, b, a || 1.0)
     end
 
     def color_from_param(param) # 0.0..1.0
@@ -144,6 +146,12 @@ class UnderOs::Color
       end
     end
 
+    ALIASES = {
+      'transparent' => 'clear',
+      'darkgray'    => 'darkGray',
+      'lightgray'   => 'lightGray'
+    }
+
     IOS_COLORS = %w[
       black
       darkGray

data/lib/under_os/core/array.rb

@@ -0,0 +1,5 @@
+class Array
+  def to_query(key)
+    collect { |value| value.to_query("#{key}[]") }.join '&'
+  end
+end

data/lib/under_os/core/hash.rb

@@ -0,0 +1,10 @@
+class Hash
+  #
+  # Converts a hash into an URL query string
+  #
+  def to_query(namespace=nil)
+    map do |key, value|
+      value.to_query(namespace ? "#{namespace}[#{key}]" : key)
+    end.sort * '&'
+  end
+end

data/lib/under_os/core/json.rb

@@ -0,0 +1,19 @@
+class JSON
+  class Malformed < StandardError ; end
+
+  def self.parse(string, encoding=nil)
+    error = Pointer.new(:object)
+    data  = NSJSONSerialization.JSONObjectWithData string.to_data(encoding), options:0, error:error
+
+    if error[0]
+      raise Malformed
+    else
+      data
+    end
+  end
+
+  def self.generate(object, pretty=false)
+    options = pretty ? NSJSONWritingPrettyPrinted : 0
+    NSJSONSerialization.dataWithJSONObject(object, options:options, error:nil).to_s
+  end
+end

data/lib/under_os/core/object.rb

@@ -0,0 +1,9 @@
+class Object
+  def to_query(key)
+    "#{key.to_s.url_encode}=#{to_s.url_encode}"
+  end
+
+  def to_json(pretty=nil)
+    JSON.generate(self, pretty)
+  end
+end

data/lib/under_os/core/string.rb

@@ -37,4 +37,44 @@ class String
     end
     constant
   end
+
+  def url_encode(encoding=nil)
+    stringByAddingPercentEscapesUsingEncoding ENCODINGS[encoding] || NSUTF8StringEncoding
+  end
+
+  def url_decode(encoding=nil)
+    stringByReplacingPercentEscapesUsingEncoding ENCODINGS[encoding] || NSUTF8StringEncoding
+  end
+
+  def to_data(encoding=nil)
+    dataUsingEncoding ENCODINGS[encoding] || NSUTF8StringEncoding
+  end
+
+  ENCODINGS = {
+    'utf-8'  => NSUTF8StringEncoding,
+    'utf-16' => NSUTF16StringEncoding,
+    'utf-32' => NSUTF32StringEncoding,
+    'ascii'  => NSASCIIStringEncoding,
+    'latin1' => NSISOLatin1StringEncoding,
+    'latin2' => NSISOLatin2StringEncoding,
+    'cp1250' => NSWindowsCP1250StringEncoding,
+    'cp1251' => NSWindowsCP1251StringEncoding,
+    'cp1252' => NSWindowsCP1252StringEncoding,
+    'cp1253' => NSWindowsCP1253StringEncoding,
+    'cp1254' => NSWindowsCP1254StringEncoding,
+
+
+    # NSNEXTSTEPStringEncoding = 2,
+    # NSJapaneseEUCStringEncoding = 3,
+    # NSSymbolStringEncoding = 6,
+    # NSNonLossyASCIIStringEncoding = 7,
+    # NSShiftJISStringEncoding = 8,
+    # NSISO2022JPStringEncoding = 21,
+    # NSMacOSRomanStringEncoding = 30,
+    # NSUTF16BigEndianStringEncoding = 0x90000100,
+    # NSUTF16LittleEndianStringEncoding = 0x94000100,
+    # NSUTF32BigEndianStringEncoding = 0x98000100,
+    # NSUTF32LittleEndianStringEncoding = 0x9c000100,
+    # NSProprietaryStringEncoding = 65536
+  }
 end

data/lib/under_os/file.rb

@@ -69,7 +69,7 @@ class UnderOs::File
       NSFileManager.defaultManager.createFileAtPath @path, contents:nil, attributes:nil
     end
 
-    content = content.dataUsingEncoding(NSUTF8StringEncoding) if content.is_a?(String)
+    content = content.to_data('utf-8') if content.is_a?(String)
 
     open
     @handle.writeData content

data/lib/under_os/http/cookies.rb

@@ -0,0 +1,30 @@
+#
+# A simple cookie jar thing
+#
+class UnderOs::HTTP::Cookies
+  def initialize(cookies, url)
+    @url  = url.is_a?(String) ? NSURL.URLWithString(url) : url
+    @hash = cookies
+  end
+
+  def headers
+    NSHTTPCookie.requestHeaderFieldsWithCookies(ios_cookies)
+  end
+
+  def to_s
+    headers["Cookie"]
+  end
+
+protected
+
+  def ios_cookies
+    @hash.map do |key, value|
+      NSHTTPCookie.cookieWithProperties({
+        NSHTTPCookieDomain => @url.host,
+        NSHTTPCookiePath   => "/",
+        NSHTTPCookieName   => key.to_s,
+        NSHTTPCookieValue  => value.to_s
+      })
+    end
+  end
+end

data/lib/under_os/http/request.rb

@@ -1,9 +1,11 @@
 #
 # Options:
 #
-#   * :method  - GET, POST, ...
-#   * :cookies - Hash of cookie values
-#   * :stream  - boolean, in case you want to stream stuff
+#   * :method   - GET, POST, ...
+#   * :cookies  - Hash of cookie values
+#   * :stream   - boolean, in case you want to stream stuff
+#   * :params   - the POST/PUT/PATCH params hash
+#   * :encoding - the POST data encoding
 #
 # Events:
 #
@@ -37,10 +39,14 @@ class UnderOs::HTTP::Request
     @receiver   = Receiver.new(self, @options[:stream])
     @connection = NSURLConnection.alloc.initWithRequest(@request, delegate:@receiver)
     @connection.start
+
+    return self
   end
 
   def cancel
     @connection.cancel
+
+    return self
   end
 
   def method
@@ -58,32 +64,43 @@ class UnderOs::HTTP::Request
     @options[:cookies] || {}
   end
 
+  def params
+    @options[:params] || {}
+  end
+
+  def encoding
+    @options[:encoding] || 'utf-8'
+  end
+
 protected
 
   def build_request
-    url = NSURL.URLWithString(NSString.stringWithFormat(@url))
-    NSMutableURLRequest.requestWithURL(url).tap do |request|
-      request.setHTTPMethod self.method
-      #request.setHTTPBody self.params
-
-      cookies = self.cookies.map do |key, value|
-        NSHTTPCookie.cookieWithProperties({
-          NSHTTPCookieDomain => url.host,
-          NSHTTPCookiePath   => "/",
-          NSHTTPCookieName   => key.to_s,
-          NSHTTPCookieValue  => value.to_s
-        })
-      end
+    query = params.to_query
+    url   = build_url(query)
 
-      request.setAllHTTPHeaderFields NSHTTPCookie.requestHeaderFieldsWithCookies(cookies) if cookies.size > 0
+    NSMutableURLRequest.requestWithURL(url).tap do |request|
+      request.setHTTPMethod method
 
-      headers.each do |key, value|
+      headers.merge(UnderOs::HTTP::Cookies.new(cookies, url).headers).each do |key, value|
         request.addValue value, forHTTPHeaderField:key
       end
 
-      # [newRequest addValue:@"application/x-www-form-urlencoded;charset=UTF-8" forHTTPHeaderField:@"Content-Type"];
-      # [newRequest setHTTPBody:[query dataUsingEncoding:NSUTF8StringEncoding]];
+      if %w[POST PUT PATCH DELETE].include?(method) && !query.empty?
+        request.addValue "application/x-www-form-urlencoded;charset=#{encoding}", forHTTPHeaderField:"Content-Type"
+        request.setHTTPBody query.to_data(encoding)
+      end
     end
   end
+
+  def build_url(query)
+    url  = @url
+
+    if method == "GET" && !query.empty?
+      url += url.include?('?') ? '&' : '?'
+      url += query
+    end
+
+    NSURL.URLWithString(url)
+  end
 end
 

data/lib/under_os/http/response.rb

@@ -14,6 +14,10 @@ class UnderOs::HTTP::Response
     @body ||= @data.to_s
   end
 
+  def json
+    JSON.parse(body)
+  end
+
   def content_length
     headers["Content-Length"].to_i
   end

data/lib/under_os/http.rb

@@ -1,5 +1,31 @@
 class UnderOs::HTTP
   def self.get(url, options={}, &block)
-    Request.new(url, options.merge(method: :get), &block).send
+    request url, options.merge(method: :get), &block
+  end
+
+  def self.post(url, options={}, &block)
+    request url, options.merge(method: :post), &block
+  end
+
+  def self.put(url, options={}, &block)
+    request url, options.merge(method: :put), &block
+  end
+
+  def self.patch(url, options={}, &block)
+    request url, options.merge(method: :patch), &block
+  end
+
+  def self.head(url, options={}, &block)
+    request url, options.merge(method: :head), &block
+  end
+
+  def self.delete(url, options={}, &block)
+    request url, options.merge(method: :delete), &block
+  end
+
+protected
+
+  def self.request(*args, &block)
+    Request.new(*args, &block).send
   end
 end

data/lib/under_os/ui/collection/delegate.rb

@@ -59,10 +59,12 @@ class UnderOs::UI::Collection::Delegate < UIViewController
   ################################################################
 
   def collectionView(collection, didSelectItemAtIndexPath: indexPath)
-    @collection.emit(:select, index: indexPath.row, section: indexPath.section)
+    item = collection.cellForItemAtIndexPath(indexPath).uos_view_for(@collection)
+    @collection.emit(:select, item: item, index: indexPath.row, section: indexPath.section)
   end
 
   def collectionView(collection, didDeselectItemAtIndexPath: indexPath)
-    @collection.emit(:unselect, index: indexPath.row, section: indexPath.section)
+    item = collection.cellForItemAtIndexPath(indexPath).uos_view_for(@collection)
+    @collection.emit(:unselect, item: item, index: indexPath.row, section: indexPath.section)
   end
 end

data/lib/under_os/ui/collection.rb

@@ -14,7 +14,7 @@ class UnderOs::UI::Collection < UnderOs::UI::View
 
   def on(*args, &block)
     super *args do |event|
-      params = [event.item, event.index, event.section].compact
+      params = [event.item, event.index, event.section]
       params = params.slice(0, block.arity) if block.arity > -1
 
       block.call *params
@@ -40,6 +40,7 @@ class UnderOs::UI::Collection < UnderOs::UI::View
 
   def reload
     @_.reloadData
+    self
   end
 
   def number_of_items(section=0)
@@ -48,6 +49,7 @@ class UnderOs::UI::Collection < UnderOs::UI::View
 
   def number_of_items=(value)
     @number_of_items = value.is_a?(Numeric) ? [value] : value
+    reload
   end
 
   def number_of_sections

data/lib/under_os/ui/locker.rb

@@ -1,7 +1,7 @@
 class UnderOs::UI::Locker < UnderOs::UI::View
   wraps UIView, tag: :locker
 
-  attr_reader :label, :sinner
+  attr_reader :label, :spinner
 
   def initialize(options={})
     super options

data/lib/under_os/ui/style/fonts.rb

@@ -22,39 +22,33 @@ module UnderOs::UI
 
       def textAlign
         if @view.is_a?(UIButton)
-          case @view.contentHorizontalAlignment
-            when UIControlContentHorizontalAlignmentRight  then 'right'
-            when UIControlContentHorizontalAlignmentCenter then 'center'
-            when UIControlContentHorizontalAlignmentFill   then 'justify'
-            else                                                'left'
-          end
+          BUTTONS_ALIGMENTS_MAP.key(@view.contentHorizontalAlignment)
         elsif @view.respond_to?(:textAlignment)
-          case @view.textAlignment
-            when NSTextAlignmentRight     then 'right'
-            when NSTextAlignmentCenter    then 'center'
-            when NSTextAlignmentJustified then 'justify'
-            else                               'left'
-          end
+          TEXTNODES_ALIGMENTS_MAP.key(@view.textAlignment)
         end
       end
 
       def textAlign=(value)
         if @view.is_a?(UIButton)
-          @view.contentHorizontalAlignment = case value.to_s
-            when 'right'   then UIControlContentHorizontalAlignmentRight
-            when 'center'  then UIControlContentHorizontalAlignmentCenter
-            when 'justify' then UIControlContentHorizontalAlignmentFill
-            else                UIControlContentHorizontalAlignmentLeft
-          end
+          @view.contentHorizontalAlignment = BUTTONS_ALIGMENTS_MAP[value.to_s] || BUTTONS_ALIGMENTS_MAP['left']
         elsif @view.respond_to?(:textAlignment)
-          @view.textAlignment = case value.to_s
-            when 'right'   then NSTextAlignmentRight
-            when 'center'  then NSTextAlignmentCenter
-            when 'justify' then NSTextAlignmentJustified
-            else                NSTextAlignmentLeft
-          end
+          @view.textAlignment = TEXTNODES_ALIGMENTS_MAP[value.to_s] || BUTTONS_ALIGMENTS_MAP['left']
         end
       end
+
+      BUTTONS_ALIGMENTS_MAP = {
+        'right'   => UIControlContentHorizontalAlignmentRight,
+        'center'  => UIControlContentHorizontalAlignmentCenter,
+        'justify' => UIControlContentHorizontalAlignmentFill,
+        'left'    => UIControlContentHorizontalAlignmentLeft
+      }
+
+      TEXTNODES_ALIGMENTS_MAP = {
+        'right'   => NSTextAlignmentRight,
+        'center'  => NSTextAlignmentCenter,
+        'justify' => NSTextAlignmentJustified,
+        'left'    => NSTextAlignmentLeft
+      }
     end
   end
 end

data/lib/under_os/ui/style/margins.rb

@@ -19,11 +19,8 @@ module UnderOs::UI
       end
 
       def margin=(value)
-        value = to_4dim_array(value)
-        self.marginTop    = value[0]
-        self.marginLeft   = value[3]
-        self.marginRight  = value[1]
-        self.marginBottom = value[2]
+        @margin_top, @margin_right, @margin_botom, @margin_left = to_4dim_array(value)
+        set_offsets
       end
 
       def marginTop
@@ -67,11 +64,8 @@ module UnderOs::UI
       end
 
       def padding=(value)
-        value = to_4dim_array(value)
-        self.paddingTop    = value[0]
-        self.paddingLeft   = value[3]
-        self.paddingRight  = value[1]
-        self.paddingBottom = value[2]
+        @padding_top, @padding_right, @padding_botom, @padding_left = to_4dim_array(value)
+        set_offsets
       end
 
       def paddingTop
@@ -113,10 +107,7 @@ module UnderOs::UI
     private
 
       def to_4dim_array(value)
-        if value.is_a?(String)
-          value = value.gsub('px', '').strip.split().reject(&:blank?).map(&:to_f)
-        end
-
+        value = value.gsub('px', '').split.map(&:to_f) if value.is_a?(String)
         value = Array(value)
         case value.size
         when 1 then value * 4
@@ -128,32 +119,45 @@ module UnderOs::UI
       def set_offsets
         return nil if display != :inline
 
-        position_x    = marginLeft
-        position_y    = marginTop
+        position_x = marginLeft + parent_offset_x
+        position_y = marginTop
 
-        parent_view   = view.superview
-        previous_view = parent_view.subviews[parent_view.subviews.index(view)-1] unless parent_view.subviews[0] === view
+        @view.frame = [[position_x, position_y], [
+          @view.frame.size.width, @view.frame.size.height
+        ]]
+      end
+
+      def set_paddings
+        if @view.respond_to?(:contentEdgeInsets)
+          @view.contentEdgeInsets = UIEdgeInsetsMake(paddingTop, paddingLeft, paddingBottom, paddingRight)
+        end
+      end
 
-        if previous_view
-          pos  = previous_view.frame.origin
-          size = previous_view.frame.size
+      def parent_offset_x
+        offset       = 0
+        parent_frame = parent_view_frame
 
-          position_x += pos.x + size.width
+        if parent_frame
+          offset += parent_frame.origin.x + parent_frame.size.width
 
-          if wrap = UnderOs::UI::View.wrap_for(view)
-            position_x += wrap.style.marginRight
+          if wrap = UnderOs::UI::View.wrap_for(@view)
+            offset += wrap.style.marginRight
           end
         end
 
-        view.frame = [[position_x, position_y],[
-          view.frame.size.width, view.frame.size.height
-        ]]
+        offset
       end
 
-      def set_paddings
-        if @view.respond_to?(:contentEdgeInsets)
-          @view.contentEdgeInsets = UIEdgeInsetsMake(paddingTop, paddingLeft, paddingBottom, paddingRight)
+      def parent_view_frame
+        parent_view  = @view.superview
+        parent_frame = nil
+
+        unless parent_view.subviews[0] === @view
+          previous_view = parent_view.subviews[parent_view.subviews.index(@view)-1]
+          parent_frame  = previous_view && previous_view.frame
         end
+
+        parent_frame
       end
     end
   end

data/lib/under_os.rb

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

data/spec/lib/core/hash_spec.rb

@@ -0,0 +1,19 @@
+describe Hash do
+  describe '#to_query' do
+    it "converts a simple hash into a query string" do
+      {a: 1, b: 2}.to_query.should == 'a=1&b=2'
+    end
+
+    it "converts nested hashes into queries correctly" do
+      {a: 1, b: {c: {d: 4}}}.to_query.should == 'a=1&b%5Bc%5D%5Bd%5D=4'
+    end
+
+    it "handles array values correctly" do
+      {a: [1,2,3,4]}.to_query.should == 'a%5B%5D=1&a%5B%5D=2&a%5B%5D=3&a%5B%5D=4'
+    end
+
+    it "escapes any URL sensitive characters in the values" do
+      {a: '%= '}.to_query.should == 'a=%25=%20'
+    end
+  end
+end

data/spec/lib/core/json_spec.rb

@@ -0,0 +1,32 @@
+describe JSON do
+  describe ".parse" do
+    it "parses correct json strings" do
+      JSON.parse('{"a":1,"b":true,"c":["data"]}').should == {
+        "a" => 1, "b" => true, "c" => ["data"]
+      }
+    end
+
+    it "raises an exception on malformed data" do
+      -> {
+        JSON.parse("malformed")
+      }.should.raise(JSON::Malformed)
+    end
+  end
+
+  describe ".generate" do
+    it "generates JSON string out of objects" do
+      JSON.generate({a:1, b:true, c:[:data]}).should ==
+        '{"a":1,"b":true,"c":["data"]}'
+    end
+
+    it "generates pretty print when asked" do
+      JSON.generate({a:1, b:true, c:[:data]}, :pretty).should ==
+        "{\n  \"a\" : 1,\n  \"b\" : true,\n  \"c\" : [\n    \"data\"\n  ]\n}"
+    end
+
+    it "allows to export things directly of objects" do
+      {a:1, b:true, c:[:data]}.to_json.should ==
+        '{"a":1,"b":true,"c":["data"]}'
+    end
+  end
+end

data/spec/lib/core/string_spec.rb

@@ -84,4 +84,38 @@ describe String do
       }.should.raise(NameError)
     end
   end
+
+  describe '#url_encode' do
+    it "escapes all the URL sensitive symbols" do
+      "!*'\"();:@&=+$,/?%#[]% ".url_encode.should == "!*'%22();:@&=+$,/?%25%23%5B%5D%25%20"
+    end
+
+    it "doesn't touch normal characters" do
+      "Hello World".url_encode.should == "Hello%20World"
+    end
+  end
+
+  describe '#url_decode' do
+    it "converts an url encoded string back to normality" do
+      "!*'%22();:@&=+$,/?%25%23%5B%5D%25%20".url_decode.should == "!*'\"();:@&=+$,/?%#[]% "
+    end
+
+    it "doesn't break normal characters" do
+      "Hello%20World".url_decode.should == "Hello World"
+    end
+  end
+
+  describe '#to_data' do
+    before do
+      @data = "ohai there".to_data
+    end
+
+    it "converts the string into a data object" do
+      @data.is_a?(NSData).should == true
+    end
+
+    it "converts it into data with correct content" do
+      @data.to_s.should == "ohai there"
+    end
+  end
 end

data/spec/lib/under_os/http/cookies_spec.rb

@@ -0,0 +1,13 @@
+describe UnderOS::HTTP::Cookies do
+  before do
+    @cookies = UnderOS::HTTP::Cookies.new({a: 1, b: true}, "http://test.com")
+  end
+
+  it "allows to export them in a string" do
+    @cookies.to_s.should == "a=1; b=true"
+  end
+
+  it "allows to export them into an HTTP header hash" do
+    @cookies.headers.should == {"Cookie"=>"a=1; b=true"}
+  end
+end

data/spec/lib/under_os/http/request_spec.rb

@@ -0,0 +1,44 @@
+describe UnderOS::HTTP::Request do
+  before do
+    @url     = "http://test.com"
+    @request = UnderOS::HTTP::Request.new(@url, {
+      headers: {my: 'headers'},
+      cookies: {my: 'cookies'},
+      params:  {my: 'params'},
+      method:  :put
+    })
+  end
+
+  describe "#constructor" do
+    it "assigns the url correctly" do
+      @request.url.should == @url
+    end
+
+    it "assigns the request headers correctly" do
+      @request.headers.should == {my: 'headers'}
+    end
+
+    it "assigns the request cookies correctly" do
+      @request.cookies.should == {my: 'cookies'}
+    end
+
+    it "assigns my params correctly" do
+      @request.params.should == {my: 'params'}
+    end
+
+    it "assigns the request method correctly" do
+      @request.method.should == 'PUT'
+    end
+  end
+
+  describe "#on" do
+    it "returns the response object instead of an event into a callback" do
+      @response = nil
+
+      @request.on(:smth) { |r| @response = r }
+      @request.emit(:smth, response: 'response')
+
+      @response.should == 'response'
+    end
+  end
+end

data/spec/lib/under_os/http_spec.rb

@@ -0,0 +1,20 @@
+describe UnderOs::HTTP do
+  extend Facon::SpecHelpers
+
+  before do
+    @url = 'http://test.com'
+    @req = mock 'request', send: :request
+  end
+
+  %w[get post put patch head delete].each do |method|
+    describe ".#{method}" do
+      it "sends a #{method.upcase} request" do
+        UnderOs::HTTP::Request.should.receive(:new)
+          .with(@url, foo: 'bar', method: method.to_sym)
+          .and_return(@req)
+
+        UnderOs::HTTP.__send__(method, @url, foo: 'bar').should == :request
+      end
+    end
+  end
+end

data/under-os.gemspec

@@ -16,8 +16,6 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}) { |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
 
-  gem.add_development_dependency 'rake'
-
   gem.post_install_message = %Q{
   If you want to use the UnderOS template with RubyMotion, please run the following:
 
@@ -29,4 +27,8 @@ Gem::Specification.new do |gem|
 
     motion create awesomness --template=uos
   }
+
+  gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'motion-facon'
+
 end

metadata

@@ -1,27 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: under-os
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Nikolay Nemshilov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-13 00:00:00.000000000 Z
+date: 2013-12-26 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
@@ -31,7 +45,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -57,7 +72,6 @@ files:
 - app/pages/navbar_page.rb
 - app/pages/scrolls_page.rb
 - app/pages/sidebars_page.rb
-- app/pages/stuff_page.rb
 - app/styles/application.css
 - app/styles/calculator.css
 - app/styles/collections.css
@@ -73,14 +87,19 @@ files:
 - lib/under_os/app.rb
 - lib/under_os/color.rb
 - lib/under_os/config.rb
+- lib/under_os/core/array.rb
+- lib/under_os/core/hash.rb
+- lib/under_os/core/json.rb
 - lib/under_os/core/kernel.rb
 - lib/under_os/core/numeric.rb
+- lib/under_os/core/object.rb
 - lib/under_os/core/string.rb
 - lib/under_os/delegate.rb
 - lib/under_os/events.rb
 - lib/under_os/file.rb
 - lib/under_os/history.rb
 - lib/under_os/http.rb
+- lib/under_os/http/cookies.rb
 - lib/under_os/http/receiver.rb
 - lib/under_os/http/request.rb
 - lib/under_os/http/response.rb
@@ -144,11 +163,16 @@ files:
 - spec/assets/test.css
 - spec/assets/test.html
 - spec/assets/test_page.rb
+- spec/lib/core/hash_spec.rb
+- spec/lib/core/json_spec.rb
 - spec/lib/core/numeric_spec.rb
 - spec/lib/core/string_spec.rb
 - spec/lib/under_os/color_spec.rb
 - spec/lib/under_os/events_spec.rb
 - spec/lib/under_os/file_spec.rb
+- spec/lib/under_os/http/cookies_spec.rb
+- spec/lib/under_os/http/request_spec.rb
+- spec/lib/under_os/http_spec.rb
 - spec/lib/under_os/page/builder_spec.rb
 - spec/lib/under_os/page/layout_spec.rb
 - spec/lib/under_os/page/matcher_spec.rb
@@ -201,17 +225,17 @@ 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: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: A web-broser like wrapper over iOS using RubyMotion
@@ -220,11 +244,16 @@ test_files:
 - spec/assets/test.css
 - spec/assets/test.html
 - spec/assets/test_page.rb
+- spec/lib/core/hash_spec.rb
+- spec/lib/core/json_spec.rb
 - spec/lib/core/numeric_spec.rb
 - spec/lib/core/string_spec.rb
 - spec/lib/under_os/color_spec.rb
 - spec/lib/under_os/events_spec.rb
 - spec/lib/under_os/file_spec.rb
+- spec/lib/under_os/http/cookies_spec.rb
+- spec/lib/under_os/http/request_spec.rb
+- spec/lib/under_os/http_spec.rb
 - spec/lib/under_os/page/builder_spec.rb
 - spec/lib/under_os/page/layout_spec.rb
 - spec/lib/under_os/page/matcher_spec.rb

data/app/pages/stuff_page.rb

@@ -1,35 +0,0 @@
-class StuffPage < UnderOs::Page
-  def initialize
-    self.title = "Various Stuff"
-
-    @box = View.new(style: {
-      top:          50,
-      left:         50,
-      width:        100,
-      height:       100,
-      background:   :red,
-      borderRadius: 10,
-      borderWidth:  2,
-      borderColor:  :green
-    })
-
-    @box.on(:tap){ @box.fade_out.fade_in }
-
-    @b2 = View.new(style: {background: :blue})
-    @b2.size = {x: 50, y: 50}
-    @b2.position = {x: 25, y: 25}
-
-    @b2.on(:tap, :highlight)
-
-    insert @box.insert(@b2)
-
-    insert Button.new(text: 'Boo Hoo!').position(x: 100, y: 200)
-
-    insert Label.new(text: "Hey Label", style: {background: :red}).position({x: 100, y: 250})
-
-    insert Icon.new(:cog).position(x: 50, y: 300)
-    insert Icon.new(:trash).position(x: 100, y: 300)
-    insert Icon.new(:home).position(x: 150, y: 300)
-    insert Icon.new(:magic).position(x: 200, y: 300)
-  end
-end