status_bar 0.2 → 0.2.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzZlOGIwZTJkYmJkZTQzZDFjODI3MjIwMjBhOTZjOTMzYzI5NTEyMg==
+    YTkwY2NmMzJjOGY3ZTQ3YWFlZGMxNDMxOTNlODRhY2JkM2Y5YzY4Yg==
   data.tar.gz: !binary |-
-    YjllNGQ1YTg4YTRmOTNkN2VlZjQzNTQ3NmYzYTgxZGIyOThjZTMxMA==
+    OGQ1Mjc3NDAyZWU1MmQ3NWNmNGJiOTcxYjRhMWU4NmY0NTQwNWY1MA==
 SHA512:
   metadata.gz: !binary |-
-    YmRkMzRlMGJjMTg4OWVkMDA5YmY4MzJhZGVjODg4NjY0OWQ5YWM0ZTg0YmVl
-    ZDAwMTQ4NTY4YTliM2ZkNmE0MDRiNTNjNGY0NWE3OTA3N2U1OGIyODQ5N2Rm
-    ZjI0ZWQyNjg5NmM1MDVlNmQyMWY5MzM3Yzg4YzZlODEzMWQ1Mzg=
+    NGU4M2Y5OTIxMWIxZDQ5ODI1OGMzYTY3MTJjNGE1MjBjNWFhMjY2OGU4N2M2
+    OWQ2OTBmNzBlZGMyYzVlY2ZmYjMwOGE4NmQ5NTI2NjZmMzQ2NjYwOGI2NjRl
+    MjU1ODRhNTJlZTIzMDcyMTU3YzlmYTFjMDkwYjhkNzQzNTk5ZWY=
   data.tar.gz: !binary |-
-    MzM5MmQ1NmVhNDhlMDQ0YTU0Yjg0ZTUxNzRmMDNkNzRjY2I1NzVjZDdjMmIw
-    YzlkOTc4ZDNmNTFmNzViY2QxYmRiMTA2NTVjNjQ2YmZiNDZhMWQ4OTdhM2Rk
-    MTNiYjljOGZiNTk0ZjY3OTQ0YTkyMzNiMGMwMzkzNmVjZTUwZTQ=
+    NTBlNjZhYTYwYjZlYmZiOGQwMTMyM2MyMDFmOTRlMDA2YTdjYzdiMmNkNGNj
+    MGZmZDM5NDJjNzM0Zjc5OTgxZGEwYTNmMGM3YjNmMzEwY2UxZDVhNjVmZDhj
+    YmQxODYxY2M4MWNlNjI5YzE4NTVhZjE1YzJhMWFiZmY4NzZhODA=

data/Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gem 'status_bar', :path => '~/Projects/*Defaults/Misc/Gems/status_bar'
 gem 'teacup', '2.1.13'
-gem 'sugarcube', '1.3.2'
+gem 'sugarcube', '1.3.5'
 
 group :development do
   gem 'awesome_print_motion'

data/Gemfile.lock

