teacup 0.0.1.pre → 0.3.1

data/lib/teacup/core_extensions/ui_view_controller.rb

@@ -1,62 +0,0 @@
-class UIViewController
-  include Teacup::Layout
-
-  class << self
-    # Define the layout of a controller's view.
-    #
-    # This function is analogous to Teacup::Layout#layout, though it is
-    # designed so you can create an entire layout in a declarative manner in
-    # your controller.
-    #
-    # The hope is that his declarativeness will allow us to automatically
-    # deal with common iOS programming tasks (like releasing views when
-    # low-memory conditions occur) for you. This is still not implemented
-    # though.
-    #
-    # @param name  The stylename for your controller's view.
-    #
-    # @param properties  Any extra styles that you want to apply.
-    #
-    # @param &block  The block in which you should define your layout.
-    #                It will be instance_exec'd in the context of a
-    #                controller instance.
-    #
-    # @example
-    #   MyViewController < UIViewController
-    #     layout :my_view do
-    #       subview UILabel, xjad: "Test"
-    #       subview UITextField, {
-    #         frame: [[200, 200], [100, 100]]
-    #         delegate: self
-    #       }
-    #       subview UIView, :shiny_thing) {
-    #         subview UIView, :centre_of_shiny_thing
-    #       }
-    #     end
-    #   end
-    #
-    def layout(stylename, properties={}, &block)
-      @layout_definition = [stylename, properties, block]
-    end
-
-    # Retreive the layout defined by {layout}
-    def layout_definition
-      @layout_definition
-    end
-  end
-
-  # Instantiate the layout from the class, and then call layoutDidLoad.
-  #
-  # If you want to use Teacup in your controller, please hook into layoutDidLoad,
-  # not viewDidLoad.
-  def viewDidLoad
-    if self.class.layout_definition
-      name, properties, block = self.class.layout_definition
-      layout(view, name, properties, &block)
-    end
-
-    layoutDidLoad
-  end
-
-  def layoutDidLoad; true; end
-end

data/lib/teacup/style_sheet.rb

