simple-view 0.1.3 → 0.5

data/lib/simple_view/layout.rb

@@ -1,7 +1,7 @@
 module SimpleView
   module Layout
     def setup view, locals = {}, &block
-      proxy = SimpleView::ViewProxy.new view, locals
+      proxy = ViewProxy.new view, locals
       proxy.instance_eval &block if block_given?
     end
   end

data/lib/simple_view/styles.rb

@@ -1,14 +1,14 @@
 module SimpleView
   class Styles
-    @@repo = {}
+    @repo = {}
 
     def self.define name, options = {}
-      existing = @@repo[name] || {}
-      @@repo[name] = existing.update(options)
+      @repo[name] ||= {}
+      @repo[name].merge! options
     end
 
     def self.for name
-      @@repo[name]
+      @repo[name] || {}
     end
   end
 end

data/lib/simple_view/version.rb

@@ -1,3 +1,3 @@
 module SimpleView
-  VERSION = "0.1.3"
+  VERSION = "0.5"
 end

data/lib/simple_view/view_builder.rb

@@ -0,0 +1,250 @@
+module SimpleView
+  class ViewBuilder
+    attr_reader :view
+    attr_accessor :top, :left, :bottom, :right, :width, :height
+
+    # first args (optional): bounds
+    # second args (optional): options
+    def self.view_for klass, *args
+      if args.nil? || args.size == 0
+        bounds = CGRectZero
+        options = {}
+      elsif args[0].is_a?(Hash)
+        bounds = CGRectZero
+        options = args[0]
+      else
+        bounds = args[0]
+        options = args.size > 1 ? args[1] : {}
+      end
+
+      builder = ViewBuilder.new klass, options
+      builder.size_within bounds
+      builder.view
+    end
+
+    def initialize klass, options = {}
+      options = extended_options_with_style klass, options
+      convert_primitives_to_objects_in_hash options
+
+      @view = view_for_class klass, klass, options
+      setValuesForKeysWithDictionary options
+    end
+
+    def convert_primitives_to_objects_in_hash options
+      options.each do |k,v|
+        options[k] = STRUCTS_MAP[v.class].call(v) if STRUCTS_MAP.has_key?(v.class)
+      end
+    end
+
+    def extended_options_with_style klass, options = {}
+      style_options = Styles.for(klass) || {}
+      style_names = options.delete(:styles)
+
+      if style_names.is_a?(Symbol)
+        style = Styles.for style_names
+        style_options.merge!(style) unless style.nil?
+
+      elsif style_names.is_a?(Array)
+        style_names.each do |style_name|
+          style = Styles.for style_name
+          style_options.merge!(style) unless style.nil?
+        end
+      end
+
+      style_options.merge options
+    end
+
+    def view_for_class klass, root_klass, options = {}
+      if VIEWS_MAP.key?(klass)
+        VIEWS_MAP[klass].call root_klass, options
+      else
+        view_for_class klass.superclass, root_klass, options
+      end
+    end
+
+    def size_within bounds
+      frame = @view.frame
+
+      if width.nil? && height.nil? && right.nil? && bottom.nil?
+        @view.sizeToFit
+      else
+        max_width = bounds.size.width
+        max_height = bounds.size.height
+
+        if width.nil?
+          self.width = 0.0
+        elsif width > 0 && width <= 1
+          if right.nil?
+            self.left ||= 0
+            self.right = max_width - max_width * width
+          else
+            self.left = max_width - max_width * width
+          end
+        end
+
+        if height.nil?
+          self.height = 0.0
+        elsif height > 0 && height <= 1
+          if bottom.nil?
+            self.top ||= 0
+            self.bottom = max_height - max_height * height
+          else
+            self.top = max_height - max_height * height
+          end
+        end
+
+        @view.autoresizingMask = UIViewAutoresizingNone
+        @view.autoresizingMask |= UIViewAutoresizingFlexibleTopMargin if top.nil?
+        @view.autoresizingMask |= UIViewAutoresizingFlexibleLeftMargin if left.nil?
+        @view.autoresizingMask |= UIViewAutoresizingFlexibleBottomMargin if bottom.nil?
+        @view.autoresizingMask |= UIViewAutoresizingFlexibleRightMargin if right.nil?
+        @view.autoresizingMask |= UIViewAutoresizingFlexibleWidth if !left.nil? && !right.nil?
+        @view.autoresizingMask |= UIViewAutoresizingFlexibleHeight if !top.nil? && !bottom.nil?
+
+        if !left.nil? && !right.nil?
+          frame.origin.x = left
+          frame.size.width = max_width - left - right
+        elsif !right.nil?
+          frame.origin.x = max_width - width - right
+          frame.size.width = width
+        elsif !left.nil?
+          frame.origin.x = left
+          frame.size.width = width
+        else
+          frame.origin.x = max_width / 2 - width / 2
+          frame.size.width = width
+        end
+
+        if !top.nil? && !bottom.nil?
+          frame.origin.y = top
+          frame.size.height = max_height - top - bottom
+        elsif !bottom.nil?
+          frame.origin.y = max_height - height - bottom
+          frame.size.height = height
+        elsif !top.nil?
+          frame.origin.y = top
+          frame.size.height = height
+        else
+          frame.origin.y = max_height / 2 - height / 2
+          frame.size.height = height
+        end
+
+        @view.frame = frame
+      end
+    end
+
+    def setValue value, forUndefinedKey: key
+      if key.end_with?('Color') || key.end_with?('color')
+        view.setValue value.to_color, forKey: key
+      elsif key.end_with?('Font') || key.end_with?('font')
+        view.setValue value.to_font, forKey: key
+      elsif key.end_with?('Image') || key.end_with?('image')
+        view.setValue value.to_image, forKey: key
+      elsif key == 'layer'
+        view.layer.setValuesForKeysWithDictionary value
+      else
+        view.setValue value, forKey: key
+      end
+    end
+
+    def setTop value
+      @top = value
+    end
+
+    def setLeft value
+      @left = value
+    end
+
+    def setBottom value
+      @bottom = value
+    end
+
+    def setRight value
+      @right = value
+    end
+
+    def setWidth value
+      @width = value
+    end
+
+    def setHeight value
+      @height = value
+    end
+
+    def setBackground_color color
+      view.backgroundColor = color.to_color
+    end
+
+    def setText_color color
+      view.textColor = color.to_color
+    end
+
+    def setTint_color color
+      @view.tintColor = color.to_color
+    end
+
+    STRUCTS_MAP = {
+      CGAffineTransform   => Proc.new {|v| NSValue.valueWithCGAffineTransform(v) },
+      CGPoint             => Proc.new {|v| NSValue.valueWithCGPoint(v) },
+      CGRect              => Proc.new {|v| NSValue.valueWithCGRect(v) },
+      CGSize              => Proc.new {|v| NSValue.valueWithCGSize(v) },
+      UIEdgeInsets        => Proc.new {|v| NSValue.valueWithUIEdgeInsets(v) },
+      UIOffset            => Proc.new {|v| NSValue.valueWithUIOffset(v) }
+    }
+
+    VIEWS_MAP = {
+      UIView => Proc.new {|klass, options| klass.alloc.initWithFrame CGRectZero },
+      UIControl => Proc.new {|klass, options| klass.alloc.init },
+      UIActionSheet => Proc.new {|klass, options|
+        title = options.delete(:title) || ''
+        delegate = options.delete(:delegate)
+        cancel_button_title = options.delete(:cancelButtonTitle) || options.delete(:cancel_button_title)
+        destructive_button_title = options.delete(:destructiveButtonTitle) || options.delete(:destructive_button_title)
+        other_button_titles = options.delete(:otherButtonTitles) || options.delete(:other_button_titles)
+
+        klass.alloc.initWithTitle title,
+          delegate: delegate,
+          cancelButtonTitle: cancel_button_title,
+          destructiveButtonTitle: destructive_button_title,
+          otherButtonTitles: other_button_titles, nil
+      },
+      UIActivityIndicatorView => Proc.new{|klass, options|
+        style = options.delete(:style) || UIActivityIndicatorViewStyleWhite
+        klass.alloc.initWithActivityIndicatorStyle style
+      },
+      UIButton => Proc.new{|klass, options|
+        button_type = options.delete(:buttonType) || options.delete(:button_type) || UIButtonTypeRoundedRect
+        klass.buttonWithType button_type
+      },
+      UIImageView => Proc.new{|klass, options|
+        image = options.delete(:image)
+        highlighted_image = options.delete(:highlightedImage) || options.delete(:highlighted_image)
+
+        if !image.nil? && !highlighted_image.nil?
+          klass.alloc.initWithImage image.to_image, highlightedImage: highlighted_image.to_image
+        elsif !image.nil?
+          klass.alloc.initWithImage image.to_image
+        else
+          klass.alloc.initWithFrame CGRectZero
+        end
+      },
+      UIProgressView => Proc.new{|klass, options|
+        style = options.delete(:style) || UIProgressViewStyleDefault
+        klass.alloc.initWithProgressViewStyle style
+      },
+      UISegmentedControl => Proc.new{|klass, options|
+        items = options.delete(:items) || []
+        klass.alloc.initWithItems items
+      },
+      UITableView => Proc.new{|klass, options|
+        style = options.delete(:style) || UITableViewStylePlain
+        klass.alloc.initWithFrame CGRectZero, style: style
+      },
+      UITableViewCell => Proc.new{|klass, options|
+        style = options.delete(:style) || UITableViewCellStyleDefault
+        identifier = options.delete(:reuseIdentifier) || options.delete(:reuse_identifier)
+        klass.alloc.initWithStyle style, reuseIdentifier: identifier
+      }
+    }
+  end
+end

data/lib/simple_view/view_proxy.rb

@@ -1,12 +1,12 @@
 module SimpleView
   class ViewProxy
-    attr_reader :view
+    attr_reader :view, :locals
 
     def initialize view = nil, locals = {}
       @view = view
       @locals = locals
 
-      if @locals
+      if !@locals.nil?
         @locals.each do |k, v|
           self.class.send :attr_accessor, k
           self.instance_variable_set "@#{k}", v
@@ -14,56 +14,34 @@ module SimpleView
       end
     end
 
-    def build_view klass, options = {}
-      builder_class = "#{klass}Builder"
-
-      if SimpleView::Builders.const_defined? builder_class
-        SimpleView::Builders.const_get(builder_class).new.build klass, options
-      else
-        if klass < UIControl
-          SimpleView::Builders::UIControlBuilder.new.build klass, options
-        else
-          SimpleView::Builders::UIViewBuilder.new.build klass, options
-        end
-      end
-    end
-
     def add klass, options = {}, &block
-      subview = build_view klass, options
+      subview = create klass, options, &block
+      view.addSubview(subview) unless view.nil?
+      subview
+    end
 
-      @view.addSubview(subview) unless @view.nil?
+    def create klass, options = {}, &block
+      bounds = view.nil? ? CGRectZero : view.bounds
+      subview = ViewBuilder.view_for klass, bounds, options
 
       if block_given?