@@ -1,16 +1,41 @@
-GIT
-  remote: https://github.com/holgersindbaek/sugarcube
-  revision: 24c813f16f5799dd7ddffdf801d83a989270befa
+PATH
+  remote: ~/Projects/*Defaults/Misc/Gems/status_bar
   specs:
-    sugarcube (1.3.4)
+    status_bar (0.2)
+      bubble-wrap (= 1.4.0)
+      hs
+      sugarcube (= 1.3.5)
+      teacup (= 2.1.13)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    activesupport (3.2.15)
+      i18n (~> 0.6, >= 0.6.4)
+      multi_json (~> 1.0)
     awesome_print_motion (0.1.0)
+    bubble-wrap (1.4.0)
     celluloid (0.15.2)
       timers (~> 1.1.0)
+    claide (0.3.2)
+    cocoapods (0.27.1)
+      activesupport (>= 3.2.15, < 4)
+      claide (~> 0.3.2)
+      cocoapods-core (= 0.27.1)
+      cocoapods-downloader (~> 0.2.0)
+      colored (~> 1.2)
+      escape (~> 0.0.4)
+      json_pure (~> 1.8)
+      open4 (~> 1.3)
+      xcodeproj (~> 0.14.0)
+    cocoapods-core (0.27.1)
+      activesupport (>= 3.2.15, < 4)
+      json_pure (~> 1.8)
+      nap (~> 0.5)
+    cocoapods-downloader (0.2.0)
     coderay (1.0.9)
+    colored (1.2)
+    escape (0.0.4)
     ffi (1.9.3)
     formatador (0.2.4)
     guard (2.2.2)
@@ -22,12 +47,23 @@ GEM
     guard-motion (0.1.2)
       guard (>= 1.1.0)
       rake (>= 0.9)
+    hs (0.1.1)
+      bubble-wrap (>= 1.3.0)
+      motion-cocoapods (>= 1.3.7)
+      sugarcube
+    i18n (0.6.5)
+    json_pure (1.8.1)
     listen (2.2.0)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
     lumberjack (1.0.4)
     method_source (0.8.2)
+    motion-cocoapods (1.4.0)
+      cocoapods (>= 0.26.2)
+    multi_json (1.8.2)
+    nap (0.5.1)
+    open4 (1.3.0)
     pry (0.9.12.2)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
@@ -37,9 +73,14 @@ GEM
     rb-inotify (0.9.2)
       ffi (>= 0.5.0)
     slop (3.4.6)
+    sugarcube (1.3.5)
     teacup (2.1.13)
     thor (0.18.1)
     timers (1.1.0)
+    xcodeproj (0.14.1)
+      activesupport (~> 3.0)
+      colored (~> 1.2)
+      rake
 
 PLATFORMS
   ruby
@@ -47,5 +88,6 @@ PLATFORMS
 DEPENDENCIES
   awesome_print_motion
   guard-motion
-  sugarcube!
+  status_bar!
+  sugarcube (= 1.3.5)
   teacup (= 2.1.13)

data/app/app_delegate.rb

@@ -1,9 +1,9 @@
 class AppDelegate
   def application(application, didFinishLaunchingWithOptions:launchOptions)
     @window = UIWindow.alloc.initWithFrame(UIScreen.mainScreen.bounds)
-    @window.makeKeyAndVisible
-    @window.backgroundColor = "#000000".uicolor
+    @window.backgroundColor = UIColor.clearColor
     @window.rootViewController = DemoController.new
+    @window.makeKeyAndVisible
     
     true
   end

data/app/controllers/demo_controller.rb

@@ -1,7 +1,9 @@
 class DemoController < UIViewController
-  stylesheet :demo
+  stylesheet :demo_sheet
 
-  layout :demo_view do
+  attr_reader :status_bar
+
+  layout :demo do
     @container = subview(UIView, :container) do
       @show_notice_button = subview(UIButton.buttonWithType(UIButtonTypeRoundedRect), :show_notice_button)
       @show_activity_button = subview(UIButton.buttonWithType(UIButtonTypeRoundedRect), :show_activity_button)
@@ -15,8 +17,6 @@ class DemoController < UIViewController
   def viewDidLoad
     super
 
-    ap "first viewDidLoad"
-
     @status_bar = StatusBar::Base.new
 
     @show_notice_button.when(UIControlEventTouchUpInside) {

data/app/styles/demo_style.rb

@@ -1,6 +1,6 @@
-Teacup::Stylesheet.new :demo do
+Teacup::Stylesheet.new :demo_sheet do
 
-  style :demo_view,
+  style :demo,
     backgroundColor: "#000000".uicolor
 
   style :container,

data/lib/project/base.rb

@@ -1,11 +1,18 @@
 module StatusBar
   class Base
 
+    attr_reader :view, :current_notice_view
+
     def initialize
 
-      @status_bar_view = StatusBar::View.new
-      App.shared.keyWindow.rootViewController.view.addSubview(@status_bar_view.view)
-      App.shared.keyWindow.rootViewController.view.sendSubviewToBack(@status_bar_view.view)
+      # Add statusbar to root view controller, once root controller is there.
+      timer = 0.1.second.every do
+        return if App.shared.keyWindow == nil || App.shared.keyWindow.rootViewController == nil
+        @view = StatusBar::View.new
+        App.shared.keyWindow.rootViewController.view.addSubview(@view.view)
+        App.shared.keyWindow.rootViewController.view.sendSubviewToBack(@view.view)
+        timer.invalidate
+      end
 
       # Set old orientation and rotation effect
       @current_notice_view = nil
@@ -24,19 +31,19 @@ module StatusBar
 
     # EXTERNAL COMMANDS
     def show_notice(text)
-      show_notice_view(@status_bar_view.notice_view, text:text)
+      show_notice_view(@view.notice_view, text:text)
     end
 
     def show_activity_notice(text)
-      show_notice_view(@status_bar_view.activity_view, text:text)
+      show_notice_view(@view.activity_view, text:text)
     end
 
     def show_success_notice(text)
-      show_notice_view(@status_bar_view.success_view, text:text)
+      show_notice_view(@view.success_view, text:text)
     end
 
     def show_error_notice(text)
-      show_notice_view(@status_bar_view.error_view, text:text)
+      show_notice_view(@view.error_view, text:text)
     end
 
     def hide_notice
@@ -44,7 +51,7 @@ module StatusBar
     end
 
     def visible?
-      StatusBar::Helper.view_visible?(@status_bar_view.status_bar_view)
+      StatusBar::Helper.view_visible?(@view.status_bar_view)
     end
 
 
@@ -53,13 +60,13 @@ module StatusBar
     def show_status_bar_view
       if !visible?
         App.shared.setStatusBarHidden(true, withAnimation:UIStatusBarAnimationSlide)
-        @status_bar_view.status_bar_view.move_to([0, 0])
+        @view.status_bar_view.move_to([0, 0])
       end
     end
 
     def hide_status_bar_view
       if visible?
-        @status_bar_view.status_bar_view.move_to([0, 20])
+        @view.status_bar_view.move_to([0, 20])
         App.shared.setStatusBarHidden(false, withAnimation:UIStatusBarAnimationSlide)
       end
     end
@@ -75,7 +82,7 @@ module StatusBar
       notice_view.y = 0 if !visible?
       notice_view.move_to([0, 0]) if visible?
       position_inner_views(notice_view)
-      @timer = EM.add_timer 3 { hide_status_bar_view } unless accessory == nil
+      @timer = EM.add_timer 3 { hide_status_bar_view } if accessory != nil && accessory.class == UIImageView
 
       show_status_bar_view unless visible?
       @current_notice_view = notice_view

data/lib/project/style.rb

@@ -1,6 +1,6 @@
 include StatusBar
 
-Teacup::Stylesheet.new :status_bar_style do
+Teacup::Stylesheet.new :status_bar_sheet do
 
   style :status_bar_view,
     height: 20,

data/lib/project/view.rb

@@ -1,10 +1,10 @@
 module StatusBar
   class View < UIViewController
-    stylesheet :status_bar_style
+    stylesheet :status_bar_sheet
 
     attr_accessor :status_bar_view, :notice_view, :notice_label, :activity_view, :activity_spinner, :activity_label, :success_view, :success_image, :success_label, :error_view, :error_image, :error_label
 
-    layout :status_bar_view_controller do
+    layout :status_bar_vc_view do
       
       @status_bar_view = subview(UIView, :status_bar_view) do
         @notice_view = subview(UIView, :notice_view) do

data/lib/status_bar.rb

@@ -33,5 +33,5 @@ Motion::Project::App.setup do |app|
   end
   
   # app.files.unshift Dir.glob(File.join(lib_dir_path, "project/**/*.rb"))
