teacup 0.0.1.pre → 0.3.1

data/spec/stylesheet_spec.rb

@@ -0,0 +1,348 @@
+describe "Teacup::Stylesheet" do
+
+  describe 'creation' do
+    before do
+      @stylesheet = Teacup::Stylesheet.new(:constanttest) { }
+    end
+
+    after do
+      Teacup::Stylesheet.stylesheets.delete(:constanttest)
+    end
+
+    it 'should create constants for named stylesheets' do
+      Teacup::Stylesheet[:constanttest].should == @stylesheet
+    end
+
+    it 'should allow creating anonymous stylesheets' do
+      stylesheet = Teacup::Stylesheet.new { }
+      stylesheet.name.should == nil
+    end
+  end
+
+  describe 'in the simplest cases' do
+    before do
+      @stylesheet = Teacup::Stylesheet.new do
+        style :example_button,
+          frame: [[0, 0], [100, 100]]
+
+        style :example_label, :example_textfield,
+          backgroundColor: :blue
+      end
+    end
+
+    it 'should let you define properties for a stylename' do
+      @stylesheet.query(:example_button)[:frame].should == [[0, 0], [100, 100]]
+    end
+
+    it 'should let you define properties for many stylenames' do
+      @stylesheet.query(:example_label)[:backgroundColor].should == :blue
+      @stylesheet.query(:example_textfield)[:backgroundColor].should == :blue
+    end
+
+    it 'should return {} for unknown stylenames' do
+      @stylesheet.query(:dingbats).should == {}
+    end
+  end
+
+  describe 'with multiple rules for the same stylename' do
+    before do
+      @stylesheet = Teacup::Stylesheet.new do
+        style :example_button,
+          title: "Example!",
+          frame: [[0, 0], [100, 100]],
+          layer: {
+            borderRadius: 10,
+            opacity: 0.5
+          }
+
+        style :example_button,
+          backgroundColor: :blue,
+          frame: [[100, 100], [200, 200]],
+          layer: {
+            borderRadius: 20
+          }
+      end
+    end
+
+    it 'should union different properties' do
+      @stylesheet.query(:example_button)[:title].should == "Example!"
+      @stylesheet.query(:example_button)[:backgroundColor].should == :blue
+    end
+
+    it 'should give later properties precedence' do
+      @stylesheet.query(:example_button)[:frame].should == [[100, 100], [200, 200]]
+    end
+
+    it 'should give merge hashes' do
+      @stylesheet.query(:example_button)[:layer][:borderRadius].should == 20
+      @stylesheet.query(:example_button)[:layer][:opacity].should == 0.5
+    end
+  end
+
+  describe 'when a stylename extends another' do
+    before do
+      @stylesheet = Teacup::Stylesheet.new do
+        style :label,
+          backgroundColor: :blue,
+          font: "IMPACT"
+
+        style :left_label, extends: :label,
+          backgroundColor: :green,
+          left: 100,
+          width: 100
+
+        style :how_much, extends: :left_label,
+          backgroundColor: :red,
+          top: 200,
+          height: 200
+      end
+
+    end
+
+    it 'should put extended properties into an "extends" Array of Hashes' do
+      @stylesheet.query(:left_label)[:font].should == "IMPACT"
+      @stylesheet.query(:left_label)[:left].should == 100
+    end
+
+    it 'should give the "lowest" style properties precedence' do
+      @stylesheet.query(:left_label)[:backgroundColor].should == :green
+    end
+
+    it 'should follow a chain of extends' do
+      @stylesheet.query(:how_much)[:backgroundColor].should == :red
+      @stylesheet.query(:how_much)[:left] == 100
+      @stylesheet.query(:how_much)[:font] == "IMPACT"
+    end
+  end
+
+  describe 'importing another stylesheet' do
+
+    before do
+      @oo_name_importer = Teacup::Stylesheet.new do
+        import :importedbyname
+
+        style :label,
+          backgroundColor: :blue
+      end
+
+      Teacup::Stylesheet.new(:importedbyname) do
+        style :label,
+          title: "Imported by name"
+      end
+
+      @name_importer = Teacup::Stylesheet.new do
+        import :importedbyname
+
+        style :label,
+          backgroundColor: :blue
+      end
+
+      Teacup::Stylesheet.new(:importrecursion) do
+        import :importrecursion
+
+        style :label,
+          importtitle: "Import recursion"
+      end
+
+      @broken_stylesheet = Teacup::Stylesheet.new do
+        import :NonExtant
+
+        style :label,
+          backgroundColor: :blue
+      end
+    end
+
+    after do
+      Teacup::Stylesheet.stylesheets.delete(:importedbyname)
+      Teacup::Stylesheet.stylesheets.delete(:importrecursion)
+    end
+
+    it 'should work with a name' do
+      @name_importer.query(:label)[:title].should == "Imported by name"
+      @name_importer.query(:label)[:backgroundColor].should == :blue
+    end
+
+    it 'should work with a name even if defined out of order' do
+      @oo_name_importer.query(:label)[:title].should == "Imported by name"
+      @oo_name_importer.query(:label)[:backgroundColor].should == :blue
+    end
+
+    it 'should work with a value' do
+      imported_anonymously = Teacup::Stylesheet.new do
+        style :label,
+          title: "Imported anonymously"
+      end
+
+      anonymous_importer = Teacup::Stylesheet.new do
+        import imported_anonymously
+
+        style :label,
+          backgroundColor: :blue
+      end
+
+      anonymous_importer.query(:label)
+      anonymous_importer.query(:label)[:title].should == "Imported anonymously"
+      @oo_name_importer.query(:label)[:backgroundColor].should == :blue
+    end
+
+    it 'should not explode if a cycle is created' do
+      Teacup::Stylesheet[:importrecursion].query(:label)[:importtitle].should == "Import recursion"
+    end
+
+    it 'should explode if an unknown stylesheet is imported' do
+      error = nil
+      begin
+        @broken_stylesheet.query(:label)
+      rescue Exception => error
+      end
+      error.nil?.should == false
+    end
+  end
+
+  describe 'querying imported stylesheets' do
+    before do
+      @most_generic = Teacup::Stylesheet.new :most_generic do
+        style :label,
+          backgroundColor: :blue,
+          title: "Most generic"
+
+        style :button,
+          title: "Click Here!"
+      end
+
+      @stylesheet = Teacup::Stylesheet.new :stylesheet do
+        import :most_generic
+
+        style :label,
+          borderRadius: 10,
+          title: "Stylesheet"
+      end
+
+      @most_specific = Teacup::Stylesheet.new :most_specific do
+        import :stylesheet
+
+        style :label,
+          title: "Most specific",
+          font: "IMPACT"
+      end
+    end
+
+    it 'should union different properties for the same rule' do
+      @stylesheet.query(:label)[:backgroundColor].should == :blue
+      @stylesheet.query(:label)[:borderRadius] == 10
+    end
+
+    it 'should give the importer precedence' do
+      @stylesheet.query(:label)[:title].should == "Stylesheet"
+    end
+
+    it 'should follow chains of imports' do
+      @most_specific.query(:label)[:title].should == "Most specific"
+      @most_specific.query(:label)[:font].should == "IMPACT"
+      @most_specific.query(:label)[:borderRadius].should == 10
+      @most_specific.query(:label)[:backgroundColor].should == :blue
+    end
+
+    it 'should allow querying a rule which exists only in the importee' do
+      @stylesheet.query(:button)[:title].should == "Click Here!"
+    end
+  end
+
+  describe 'precedence tree flattening' do
+    it 'should give precedence to later imports' do
+      stylesheet = Teacup::Stylesheet.new do
+        import Teacup::Stylesheet.new{
+          style :label_bla,
+            text: "Imported first",
+            backgroundColor: :blue
+        }
+
+        import Teacup::Stylesheet.new{
+          style :label_bla,
+            text: "Imported last"
+        }
+      end
+      stylesheet.query(:label_bla)[:text].should == "Imported last"
+      stylesheet.query(:label_bla)[:backgroundColor].should == :blue
+    end
+
+    it 'should give precedence to less-nested imports' do
+      stylesheet = Teacup::Stylesheet.new do
+        import Teacup::Stylesheet.new {
+          import Teacup::Stylesheet.new {
+            style :button,
+              text: "Indirect import",
+              backgroundColor: :blue
+          }
+
+          style :button,
+            text: "Direct import"
+        }
+      end
+
+      stylesheet.query(:button)[:text].should == "Direct import"
+      stylesheet.query(:button)[:backgroundColor].should == :blue
+    end
+
+    it 'should extend multiple entries, and prefer the first' do
+      stylesheet = Teacup::Stylesheet.new do
+        style :input,
+          origin: [0, 0],
+          backgroundColor: :white
+
+        style :textfield,
+          text: "Extended",
+          backgroundColor: :blue
+
+        style :my_textfield, extends: [:textfield, :input],
+          borderRadius: 10
+      end
+
+      stylesheet.query(:my_textfield)[:text].should == "Extended"
+      stylesheet.query(:my_textfield)[:backgroundColor].should == :blue
+      stylesheet.query(:my_textfield)[:origin].should == [0, 0]
+      stylesheet.query(:my_textfield)[:borderRadius].should == 10
+    end
+
+    it 'should give precedence to imported rules over extended rules' do
+      stylesheet = Teacup::Stylesheet.new do
+        style :textfield,
+          text: "Extended",
+          backgroundColor: :blue
+
+        style :my_textfield, extends: :textfield,
+          borderRadius: 10
+
+        import Teacup::Stylesheet.new{
+          style :my_textfield,
+            text: "Imported"
+        }
+      end
+
+      stylesheet.query(:my_textfield)[:text].should == "Imported"
+      stylesheet.query(:my_textfield)[:backgroundColor].should == :blue
+      stylesheet.query(:my_textfield)[:borderRadius].should == 10
+    end
+
+    it 'should import rules using a deep merge strategy' do
+      stylesheet = Teacup::Stylesheet.new do
+        import Teacup::Stylesheet.new{
+          style :my_textfield,
+            layer: {
+              borderRadius: 1,
+              opacity: 0.5
+            }
+        }
+
+        style :my_textfield,
+          layer: {
+            borderRadius: 10
+          }
+      end
+
+      stylesheet.query(:my_textfield)[:layer][:opacity].should == 0.5
+      stylesheet.query(:my_textfield)[:layer][:borderRadius].should == 10
+    end
+
+  end
+end

data/spec/view_spec.rb

@@ -0,0 +1,103 @@
+describe "Teacup::View" do
+
+  before do
+    @view = UILabel.new
+
+    @stylesheet = Teacup::Stylesheet.new do
+      style :label,
+        text: "Stylesheet1 Label1"
+    end
+  end
+
+  describe 'stylename=' do
+    it 'should work' do
+      @view.stylename = :label
+      @view.stylename.should == :label
+    end
+
+    it 'should set the style when a stylesheet is there' do
+      @view.stylesheet = @stylesheet
+      @view.stylename = :label
+
+      @view.stylename.should == :label
+      @view.text.should == "Stylesheet1 Label1"
+    end
+  end
+
+  describe 'stylesheet=' do
+    it 'should work' do
+      @view.stylesheet = @stylesheet
+      @view.stylesheet.should == @stylesheet
+    end
+
+    it 'should set the style when a stylename is there' do
+      @view.stylename = :label
+      @view.stylesheet = @stylesheet
+
+      @view.text.should == "Stylesheet1 Label1"
+    end
+
+    it 'should push the stylesheet down to all subviews' do
+      listener = UIView.new
+      @view.addSubview(listener)
+      @view.stylesheet = @stylesheet
+      listener.stylesheet.should == @stylesheet
+    end
+  end
+
+  describe 'import' do
+    before do
+      @import_view = UIView.new
+
+      Teacup::Stylesheet.new :to_import do
+        style :view,
+          top: 20,
+          portrait: {
+            top: 30
+          }
+      end
+
+      @import_stylesheet = Teacup::Stylesheet.new do
+        import :to_import
+
+        style :view,
+          top: 40
+      end
+    end
+
+    it 'should always prefer more local styles' do
+      @import_view.stylename = :view
+      @import_view.stylesheet = @import_stylesheet
+
+      @import_view.restyle!(orientation=UIInterfaceOrientationPortrait)
+      @import_view.frame.origin.y.should == 40
+    end
+  end
+
+  describe 'style' do
+
+    it 'should assign any random property that works' do
+      @view.style(tag: 1)
+      @view.tag.should == 1
+    end
+
+    it 'should convert left/top/width/height into frame' do
+      @view.style(left: 1, top: 2, width: 3, height: 4)
+      @view.frame.origin.x.should == 1
+      @view.frame.origin.y.should == 2
+      @view.frame.size.width.should == 3
+      @view.frame.size.height.should == 4
+    end
+
+    it 'should assign any random property that works on the layer' do
+      @view.style(layer: { borderWidth: 10 })
+      @view.layer.borderWidth.should == 10
+    end
+
+    it 'should warn about unknown thingies' do
+      @view.style(partyTime: :excellent)
+    end
+
+  end
+
+end

data/teacup.gemspec

@@ -1,25 +1,25 @@
 require File.expand_path('../lib/teacup/version.rb', __FILE__)
-require File.expand_path('../lib/teacup/contributors.rb', __FILE__)
 
 Gem::Specification.new do |gem|
+  gem.name          = 'teacup'
+  gem.version       = Teacup::VERSION
+
+  gem.authors  = ['the rubymotion community']
 
-  gem.authors  = Teacup::CONTRIBUTORS
   gem.description = <<-DESC
-  Teacup is a community-driven DSL for making CSS-like templates for RubyMotion iOS
-  apps.
-  DESC
+Teacup is a community-driven DSL for making CSS-like styling, and layouts for
+complex and simple iOS apps with RubyMotion.
 
-  gem.summary = 'CSS-like templates for RubyMotion.'
-  gem.homepage = 'https://github.com/rubymotion/teacup'
+By aiming at making RubyMotion less tedious, Teacup makes RubyMotion feel like
+interface builder, and work like a CSS stylesheet.
+DESC
 
-  gem.files   = `git ls-files`.lines.map(&:strip)
-  
-  gem.executables = gem.files.grep(%r(^bin/)).map { |f| File.basename(f) }
-  gem.test_files  = gem.files.grep(%r{^(test|spec|features)/})
+  gem.summary = 'A community-driven DSL for creating user interfaces on iOS.'
+  gem.homepage = 'https://github.com/rubymotion/teacup'
 
