teacup 1.2.9 → 1.3.0

data/.travis.yml

@@ -0,0 +1,2 @@
+language: objective-c
+before_install: rvm use 1.9.3

data/Gemfile

@@ -1,5 +1,5 @@
-source :rubygems
+source 'https://rubygems.org'
 
-gem 'teacup', :path => '.'
+gem 'rake'
 
 gemspec

data/Gemfile.lock

@@ -1,14 +1,16 @@
 PATH
   remote: .
   specs:
-    teacup (1.2.8)
+    teacup (1.3.0)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
+    rake (10.0.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  rake
   teacup!

data/README.md

@@ -3,6 +3,9 @@ Teacup
 
 A community-driven DSL for creating user interfaces on the iphone.
 
+**Note: for a yet-unknown reason teacup does not compile correctly using ruby
+2.0.  Use 1.9.3 instead please, or help determine what is wrong with 2.0.**
+
 Using teacup, you can easily create and style layouts while keeping your code
 dry.  The goal is to offer a rubyesque (well, actually a rubymotion-esque) way
 to create interfaces programmatically.

data/app/app_delegate.rb

@@ -6,7 +6,8 @@ class AppDelegate
     application.setStatusBarHidden(true, withAnimation:UIStatusBarAnimationSlide)
 
     @window = UIWindow.alloc.initWithFrame(UIScreen.mainScreen.bounds)
-    @window.rootViewController = FirstController.new
+    ctlr = PresentModalController.new
+    @window.rootViewController = UINavigationController.alloc.initWithRootViewController(ctlr)
     @window.rootViewController.wantsFullScreenLayout = true
     @window.makeKeyAndVisible
 

data/app/controllers/present_modal_controller.rb

@@ -0,0 +1,96 @@
+class PresentModalController < UIViewController
+
+  stylesheet :present_modal
+
+  layout :root do
+    @button = subview(UIButton.buttonWithType(UIButtonTypeRoundedRect), :open_modal_button)
+    @button.addTarget(self, action: :open_modal_button, forControlEvents:UIControlEventTouchUpInside)
+  end
+
+  def open_modal_button
+    self.presentViewController(PresentedController.new, animated:true, completion:nil)
+  end
+
+end
+
+class PresentedController < UIViewController
+
+  stylesheet :present_modal
+
+  layout :root do
+    subview(UIView, :header)
+    subview(UIView, :footer)
+    subview(UIView, :center) do
+      $left = subview(UIView, :left)
+      $top_right = subview(UIView, :top_right)
+      $btm_right = subview(UIView, :btm_right)
+    end
+  end
+
+end
+
+
+Teacup::Stylesheet.new :present_modal do
+
+  style :root,
+    backgroundColor: UIColor.blackColor
+
+  style :open_modal_button,
+    title: 'Open Modal',
+    constraints: [
+      :centered
+    ]
+
+  style :header,
+    backgroundColor: UIColor.blueColor,
+    constraints: [
+      :full_width,
+      :top,
+      constrain_height(52),
+    ]
+
+  style :footer,
+    backgroundColor: UIColor.magentaColor,
+    constraints: [
+      :full_width,
+      :bottom,
+      constrain_height(52),
+    ]
+
+  style :center,
+    backgroundColor: UIColor.lightGrayColor,
+    constraints: [
+      constrain_below(:header).plus(8),
+      constrain_above(:footer).minus(8),
+      constrain_left(8),
+      constrain_right(-8),
+    ]
+
+  style :left,
+    backgroundColor: UIColor.redColor,
+    constraints: [
+      constrain_left(8),
+      constrain_top(8),
+      constrain(:right).plus(8).equals(:top_right, :left),
+      constrain(:right).plus(8).equals(:btm_right, :left),
+      constrain_bottom(-8),
+      constrain(:width).equals(:top_right, :width),
+      constrain(:width).equals(:btm_right, :width),
+    ]
+
+  style :top_right,
+    backgroundColor: UIColor.greenColor,
+    constraints: [
+      constrain(:top).equals(:left, :top),
+      constrain_right(-8),
+      constrain(:height).equals(:btm_right, :height),
+      constrain(:bottom).plus(8).equals(:btm_right, :top),
+    ]
+
+  style :btm_right,
+    backgroundColor: UIColor.yellowColor,
+    constraints: [
+      constrain(:bottom).equals(:left, :bottom),
+    ]
+
+end

data/lib/teacup/calculations.rb

@@ -1,19 +1,23 @@
 module Teacup
   module_function
-  def calculate(view, dimension, percent)
-    if percent.is_a? Proc
-      view.instance_exec(&percent)
-    elsif percent.is_a? String and percent[-1] == '%'
-      percent = percent[0...-1].to_f / 100.0
+  def calculate(view, dimension, amount)
+    if amount.is_a? Proc
+      view.instance_exec(&amount)
+    elsif amount.is_a?(String) && amount.include?('%')
+      location = amount.index '%'
+      offset = amount[(location+1)..-1].gsub(' ', '').to_f
+      percent = amount[0...location].to_f / 100.0
 
       case dimension
       when :width
-        CGRectGetWidth(view.superview.bounds) * percent
+        CGRectGetWidth(view.superview.bounds) * percent + offset
       when :height
-        CGRectGetHeight(view.superview.bounds) * percent
+        CGRectGetHeight(view.superview.bounds) * percent + offset
+      else
+        raise "Unknown dimension #{dimension}"
       end
     else
-      percent
+      amount
     end
   end
 end

data/lib/teacup/constraint.rb

@@ -169,6 +169,9 @@ module Teacup
     end
 
     def plus(constant)
+      if not self.relationship
+        constant = -constant
+      end
       self.constant += constant
       self
     end

data/lib/teacup/stylesheet.rb

@@ -131,10 +131,12 @@ module Teacup
     end
 
     def get_stylesheet_cache(stylename, target, orientation)
+      orientation ||= UIApplication.sharedApplication.statusBarOrientation
       stylesheet_cache[stylename][target][orientation]
     end
 
     def set_stylesheet_cache(stylename, target, orientation, value)
+      orientation ||= UIApplication.sharedApplication.statusBarOrientation
       self.stylesheet_cache[stylename][target][orientation] = value
     end
 
@@ -255,7 +257,31 @@ module Teacup
       end
     end
 
-    protected
+    # In the [rare] case you need to know whether the style extends another
+    # style, this method will find out quickly.  This is mostly useful in the
+    # `UIView#viewWithStylename` method.
+    def extends_style?(stylename, extended_name, checked=[])
+      return true if stylename == extended_name
+
+      extended_style_names = styles[stylename][:extends]
+      return false unless extended_style_names
+
+      extended_style_names = [extended_style_names] unless extended_style_names.is_a? Array
+      return true if extended_style_names.any? { |name| name == extended_name }
+      retval = false
+      extended_style_names.each do |recusive_check|
+        next if checked.include?(recusive_check)
+
+        checked << recusive_check
+        if extends_style?(recusive_check, extended_name, checked)
+          retval = true
+          break
+        end
+      end
+      return retval
+    end
+
+protected
 
     # The list of Stylesheets or names that have been imported into this one.
     #

data/lib/teacup/version.rb

@@ -1,5 +1,5 @@
 module Teacup
 
-  VERSION = '1.2.9'
+  VERSION = '1.3.0'
 
 end

data/lib/teacup/z_core_extensions/ui_view.rb

@@ -48,9 +48,12 @@ class UIView
   end
 
   def stylesheet
-    super
+    if @stylesheet.is_a? Symbol
+      @stylesheet = Teacup::Stylesheet[@stylesheet]
+    end
     # is a stylesheet assigned explicitly?
     retval = @stylesheet
+    return retval if retval
 
     # the 'teacup_next_responder' is assigned in the `layout` method, and links
     # any views created there to the custom class (could be a controller, could

data/lib/teacup/z_core_extensions/ui_view_getters.rb

@@ -37,10 +37,13 @@ class UIView
 
   def _teacup_check_stylename(name_or_class)
     if name_or_class.is_a? Class
-      self.is_a? name_or_class
-    else
-      self.stylename == name_or_class
+      return self.is_a?(name_or_class)
+    elsif stylename == name_or_class
+      return true
+    elsif stylesheet.is_a?(Teacup::Stylesheet)
+      return stylesheet.extends_style?(self.stylename, name_or_class)
     end
+    return false
   end
 
 end

data/spec/calculations_spec.rb

@@ -0,0 +1,55 @@
+class Viewish
+  def superview
+    @superview ||= Viewish.new
+  end
+
+  def bounds
+    CGRect.new([0, 0,], [100, 44])
+  end
+end
+
+
+describe 'Teacup.calculate' do
+
+  it 'should return static numbers' do
+    Teacup.calculate(nil, nil, 1).should == 1
+  end
+
+  it 'should call blocks' do
+    a = 'hi!'
+    Teacup.calculate(a, nil, ->{
+      self.should == a
+      2
+    }).should == 2
+  end
+
+  it 'should return percents with :width' do
+    Teacup.calculate(Viewish.new, :width, '50%').should == 50
+  end
+
+  it 'should return percents with :height' do
+    Teacup.calculate(Viewish.new, :height, '50%').should == 22
+  end
+
+  describe 'should return percents with offset' do
+    it ':width, 50% + 10' do
+      Teacup.calculate(Viewish.new, :width, '50% + 10').should == 60
+    end
+    it ':width, 50% - 10' do
+      Teacup.calculate(Viewish.new, :width, '50% - 10').should == 40
+    end
+    it ':width, 25% + 5' do
+      Teacup.calculate(Viewish.new, :width, '25% + 5').should == 30
+    end
+    it ':height, 50% + 10' do
+      Teacup.calculate(Viewish.new, :height, '50% + 10').should == 32
+    end
+    it ':height, 50% - 10' do
+      Teacup.calculate(Viewish.new, :height, '50% - 10').should == 12
+    end
+    it ':height, 25% + 5' do
+      Teacup.calculate(Viewish.new, :height, '25% + 5').should == 16
+    end
+  end
+
+end

data/spec/styling_modal_spec.rb

@@ -0,0 +1,11 @@
+describe 'Styling a modal view' do
+  tests PresentModalController
+
+  it 'should open a modal' do
+    tap 'Open Modal'
+    wait 10 {
+      1.should == 1
+    }
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teacup
 version: !ruby/object:Gem::Version
-  version: 1.2.9
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-03 00:00:00.000000000 Z
+date: 2013-04-07 00:00:00.000000000 Z
 dependencies: []
 description: ! 'Teacup is a community-driven DSL for making CSS-like styling, and
   layouts for
@@ -28,6 +28,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - CHANGES.md
 - Gemfile
 - Gemfile.lock
@@ -38,6 +39,7 @@ files:
 - app/controllers/first_controller.rb
 - app/controllers/gradient_controller.rb
 - app/controllers/landscape_only_controller.rb
+- app/controllers/present_modal_controller.rb
 - app/controllers/tableview_controller.rb
 - app/custom_class.rb
 - app/styles/main_styles.rb
@@ -63,6 +65,7 @@ files:
 - lib/teacup/z_core_extensions/ui_view_controller.rb
 - lib/teacup/z_core_extensions/ui_view_getters.rb
 - lib/teacup/z_core_extensions/z_handlers.rb
+- resources/Default-568h@2x.png
 - samples/AutoLayout/Gemfile
 - samples/AutoLayout/Gemfile.lock
 - samples/AutoLayout/Rakefile
@@ -88,11 +91,13 @@ files:
 - samples/OnePage/resources/you_didnt_see_this
 - samples/OnePage/spec/main_spec.rb
 - samples/README.md
+- spec/calculations_spec.rb
 - spec/custom_class_spec.rb
 - spec/gradient_spec.rb
 - spec/main_spec.rb
 - spec/style_spec.rb
 - spec/stylesheet_spec.rb
+- spec/styling_modal_spec.rb
 - spec/uiswitch_spec.rb
 - spec/view_spec.rb
 - teacup.gemspec
@@ -121,11 +126,12 @@ signing_key:
 specification_version: 3
 summary: A community-driven DSL for creating user interfaces on iOS.
 test_files:
+- spec/calculations_spec.rb
 - spec/custom_class_spec.rb
 - spec/gradient_spec.rb
 - spec/main_spec.rb
 - spec/style_spec.rb
 - spec/stylesheet_spec.rb
+- spec/styling_modal_spec.rb
 - spec/uiswitch_spec.rb
 - spec/view_spec.rb
-has_rdoc: