teacup 2.1.11 → 2.1.12

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    teacup (2.1.11)
+    teacup (2.1.12)
 
 GEM
   remote: https://rubygems.org/

data/lib/teacup/layout.rb

@@ -165,7 +165,6 @@ module Teacup
       # one is not explicitly assigned to the view
       if view.is_a? Layout
         view.teacup_next_responder = WeakRef.new(self)
-        # view.teacup_next_responder = self
       end
 
       if block_given?

data/lib/teacup/stylesheet.rb

@@ -125,19 +125,23 @@ module Teacup
     # @stylesheet_cache object is manipulated directly (to invalidate entries,
     # or the entire cache)
     def stylesheet_cache
-      @stylesheet_cache ||= Hash.new do |cache,_stylename|
-        cache[_stylename] = Hash.new do |_target,_orientation|
-          _target[_orientation] = {}
-        end
-      end
+      return nil
+      # @stylesheet_cache ||= Hash.new do |by_stylename,_stylename|
+      #   by_stylename[_stylename] = Hash.new do |by_target,_target|
+      #     by_orientation = {}
+      #     by_target[_target] = by_orientation
+      #   end
+      # end
     end
 
     def get_stylesheet_cache(stylename, target, orientation)
-      self.stylesheet_cache[stylename][target][orientation]
+      return nil
+      # self.stylesheet_cache[stylename][target][orientation]
     end
 
     def set_stylesheet_cache(stylename, target, orientation, value)
-      self.stylesheet_cache[stylename][target][orientation] = value
+      return
+      # self.stylesheet_cache[stylename][target][orientation] = value
     end
 
     # Include another Stylesheet into this one, the rules defined
@@ -211,15 +215,17 @@ module Teacup
       return {} if seen[self]
       return {} unless stylename
 
-      unless get_stylesheet_cache(stylename, target, orientation)
+      p stylename: stylename, target: target, orientation: orientation
+      if cached = get_stylesheet_cache(stylename, target, orientation)
+        return cached.dup
+      else
         run_block
         seen[self] = true
 
-        set_stylesheet_cache(stylename, target, orientation, styles[stylename].build(target, orientation, seen))
+        built = styles[stylename].build(target, orientation, seen)
+        set_stylesheet_cache(stylename, target, orientation, built)
+        return built.dup
       end
-
-      # mutable hashes could mess with our cache, so return a duplicate
-      get_stylesheet_cache(stylename, target, orientation).dup
     end
 
     # Add a set of properties for a given stylename or multiple stylenames.

data/lib/teacup/teacup_controller.rb

@@ -101,6 +101,8 @@ module Teacup
         layout(top_level_view, stylename, properties, &block)
       end
 
+      layoutDidLoad
+
       if should_restyle
         Teacup.should_restyle!
         self.top_level_view.restyle!
@@ -109,12 +111,9 @@ module Teacup
       if defined? NSLayoutConstraint
         self.top_level_view.apply_constraints
       end
-
-      layoutDidLoad
     end
 
     def layoutDidLoad
-      true
     end
 
   end

data/lib/teacup/version.rb

@@ -1,5 +1,5 @@
 module Teacup
 
-  VERSION = '2.1.11'
+  VERSION = '2.1.12'
 
 end

data/spec/ios/main_spec.rb

@@ -25,9 +25,9 @@ describe "Application 'Teacup'" do
   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 == 20
-    @root_view.frame.size.width.should == 320
-    @root_view.frame.size.height.should == 460
+    @root_view.frame.origin.y.should == 0
+    @root_view.frame.size.width.should == UIApplication.sharedApplication.keyWindow.frame.size.width
+    @root_view.frame.size.height.should == UIApplication.sharedApplication.keyWindow.frame.size.height
     @root_view.backgroundColor.should == UIColor.yellowColor
   end
 

data/spec/ios/memory_leak_spec.rb

@@ -19,7 +19,6 @@ describe "Memory leaks" do
 
   def controller
     unless @controller
-      puts("=============== memory_leak_spec.rb line #{__LINE__} ===============")
       root = UIViewController.new
       @controller = UINavigationController.alloc.initWithRootViewController(root)
     end
@@ -31,7 +30,6 @@ describe "Memory leaks" do
     detector = LeakDetector.new
 
     memory_leak = MemoryLeakController.new
-    p memory_leak.view
 
     NSNotificationCenter.defaultCenter.addObserver(detector,
             selector: :'did_dealloc:',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teacup
 version: !ruby/object:Gem::Version
-  version: 2.1.11
+  version: 2.1.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-04 00:00:00.000000000 Z
+date: 2013-10-10 00:00:00.000000000 Z
 dependencies: []
 description: ! 'Teacup is a community-driven DSL for making CSS-like styling, and
   layouts for