-  gem.name          = 'teacup'
+  gem.files       = `git ls-files`.split($\)
   gem.require_paths = ['lib']
-  gem.version       = "#{Teacup::VERSION}.pre"
+  gem.test_files  = gem.files.grep(%r{^spec/})
 
   gem.add_dependency 'rake'
   gem.add_development_dependency 'rspec'

metadata

@@ -1,19 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: teacup
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre
-  prerelease: 6
+  version: 0.3.1
+  prerelease: 
 platform: ruby
 authors:
-- Chris Clarke
-- Colin Thomas-Arnold
-- Conrad Irwin
-- Roland Oth
-- Vladimir Pouzanov
+- the rubymotion community
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-24 00:00:00.000000000 Z
+date: 2012-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -47,58 +43,61 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: ! "  Teacup is a community-driven DSL for making CSS-like templates for
-  RubyMotion iOS\n  apps.\n"
+description: ! 'Teacup is a community-driven DSL for making CSS-like styling, and
+  layouts for
+
+  complex and simple iOS apps with RubyMotion.
+
+
+  By aiming at making RubyMotion less tedious, Teacup makes RubyMotion feel like
+
+  interface builder, and work like a CSS stylesheet.
+
+'
 email: 
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .rspec
+- CHANGES.md
 - Dofile
 - Gemfile
 - Gemfile.lock
+- LICENSE
 - README.md
 - Rakefile
+- app/app_delegate.rb
+- app/controllers/first_controller.rb
+- app/controllers/landscape_only_controller.rb
+- app/controllers/tableview_controller.rb
+- app/styles/main_styles.rb
+- app/views/custom_view.rb
+- lib/dummy.rb
 - lib/teacup.rb
-- lib/teacup/contributors.rb
-- lib/teacup/core_extensions/ui_view.rb
-- lib/teacup/core_extensions/ui_view_controller.rb
+- lib/teacup/handler.rb
 - lib/teacup/layout.rb
-- lib/teacup/style_sheet.rb
+- lib/teacup/merge_defaults.rb
+- lib/teacup/style.rb
+- lib/teacup/stylesheet.rb
+- lib/teacup/stylesheet_extensions/rotation.rb
 - lib/teacup/version.rb
-- lib/teacup/view.rb
-- pkg/teacup-0.0.0.gem
-- pkg/teacup-0.0.1.gem
-- proposals/other/README.md
-- proposals/other/app/config/application.rb
-- proposals/other/app/config/boot.rb
-- proposals/other/app/config/initializers/twitter.rb
-- proposals/other/app/controllers/events_controller.rb
-- proposals/other/app/controllers/venues_controller.rb
-- proposals/other/app/db/README.md
-- proposals/other/app/db/migrations/20120514201043_create_events.rb
-- proposals/other/app/db/migrations/20120514201044_add_price_to_events.rb
-- proposals/other/app/db/migrations/20120514201045_create_venues.rb
-- proposals/other/app/db/schema.rb
-- proposals/other/app/models/event.rb
-- proposals/other/app/models/venue.rb
-- proposals/other/app/views/events/edit.ipad.rb
-- proposals/other/app/views/events/edit.iphone.rb
-- proposals/other/app/views/events/show.ipad.rb
-- proposals/other/app/views/events/show.iphone.rb
+- lib/teacup/z_core_extensions/ca_layer.rb
+- lib/teacup/z_core_extensions/ui_view.rb
+- 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
 - samples/Hai/.gitignore
 - samples/Hai/Rakefile
 - samples/Hai/app/app_delegate.rb
 - samples/Hai/app/hai_controller.rb
 - samples/Hai/spec/main_spec.rb
-- samples/Hai/styles/ipad.rb
-- samples/Hai/styles/ipad_vertical.rb
+- samples/Hai/styles/iphone.rb
 - samples/README.md
-- spec/spec_helper.rb
-- spec/teacup/contributions_spec.rb
-- spec/teacup/version_spec.rb
+- spec/main_spec.rb
+- spec/style_spec.rb
+- spec/stylesheet_spec.rb
+- spec/view_spec.rb
 - teacup.gemspec
 homepage: https://github.com/rubymotion/teacup
 licenses: []
@@ -115,16 +114,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3
-summary: CSS-like templates for RubyMotion.
+summary: A community-driven DSL for creating user interfaces on iOS.
 test_files:
-- spec/spec_helper.rb
-- spec/teacup/contributions_spec.rb
-- spec/teacup/version_spec.rb
+- spec/main_spec.rb
+- spec/style_spec.rb
+- spec/stylesheet_spec.rb
+- spec/view_spec.rb
+has_rdoc: 

data/.rspec

@@ -1,2 +0,0 @@
---color
---format documentation

data/lib/teacup/contributors.rb

@@ -1,7 +0,0 @@
-module Teacup
-
-  # If you've made a contribution, add your name here in :' ... ' as a constant symbol.
-  # Please place names in aphabetical order.
-  CONTRIBUTORS = ['Chris Clarke', 'Colin Thomas-Arnold', 'Conrad Irwin', 'Roland Oth', 'Vladimir Pouzanov']
-
-end

data/lib/teacup/core_extensions/ui_view.rb

@@ -1,4 +0,0 @@
-class UIView
-  include Teacup::Layout
-  include Teacup::View
-end