chamomile-flourish 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99ff8353639abd9d1ebbdb7bf6671a6ba65a7f1a34ccf7065357dcc9e058d133
-  data.tar.gz: 5cae6fc2d9f85cf20b6887322265fb5a493baa31dc27d8bd65b06965c45716d2
+  metadata.gz: 73bccda63b64cd67d97ef4b8ff7c098e4098cce08426894b8a717df63d640dfb
+  data.tar.gz: d26ed006acffbf7a6863b055ed69543811c83450fbf2ac5b27a92b7f06ed1d31
 SHA512:
-  metadata.gz: 76584a587427f401062a13ed8f36de308158f32a2ad4fddeee98cf39cb4fd9a543b51f2a59dd0bcad839fd77298ad16828eeb89a791690ee0e080734cdfa5e83
-  data.tar.gz: 7859519fecc20af8437f5a8f11972d883b7aa19a382dedb6929e7bd974a1627ba62d42a1abd2860dce08d67a702bae38fae3a44aec26db89819f475ed045d800
+  metadata.gz: 93ba8923e8bf8303cf5ec49a909917a308df7cb1352597c847bb1e305aab0bb406c8db8a4fdd53758eda8b674b082eef028cc65ce4acba1b7be50832cccfb819
+  data.tar.gz: eb13351362d89be36d4876c81bf4983f0f26a72d8d06bb2314fb7dc7bf92cf2129cd0aaaa594f996e8ed0109befb1e74bab75d89a11d284ed82d1c3eb819d2b3

data/lib/flourish/style.rb

@@ -170,13 +170,13 @@ module Flourish
 
     def align(*positions)
       copy = dup
-      copy.set_prop!(:align_horizontal, positions[0]) if positions.length >= 1
-      copy.set_prop!(:align_vertical, positions[1]) if positions.length >= 2
+      copy.set_prop!(:align_horizontal, Flourish.resolve_position(positions[0])) if positions.length >= 1
+      copy.set_prop!(:align_vertical, Flourish.resolve_position(positions[1])) if positions.length >= 2
       copy
     end
 
-    def align_horizontal(pos) = assign_prop(:align_horizontal, pos)
-    def align_vertical(pos) = assign_prop(:align_vertical, pos)
+    def align_horizontal(pos) = assign_prop(:align_horizontal, Flourish.resolve_position(pos))
+    def align_vertical(pos) = assign_prop(:align_vertical, Flourish.resolve_position(pos))
 
     # --- Whitespace options ---
 
@@ -359,8 +359,8 @@ module Flourish
     def effective_margin_bottom = @margin_bottom || 0
     def effective_margin_left = @margin_left || 0
     def effective_border_style = @border_style
-    def effective_align_horizontal = @align_horizontal || Flourish::LEFT
-    def effective_align_vertical = @align_vertical || Flourish::TOP
+    def effective_align_horizontal = @align_horizontal || 0.0
+    def effective_align_vertical = @align_vertical || 0.0
 
     def compute_content_width
       w = effective_width

data/lib/flourish/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Flourish
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/lib/flourish.rb

@@ -12,13 +12,22 @@ require_relative "flourish/place"
 require_relative "flourish/style"
 
 module Flourish
-  # Position constants
+  # Position constants (kept for backward compat)
   TOP = 0.0
   LEFT = 0.0
   CENTER = 0.5
   BOTTOM = 1.0
   RIGHT = 1.0
 
+  # Symbol-to-float position map
+  POSITION_MAP = {
+    top: 0.0,
+    left: 0.0,
+    center: 0.5,
+    bottom: 1.0,
+    right: 1.0,
+  }.freeze
+
   class << self
     def width(str)
       ANSI.printable_width(str)
@@ -32,24 +41,64 @@ module Flourish
       ANSI.size(str)
     end
 
-    def join_horizontal(position, *strs)
-      Join.horizontal(position, *strs)
+    # New primary API — accepts array or block, keyword align
+    def horizontal(strs = nil, align: :top, &block)
+      strs = block.call if block && strs.nil?
+      strs = Array(strs)
+      Join.horizontal(resolve_position(align), *strs)
     end
 
-    def join_vertical(position, *strs)
-      Join.vertical(position, *strs)
+    # New primary API — accepts array or block, keyword align
+    def vertical(strs = nil, align: :left, &block)
+      strs = block.call if block && strs.nil?
+      strs = Array(strs)
+      Join.vertical(resolve_position(align), *strs)
     end
 
-    def place(width, height, h_pos, v_pos, str)
-      Place.place(width, height, h_pos, v_pos, str)
+    # New primary API — content first, keyword args
+    # Also supports old positional form for backward compat
+    def place(first, second = nil, third = nil, fourth = nil, fifth = nil,
+              width: nil, height: nil, align: :left, valign: :top, content: nil)
+      if fifth
+        # Old 5-arg form: place(width, height, h_pos, v_pos, str)
+        Place.place(first, second, resolve_position(third), resolve_position(fourth), fifth.to_s)
+      else
+        # New keyword form: place(content, width:, height:, align:, valign:)
+        content = (content || first).to_s
+        Place.place(width || 80, height || 24,
+                    resolve_position(align), resolve_position(valign), content)
+      end
+    end
+
+    # Old API — kept for backward compat
+    def join_horizontal(position, *strs)
+      Join.horizontal(resolve_position(position), *strs)
+    end
+
+    # Old API — kept for backward compat
+    def join_vertical(position, *strs)
+      Join.vertical(resolve_position(position), *strs)
     end
 
     def place_horizontal(width, pos, str)
-      Place.place_horizontal(width, pos, str)
+      Place.place_horizontal(width, resolve_position(pos), str)
     end
 
     def place_vertical(height, pos, str)
-      Place.place_vertical(height, pos, str)
+      Place.place_vertical(height, resolve_position(pos), str)
+    end
+
+    # Convert symbol positions to float values.
+    # Accepts symbols (:top, :left, :center, :bottom, :right) or floats.
+    def resolve_position(val)
+      case val
+      when Symbol
+        POSITION_MAP.fetch(val) { raise ArgumentError, "Unknown position: #{val.inspect}" }
+      when Numeric
+        val.to_f
+      else
+        raise ArgumentError, "Expected a Symbol or Numeric position, got #{val.inspect}"
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chamomile-flourish
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Jack Killilea
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2026-03-10 00:00:00.000000000 Z
+date: 2026-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec