teacup 0.0.1.pre → 0.3.1

data/lib/teacup.rb

@@ -1,41 +1,24 @@
 unless defined?(Motion::Project::Config)
-  raise "This file must be required within a RubyMotion project Rakefile."
+  raise "The teacup gem must be required within a RubyMotion project Rakefile."
 end
 
-# In order that we can prepend our files to the load path after the user has
-# configured their app.files, we need to run code *after* the user has set up
-# their app.
-#
-# Unfortunately, the canonical place to require rubygems is at the top of the
-# file (while we could just add to the instructions "please `require 'teacup'`
-# at the bottom, that would be odd, and no-one would read the instructions).
-#
-# To this end, we tweak the App setup function so that whenever setup is called,
-# we configure teacup after that.
-#
-# This is not great though, as other gems may (following the instructions at
-# http://reality.hk/posts/2012/05/22/create-gems-for-rubymotion/) also call
-# setup...
-#
-# For sanity reasons, we therefore delete teacup requires from the load order
-# and re-add them to the front every single time {setup} is called.
-#
-# TODO: We should send a patch to rubymotion that adds first-class support for
-# app.gems. These could then be required *after* the user has finished running
-# the setup block, so that they can just run setup properly.
-#
-class << Motion::Project::App
 
-  def setup_with_teacup
-    setup_without_teacup do |app|
-      yield app
-
-      dirs = %w(teacup teacup/core_extensions)
-      files = dirs.map{ |dir| Dir.glob("#{File.dirname(__FILE__)}/#{dir}/*.rb") }.flatten
-      app.files = files + (app.files - files)
+Motion::Project::App.setup do |app|
+  # scans app.files until it finds app/ (the default)
+  # if found, it inserts just before those files, otherwise it will insert to
+  # the end of the list
+  insert_point = 0
+  app.files.each_index do |index|
+    file = app.files[index]
+    if file =~ /^(?:\.\/)?app\//
+      # found app/, so stop looking
+      break
     end
+    insert_point = index + 1
   end
 
-  alias setup_without_teacup setup
-  alias setup setup_with_teacup
+  app.files.insert(insert_point, File.join(File.dirname(__FILE__), 'dummy.rb'))
+  Dir.glob(File.join(File.dirname(__FILE__), 'teacup/**/*.rb')).reverse.each do |file|
+    app.files.insert(insert_point, file)
+  end
 end

data/samples/Hai/Rakefile

@@ -4,9 +4,14 @@ require 'motion/project'
 Motion::Project::App.setup do |app|
   app.name = 'Hai'
 
-  app.device_family = :ipad
+  app.device_family = :iphone
 
-  app.files += Dir.glob(File.join(app.project_dir, 'teacup/**/*.rb'))
+  app.files += Dir.glob(File.join(app.project_dir, '../../lib/**/*.rb'))
   app.files += Dir.glob(File.join(app.project_dir, 'styles/**/*.rb'))
   app.files += Dir.glob(File.join(app.project_dir, 'app/**/*.rb'))
+  app.files_dependencies './../../lib/teacup/layout.rb' => './../../lib/teacup/stylesheet.rb'
+  app.files_dependencies './../../lib/teacup/z_core_extensions/ui_view_controller.rb' => './../../lib/teacup/layout.rb'
+  app.files_dependencies './../../lib/teacup/z_core_extensions/ui_view.rb' => './../../lib/teacup/z_core_extensions/ui_view_controller.rb'
+  app.files_dependencies 'app/app_delegate.rb' => './../../lib/teacup/z_core_extensions/ui_view.rb'
+  app.files_dependencies 'app/hai_controller.rb' => './../../lib/teacup/z_core_extensions/ui_view.rb'
 end

data/samples/Hai/app/app_delegate.rb

@@ -1,9 +1,9 @@
 class AppDelegate
   def application(application, didFinishLaunchingWithOptions:launchOptions)
     @window = UIWindow.alloc.initWithFrame(UIScreen.mainScreen.bounds)
-    @window.rootViewController = HaiViewController.alloc.init.tap{ |c| c.wantsFullScreenLayout = true }
+    @window.rootViewController = HaiViewController.alloc.init
     @window.makeKeyAndVisible
-  
+
     true
   end
 end

data/samples/Hai/app/hai_controller.rb

@@ -1,9 +1,13 @@
 class HaiViewController < UIViewController
+  stylesheet :iphone
 
-  def viewDidLoad
-    view.addSubview(Teacup.style(:label, UILabel.new))
-    self.setFrame([[0,0],[0,0]]) if rand > 1
-    true
+  layout :hai do
+    subview(UILabel, :label)
+    subview(UILabel, :footer)
+  end
+
+  def shouldAutorotateToInterfaceOrientation(orientation)
+    autorotateToOrientation(orientation)
   end
 
 end

data/samples/Hai/styles/iphone.rb

@@ -0,0 +1,40 @@
+
+Teacup::Stylesheet.new(:iphone) do
+  label_color = UIColor.blueColor
+
+  style :hai,
+    landscape: true
+
+  style UILabel,
+    textColor: label_color
+
+  style :label,
+    text: 'Hai!',
+    backgroundColor: UIColor.whiteColor,
+    top: 10,
+    left: 100,
+    width: 50,
+    height: 20,
+    layer: {
+      transform: identity,
+    },
+    landscape_left: {
+      layer: {
+        transform: rotate(identity, pi/6, 0.3, 0.3, 0.3)
+      },
+      width: 75
+    }
+
+  style :footer,
+    text: 'brought to you by teacup',
+    backgroundColor: UIColor.lightGrayColor,
+    top: 440,
+    left: 120,
+    width: 200,
+    height: 20,
+    landscape: {
+      left: 280,
+      top: 280
+    }
+
+end

data/spec/main_spec.rb