-        child_layout = ViewProxy.new(subview, @locals)
-        child_layout.instance_eval &block
+        child_layout = ViewProxy.new subview, locals
+        child_layout.instance_exec subview, &block
       end
 
-      subview.sizeToFit if options[:width].nil? && options[:height].nil? && options[:right].nil? && options[:bottom].nil?
-      subview.invalidate_size
       subview
     end
 
-    def activity_indicator(options = {}, &block)  add(::UIActivityIndicatorView, options, &block); end
-    def button(options = {}, &block)              add(::UIButton, options, &block); end
-    def date_picker(options = {}, &block)         add(::UIDatePicker, options, &block); end
-    def image_view(options = {}, &block)          add(::UIImageView, options, &block); end
-    def label(options = {}, &block)               add(::UILabel, options, &block); end
-    def page_control(options = {}, &block)        add(::UIPageControl, options, &block); end
-    def picker_view(options = {}, &block)         add(::UIPickerView, options, &block); end
-    def progress_view(options = {}, &block)       add(::UIProgressView, options, &block); end
-    def rect(options = {}, &block)                add(::UIView, options, &block); end
-    def scroll_view(options = {}, &block)         add(::UIScrollView, options, &block); end
-    def search_bar(options = {}, &block)          add(::UISearchBar, options, &block); end
-    def segmented_control(options = {}, &block)   add(::UISegmentedControl, options, &block); end
-    def slider(options = {}, &block)              add(::UISlider, options, &block); end
-    def stepper(options = {}, &block)             add(::UIStepper, options, &block); end
-    def switch(options = {}, &block)              add(::UISwitch, options, &block); end
-    def tab_bar(options = {}, &block)             add(::UITabBar, options, &block); end
-    def table_view(options = {}, &block)          add(::UITableView, options, &block); end
-    def table_view_cell(options = {}, &block)     add(::UITableViewCell, options, &block); end
-    def text_field(options = {}, &block)          add(::UITextField, options, &block); end
-    def text_view(options = {}, &block)           add(::UITextView, options, &block); end
-    def toolbar(options = {}, &block)             add(::UIToolbar, options, &block); end
-    def web_view(options = {}, &block)            add(::UIWebView, options, &block); end
+    [::UIActionSheet, ::UIActivityIndicatorView, ::UIButton, ::UIDatePicker, ::UIImageView, ::UILabel,
+      ::UIPageControl, ::UIPickerView, ::UIProgressView, ::UIScrollView, ::UISearchBar, ::UISegmentedControl,
+      ::UISlider, ::UIStepper, ::UISwitch, ::UITabBar, ::UITableView, ::UITableViewCell, ::UITextField, ::UITextView,
+      ::UIToolbar, ::UIWebView].each do |klass|
+      shorthand = "#{klass}"[2..-1].underscore.to_sym
+      define_method(shorthand) do |*args, &block|
+        options = args[0] || {}
+        add klass, options, &block
+      end
+    end
+    def rect(options = {}, &block) add(::UIView, options, &block); end
   end
 end