-  app.resources_dirs << File.join(File.dirname(__FILE__), 'resources')
+  # app.resources_dirs << File.join(File.dirname(__FILE__), 'resources')
 end

data/spec/demo_controller_spec.rb

@@ -1,52 +1,167 @@
 describe "A - DemoController" do
   tests DemoController
-  
-  # I gave up testing, because things good weird. If anyone wants to take up this, I'd love to see how they'd do it.
 
-  context "B - Verify button existence" do
+  before do
+    # Buttons
+    @show_notice_button = view("Show Notice")
+    @show_activity_button = view("Show Activity")
+    @show_success_button = view("Show Success")
+    @show_error_button = view("Show Error")
+    @hide_notice_button = view("Hide Notice")
+    @visibility_button = view("Visible?")
+
+    # Statusbar view
+    @status_bar_view = controller.view.viewWithStylename(:status_bar_view)
+
+    # Statusbar subviews
+    @notice_view = controller.view.viewWithStylename(:notice_view)
+    @notice_label = controller.view.viewWithStylename(:notice_label)
+    @activity_view = controller.view.viewWithStylename(:activity_view)
+    @activity_spinner = controller.view.viewWithStylename(:activity_spinner)
+    @activity_label = controller.view.viewWithStylename(:activity_label)
+    @success_view = controller.view.viewWithStylename(:success_view)
+    @success_image = controller.view.viewWithStylename(:success_image)
+    @success_label = controller.view.viewWithStylename(:success_label)
+    @error_view = controller.view.viewWithStylename(:error_view)
+    @error_image = controller.view.viewWithStylename(:error_image)
+    @error_label = controller.view.viewWithStylename(:error_label)
+  end
+
+
 