@@ -0,0 +1,226 @@
+describe "Application 'Teacup'" do
+  before do
+    UIDevice.currentDevice.beginGeneratingDeviceOrientationNotifications
+    @app = UIApplication.sharedApplication
+    @view_ctrlr = @app.windows[0].rootViewController
+  end
+
+  after do
+    UIDevice.currentDevice.endGeneratingDeviceOrientationNotifications
+  end
+
+  it "has one window" do
+    @app.windows.size.should == 1
+  end
+
+  it "should have a root view" do
+    view_ctrlr_view = @view_ctrlr.view
+    view_ctrlr_view.subviews.length.should == 1
+    view_ctrlr_view.subviews[0].class.should == CustomView
+  end
+
+  describe "view controller" do
+
+    it "should be able to rotate" do
+      @view_ctrlr.shouldAutorotateToInterfaceOrientation(UIDeviceOrientationPortrait).should == true
+      @view_ctrlr.shouldAutorotateToInterfaceOrientation(UIDeviceOrientationLandscapeLeft).should == true
+      @view_ctrlr.shouldAutorotateToInterfaceOrientation(UIDeviceOrientationLandscapeRight).should == true
+      @view_ctrlr.shouldAutorotateToInterfaceOrientation(UIDeviceOrientationPortraitUpsideDown).should == false
+    end
+  end
+
+  describe "root view" do
+
+    before do
+      @root_view = @app.windows[0].subviews[0]
+    end
+
+    it "root view should be styled as 'root'" do
+      @root_view.stylename.should == :root
+      @root_view.frame.origin.x.should == 0
+      @root_view.frame.origin.y.should == 0
+      @root_view.frame.size.width.should == 320
+      @root_view.frame.size.height.should == 480
+      @root_view.backgroundColor.should == UIColor.yellowColor
+    end
+
+  end
+
+  describe "background view" do
+
+    before do
+      @background = @app.windows[0].subviews[0].subviews[0]
+    end
+
+    it "should be styled as :background" do
+      @background.stylename.should == :background
+      @background.frame.origin.x.should == 10
+      @background.frame.origin.y.should == 30
+      @background.frame.size.width.should == 300
+      @background.frame.size.height.should == 440
+      @background.backgroundColor.should == UIColor.darkGrayColor
+    end
+
+    it "background view should have subviews" do
+      @background.subviews.length.should == 3
+      @background.subviews[0].class.should == UILabel
+      @background.subviews[1].class.should == UILabel
+      @background.subviews[2].class.ancestors.include?(UIButton).should == true
+    end
+
+    it "should not have styles overridden by base classes" do
+      @background.alpha.should == 0.5
+    end
+
+    it "should have styles overridden orientation styles" do
+      @background.backgroundColor.should == UIColor.darkGrayColor
+    end
+
+    describe "background subviews" do
+
+      before do
+        @welcome = @background.subviews[0]
+        @footer = @background.subviews[1]
+        @button = @background.subviews[2]
+      end
+
+      it "should have all UILabels with color blue" do
+        @welcome.textColor.should == UIColor.blueColor
+        @footer.textColor.should == UIColor.blueColor
+      end
+
+      describe "welcome" do
+        it "should be styled as :welcome" do
+          @welcome.stylename.should == :welcome
+          @welcome.frame.origin.x.should == 10
+          @welcome.frame.origin.y.should == 40
+          @welcome.frame.size.width.should == 280
+          @welcome.frame.size.height.should == 20
+          @welcome.text.should == "Welcome to teacup"
+        end
+      end
+
+      describe "footer" do
+        it "should be styled as :footer" do
+          @footer.stylename.should == :footer
+          @footer.frame.origin.x.should == 10
+          @footer.frame.origin.y.should == 410
+          @footer.frame.size.width.should == 280
+          @footer.frame.size.height.should == 20
+          @footer.text.should == "This is a teacup example"
+        end
+      end
+
+      describe "button" do
+        it "should be styled as :next_message" do
+          @button.stylename.should == :next_message
+          @button.frame.origin.x.should == 150
+          @button.frame.origin.y.should == 370
+          @button.frame.size.width.should == 130
+          @button.frame.size.height.should == 20
+          @button.titleForState(UIControlStateNormal).should == "Next Message..."
+        end
+      end
+
+    end
+
+  end
+
+  describe "background view in landscape" do
+
+    before do
+      @background = @app.windows[0].subviews[0].subviews[0]
+      @view_ctrlr.landscape_only
+      UIApplication.sharedApplication.setStatusBarOrientation(UIDeviceOrientationLandscapeLeft, animated:false)
+    end
+
+    it "should be in landscape" do
+      # the rest of these tests *pass*, but the device orientation isn't actually
+      # updated to be landscape yet... :-/
+      UIDevice.currentDevice.orientation.should > 0
+    end
+
+    it "should be styled as :background - landscape" do
+      @background.stylename.should == :background
+      @background.frame.origin.x.should == 10
+      @background.frame.origin.y.should == 30
+      @background.frame.size.width.should == 460
+      @background.frame.size.height.should == 280
+      @background.backgroundColor.should == UIColor.lightGrayColor
+    end
+
+    it "should not have styles overridden by base classes" do
+      @background.alpha.should == 0.8
+    end
+
+    it "should have styles overridden orientation styles" do
+      @background.backgroundColor.should == UIColor.lightGrayColor
+    end
+
+    describe "background subviews in landscape" do
+
+      before do
+        @welcome = @background.subviews[0]
+        @footer = @background.subviews[1]
+        @button = @background.subviews[2]
+      end
+
+      describe "welcome" do
+        it "should be styled as :welcome - landscape" do
+          @welcome.stylename.should == :welcome
+          @welcome.frame.origin.x.should == 90
+          @welcome.frame.origin.y.should == 40
+          @welcome.frame.size.width.should == 280
+          @welcome.frame.size.height.should == 20
+          @welcome.text.should == "Welcome to teacup"
+        end
+      end
+
+      describe "footer" do
+        it "should be styled as :footer - landscape" do
+          @footer.stylename.should == :footer
+          @footer.frame.origin.x.should == 90
+          @footer.frame.origin.y.should == 250
+          @footer.frame.size.width.should == 280
+          @footer.frame.size.height.should == 20
+          @footer.text.should == "This is a teacup example"
+        end
+      end
+
+      describe "button" do
+        it "should be styled as :next_message - landscape" do
+          @button.stylename.should == :next_message
+          @button.frame.origin.x.should == 20
+          @button.frame.origin.y.should == 200
+          @button.frame.size.width.should == 130
+          @button.frame.size.height.should == 20
+          @button.titleForState(UIControlStateNormal).should == "Next Message..."
+        end
+      end
+
+    end
+
+  end
+
+end
+
+describe "Stylesheet 'first'" do
+  before do
+    @stylesheet = Teacup::Stylesheet[:first]
+  end
+
+  it "should exist" do
+    @stylesheet.nil?.should == false
+  end
+
+  it "should define some styles" do
+    @stylesheet.query(:footer)[:text].nil?.should == false
+    @stylesheet.query(:footer)[:text].should == "This is a teacup example"
+  end
+
+  it "should union the next_message styles" do
+    @stylesheet.query(:next_message)[:title].should == "Next Message..."
+    (@stylesheet.query(:next_message)[:portrait] ? true : false).should == false
+  end
+
+end

data/spec/style_spec.rb

