dedalus 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9022025c864310b9328e3e4c1a9dc4735cb884b
-  data.tar.gz: 0e102ca23e119b7f3a30c31a34cd1f00e4690ec9
+  metadata.gz: 5b87e77ef8b41ec61f19f7b84e31853dc27e2c28
+  data.tar.gz: 2a4a4ab7156a738647dea2c1e99ce60f28c03b6d
 SHA512:
-  metadata.gz: 9fda3c838779db5ed86226142b99fb6eacd6799c228e7452146dc29a8f60b63799d73f2721761be4ceff8f8e5bb685131ad6dd1c4acc644963679fdc452e2a13
-  data.tar.gz: 7318c2c200a98b671915659d78da4907938ff89c6ff1ebf520dd7b319e020370b326c72460449afdb290e547beeff6ef03ee062b8bb4402ab608bcaa58b9527c
+  metadata.gz: e81bb797a355ffa07f9a7b52f148dda150645eebebd28591d5ad9498dd85b79f9fc1940c079b449e0f990e8696527790b4759f3185158c924f756db54c8c6c37
+  data.tar.gz: 92e2de9cc81a726c45e99a6d9b6a31e8fb3426e56ad6b79808b50b0d767c3aba71ae0bc0dd685b3b67e5db2fad2c4014cbd7c10c33e61a279b36c130ae74544f

data/bin/dedalus

@@ -8,8 +8,8 @@ if File.directory?(File.join(root,'.git'))
       require 'dedalus'
       Dedalus::PatternLibrary::Application.kickstart!({
         setup: {
-          library_name: "Dedalus Pattern Library",
-          module_to_search: Dedalus::PatternLibrary
+          library_name: "Dedalus",
+          module_to_search: Dedalus::Elements
         }
       })
     rescue LoadError => e

data/lib/dedalus/app_view_composer.rb

@@ -33,7 +33,7 @@ module Dedalus
 
     def render!(structure, dims)
       traverse(structure, origin: [0,0], dimensions: dims) do
-        on_atom do |atom, origin:, dimensions:|
+        on_atom do |atom, origin:, dimensions:, freeform:|
           if atom.background_color
             atom.draw_bounding_box(
               color: atom.background_color,
@@ -41,7 +41,8 @@ module Dedalus
               dimensions: dimensions
             )
           end
-          atom.position = origin
+
+          atom.position = origin unless freeform
           atom.render
         end
 

data/lib/dedalus/application_view.rb

@@ -17,9 +17,8 @@ module Dedalus
     def compose(screen)
       screen = composer.hover_molecule(screen, dimensions, mouse_position: mouse_position)
       composer.render!(screen, dimensions)
-
-      cursor.position = mouse_position
-      cursor.render
+      # cursor.position = mouse_position
+      # cursor.render
     end
 
     def dimensions
@@ -35,11 +34,6 @@ module Dedalus
       end
     end
 
-    protected
-    def cursor
-      @cursor ||= Elements::Icon.for :arrow_cursor
-    end
-
     private
     def composer
       @composer ||= Dedalus::ApplicationViewComposer.new

data/lib/dedalus/elements/image.rb

@@ -1,19 +1,15 @@
 module Dedalus
   module Elements
-    class ImageRepository
-      def self.lookup(path)
-        @images ||= {}
-        @images[path] ||= Gosu::Image.new(path)
-        @images[path]
-      end
-    end
-
     class Image < Dedalus::Atom
-      attr_accessor :path, :padding
+      attr_accessor :path, :padding, :z_order
 
       def render
         x,y = *position
-        asset.draw(x + padding, y + padding, ZOrder::Foreground, scale, scale)
+        asset.draw(x + padding, y + padding, z_order, scale, scale)
+      end
+
+      def z_order
+        @z_order ||= ZOrder::Foreground
       end
 
       def width
@@ -29,7 +25,7 @@ module Dedalus
       end
 
       def padding
-        @padding ||= 10.0
+        @padding ||= 0.0
       end
 
       def scale
@@ -44,9 +40,8 @@ module Dedalus
         "an image"
       end
 
-      private
       def asset
-        @asset ||= ImageRepository.lookup(path)
+        @asset ||= Dedalus::ImageRepository.lookup(path)
       end
     end
   end

data/lib/dedalus/elements/image_grid.rb

