straightedge 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8b2f60d62255936247fe75932dc27426760a1e9
-  data.tar.gz: 05cc12291ebbf0518a608b1f1e0f3ef6f0ca376d
+  metadata.gz: 9f2a81c654f8816e7d1d0bbc53c0f75c928c7146
+  data.tar.gz: 546d460caabdfd47c16025a53fe54c851d898007
 SHA512:
-  metadata.gz: 176f4ae297d81ab3c94e6daf7a0ea0aa3ad94cd12594ead81123822e0704ba6b7dd56f2026a1e9094e5840eb0320fc7c64c2e8b49787e1468f52e2e2c8e059aa
-  data.tar.gz: 8e600b22c8cf4463e7a55e5d1883da258e81ea4668e8e686f36af5dbbe0bc35e9e7b277c39a651f6431dbe3ce81703143d14167b630567ddc4b857a1998c9ab6
+  metadata.gz: 4b9515f8995dbcf87e7d494b867171b31001880c07498682295b17e2f0c6caf7eb497e6fe411e1bfb736a2b8531a57493c89be149751d85ec865a3d0682fcf4a
+  data.tar.gz: 18339a4a432ad8ee3dcf21357277d30083cb7a40eb55809f2f18a450cdc183261b6f26ecb1187819cf89521454b60a6e5819c1b31d6bf1d6f8823833e4552236

data/lib/straightedge/aspects/colorable.rb

@@ -4,5 +4,9 @@ module Straightedge::Aspects
     def paint(c=Straightedge::Colors.pick)
       @color = c
     end
+
+    def dim
+      @color = Straightedge::Colors.hex_value(@color) - 0x4B4B4B4B
+    end
   end
 end

data/lib/straightedge/colors.rb

@@ -8,11 +8,11 @@ module Straightedge
 	@names_and_values = names_and_hex_values 
       end
 
-
       def list; @names_and_values.keys end
       def_delegator :list, :sample
       
       def hex_value_for(name)
+	return name if name.is_a?(Integer)
 	raise "no such color: #{name}" unless list.include?(name)
 	@names_and_values[name] 
       end
@@ -20,7 +20,7 @@ module Straightedge
       def self.base
 	@core ||= new({
 	  white: 0xFFFFFFFF,
-	  black: 0xFF000000,
+	  #black: 0xFF000000,
 	  none:  0x00000000,
 	})
       end
@@ -62,8 +62,17 @@ module Straightedge
       palette.sample
     end
 
+    # http://stackoverflow.com/questions/1698318/ruby-generate-a-random-hex-color
+    def self.random
+      ("%08x" % (rand * 0xffffffff)).to_i(16)
+    end
+
     def self.hex_value(color)
-      palette.hex_value_for color
+      palette.hex_value_for(color) #rescue color
+    end
+
+    def self.dim(color, factor=0x2A000000) #2A2A2A)
+      Colors.hex_value(color) - factor
     end
   end
 

data/lib/straightedge/director.rb

@@ -15,8 +15,7 @@ module Straightedge
 
     def current_scene
       Scene.new({
-	ORIGIN    => @space,
-	[10,10]   => "grid",
+	ORIGIN    => [ @space, "grid" ],
 
 	[200,300] => Quadrilateral.new(dimensions: [200,100], color: :green),
 	[200,305] => "rectangle",

data/lib/straightedge/extend/array.rb

@@ -2,8 +2,15 @@ class Array
   include Straightedge::Aspects::Positional
   include Straightedge::Aspects::Figural
 
-  def sum
-    inject(&:+)
+  def second; self[1] end
+  def third;  self[2] end
+
+  def sum(&blk)
+    if block_given?
+      map(&blk).sum
+    else
+      inject(&:+)
+    end
   end
 
   def mean 

data/lib/straightedge/figures/figure.rb

@@ -9,7 +9,7 @@ module Straightedge
       include Enumerable
 
       def_delegators :marks, :each
-      def_delegators :compass, :project
+      def_delegators :compass, :orbit
       def_delegators :location, :x, :y
 
       attr_accessor :marks, :color, :location
@@ -23,12 +23,11 @@ module Straightedge
       def compass; @compass ||= Straightedge::Toolkit::Compass.default end
 
       def adjacent
-	approximate_adjacent = map(&method(:project)).flatten(1).uniq
-	actual_adjacent = approximate_adjacent.reject(&method(:include?))
-	actual_adjacent.sort_by(&method(:distance_from_center))
+	approximate_adjacent = map(&method(:orbit)).flatten(1).uniq
+	approximate_adjacent.reject(&method(:include?))
+	#actual_adjacent.sort_by(&method(:distance_from_center))
       end
 
-
       # note this is center of the collection of raw marks
       #      in terms of their own space; not displaced by location
       #      or scaled by dimensions
@@ -36,9 +35,9 @@ module Straightedge
 	[map(&:x).mean, map(&:y).mean]
       end
 
-      def distance_from_center(xy)
-	Straightedge::Toolkit::Ruler.distance(xy,center)
-      end
+      #def distance_from_center(xy)
+      #  Straightedge::Toolkit::Ruler.distance(xy,center)
+      #end
     end
   end
 end

data/lib/straightedge/figures/grid.rb

@@ -18,19 +18,25 @@ module Straightedge
 	[xy.x, xy.y]
       end
 
+      def orbit(xy)
+	clip compass.orbit(xy)
+      end
+
       def each
 	Grid.each_coordinate([width, height]) do |x, y|
 	  yield(at([x,y]))
 	end
       end
 
+      # over-ride with data
+      def color_at(_); :none end 
       def cell_at(xy)
 	@cells     ||= {}
-	@cells[xy] ||= Figures::Quadrilateral.new(dimensions: [@scale, @scale], location: to_pixels(xy)) #[xy.x+1,xy.y+1])) #to_pixels(xy))
+	@cells[xy] = Figures::Quadrilateral.new(color: color_at(xy), dimensions: [@scale, @scale], location: to_pixels(xy))
       end
 
       def each_cell
-	each { |xy| yield cell_at(xy) }
+	each { |xy| c = cell_at(xy); yield c if c }
       end
 
       def paint!
@@ -40,19 +46,20 @@ module Straightedge
 
       def clip(xys=[])
 	xys.reject do |xy|
-	  _x,_y = *xy
-	  _x < 0 || _y < 0 || x >= _x || y >= _y
+	  _x, _y = xy.x, xy.y
+	  _x < 0 || _y < 0 || _x >= width || _y >= height
 	end 
       end
 
-      def self.each_coordinate(dimensions)
-	dimensions.x.times do |x|
-	  dimensions.y.times do |y|
+      def self.each_coordinate(dim)
+	dim.x.times do |x|
+	  dim.y.times do |y|
 	    yield [x,y]
 	  end
 	end
       end
 
+      # why scale/2? there's something goofy somewhere
       def to_pixels(xy)
 	[xy.x * (@scale/2), xy.y * (@scale/2)]
       end

data/lib/straightedge/figures/grid_cell.rb

@@ -0,0 +1,8 @@
+#module Straightedge
+#  module Figures
+#    class GridCell < Figure
+#      include Colorable
+#      attr_accessor :visible, :color
+#    end
+#  end
+#end

data/lib/straightedge/figures/quadrilateral.rb

@@ -13,7 +13,6 @@ module Straightedge
 
       def corners(w=width, h=height)
 	@corners ||= [[x,y],[x,y+h],[x+w,y+h],[x+w,y]]
-	#Rose.simple.project(origin).map { |xy| [xy.x*w, xy.y*h] }
       end
     end
   end

data/lib/straightedge/presenter.rb

@@ -1,29 +1,14 @@
 module Straightedge
-  # TODO something with this
   class Presenter
     extend Forwardable
-    #def_delegators :location, :x, :y
 
     def on(surface)
       @surface = surface
       self
     end
 
-    #def at(p)
-    #  @location = p
-    #  self 
-    #end
-
     def display(figure)
       raise 'implement in subclass'
     end
-
-    #def location
-    #  @location ||= [0,0]
-    #end
-
-    #def color(figure)
-    #  @color ||= 0xEFEFEFEF
-    #end
   end
 end

data/lib/straightedge/scene.rb

@@ -9,12 +9,22 @@ module Straightedge
 
     def render(adapter=nil)
       return false unless adapter
-      @locations_and_figures.each do |location,figure|
-	figure = Figures::Label.new.says(figure) if figure.is_a?(String)
-	figure.location = location
-	presenter = adapter.presenter_for(figure)
-	presenter.display(figure)
+      @locations_and_figures.each do |location,f|
+	if f.is_a?(Array)
+	  f.map do |figure|
+	    Scene.render_figure(figure, location,adapter)
+	  end
+	else
+	  Scene.render_figure(f, location,adapter)
+	end
       end
     end
+
+    def self.render_figure(figure,location,adapter)
+      figure = Figures::Label.new.says(figure) if figure.is_a?(String)
+      figure.location = location
+      presenter = adapter.presenter_for(figure)
+      presenter.display(figure)
+    end
   end
 end

data/lib/straightedge/toolkit/compass.rb

@@ -3,7 +3,7 @@ module Straightedge
     class Compass
       extend Forwardable
       attr_accessor :rose
-      def_delegator :rose, :project
+      def_delegator :rose, :orbit
 
       def initialize(rose=Rose.extended)
 	@rose = rose

data/lib/straightedge/toolkit/rose.rb

@@ -7,12 +7,18 @@ module Straightedge
 	@directions = directions
       end
 
-      def project(point)
+      def orbit(point)
 	@directions.values.collect do |delta|
 	  Ruler.translate(point, delta)
 	end
       end
 
+      def orbits(points, depth: 1)
+	return if depth.zero?
+	obs = points.map(&method(:orbit)).flatten(1)
+	(obs + orbits(obs, depth: depth-1)).uniq
+      end
+
       class << self
 	def simple
 	  return @simple_rose unless @simple_rose.nil?
@@ -25,6 +31,7 @@ module Straightedge
 	end
 
 	# for hex navigation (nb coords are in cube-space)
+	# TODO use for hex oriented grids
 	def hexagonal
 	  return @hex_rose unless @hex_rose.nil?
 	  @hex_rose = new directions: {

data/lib/straightedge/version.rb

@@ -1,4 +1,4 @@
 module Straightedge
   # straightedge version
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/straightedge/extend/array_spec.rb

@@ -17,24 +17,5 @@ describe Array do
       end
     end
   end
-
-  describe ".to_points" do
-    subject do
-      [[1,2],[3,2]]
-    end
-
-    context 'should decode as a set of points' do
-      it 'should have a center' do
-	expect(subject.center).to eql([2,2])
-      end
-
-      let(:expected_adjacent) do
-	[[2, 2], [2, 3], [2, 1], [1, 1], [3, 1], [1, 3], [3, 3], [4, 2], [0, 2], [0, 1], [0, 3], [4, 1], [4, 3]]
-      end
-      it 'should have adjacent coordinates' do
-	expect(subject.adjacent).to eql(expected_adjacent)
-      end
-    end
-  end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: straightedge
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Joseph Weissman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-30 00:00:00.000000000 Z
+date: 2015-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini-config