@@ -0,0 +1,171 @@
+describe "Teacup::Style" do
+
+  it "should be equal to a Hash" do
+    Teacup::Style.new.should == {}
+  end
+
+  it "should act like a Hash" do
+    style = Teacup::Style.new
+    style[:key] = :value
+    style[:key].should == :value
+  end
+
+  it "should use orientation to override" do
+    style = Teacup::Style.new
+    style[:name] = :default
+    style[:landscape] = {
+      name: :landscape_name,
+    }
+    style[:portrait] = {
+      name: :portrait_name,
+    }
+    style[:upside_down] = {
+      name: :upside_down_name,
+    }
+    # no orientation, which ends up being portrait anyway.
+    style.build()[:name].should == :portrait_name
+    # landscape
+    style.build(nil, UIInterfaceOrientationLandscapeLeft)[:name].should == :landscape_name
+
+    # upside down
+    style.build(nil, UIInterfaceOrientationPortraitUpsideDown)[:name].should == :upside_down_name
+  end
+
+  it "should look in extends" do
+    sheet = Teacup::Stylesheet.new do
+      style :extended,
+        key: :value
+    end
+    sheet.query(:extended)[:key].should == :value
+
+    style = Teacup::Style.new
+    style.stylename = :self
+    style.stylesheet = sheet
+    style[:extends] = :extended
+    style.build()[:key].should == :value
+  end
+
+  it "should look in import" do
+    imported_sheet = Teacup::Stylesheet.new do
+      style :extended,
+        imported: :imported,
+        override: :overridden
+    end
+
+    sheet = Teacup::Stylesheet.new do
+      import imported_sheet
+
+      style :extended,
+        key: :value,
+        override: :override
+    end
+    sheet.query(:extended)[:key].should == :value
+    sheet.query(:extended)[:imported].should == :imported
+    sheet.query(:extended)[:override].should == :override
+  end
+
+  it 'should merge :extends properties' do
+    sheet = Teacup::Stylesheet.new do
+      style :style1,
+        a: 'a',
+        b: 'b'
+    end
+    style2 = Teacup::Style.new
+    style2.stylesheet = sheet
+    style2[:a] = 'A'
+    style2[:extends] = :style1
+
+    built = style2.build()
+    built[:a].should == 'A'
+    built[:b].should == 'b'
+  end
+
+  it 'should merge hashes' do
+    sheet = Teacup::Stylesheet.new do
+      style :style1,
+        layer: { borderWidth: 20, opacity: 0.5 }
+    end
+
+    style2 = Teacup::Style.new
+    style2.stylesheet = sheet
+    style2[:layer] = { borderWidth: 10 }
+    style2[:extends] = :style1
+
+    built = style2.build()
+    built[:layer][:opacity].should == 0.5
+    built[:layer][:borderWidth].should == 10
+  end
+
+  it 'should merge multiple extends' do
+    sheet = Teacup::Stylesheet.new do
+      style :style1,
+        layer: { borderWidth: 20 }
+      style :style2,
+        layer: { borderWidth: 10, opacity: 0.5 }
+    end
+
+    style3 = Teacup::Style.new
+    style3.stylesheet = sheet
+    style3[:extends] = [:style1, :style2]
+
+    built = style3.build()
+    built[:layer][:opacity].should == 0.5
+    built[:layer][:borderWidth].should == 20
+  end
+
+  it 'should merge and flatten orientation rules' do
+    sheet = Teacup::Stylesheet.new do
+      style :style1,
+        portrait: { text: "ignored", tag: 1 }
+    end
+
+    style2 = Teacup::Style.new
+    style2.stylesheet = sheet
+    style2[:portrait] = { text: "text" }
+    style2[:extends] = :style1
+
+    built = style2.build(nil, UIInterfaceOrientationPortrait)
+    built[:tag].should == 1
+    built[:text].should == "text"
+  end
+
+  it 'should respect precedence rules' do
+    sheet = Teacup::Stylesheet.new do
+      style :style1,
+        portrait: { text: "extended", tag: 1 }
+    end
+
+    style2 = Teacup::Style.new
+    style2.stylesheet = sheet
+    style2[:text] = "text"
+    style2[:extends] = :style1
+
+    built = style2.build(nil, UIInterfaceOrientationPortrait)
+    built[:tag].should == 1
+    built[:text].should == "text"
+  end
+
+  it 'should respect merge based on class inheritance' do
+    class Foo
+      attr_accessor :bar
+    end
+
+    class Bar < Foo
+      attr_accessor :baz
+    end
+
+    sheet = Teacup::Stylesheet.new do
+      style Foo,
+        bar: 'bar'
+    end
+
+    style = Teacup::Style.new
+    style.stylesheet = sheet
+    style[:baz] = 'baz'
+
+    built = style.build(Bar.new)
+    built[:bar].should == 'bar'
+    built[:baz].should == 'baz'
+  end
+
+end