under-os 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f26c97edd3027e97c225827fd8bd869ae1590cc0
-  data.tar.gz: 517d1b9dbcbb2ed6008a4211ce765705e1c58a65
+  metadata.gz: c85e8e24c0882f5dd2129ab806fc38c6af5086b9
+  data.tar.gz: 943c82a084c7b39be0c67d9931f6b956e90b5e7b
 SHA512:
-  metadata.gz: 6eb0aeb8452c02e6b7777f37b2f4cd4187dcd9e03aad75542bd91350a961c592edfa1c315b8d26075606a9199c1cda707dd54cf8b62a4cb4e0256b19dae73dd1
-  data.tar.gz: 289fbfefe89706b5abc4e31f97d461a635ead887d28fd360a8463ba4430e0efe7dd08c9f4d5b2c2e524cc37dc2b1c6c281327953a3d84f106425a627ea3508f6
+  metadata.gz: b49c68493a565fe87549b70cfb19f33d861ad8d7a164b918a3875485c4b965a11eddf636a26800b72384d7a881acf14ecd24f313445317bf1369d68a434a5ef8
+  data.tar.gz: b3b2067131c19751aed7c5e3478b60bae458aaedd59d8bde0cf84e1ab7fde5c5094113566b942e520aa3d01fe203f19b4a3f904459bc7aa9936377bd7f187dba

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    under-os (1.2.0)
+    under-os (1.2.1)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -1,9 +1,11 @@
 # 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)
 
-[UnderOS](http://under-os.com) is an experiment in building a thin web-like wrapper over iOS using rubymotion
+[UnderOS](http://under-os.com) is an experiment in building a thin web-browser like
+envirnonment over iOS using rubymotion
 
-The idea is to use encapsulation instead of monkey patching and build the
-entire development platform correctly and from scratch.
+The idea is to create a native mobile apps development environment that will be
+using concepts familiar to all web-developers, like HTML, CSS, jQuery style
+events handling, etc.
 
 The result should be a _webbish_ infrastructure that uses ruby instead
 of JavaScript and compiles into native code in the end.
@@ -18,20 +20,13 @@ That's gonna be legendary!
 gem install under-os
 ```
 
-2) Clone the RubyMotion template in place
-
-```
-mkdir -p ~/Library/RubyMotion/template/uos
-git clone https://github.com/under-os/under-os-template.git ~/Library/RubyMotion/template/uos
-```
-
-3) Make a new app using the `uos` template
+2) Make a new app using the `uos` template
 
 ```
 motion create test --template=uos
 ```
 
-Now, Run it!
+3) Run it!
 
 ```
 cd test && rake
@@ -42,7 +37,7 @@ cd test && rake
 
 All code in this library is released under the terms of the MIT license
 
-Copyright (C) 2013 Nikolay Nemshilov
+Copyright (C) 2013-2014 Nikolay Nemshilov
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/lib/under-os.rb

@@ -1,21 +1,8 @@
-# just a gem hook
+require File.dirname(__FILE__) + "/under_os.rb"
 
-Motion::Project::App.instance_eval do
-  alias :setup_before_under_os :setup
+UnderOs.extend __FILE__ do |app|
+  app.resources_dirs << "app/styles/"  if File.exists?("app/styles")
+  app.resources_dirs << "app/layouts/" if File.exists?("app/layouts")
 
-  def setup(*args, &block)
-    config.setup_blocks << proc do |app|
-      Dir.glob(File.dirname(__FILE__) + '/**/*.rb').reverse.each do |file|
-        app.files.insert(0, file) if file != __FILE__
-      end
-
-      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"
-    end
-
-    setup_before_under_os *args, &block
-  end
+  app.fonts << "fontawesome-webfont.ttf"
 end

data/lib/under_os/events.rb

@@ -19,19 +19,17 @@ module UnderOs::Events
     extend self
 
     def list(model, event=nil)
-      @listeners                      ||= {}
-      @listeners[model]               ||= {}
-      @listeners[model][event.to_sym] ||= [] if event
+      @listeners ||= Hash.new{|h,k| h[k] = Hash.new{|h,k| h[k] = []} }
       event ? @listeners[model][event.to_sym] : @listeners[model]
     end
 
     def add(model, event, *args, block)
-      list(model, event.to_sym) << [block, *args]
+      list(model, event) << [block, *args]
       model
     end
 
     def all(model, event)
-      list(model, event.to_sym)
+      list(model, event)
     end
 
     def remove(model, event)
@@ -44,7 +42,9 @@ module UnderOs::Events
 
       all(model, event.name).each do |block, method_name, *args|
         if !block && method_name
-          block   = Proc.new{ __send__(method_name, *args) }
+          block   = Proc.new{ |e|
+            a = method(method_name).arity == 0 ? [] : [e];
+            __send__(method_name, *a) }
           context = model
         elsif block && method_name # <- considering it's a context reference
           context = method_name

data/lib/under_os/history.rb

@@ -15,7 +15,10 @@ class UnderOs::History
   end
 
   def current_page
-    @_.visibleViewController.wrapper
+    controller = @_.topViewController
+
+    controller.is_a?(UnderOs::Page::UIViewControllerWrap) ?
+      controller.wrapper : root_page
   end
 
   def push(page, animated=true)

data/lib/under_os/page.rb

@@ -149,5 +149,21 @@ class UnderOs::Page
     def prefersStatusBarHidden
       !UnderOs::App.config.status_bar
     end
+
+    def touchesBegan(touches, withEvent:event)
+      UnderOs::UI::Events::TouchListeners.notify :touchstart, event
+    end
+
+    def touchesMoved(touches, withEvent:event)
+      UnderOs::UI::Events::TouchListeners.notify :touchmove, event
+    end
+
+    def touchesEnded(touches, withEvent: event)
+      UnderOs::UI::Events::TouchListeners.notify :touchend, event
+    end
+
+    def touchesCancelled(touches, withEvent: event)
+      UnderOs::UI::Events::TouchListeners.notify :touchcancel, event
+    end
   end
 end

data/lib/under_os/ui/navbar.rb

@@ -24,13 +24,21 @@ class UnderOs::UI::Navbar
     !hidden
   end
 
+  def disable_swipes
+    @_.interactivePopGestureRecognizer.enabled = false
+  end
+
+  def enable_swipes
+    @_.interactivePopGestureRecognizer.enabled = true
+  end
+
   def left_button
     @left_button
   end
 
   def left_button=(view)
     @left_button = view
-    @_.visibleViewController.navigationItem.leftBarButtonItem = to_navigation_item(view)
+    @_.topViewController.navigationItem.leftBarButtonItem = to_navigation_item(view)
   end
 
   def right_button
@@ -48,7 +56,7 @@ class UnderOs::UI::Navbar
   def right_buttons=(views)
     views = [views] if views.is_a?(Hash)
     @right_buttons = views
-    @_.visibleViewController.navigationItem.rightBarButtonItems =
+    @_.topViewController.navigationItem.rightBarButtonItems =
       views.map{|v| to_navigation_item(v)}.flatten.compact.reverse
   end
 

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

@@ -88,11 +88,83 @@ module UnderOs::UI
         @view.layer.borderWidth = width
       end
 
+      def boxShadow
+        get_layer_shadow @view.layer
+      end
+
+      def boxShadow=(value)
+        set_layer_shadow @view.layer, value
+      end
+
+      def textShadow
+        get_layer_shadow text_layer
+      end
+
+      def textShadow=(value)
+        set_layer_shadow text_layer, value
+      end
+
     private
 
       def convert_color(color)
         UnderOs::Color.new(color).ui
       end
+
+      def text_layer
+        @view.is_a?(UIButton) ? @view.titleLabel : @view.layer
+      end
+
+      def get_layer_shadow(layer)
+        [
+          layer.shadowOffset.width,
+          layer.shadowOffset.height,
+          layer.shadowRadius,
+          layer.shadowOpacity,
+          UnderOs::Color.new(layer.shadowColor).to_hex
+        ].compact.join(" ")
+      end
+
+      def set_layer_shadow(layer, value)
+        x, y, radius, opacity, color = parse_shadow_params(value)
+
+        layer.shadowOffset  = CGSizeMake(x, y) if x && y
+        layer.shadowColor   = color.CGColor    if color
+        layer.shadowRadius  = radius           if radius
+        layer.shadowOpacity = opacity          if opacity
+        layer.shadowPath    = UIBezierPath.bezierPathWithRect(@view.layer.bounds).CGPath
+      end
+
+      def parse_shadow_params(string)
+        x, y, radius, opacity, color = string.strip.split
+
+        x = x.gsub /px$/, ''
+        y = y.gsub /px$/, ''
+        radius  = radius.gsub  /px$/, '' if radius
+        opacity = opacity.gsub /px$/, '' if opacity
+
+        if ! color
+          if opacity
+            unless opacity =~ /^[\d\.]+$/
+              color   = opacity
+              opacity = nil
+            end
+          elsif radius
+            unless radius =~ /^[\d\.]+$/
+              color  = radius
+              radius = nil
+            end
+          end
+        end
+
+        x = x.to_f if x
+        y = y.to_f if y
+
+        radius  = radius.to_f  if radius
+        opacity = opacity.to_f if opacity
+        color   = convert_color(color) if color
+
+        [x, y, radius, opacity, color]
+      end
     end
   end
 end

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

@@ -6,11 +6,10 @@ module UnderOs::UI::Events
   def on(event, *args, &block)
     return event.map{|e,b| self.on(e,&b)}[0] || self if event.is_a?(Hash)
 
-    event, recognizer = find_recognizer_from(event)
-
-    @_.addGestureRecognizer(recognizer.alloc.initWithTarget(self, action: :emit)) if recognizer
     @_.userInteractionEnabled = true
 
+    event = add_ui_event_listener(event)
+
     UnderOs::Events::Listeners.add(self, event, *args, block)
   end
 
@@ -20,6 +19,7 @@ module UnderOs::UI::Events
 
   def emit(*event)
     if event.is_a?(UIGestureRecognizer)
+      event, r = find_recognizer_from(event.class)
       event = Event.new(self, event)
     else
       event = Event.new(self, *event)
@@ -32,8 +32,105 @@ module UnderOs::UI::Events
     on hash
   end
 
+  class TouchListeners
+    def self.listeners
+      @listeners ||= Hash.new{ |h,k| h[k] = [] }
+    end
+
+    def self.add(eventname, view)
+      listeners[eventname] << view
+    end
+
+    def self.notify(eventname, event)
+      listeners[eventname].each do |view|
+        if eventname == :touchmove # being nice and throttling the touchmove events
+          return if @__working
+          @__working = true
+        end
+
+        touches = touches_for_view(view, event)
+
+        view.emit(eventname, touches: touches) if touches.size > 0
+
+        @__working = false
+      end
+    end
+
+    def self.touches_for_view(view, event)
+      frame   = view._.frame
+      touches = []
+
+      event.allTouches.each do |touch|
+        if point = touch_inside_of(frame, touch)
+          touches << Touch.new(view, point)
+        end
+      end
+
+      touches
+    end
+
+    def self.touch_inside_of(frame, touch)
+      point = touch.locationInView(nil)
+      point = nil if point.x < frame.origin.x ||
+           point.y < frame.origin.y ||
+           point.x > frame.origin.x + frame.size.width ||
+           point.y > frame.origin.y + frame.size.height
+
+      point
+    end
+
+    class Touch
+      attr_reader :view, :position
+
+      def initialize(view, position)
+        @view     = view
+        @position = position
+      end
+
+      def pageX
+        position.x
+      end
+
+      def pageY
+        position.y
+      end
+
+      def viewX
+        @position.x - view._.frame.origin.x
+      end
+
+      def viewY
+        @position.y - view._.frame.origin.y
+      end
+
+      def inspect
+        "#<Touch x=#{pageX} y=#{pageY}"
+      end
+    end
+  end
+
 private
 
+  def add_ui_event_listener(event)
+    event = event.to_sym if event.is_a?(String)
+    event = try_add_touch_event_listener(event)
+    event, recognizer = find_recognizer_from(event)
+
+    @_.addGestureRecognizer(recognizer.alloc.initWithTarget(self, action: :emit)) if recognizer
+
+    event
+  end
+
+  TOUCH_EVENTS = [:touchstart, :touchmove, :touchend, :touchcancel]
+
+  def try_add_touch_event_listener(event)
+    if TOUCH_EVENTS.include?(event)
+      UnderOs::UI::Events::TouchListeners.add(event, self)
+    end
+
+    event
+  end
+
   RECOGNIZERS = {
     tap:    UITapGestureRecognizer,
     pinch:  UIPinchGestureRecognizer,
@@ -45,8 +142,6 @@ private
 
   # tries to figure event name and gesture recognizer
   def find_recognizer_from(event)
-    event = event.to_sym if event.is_a?(String)
-
     if event.is_a?(Class) && event < UIGestureRecognizer
       recognizer = event
 
@@ -68,7 +163,7 @@ private
 
     def initialize(view, event, params={})
       @target = view
-      event, r = view.__send__ :find_recognizer_from, event.class if event.is_a?(UIGestureRecognizer)
+
       super event, params
     end
   end

data/lib/under_os.rb

@@ -1,5 +1,41 @@
 module UnderOs
-  VERSION='1.2.1'
+  VERSION='1.3.0'
+
+  #
+  # Generic ecosystem extension hook, for plugins and such
+  #
+  #     require('under-os')
+  #
+  #     UnderOs.extend __FILE__ do |app|
+  #       app.extra_things..
+  #     end
+  #
+  def self.extend(__file__, &block)
+    UnderOs.setup_callbacks[__file__] = block
+    UnderOs.setup_callbacks.size == 1 && Motion::Project::App.instance_eval do
+      alias :setup_before_under_os :setup
+      def setup(*args, &block)
+        config.setup_blocks << proc do |app|
+          UnderOs.setup_callbacks.each do |__file__, block|
+            Dir.glob(File.dirname(__file__) + '/**/*.rb').reverse.each do |file|
+              app.files.insert(0, file) if file != __file__
+            end
+
+            module_assets_folder = File.dirname(__file__) + "/assets"
+            app.resources_dirs << module_assets_folder if File.exists?(module_assets_folder)
+
+            block.call(app) if block
+          end
+        end
+
+        setup_before_under_os *args, &block
+      end
+    end
+  end
+
+  def self.setup_callbacks
+    @callbacks ||= {}
+  end
 end
 
 UOS = UnderOS = UnderOs

data/spec/lib/under_os/ui/style/outlining_spec.rb

@@ -66,4 +66,36 @@ describe UnderOs::UI::Style::Outlining do
       end
     end
   end
+
+  describe '#boxShadow' do
+    it "recognizes the x, y values" do
+      @view.style.boxShadow = "1px 2px"
+      @view.style.boxShadow.should == "1.0 2.0 3.0 0.0 #ff0000"
+    end
+
+    it "recognizes the x, y, radius values" do
+      @view.style.boxShadow = "-1 -2 4"
+      @view.style.boxShadow.should == "-1.0 -2.0 4.0 0.0 #ff0000"
+    end
+
+    it "recognizes the x, y, radius, opacity values" do
+      @view.style.boxShadow = "4 5 6 7"
+      @view.style.boxShadow.should == "4.0 5.0 6.0 7.0 #ff0000"
+    end
+
+    it "recognizes the x, y, radius, opacity, color values" do
+      @view.style.boxShadow = "4 5 6 7 blue"
+      @view.style.boxShadow.should == "4.0 5.0 6.0 7.0 #ff0000"
+    end
+
+    it "recognizes the x, y, radius, color values" do
+      @view.style.boxShadow = "4 5 6 blue"
+      @view.style.boxShadow.should == "4.0 5.0 6.0 0.0 #ff0000"
+    end
+
+    it "recognizes the x, y, color values" do
+      @view.style.boxShadow = "4 5 green"
+      @view.style.boxShadow.should == "4.0 5.0 3.0 0.0 #ff0000"
+    end
+  end
 end

data/spec/lib/under_os/ui/utils/events_spec.rb

@@ -0,0 +1,87 @@
+class MyView < UnderOs::UI::View
+  attr_reader :args
+
+  def handler_with_event(event)
+    @args = [event]
+  end
+
+  def handler_without_event
+    @args = []
+  end
+end
+
+describe UnderOs::UI::Events do
+  before do
+    @view = UnderOs::UI::View.new
+  end
+
+  describe "#on" do
+    before do
+      @tapped = false
+      @result = @view.on(:tap) { @tapped = true }
+
+      @view.emit(:tap)
+    end
+
+    it "binds the event listener" do
+      @tapped.should == true
+    end
+
+    it "returns the view object itself back" do
+      @result.should.be.same_as @view
+    end
+  end
+
+  describe "#off" do
+    before do
+      @tapped = false
+      @view.on(:tap) { @tapped = true }
+
+      @result = @view.off(:tap)
+
+      @view.emit(:tap)
+    end
+
+    it "un-binds the event listener" do
+      @tapped.should == false
+    end
+
+    it "returns the view object itself back" do
+      @result.should.be.same_as @view
+    end
+  end
+
+  describe "#emit" do
+    before do
+      @view.on(:tap) { |e| @event = e }
+      @view.emit(:tap, custom: 'param')
+    end
+
+    it "emits an UI::Event" do
+      @event.class.should == UnderOs::UI::Events::Event
+    end
+
+    it "sets the event target to the view" do
+      @event.target.should.be.same_as @view
+    end
+  end
+
+  describe "named event handlers" do
+    before do
+      @view = MyView.new
+    end
+
+    it "allows to bind a method by name with an event listener" do
+      @view.on :tap, :handler_with_event
+      @view.emit(:tap)
+      @view.args.size.should == 1
+      @view.args[0].class.should == UnderOs::UI::Events::Event
+    end
+
+    it "allows to bind a method by name without an event argument" do
+      @view.on :tap, :handler_without_event
+      @view.emit(:tap)
+      @view.args.size.should == 0
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: under-os
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Nikolay Nemshilov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-13 00:00:00.000000000 Z
+date: 2014-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -210,6 +210,7 @@ files:
 - spec/lib/under_os/ui/switch_spec.rb
 - spec/lib/under_os/ui/textarea_spec.rb
 - spec/lib/under_os/ui/utils/commons_spec.rb
+- spec/lib/under_os/ui/utils/events_spec.rb
 - spec/lib/under_os/ui/utils/manipulation_spec.rb
 - spec/lib/under_os/ui/utils/styles_spec.rb
 - spec/lib/under_os/ui/utils/traversing_spec.rb
@@ -233,7 +234,7 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: |2+
-    = UnderOS 1.2.1 =
+    = UnderOS 1.3.0 =
 
     To get started run the following:
 
@@ -309,6 +310,7 @@ test_files:
 - spec/lib/under_os/ui/switch_spec.rb
 - spec/lib/under_os/ui/textarea_spec.rb
 - spec/lib/under_os/ui/utils/commons_spec.rb
+- spec/lib/under_os/ui/utils/events_spec.rb
 - spec/lib/under_os/ui/utils/manipulation_spec.rb
 - spec/lib/under_os/ui/utils/styles_spec.rb
 - spec/lib/under_os/ui/utils/traversing_spec.rb