teacup 2.2.2 → 2.3.0

data/lib/teacup-ios/stylesheet_extensions/autoresize.rb

@@ -7,7 +7,7 @@
 #         autoresizingMask: autoresize { flexible_left | flexible_right | flexible_height }
 #     end
 module Teacup
-  class Stylesheet
+  module StylesheetExtension
 
     def autoresize &block
       @@autoresize ||= Autoresize.new

data/lib/teacup-ios/stylesheet_extensions/device.rb

@@ -25,7 +25,7 @@
 #         frame: [[0, 0], app_size]
 #     end
 module Teacup
-  class Stylesheet
+  module StylesheetExtension
     def iPhone       ; 1 << 1 ; end
     def iPhoneRetina ; 1 << 2 ; end
     def iPhone4      ; 1 << 3 ; end

data/lib/teacup-osx/style_extensions/autoresize.rb

@@ -7,7 +7,7 @@
 #         autoresizingMask: autoresize { flexible_left | flexible_right | flexible_height }
 #     end
 module Teacup
-  class Stylesheet
+  module StylesheetExtension
 
     def autoresize &block
       @@autoresize ||= Autoresize.new

data/lib/teacup/constraint.rb

@@ -122,6 +122,8 @@ module Teacup
       self.priority = :high  # this is the xcode default
     end
 
+    # c.equals(100)
+    # c.equals(:superview, :width)
     def equals(relative_to, attribute2=nil)
       self.set_relationship(NSLayoutRelationEqual, relative_to, attribute2)
     end
@@ -169,6 +171,13 @@ module Teacup
       times 1.0/multiplier
     end
 
+    # If no relationship has been set, the "use case" here is:
+    #
+    #     c.plus(10).equals(:view, :x)
+    #
+    # Which is the same as
+    #
+    #     c.equals(:view, :x).minus(10)
     def plus(constant)
       if not self.relationship
         constant = -constant

data/lib/teacup/limelight.rb

@@ -0,0 +1,19 @@
+module Teacup
+  class Limelight
+    include StylesheetExtension
+    attr :styles
+
+    def initialize(&block)
+      @styles = {}
+      instance_exec(&block)
+    end
+
+    def method_missing(property, value=nil, &more_props)
+      if more_props
+        value = Limelight.new(&more_props).styles
+      end
+      styles[property] = value
+    end
+
+  end
+end

data/lib/teacup/stylesheet.rb

@@ -65,6 +65,8 @@ module Teacup
   # a second phase, the ':extends' chain is flattened.
   #
   class Stylesheet
+    include StylesheetExtension
+
     attr_reader :name
 
     class << self
@@ -249,6 +251,7 @@ module Teacup
       end
 
       queries.each do |stylename|
+
         # reset the stylesheet_cache for this stylename
         @stylesheet_cache.delete(stylename) if @stylesheet_cache
 
@@ -319,6 +322,13 @@ module Teacup
       end
     end
 
+    # supports the 'new-style' stylesheet syntax.
+    # @example
+    def method_missing(stylename, &styles)
+      properties = Limelight.new(&styles).styles
+      style(stylename, properties)
+    end
+
 protected
 
     # The list of Stylesheets or names that have been imported into this one.

data/lib/teacup/stylesheet_extensions/constraints.rb

@@ -1,5 +1,5 @@
 module Teacup
-  class Stylesheet
+  module StylesheetExtension
 
     def constrain(target, attribute=nil)
       if attribute.nil?

data/lib/teacup/stylesheet_extensions/transform.rb

@@ -1,6 +1,6 @@
 
 module Teacup
-  class Stylesheet
+  module StylesheetExtension
 
     def pi
       Math::PI

data/lib/teacup/version.rb

@@ -1,5 +1,5 @@
 module Teacup
 
-  VERSION = '2.2.2'
+  VERSION = '2.3.0'
 
 end

data/spec/ios/stylesheet_spec.rb

@@ -25,8 +25,10 @@ describe "Teacup::Stylesheet" do
         style :example_button,
           frame: [[0, 0], [100, 100]]
 
-        style :example_label, :example_textfield,
+        style :example_label,
           backgroundColor: :blue
+
+        style :example_textfield, extends: :example_label
       end
     end
 

data/spec/limelight_spec.rb

@@ -0,0 +1,27 @@
+describe "Teacup::Stylesheet" do
+
+  describe "Limelight-style syntax" do
+    before do
+      @limelight = Teacup::Stylesheet.new :most_generic do
+        label {
+          backgroundColor :blue
+          title 'In the lime light'
+        }
+
+        button {
+          title 'Click Here!'
+          layer {
+            color :blue
+          }
+        }
+      end
+    end
+
+    it "should have styles" do
+      @limelight.query(:label)[:backgroundColor].should == :blue
+      @limelight.query(:label)[:title].should == 'In the lime light'
+      @limelight.query(:button)[:title].should == 'Click Here!'
+      @limelight.query(:button)[:layer][:color].should == :blue
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: teacup
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.3.0
 platform: ruby
 authors:
 - the rubymotion community
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-02 00:00:00.000000000 Z
+date: 2014-06-05 00:00:00.000000000 Z
 dependencies: []
 description: |
   Teacup is a community-driven DSL for RubyMotion.  It has CSS-like styling, and
@@ -27,6 +27,7 @@ files:
 - lib/teacup/core_extensions/view_getters.rb
 - lib/teacup/handler.rb
 - lib/teacup/layout.rb
+- lib/teacup/limelight.rb
 - lib/teacup/merge_defaults.rb
 - lib/teacup/restyle.rb
 - lib/teacup/stylesheet.rb
@@ -56,6 +57,7 @@ files:
 - lib/teacup-osx/style.rb
 - lib/teacup-osx/style_extensions/autoresize.rb
 - lib/teacup.rb
+- README.md
 - spec/ios/appearance_spec.rb
 - spec/ios/calculations_spec.rb
 - spec/ios/child_controllers_spec.rb
@@ -77,6 +79,7 @@ files:
 - spec/ios/ui_view_getters_spec.rb
 - spec/ios/uiswitch_spec.rb
 - spec/ios/view_spec.rb
+- spec/limelight_spec.rb
 homepage: https://github.com/rubymotion/teacup
 licenses:
 - BSD
@@ -123,3 +126,4 @@ test_files:
 - spec/ios/ui_view_getters_spec.rb
 - spec/ios/uiswitch_spec.rb
 - spec/ios/view_spec.rb
+- spec/limelight_spec.rb