@@ -0,0 +1,50 @@
+module Dedalus
+  module Elements
+    class ImageGrid < Dedalus::Molecule
+      attr_accessor :grid, :tiles_path, :tile_width, :tile_height
+
+      def show
+        grid.map do |row|
+          row.map do |grid_value|
+            if grid_value
+              sprite_for(grid_value)
+            else
+              no_image
+            end
+          end
+        end
+      end
+
+      def height
+        grid.length * tile_height
+      end
+
+      def sprite_for(frame)
+        Sprite.new(frame: frame, width: tile_width, height: tile_height, path: tiles_path)
+      end
+
+      def no_image
+        Void.new(height: tile_height, width: tile_width)
+      end
+
+      def self.description
+        "a grid of images"
+      end
+
+      def self.example_data
+        {
+          tiles_path: "media/images/tiles.png",
+          tile_width: 64,
+          tile_height: 64,
+          grid: [
+            [ nil, 0, 2, 0 ],
+            [ 0, nil, 1, 0 ],
+            [ 0, 0, nil, 0 ],
+            [ 0, 1, 2, nil ],
+          ]
+        }
+      end
+    end
+
+  end
+end

data/lib/dedalus/elements/sprite.rb

@@ -0,0 +1,24 @@
+module Dedalus
+  module Elements
+    class Sprite < Image
+      attr_accessor :width, :height, :frame
+
+      def asset
+        @asset ||= Dedalus::ImageRepository.lookup_tiles(path, width, height)[frame]
+      end
+
+      def self.example_data
+        {
+          path: "media/images/tiles.png",
+          frame: 0,
+          width: 64,
+          height: 64
+        }
+      end
+
+      def self.description
+        "an animated image"
+      end
+    end
+  end
+end

data/lib/dedalus/elements/void.rb

@@ -0,0 +1,16 @@
+module Dedalus
+  module Elements
+    class Void < Dedalus::Atom
+      attr_accessor :width, :height
+      def render(*); end
+
+      def self.description
+        'an empty space'
+      end
+
+      def self.example_data
+        { width: 300, height: 300 }
+      end
+    end
+  end
+end

data/lib/dedalus/elements.rb

@@ -8,10 +8,11 @@ module Dedalus
   end
 
   class FontRepository
-    def self.get_font(size: 20)
+    def self.get_font(font_name='Helvetica',size: 20)
       @fonts ||= {}
-      @fonts[size] ||= Gosu::Font.new(size)
-      @fonts[size]
+      @fonts[font_name] ||= {}
+      @fonts[font_name][size] ||= Gosu::Font.new(size, name: font_name)
+      @fonts[font_name][size]
     end
   end
 
@@ -31,29 +32,37 @@ module Dedalus
       attrs.each { |(k,v)| instance_variable_set(:"@#{k}",v) } unless attrs.nil?
     end
 
-    def draw_bounding_box(origin:, dimensions:, color: Palette.gray) #, highlight: false)
+    def draw_bounding_box(origin:, dimensions:, color: Palette.gray)
       x,y = *origin
       w,h = *dimensions
 
       raise "Invalid color #{color} given to #{self.class.name} for bounding box" unless color.is_a?(Dedalus::Color)
 
       c = color.to_gosu
-      window.draw_quad(x,y,c,
-                       x,y+h,c,
-                       x+w,y,c,
-                       x+w,y+h,c,ZOrder::Background)
+      window.draw_quad(x,   y,   c,
+                       x,   y+h, c,
+                       x+w, y,   c,
+                       x+w, y+h, c,ZOrder::Background)
     end
 
     def view
       Dedalus.active_view
     end
 
+    def tiny_font
+      FontRepository.get_font(size: 14)
+    end
+
+    def code_font
+      FontRepository.get_font('courier new', size: 18)
+    end
+
     def font
       FontRepository.get_font(size: 20)
     end
 
     def big_font
-      FontRepository.get_font(size: 36)
+      FontRepository.get_font(size: 24)
     end
 
     def huge_font
@@ -67,6 +76,54 @@ module Dedalus
 
   ###
 
+  class Container < Element
+    def initialize(contents, attrs={})
+      @contents = contents
+      super(attrs)
+    end
+
+    def show
+      @contents
+    end
+  end
+
+  # layer is an abstract element...
+  # maybe should also pull out rows and columns?
+  # could cleanup traversal impl, and will be clearer ultimately
+  class Layer < Element
+    def initialize(elements, freeform: false)
+      @elements = elements
+      @freeform = freeform
+    end
+
+    def show
+      @elements
+    end
+
+    def freeform?
+      @freeform == true
+    end
+  end
+
+  # it's like a gluon or something, not sure how to model in nuclear terms
+  class LayerStack < Element
+    attr_reader :layers
+
+    def initialize(layers: [])
+      @layers = []
+    end
+
+    def push(layer_elements)
+      @layers.push(layer_elements)
+    end
+
+    # def each
+    #   @layers.each
+    # end
+  end
+
+  ###
+
   class Atom < Element
     attr_accessor :scale, :padding
   end
@@ -88,6 +145,8 @@ module Dedalus
   class Screen < Element
   end
 
+  ###
+
   module ZOrder
     Background, Foreground, Text, Overlay = *(0..5)
   end

data/lib/dedalus/image_repository.rb

@@ -0,0 +1,15 @@
+module Dedalus
+  class ImageRepository
+    def self.lookup(path)
+      @images ||= {}
+      @images[path] ||= Gosu::Image.new(path)
+      @images[path]
+    end
+
+    def self.lookup_tiles(path, width, height)
+      @tiles ||= {}
+      @tiles[path] ||= Gosu::Image::load_tiles(path, width, height)
+      @tiles[path]
+    end
+  end
+end

data/lib/dedalus/palette.rb

@@ -2,7 +2,7 @@ module Dedalus
   class Color
     attr_accessor :red, :green, :blue, :alpha
 
-    def initialize(red,green,blue,alpha=255)
+    def initialize(red,green,blue,alpha=160)
       @red = red
       @green = green
       @blue = blue

data/lib/dedalus/pattern_library/application.rb

@@ -14,7 +14,7 @@ module Dedalus
       end
 
       def find_descendants_of(klass, module_to_search)
-        ObjectSpace.each_object(Class).select { |k| k < klass && find_descendants_of(k, module_to_search).count.zero? && k.name.deconstantize == module_to_search.name }
+        ObjectSpace.each_object(Class).select { |k| k < klass && k.name.deconstantize == module_to_search.name }
       end
 
       def create_library(module_to_search:, name:)

data/lib/dedalus/pattern_library/application_view.rb

@@ -5,6 +5,7 @@ module Dedalus
 
       def app_screen
         ApplicationScreen.new(app_template).hydrate(
+          mouse_position: mouse_position,
           library_section_tabs: library_view.library_section_tabs,
           current_entry_name: current_entry_name,
           library_sections: library_view.library_sections,

data/lib/dedalus/pattern_library/atoms/code.rb

@@ -0,0 +1,9 @@
+module Dedalus
+  module PatternLibrary
+    class Code < Dedalus::Elements::Paragraph
+      def font
+        code_font
+      end
+    end
+  end
+end

data/lib/dedalus/pattern_library/atoms/tiny_text.rb

@@ -0,0 +1,9 @@
+module Dedalus
+  module PatternLibrary
+    class TinyText < Dedalus::Elements::Heading
+      def font
+        tiny_font
+      end
+    end
+  end
+end

data/lib/dedalus/pattern_library/molecules/library_item_example.rb

@@ -9,9 +9,10 @@ module Dedalus
 
       def show
         [
-          Elements::Paragraph.new(text: "EXAMPLE", scale: 0.5, height_percent: 0.05, background_color: background_color.darken),
+          TinyText.new(text: "EXAMPLE", height_percent: 0.05, background_color: background_color.darken),
           item,
-          Elements::Paragraph.new(text: item_data, scale: 0.7, background_color: Palette.decode_color('darkgray'), padding: 10)
+          TinyText.new(text: "DATA", height_percent: 0.05, background_color: background_color.darken),
+          Code.new(text: item_data, background_color: Palette.decode_color('darkgray'), padding: 10)
         ]
       end
 

data/lib/dedalus/pattern_library/molecules/library_section_tab.rb

@@ -4,10 +4,7 @@ module Dedalus
       attr_accessor :icon, :name, :description, :scale, :highlight, :section_color
 
       def show
-        [[
-          icon_element, [ title_element,
-                          description_element ]
-        ]]
+        Container.new([[icon_element, [ title_element, description_element ]]], padding: 16)
       end
 
       def hover
@@ -33,15 +30,15 @@ module Dedalus
       end
 
       def icon_element
-        Elements::Icon.for(icon, padding: 16)
+        Elements::Icon.for(icon, padding: 10)
       end
 
       def title_element
-        LargeText.new(text: name)
+        Elements::Heading.new(text: name)
       end
 
       def description_element
-        Elements::Paragraph.new(text: description)
+        TinyText.new(text: description)
       end
 
       def self.description

data/lib/dedalus/pattern_library/molecules/periodic_table_entry.rb

@@ -9,9 +9,8 @@ module Dedalus
       def show
         [
           HugeText.new(text: abbreviation, scale: scale),
-          #Elements::Heading.new(text: abbreviation, scale: 6.0 * scale),
-          Elements::Paragraph.new(text: element_name, scale: scale),
-          Elements::Paragraph.new(text: kind, scale: 0.6 * scale)
+          LargeText.new(text: element_name, scale: scale),
+          TinyText.new(text: kind, scale: scale)
         ]
       end
 
@@ -40,7 +39,7 @@ module Dedalus
       end
 
       def width
-        280 * scale
+        260 * scale
       end
 
       def height
@@ -62,8 +61,8 @@ module Dedalus
 
       def self.example_data
         {
-          element_abbreviation: "Pa",
-          element_name: "Paragraph"
+          element_abbreviation: "Ht",
+          element_name: "Huge Text"
         }
       end
     end

data/lib/dedalus/pattern_library/organisms/library_entry.rb

@@ -9,9 +9,9 @@ module Dedalus
 
       def show
         [
-          Elements::Heading.new(text: title),
-          Elements::Heading.new(text: subtitle, scale: 0.9),
-          Elements::Paragraph.new(text: description)
+          HugeText.new(text: title),
+          LargeText.new(text: subtitle),
+          TinyText.new(text: description)
         ] + [ library_items ]
       end
 

data/lib/dedalus/pattern_library/screens/app_screen.rb

@@ -6,15 +6,34 @@ module Dedalus
       end
 
       def show
-        @template.show
+        layers
       end
 
-      def hydrate(library_section_tabs:, current_entry_name:, library_sections:, library_items:)
+      def layers
+        layer_stack = Dedalus::LayerStack.new
+        layer_stack.push(Dedalus::Layer.new(background_image))
+        layer_stack.push(Dedalus::Layer.new(@template))
+        layer_stack.push(Dedalus::Layer.new(cursor, freeform: true))
+        layer_stack
+      end
+
+      def background_image
+        @bg_image ||= Elements::Image.new(path: "media/images/cosmos.jpg", z_order: -1)
+      end
+
+      def cursor
+        @cursor ||= Elements::Icon.for :arrow_cursor
+      end
+
+      def hydrate(mouse_position:, library_section_tabs:, current_entry_name:, library_sections:, library_items:)
         @template.library_name = "Dedalus Pattern Library"
         @template.library_section_tabs = library_section_tabs
         @template.library_sections = library_sections
         @template.library_items = library_items
         @template.current_entry_name = current_entry_name
+
+        cursor.position = mouse_position
+
         self
       end
     end

data/lib/dedalus/pattern_library/templates/app_template.rb

@@ -13,8 +13,8 @@ module Dedalus
       def layout
         [
           app_header,
-          [ sidebar, yield ]
-          # app_footer
+          [ sidebar, yield ],
+          app_footer
         ]
       end
 

data/lib/dedalus/pattern_library.rb

@@ -3,7 +3,10 @@ require 'dedalus/pattern_library/models/library_section'
 require 'dedalus/pattern_library/models/library_item'
 
 require 'dedalus/pattern_library/atoms/large_text'
+require 'dedalus/pattern_library/atoms/tiny_text'
 require 'dedalus/pattern_library/atoms/huge_text'
+require 'dedalus/pattern_library/atoms/code'
+
 require 'dedalus/pattern_library/molecules/library_section_tab'
 # require 'dedalus/pattern_library/molecules/library_item_molecule'
 require 'dedalus/pattern_library/molecules/library_item_example'

data/lib/dedalus/version.rb

@@ -1,4 +1,4 @@
 module Dedalus
   # dedalus version
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lib/dedalus/view_traversal.rb

@@ -19,14 +19,14 @@ module Dedalus
       @element_callback = blk
     end
 
-    def walk!(structure, origin:, dimensions:)
+    def walk!(structure, origin:, dimensions:, freeform: false)
       width, height = *dimensions
       height = structure.height if !structure.is_a?(Array) && structure.height
       width = structure.width if !structure.is_a?(Array) && structure.width
       x0, y0 = *origin
 
       if structure.is_a?(Dedalus::Atom)
-        @atom_callback.call(structure, origin: origin, dimensions: dimensions) if @atom_callback
+        @atom_callback.call(structure, origin: origin, dimensions: dimensions, freeform: freeform) if @atom_callback
       elsif structure.is_a?(Dedalus::Element)
         # an element *other than* an atom, we need to call #show on it
         margin = structure.margin || 0.0
@@ -42,13 +42,18 @@ module Dedalus
           @element_callback.call(structure, origin: margin_origin, dimensions: margin_dims)
         end
 
-        pad = structure.padding || 10.0
-        # x,y = x0+pad, y0+pad
+        pad = structure.padding || 0.0
         pad_origin = [x+pad,y+pad]
         pad_dims = [width - pad*2 - margin*2, height - pad*2 - margin*2 ]
 
-
-        walk!(structure.show, origin: pad_origin, dimensions: pad_dims)
+        if structure.is_a?(LayerStack)
+          layers = structure.layers
+          layers.each do |layer|
+            walk!(layer, origin: pad_origin, dimensions: pad_dims, freeform: layer.freeform?)
+          end
+        else
+          walk!(structure.show, origin: pad_origin, dimensions: pad_dims, freeform: freeform)
+        end
       elsif structure.is_a?(Array) # we have a set of rows
         walk_rows!(structure, origin: origin, dimensions: dimensions)
       end
@@ -63,7 +68,16 @@ module Dedalus
         y = y0 + height_cursor
         dims = [width, current_row_height]
         if row.is_a?(Array)
-          walk_columns!(row, origin: [x0, y], dimensions: dims)
+          extra_columns = true
+          while extra_columns 
+            row = walk_columns!(row, origin: [x0, y], dimensions: dims)
+            if row.empty?
+              extra_columns = false
+            else
+              height_cursor += row.first.height
+              y = y0 + height_cursor
+            end
+          end
         else
           walk!(row, origin: [x0,y], dimensions: dims)
         end
@@ -73,6 +87,7 @@ module Dedalus
     def walk_columns!(columns, origin:, dimensions:)
       width, height = *dimensions
       x0, y0 = *origin
+
       subdivide_line(columns, distance: width, attr: :width) do |column, current_column_width, width_cursor|
         x = x0 + width_cursor
         dims = [ current_column_width, height ]
@@ -121,9 +136,16 @@ module Dedalus
           end
         end
 
+        if distance_cursor > distance - current_element_distance # ??
+          return elements.slice(index,elements.size)
+        end
+
         yield(element, current_element_distance, distance_cursor)
         distance_cursor += current_element_distance
       end
+
+      # no overflowing elements...
+      []
     end
   end
 end

data/lib/dedalus.rb

@@ -2,17 +2,22 @@ require 'joyce'
 require 'geometer'
 
 require 'dedalus/version'
+
 require 'dedalus/view_traversal'
 require 'dedalus/app_view_composer'
 require 'dedalus/application_view'
 
 require 'dedalus/palette'
+require 'dedalus/image_repository'
 
 require 'dedalus/elements'
+require 'dedalus/elements/void'
 require 'dedalus/elements/text'
 require 'dedalus/elements/heading'
 require 'dedalus/elements/paragraph'
 require 'dedalus/elements/image'
 require 'dedalus/elements/icon'
+require 'dedalus/elements/sprite'
+require 'dedalus/elements/image_grid'
 
 require 'dedalus/pattern_library'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dedalus
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Joseph Weissman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-29 00:00:00.000000000 Z
+date: 2016-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: joyce
@@ -169,14 +169,20 @@ files:
 - lib/dedalus/elements/heading.rb
 - lib/dedalus/elements/icon.rb
 - lib/dedalus/elements/image.rb
+- lib/dedalus/elements/image_grid.rb
 - lib/dedalus/elements/paragraph.rb
+- lib/dedalus/elements/sprite.rb
 - lib/dedalus/elements/text.rb
+- lib/dedalus/elements/void.rb
+- lib/dedalus/image_repository.rb
 - lib/dedalus/palette.rb
 - lib/dedalus/pattern_library.rb
 - lib/dedalus/pattern_library/application.rb
 - lib/dedalus/pattern_library/application_view.rb
+- lib/dedalus/pattern_library/atoms/code.rb
 - lib/dedalus/pattern_library/atoms/huge_text.rb
 - lib/dedalus/pattern_library/atoms/large_text.rb
+- lib/dedalus/pattern_library/atoms/tiny_text.rb
 - lib/dedalus/pattern_library/library_view.rb
 - lib/dedalus/pattern_library/models/library.rb
 - lib/dedalus/pattern_library/models/library_item.rb
@@ -199,6 +205,9 @@ files:
 - media/icons/house.png
 - media/icons/molecule.png
 - media/icons/paramecium.png
+- media/images/controls.png
+- media/images/cosmos.jpg
+- media/images/tiles.png
 - spec/dedalus_spec.rb
 - spec/spec_helper.rb
 homepage: https://rubygems.org/gems/dedalus