@@ -1,195 +0,0 @@
-module Teacup
-  # Stylesheets in Teacup act as a central configuration mechanism,
-  # they have two aims:
-  #
-  # 1. Allow you to store "Details" away from the main body of your code.
-  #    (controllers shouldn't have to be filled with style rules)
-  # 2. Allow you to easily re-use configuration in many places.
-  #
-  # The API really provides only two methods, {Stylesheet#style} to store properties
-  # on the Stylesheet; and {Stylesheet#query} to get them out again:
-  #
-  # @example
-  #   stylesheet = Teacup::Stylesheet.new
-  #   stylesheet.style :buttons, :corners => :rounded
-  #   # => nil
-  #   stylesheet.query :buttons
-  #   # => {:corners => :rounded}
-  #
-  # In addition to this, two separate mechanisms are provided for sharing
-  # configuration within stylesheets.
-  #
-  # Firstly, if you set the ':extends' property for a given stylename, then on lookup
-  # the Stylesheet will merge the properties for the ':extends' stylename into the return
-  # value. Conflicts are resolved so that properties with the original stylename
-  # are resolved in its favour.
-  #
-  # @example
-  #   Teacup::Stylesheet.new(:IPad) do
-  #     style :button,
-  #       background: UIColor.blackColor,
-  #       top: 100
-  #
-  #     style :ok_button, extends: :button,
-  #       title: "OK!",
-  #       top: 200
-  #
-  #   end
-  #   Teacup::Stylesheet::IPad.query(:ok_button)
-  #   # => {background: UIColor.blackColor, top: 200, title: "OK!"}
-  #
-  # Secondly, you can import Stylesheets into each other, in exactly the same way as you
-  # can include Modules into each other in Ruby. This allows you to share rules between
-  # Stylesheets.
-  #
-  # As you'd expect, conflicts are resolve so that the Stylesheet on which you call query
-  # has the highest precedence.
-  #
-  # @example
-  #   Teacup::Stylesheet.new(:IPad) do
-  #     style :ok_button,
-  #       title: "OK!"
-  #   end
-  #
-  #   Teacup::Stylesheet.new(:IPadVertical) do
-  #     import :IPad
-  #     style :ok_button,
-  #       width: 80
-  #   end
-  #   Teacup::Stylesheet::IPadVertical.query(:ok_button)
-  #   # => {title: "OK!", width: 80}
-  #
-  # The two merging mechanisms are considered independently, so you can override
-  # a property both in a ':extends' rule, and also in an imported Stylesheet. In such a
-  # a case the Stylesheet inclusion conflicts are resolved independently; and then in
-  # a second phase, the ':extends' chain is flattened.
-  #
-  class Stylesheet
-    attr_reader :name
-
-    # Create a new Stylesheet with the given name.
-    #
-    # @param name, The name to give.
-    # @param &block, The body of the Stylesheet instance_eval'd.
-    # @example
-    #   Teacup::Stylesheet.new(:IPadVertical) do
-    #     import :IPadBase
-    #     style :continue_button,
-    #        top: 50
-    #   end
-    #
-    def initialize(name, &block)
-      @name = name.to_sym
-      Teacup::Stylesheet.const_set(@name, self)
-      instance_eval &block
-      self
-    end
-
-    # Include another Stylesheet into this one, the rules defined
-    # within it will have lower precedence than those defined here
-    # in the case that they share the same keys.
-    #
-    # @param Symbol the name of the stylesheet.
-    # @example
-    #   Teacup::Stylesheet.new(:IPadVertical) do
-    #     import :IPadBase
-    #     import :VerticalTweaks
-    #   end
-    def import(name_or_stylesheet)
-      if Stylesheet === name_or_stylesheet
-        imported << name_or_stylesheet.name
-      else
-        imported << name_or_stylesheet.to_sym
-      end
-    end
-
-    # Add a set of properties for a given stylename or set of stylenames.
-    #
-    # @param Symbol, *stylename
-    # @param Hash[Symbol, Object], properties
-    # @example
-    #   Teacup::Stylesheet.new(:IPadBase) do
-    #     style :pretty_button,
-    #       backgroundColor: UIColor.blackColor
-    #
-    #     style :continue_button, extends: :pretty_button,
-    #       title: "Continue!",
-    #       top: 50
-    #   end
-    def style(*queries)
-      properties = queries.pop
-      queries.each do |stylename|
-        styles[stylename].update(properties)
-      end
-    end
-
-    # Get the properties defined for the given stylename, in this Stylesheet and all
-    # those that have been imported.
-    #
-    # If the ':extends' property is set, we then repeat the process with the value
-    # of that, and include them into the result with lower precedence.
-    #
-    # @param Symbol stylename, the stylename to look up.
-    # @return Hash[Symbol, *] the resulting properties.
-    # @example
-    #   Teacup::Stylesheet::IPadBase.query(:continue_button)
-    #   # => {backgroundColor: UIColor.blackColor, title: "Continue!", top: 50}
-    def query(stylename)
-      this_rule = properties_for(stylename)
-
-      if also_include = this_rule.delete(:extends)
-        query(also_include).merge(this_rule)
-      else
-        this_rule
-      end
-    end
-
-    # A unique and hopefully meaningful description of this Object.
-    #
-    # @return String
-    def inspect
-      "Teacup::Stylesheet:#{name.inspect}"
-    end
-
-    protected
-
-    # Get the properties for a given stylename, including any properties
-    # defined on stylesheets that have been imported into this one, but not
-    # resolving ':extends' inheritance.
-    #
-    # @param Symbol stylename, the stylename to search for.
-    # @param Hash so_far, the properties already found in stylesheets with
-    #                     lower precedence than this one.
-    # @param Hash seen, the Stylesheets that we've already visited, this is
-    #                   to avoid pathological cases where stylesheets
-    #                   have been imported recursively.
-    # @return Hash
-    def properties_for(stylename, so_far={}, seen={})
-      return so_far if seen[self]
-      seen[self] = true
-
-      imported.each do |name|
-        unless Teacup::Stylesheet.const_defined?(name)
-          raise "Teacup tried to import Stylesheet:#{name} into Stylesheet:#{self.name}, but it didn't exist"
-        end
-        Teacup::Stylesheet.const_get(name).properties_for(stylename, so_far, seen)
-      end
-
-      so_far.update(styles[stylename])
-    end
-
-    # The list of Stylesheet names that have been imported into this one.
-    #
-    # @return Array[Symbol]
-    def imported
-      @imported ||= []
-    end
-
-    # The actual contents of this stylesheet as a Hash from stylename to properties.
-    #
-    # @return Hash[Symbol, Hash]
-    def styles
-      @styles ||= Hash.new{ |h, k| h[k] = {} }
-    end
-  end
-end

data/lib/teacup/view.rb

@@ -1,123 +0,0 @@
-module Teacup
-  # Teacup::View defines some utility functions for UIView that enable
-  # a lot of the magic for Teacup::Layout.
-  #
-  # Most users of teacup should be able to ignore the contents of this file
-  # for the most part.
-  module View
-    # The current stylename that is used to look up properties in the stylesheet.
-    attr_reader :stylename
-    
-    # The current stylesheet will be looked at when properties are needed.
-    attr_reader :stylesheet
-
-    # Alter the stylename of this view.
-    #
-    # This will cause new styles to be applied from the stylesheet.
-    #
-    # @param Symbol  stylename
-    def stylename=(stylename)
-      @stylename = stylename
-      style(stylesheet.query(stylename)) if stylesheet
-    end
-
-    # Alter the stylesheet of this view.
-    #
-    # This will cause new styles to be applied using the current stylename,
-    # and will recurse into subviews.
-    #
-    # If you would prefer that a given UIView object does not inherit the
-    # stylesheet from its parents, override the 'stylesheet' method to
-    # return the correct value at all times.
-    #
-    # @param Teacup::Stylesheet  stylesheet.
-    def stylesheet=(stylesheet)
-      @stylesheet = stylesheet
-      style(stylesheet.query(stylename)) if stylename && stylesheet
-      subviews.each{ |subview| subview.stylesheet = stylesheet }
-    end
-
-    # Animate a change to a new stylename.
-    #
-    # This is equivalent to wrapping a call to .stylename= inside
-    # UIView.beginAnimations.
-    #
-    # @param Symbol  the new stylename
-    # @param Options  the options for the animation (may include the
-    #                 duration and the curve)
-    #
-    def animate_to_stylename(stylename, options={})
-      return if self.stylename == stylename
-      UIView.beginAnimations(nil, context: nil)
-      # TODO: This should be in a style-sheet!
-      UIView.setAnimationDuration(options[:duration]) if options[:duration]
-      UIView.setAnimationCurve(options[:curve]) if options[:curve]
-      self.stylename = stylename
-      UIView.commitAnimations
-    end
-
-    # Apply style properties to this element.
-    #
-    # Takes a hash of properties such as may have been read from a stylesheet
-    # or passed as parameters to {Teacup::Layout#layout}, and applies them to
-    # the element.
-    #
-    # Does a little bit of magic (that may be split out as 'sugarcube') to
-    # make properties work as you'd expect.
-    #
-    # If you try and assign something in properties that is not supported,
-    # a warning message will be emitted.
-    #
-    # @param Hash  the properties to set.
-    def style(properties)
-      clean_properties! properties
-
-      properties.each do |key, value|
-        if key == :title && UIButton === self
-          setTitle(value, forState: UIControlStateNormal)
-        elsif respond_to?(:"#{key}=")
-          send(:"#{key}=", value)
-        elsif layer.respond_to?(:"#{key}=")
-          layer.send(:"#{key}=", value)
-        elsif key == :keyboardType
-          setKeyboardType(value)
-        else
-          $stderr.puts "Teacup WARN: Can't apply #{key} to #{inspect}"
-        end
-      end
-
-      #OUCH! Figure out why this is needed
-      if rand > 1
-        setCornerRadius(1.0) 
-        setFrame([[0,0],[0,0]])
-        setTransform(nil)
-        setMasksToBounds(0)
-        setShadowOffset(0)
-      end
-    end
-
-    # merge definitions for 'frame' into one.
-    #
-    # To support 'extends' more nicely it's convenient to split left, top, width
-    # and height out of frame. Unfortunately that means we have to write ugly
-    # code like this to reassemble them into what the user actually meant.
-    #
-    # WARNING: this method *mutates* its parameter.
-    #
-    # @param Hash
-    # @return Hash
-    def clean_properties!(properties)
-      return unless [:frame, :left, :top, :width, :height].any?(&properties.method(:key?))
-
-      frame = properties.delete(:frame) || self.frame
-
-      frame[0][0] = properties.delete(:left) || frame[0][0]
-      frame[0][1] = properties.delete(:top) || frame[0][1]
-      frame[1][0] = properties.delete(:width) || frame[1][0]
-      frame[1][1] = properties.delete(:height) || frame[1][1]
-
-      properties[:frame] = frame
-      properties
-    end
-  end
-end