-    it "show notice button" do
-      view("Show Notice").should.not.equal nil
+  context "B - View existence" do
+
+    it "buttons" do
+      @show_notice_button.should.not.equal nil
+      @show_activity_button.should.not.equal nil
+      @show_success_button.should.not.equal nil
+      @show_error_button.should.not.equal nil
+      @hide_notice_button.should.not.equal nil
+      @visibility_button.should.not.equal nil
     end
 
-    it "show activity button" do
-      view("Show Activity").should.not.equal nil
+    it "statusbar view" do
+      @status_bar_view.should.not.equal nil
     end
 
-    it "show success button" do
-      view("Show Success").should.not.equal nil
+    it "statusbar subviews" do
+      @notice_view.should.not.equal nil
+      @notice_label.should.not.equal nil
+      @activity_view.should.not.equal nil
+      @activity_spinner.should.not.equal nil
+      @activity_label.should.not.equal nil
+      @success_view.should.not.equal nil
+      @success_image.should.not.equal nil
+      @success_label.should.not.equal nil
+      @error_view.should.not.equal nil
+      @error_image.should.not.equal nil
+      @error_label.should.not.equal nil
     end
 
-    it "show error button" do
-      view("Show Error").should.not.equal nil
+  end
+
+
+
+  context "B - Clicking buttons" do
+
+    it "show notice" do
+      @notice_view.y.should.equal 20
+      tap "Show Notice"
+      wait 0.3 do
+        @notice_view.y.should.equal 0
+      end
     end
 
-    it "hide notice button" do
-      view("Hide Notice").should.not.equal nil
+    it "activity notice" do
+      @activity_view.y.should.equal 20
+      tap "Show Activity"
+      wait 0.3 do
+        @activity_view.y.should.equal 0
+      end
     end
 
-    it "visible? button" do
-      view("Visible?").should.not.equal nil
+    it "success notice" do
+      @success_view.y.should.equal 20
+      tap "Show Success"
+      wait 0.3 do
+        @success_view.y.should.equal 0
+      end
+    end
+
+    it "error notice" do
+      @error_view.y.should.equal 20
+      tap "Show Error"
+      wait 0.3 do
+        @error_view.y.should.equal 0
+      end
+    end
+
+    it "hide notice" do
+      @status_bar_view.y.should.equal 0
+      tap "Hide Notice"
+      wait 0.3 do
+        @status_bar_view.y.should.equal 20
+      end
     end
 
   end
 
 
 
-  # context "B - Clicking buttons" do
+  context "B - Multiple clicks" do
 
-  #   it "notice button should show notice"
+    it "show success notice three times" do
+      @success_view.y.should.equal 20
+      tap "Show Success"
+      wait 0.3 do
+        tap "Show Success"
+        @success_view.y.should.equal 0
+      end
 
-  #   it "activity button should show activity"
+      wait 0.4 do
+        tap "Show Success"
+        @success_view.y.should.equal 0
+      end
 
-  #   it "success button should show success"
+      wait 0.5 do
+        @success_view.y.should.equal 0
+      end
+    end
 
-  #   it "error button should show error"
+    it "show success notice twice with different message" do
+      @notice_view.y.should.equal 20
+      tap "Show Notice"
+      wait 0.3 do
+        @notice_view.y.should.equal 0
+        @notice_label.text.should.equal "This is a notice"
+        controller.status_bar.show_notice "This is another notice"
+      end
+
+      wait 0.4 do
+        @notice_view.y.should.equal 0
+        @notice_label.text.should.equal "This is another notice"
+      end
+    end
 
-  #   it "hide button should hide notice"
+    it "show success, then notice, then error" do
+      @success_view.y.should.equal 20
+      tap "Show Success"
+      wait 0.3 do
+        @success_view.y.should.equal 0
+        tap "Show Notice"
+      end
+
+      wait 0.4 do
+        @notice_view.y.should < 20
+        tap "Show Error"
+      end
+
+      wait 0.5 do
+        @error_view.y.should < 20
+      end
+    end
 
-  #   it "visible buttons should check visibility"
+  end
 
-  # end
 
 end

data/status_bar.gemspec

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-STATUSBAR_VERSION = "0.2"
+STATUSBAR_VERSION = "0.2.1"
 
 Gem::Specification.new do |spec|
   spec.name          = "status_bar"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: status_bar
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: 0.2.1
 platform: ruby
 authors:
 - Holger Sindbaek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-01 00:00:00.000000000 Z
+date: 2013-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -166,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.8
+rubygems_version: 2.1.10
 signing_key: 
 specification_version: 4
 summary: RubyMotion status bar wrapper.