data/spec/acceptance/view_anchoring_controller_spec.rb

@@ -0,0 +1,82 @@
+describe 'ViewAnchoringController' do
+  tests ViewAnchoringController
+
+  BLOCK_SIZE = 20
+
+  it "should have a view anchored to the four sides of the parent view" do
+    view = controller.view.find('fill')
+    view.frame.should == controller.view.bounds
+  end
+
+  it "should have a view anchored to top left corner" do
+    view = controller.view.find('tl')
+    view.frame.origin.x.should == 0
+    view.frame.origin.y.should == 0
+    view.frame.size.width.should == BLOCK_SIZE
+    view.frame.size.height.should == BLOCK_SIZE
+  end
+
+  it "should have a view anchored to top and centered" do
+    view = controller.view.find('tc')
+    view.center.x.should == controller.view.bounds.size.width / 2
+    view.frame.origin.y.should == 0
+    view.frame.size.width.should == BLOCK_SIZE
+    view.frame.size.height.should == BLOCK_SIZE
+  end
+
+  it "should have a view anchored to top right corner" do
+    view = controller.view.find('tr')
+    view.frame.origin.x.should == controller.view.bounds.size.width - BLOCK_SIZE
+    view.frame.origin.y.should == 0
+    view.frame.size.width.should == BLOCK_SIZE
+    view.frame.size.height.should == BLOCK_SIZE
+  end
+
+  it "should have a view anchored to middle left corner" do
+    view = controller.view.find('ml')
+    view.frame.origin.x.should == 0
+    view.center.y.should == controller.view.bounds.size.height / 2
+    view.frame.size.width.should == BLOCK_SIZE
+    view.frame.size.height.should == BLOCK_SIZE
+  end
+
+  it "should have a view anchored to middle and centered" do
+    view = controller.view.find('mc')
+    view.center.x.should == controller.view.bounds.size.width / 2
+    view.center.y.should == controller.view.bounds.size.height / 2
+    view.frame.size.width.should == BLOCK_SIZE
+    view.frame.size.height.should == BLOCK_SIZE
+  end
+
+  it "should have a view anchored to middle right corner" do
+    view = controller.view.find('mr')
+    view.frame.origin.x.should == controller.view.bounds.size.width - BLOCK_SIZE
+    view.center.y.should == controller.view.bounds.size.height / 2
+    view.frame.size.width.should == BLOCK_SIZE
+    view.frame.size.height.should == BLOCK_SIZE
+  end
+
+  it "should have a view anchored to bottom left corner" do
+    view = controller.view.find('bl')
+    view.frame.origin.x.should == 0
+    view.frame.origin.y.should == controller.view.bounds.size.height - BLOCK_SIZE
+    view.frame.size.width.should == BLOCK_SIZE
+    view.frame.size.height.should == BLOCK_SIZE
+  end
+
+  it "should have a view anchored to bottom and centered" do
+    view = controller.view.find('bc')
+    view.center.x.should == controller.view.bounds.size.width / 2
+    view.frame.origin.y.should == controller.view.bounds.size.height - BLOCK_SIZE
+    view.frame.size.width.should == BLOCK_SIZE
+    view.frame.size.height.should == BLOCK_SIZE
+  end
+
+  it "should have a view anchored to bottom right corner" do
+    view = controller.view.find('br')
+    view.frame.origin.x.should == controller.view.bounds.size.width - BLOCK_SIZE
+    view.frame.origin.y.should == controller.view.bounds.size.height - BLOCK_SIZE
+    view.frame.size.width.should == BLOCK_SIZE
+    view.frame.size.height.should == BLOCK_SIZE
+  end
+end