data/proposals/other/README.md

@@ -1,45 +0,0 @@
-# Railsifiying mobile development
-
-** This is a rough idea, which may have lots of holes, please comment on it, post issues, or fork. ** 
-
-
-It's time we take control of iOS app development, because it's clunky, 
-slow, not obvious and because we love Ruby & Rails.
-
-We can't have "just" styling, it's not a full solution we need a framework now
-more then ever.
-
-With that said, I believe Rails provides a solid MVC. It can help hide or augment
-may of the typical problems with iOS development.
-
-
-Directory structure:
-
-    .teacup
-    |____app
-    | |____config
-    | | |____application.rb
-    | | |____boot.rb
-    | | |____initializers
-    | | | |____twitter.rb
-    | |____controllers
-    | | |____events_controller.rb
-    | | |____venues_controller.rb
-    | |____db
-    | | |____migrations
-    | | | |____20120514201043_create_events.rb
-    | | | |____20120514201044_add_price_to_events.rb
-    | | | |____20120514201045_create_venues.rb
-    | | |____README.md
-    | | |____schema.rb
-    | |____models
-    | | |____event.rb
-    | | |____venue.rb
-    | |____views
-    | | |____events
-    | | | |____edit.ipad.rb
-    | | | |____edit.iphone.rb
-    | | | |____show.ipad.rb
-    | | | |____show.iphone.rb
-    | | |____venues
-    |____README.md

data/proposals/other/app/config/application.rb

@@ -1 +0,0 @@
-# Idea: framework runtime, starts to load the application, load initializers, run migrations, etc

data/proposals/other/app/config/boot.rb

@@ -1 +0,0 @@
-# Idea: framework booting before application (if it's needed at all)

data/proposals/other/app/config/initializers/twitter.rb

@@ -1,7 +0,0 @@
-# 0. applicationDidFinishLaunching
-#   1. boot
-#   2. application
-#     3. initializers
-#       4. twitter configuration values loaded
-
-Twitter.setup("XXX", "YYY")

data/proposals/other/app/controllers/events_controller.rb

@@ -1,28 +0,0 @@
-class EventsController < Controller
-
-  # Idea: Need to think about this more, but in lue of generators, we could have 
-  # over-rideable defaults based on a responds_to/actions
-  # Idea: This would also configure what actions a controller can respond to / route to (do we need routes?)
-  responds_to :only => [:new, :create, :edit, :update, :destroy, :index, :show] # default options
-
-  def show(id)
-    @event = Event.find(id)
-    render :show
-  end
-
-  def edit(id)
-    @event = Event.find(id)
-  end
-
-  def update(id)
-    # Note: How would this conflict with the previously set @event, should something be passed? augment params?
-    @event = Event.find(id)
-    @event.update_attributes(
-      # 1. data from the current/old view?
-      # 2. autosave was false
-      :price => self.view.price
-    )
-    # render :edit # Idea: (self.view is loaded)
-  end
-
-end

data/proposals/other/app/controllers/venues_controller.rb

@@ -1,4 +0,0 @@
-class VenuesController < Controller
-  # Idea: We may want to force some kind of nesting in controller
-  belongs_to :event
-end

data/proposals/other/app/db/README.md

@@ -1,16 +0,0 @@
-# DB
-
-## CoreDataAdapter
-
-Rationale: CD is widely used in iOS projects and may be useful for simpler
-integration with UI.
-
-## SqlLiteAdapter
-
-This would be responsible for handling CoreData+Sqlite backend.
-
-## RemoteAdapter
-
-This would be responsible for handling remote data sources (initially just JSON).
-
-* A RemoteAdapter would be migration-less, APIs would need to be backwards compatible or be versioned, see endpoint in `models/event.rb`

data/proposals/other/app/db/migrations/20120514201043_create_events.rb

@@ -1,9 +0,0 @@
-class CreateEvents < Migration
-  def change
-    create_table(:events) do |t|
-      t.string :name
-      t.references :venue
-      t.timestamps
-    end
-  end
-end

data/proposals/other/app/db/migrations/20120514201044_add_price_to_events.rb

@@ -1,5 +0,0 @@
-class AddPriceToEvents < Migration
-  def change
-    add_column :events, :price, :float, :default => 0.00
-  end
-end

data/proposals/other/app/db/migrations/20120514201045_create_venues.rb

@@ -1,8 +0,0 @@
-class CreateVenues < Migration
-  def change
-    create_table(:venues) do |t|
-      t.string :name
-      t.timestamps
-    end
-  end
-end

data/proposals/other/app/db/schema.rb

@@ -1,19 +0,0 @@
-Schema.define(:version => 20120514201043) do
-
-  create_table(:events) do |t|
-    t.string :name
-    t.references :venue
-    t.timestamps
-  end
-
-  create_table(:venues) do |t|
-    t.string :name
-    t.timestamps
-  end
-
-  # Idea: If we can't automagically infer from CoreData?
-  # create_table(:schema_migrations) do
-  #   t.integer :version, :default => false
-  # end
-
-end

data/proposals/other/app/models/event.rb

@@ -1,14 +0,0 @@
-class Event < Model
-
-  # Idea: By default the endpoint is considered a local Sqllite store, see db/README.md for more information.
-  #
-  # endpoint nil                  # uses sqlite, not required
-  #
-  # endpoint "http://example.com" # simple configuration
-  #
-  # # more advanced confiruations delegating to something, in this case the AppDelegate for a current_user
-  # endpoint lambda { 
-  #   "https://#{app.current_user.name}:pass@example.com" 
-  # }
-
-end

data/proposals/other/app/models/venue.rb

@@ -1,3 +0,0 @@
-class Venue < Model
-  belongs_to :event
-end

data/proposals/other/app/views/events/edit.ipad.rb

@@ -1,8 +0,0 @@
-text_field{@event, :name,  :autosave => true}
-text_field{@event, :price, :autosave => false}
-
-button("Save?").on(:press) do |btn|
-  alert("Slide to save the event")
-end.on(:slide) do |btn|
-  update(@event.id) # invokes to controller or use @controller?
-end

data/proposals/other/app/views/events/edit.iphone.rb

@@ -1,7 +0,0 @@
-text_field{@event, :name}
-text_field{@event, :price}
-button("Save?").on(:press) do |btn|
-  alert("Slide to save the event")
-end.on(:slide) do |btn|
-  update(@event.id)
-end

data/proposals/other/app/views/events/show.ipad.rb

@@ -1,2 +0,0 @@
-# alternate devise layout
-label{@event, :name, :color => "#ffffff", :font => {:name => "Helvetica-Bold", :size => 20} }

data/proposals/other/app/views/events/show.iphone.rb

@@ -1,3 +0,0 @@
-# element(object, attribute, props) => DSL
-label{@event,       :name, :background-color => "#ffffff", :font => UIFont.fontWithName("Helvetica-Bold")}
-label{@event.venue, :name, :link_to => :show} # or a click handler?

data/samples/Hai/styles/ipad.rb

@@ -1,11 +0,0 @@
-Teacup::StyleSheet.new(:IPad) do
-
-  style :label,
-    text: 'Hai!',
-    backgroundColor: UIColor.whiteColor,
-    top: 10,
-    left: 100,
-    width: 200,
-    height: 50
-    
-end

data/samples/Hai/styles/ipad_vertical.rb

@@ -1,3 +0,0 @@
-Teacup::StyleSheet.new(:IPadVertical) do
-  include :IPad
-end

data/spec/spec_helper.rb

@@ -1,5 +0,0 @@
-# Add RSpec helpers here.
-
-require 'rspec'
-require File.expand_path '../../lib/teacup/version.rb', __FILE__
-require File.expand_path '../../lib/teacup/contributors.rb', __FILE__

data/spec/teacup/contributions_spec.rb

@@ -1,13 +0,0 @@
-require 'spec_helper'
-
-describe "Teacup::CONTRIBUTORS" do
-
-  it 'has contributors' do
-    Teacup::CONTRIBUTORS.should be
-  end
-
-  it 'is an array' do
-    Teacup::CONTRIBUTORS.should be_instance_of Array
-  end
-
-end

data/spec/teacup/version_spec.rb

@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe 'Teacup::VERSION' do
-
-  it 'has a version' do
-    Teacup::VERSION.should be
-  end
-  
-end