vector_salad 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aaccdb7ab3d09bd163ec4868a518c0a93ed2be68
-  data.tar.gz: 6cca51fd3cde40a4003785ef789b8586c4dc2b20
+  metadata.gz: bc23021a759973f72595a9b083f0c14557a81ee1
+  data.tar.gz: de57bf043d59f32f38f9c85a4ec54d4b1347c4b2
 SHA512:
-  metadata.gz: 4327f2033ea5c7a2525987c755401cf6eb7ca47eadbca43bfcdff85ce45db3667466b8c05b30874c03362deea47b461dc6ebee2e995db06e7fc71415c1588606
-  data.tar.gz: fac9847a5c5f658b3568f1dd30b677c902d18106c99c81cc9858aed256aedc672d3df9405f58ffb4af3832d8f03b1ffc79b5eae2c209825dab3248fc81e9481c
+  metadata.gz: e9b18624730aab10da1463714ae2b6da737ffdcf168a205205fe48f668cdfacebe9c9f6d60cae3220472f19267857a6d5650cf1a1162536c3ab167c83afbd429
+  data.tar.gz: 78df56043bb2ad3d9f5ad54bbd8413705c8d2432315477a5af4b449c0febeb954973f89b9a35b00546469cb9d150985417f2e2f3d878c56e0c30e25d3d0c2de8

data/bin/vector_salad

@@ -2,74 +2,11 @@
 
 require "optparse"
 require "ostruct"
-require_relative "../lib/vector_salad/version"
+require "vector_salad/version"
+require "vector_salad/optparse"
 
-class OptparseVectorSalad
-  #
-  # Return a structure describing the options.
-  #
-  def self.parse(args)
-    # The options specified on the command line will be collected in *options*.
-    # We set default values here.
-    options = OpenStruct.new
-    options.file = nil
-    options.magic = true
-    options.verbose = false
-    options.width = nil
-    options.height = nil
+ARGV << "--help" if ARGV.empty?
+options = VectorSalad::Optparse.parse(ARGV)
 
-    opt_parser = OptionParser.new do |opts|
-      opts.banner = "Usage: vrs [options]"
-
-      opts.separator ""
-      opts.separator "Specific options:"
-
-      opts.on("--crop CROP",
-              "Set manual crop, WIDTHxHEIGHT, e.g: 400x600") do |crop|
-        options.width, options.height = crop.split('x').map(&:to_i)
-      end
-
-      # Mandatory argument.
-      opts.on("-f", "--file FILE",
-              "Run VectorSalad on the FILE") do |file|
-        options.file = file
-      end
-
-      opts.on("--[no-]magic",
-              "Add some helpful magic to your design") do |m|
-        puts "So this happened: #{m}"
-        options.magic = m
-      end
-
-      # Boolean switch.
-      # opts.on("-v", "--[no-]verbose", "Run verbosely") do |v|
-        # options.verbose = v
-      # end
-
-      opts.separator ""
-      opts.separator "Common options:"
-
-      # No argument, shows at tail.  This will print an options summary.
-      # Try it and see!
-      opts.on_tail("-h", "--help", "Show this message") do
-        puts opts
-        exit
-      end
-
-      # Another typical switch to print the version.
-      opts.on_tail("--version", "Show version") do
-        puts VectorSalad::VERSION
-        exit
-      end
-    end
-
-    opt_parser.parse!(args)
-    options
-  end
-end
-
-ARGV << "-h" if ARGV.empty?
-options = OptparseVectorSalad.parse(ARGV)
-
-require_relative "../lib/vector_salad/export_with_magic"
+require "vector_salad/export_with_magic"
 puts VectorSalad::ExportWithMagic.new(options).export

data/lib/contracts_builtin.rb

@@ -0,0 +1,34 @@
+# @api private
+module Contracts
+  module Builtin
+    class Coords
+      def self.valid?(val)
+        Contracts::Maybe[[Contracts::Num, Contracts::Num]].valid? val
+      end
+
+      def self.to_s
+        "[Num, Num] an x,y coordinate array"
+      end
+    end
+
+    class Coord
+      def self.valid?(val)
+        Contracts::Num.valid? val
+      end
+
+      def self.to_s
+        "Num; a coordinate"
+      end
+    end
+
+    class PolySides
+      def self.valid?(val)
+        val && val.is_a?(Integer) && val >= 3
+      end
+
+      def self.to_s
+        "Int; sides of the polygon, minimum of 3"
+      end
+    end
+  end
+end

data/lib/vector_salad/magic.rb

@@ -8,7 +8,7 @@ module VectorSalad
   # @api private
   module Magic
     def canvas
-      @vs_canvas ||= VectorSalad::Canvas.new
+      @canvas ||= VectorSalad::Canvas.new
     end
   end
 end

data/lib/vector_salad/optparse.rb

@@ -0,0 +1,65 @@
+module VectorSalad
+  # @api private
+  class Optparse
+    def self.defaults
+      @defaults ||= {
+        file: nil,
+        magic: true,
+        verbose: false,
+        width: nil,
+        height: nil
+      }
+    end
+
+    def self.options
+      @options ||= OpenStruct.new(defaults)
+    end
+
+    def self.tool_name=(name)
+      @tool_name = name
+    end
+    self.tool_name = "vector_salad"
+
+    def self.optparse
+      @optparse ||= OptionParser.new do |o|
+        o.banner = <<-EOF.gsub(/^.*# ?/, "")
+          # Usage:
+          #     #{@tool_name} -f path/to/file.rb [options]
+          #
+          # Options:
+        EOF
+
+        o.on_head("-c", "--crop CROP", "Set manual crop, WIDTHxHEIGHT, e.g: 400x600") do |crop|
+          options.width, options.height = crop.split("x").map(&:to_i)
+        end
+
+        o.on_head("-f", "--file FILE", "Run VectorSalad on the FILE") do |file|
+          options.file = file
+        end
+
+        # o.on_head("--[no-]magic", "Add some helpful magic to your design") do |m|
+          # options.magic = m
+        # end
+
+        o.separator ""
+        o.separator "General options:"
+
+        o.on_tail("-h", "--help", "Show this message") do
+          puts o
+          exit
+        end
+
+        o.on_tail("--version", "Show version") do
+          puts VectorSalad::VERSION
+          exit
+        end
+      end
+    end
+
+    # Return a structure describing the options.
+    def self.parse(args)
+      optparse.parse!(args)
+      options
+    end
+  end
+end

data/lib/vector_salad/standard_shapes/basic_shape.rb

@@ -1,6 +1,6 @@
 require "forwardable"
 require "contracts"
-require "contracts_contracts"
+require "contracts_builtin"
 
 module VectorSalad
   module StandardShapes
@@ -13,7 +13,8 @@ module VectorSalad
     # You can't use BasicShape directly.
     class BasicShape
       extend Forwardable
-      include Contracts
+      include Contracts::Core
+      include Contracts::Builtin
 
       attr_accessor :options
 

data/lib/vector_salad/standard_shapes/clip.rb

@@ -2,6 +2,7 @@ require "clipper"
 
 require "vector_salad/dsl"
 require "vector_salad/canvas"
+require "vector_salad/standard_shapes/basic_shape"
 require "vector_salad/standard_shapes/multi_path"
 
 module VectorSalad

data/lib/vector_salad/standard_shapes/custom.rb

@@ -1,7 +1,6 @@
-require "vector_salad/standard_shapes/path"
-require "vector_salad/standard_shapes/n"
 require "vector_salad/dsl"
 require "vector_salad/canvas"
+require "vector_salad/standard_shapes/basic_shape"
 
 module VectorSalad
   module StandardShapes

data/lib/vector_salad/standard_shapes/difference.rb

@@ -1,5 +1,4 @@
 require "vector_salad/standard_shapes/clip"
-require "vector_salad/standard_shapes/multi_path"
 
 module VectorSalad
   module StandardShapes

data/lib/vector_salad/standard_shapes/exclusion.rb

@@ -1,5 +1,4 @@
 require "vector_salad/standard_shapes/clip"
-require "vector_salad/standard_shapes/multi_path"
 
 module VectorSalad
   module StandardShapes

data/lib/vector_salad/standard_shapes/flip.rb

@@ -1,4 +1,5 @@
 require "vector_salad/standard_shapes/transform"
+require "vector_salad/canvas"
 
 module VectorSalad
   module StandardShapes

data/lib/vector_salad/standard_shapes/heart.rb

@@ -1,4 +1,6 @@
+require "vector_salad/standard_shapes/basic_shape"
 require "vector_salad/standard_shapes/polygon"
+require "vector_salad/standard_shapes/union"
 
 module VectorSalad
   module StandardShapes

data/lib/vector_salad/standard_shapes/intersection.rb

@@ -1,5 +1,4 @@
 require "vector_salad/standard_shapes/clip"
-require "vector_salad/standard_shapes/multi_path"
 
 module VectorSalad
   module StandardShapes

data/lib/vector_salad/standard_shapes/iso_tri.rb

@@ -1,3 +1,4 @@
+require "vector_salad/standard_shapes/basic_shape"
 require "vector_salad/standard_shapes/path"
 require "vector_salad/standard_shapes/n"
 require "vector_salad/mixins/at"

data/lib/vector_salad/standard_shapes/jitter.rb

@@ -1,3 +1,4 @@
+require "vector_salad/canvas"
 require "vector_salad/standard_shapes/transform"
 
 module VectorSalad

data/lib/vector_salad/standard_shapes/move.rb

@@ -1,4 +1,5 @@
 require "vector_salad/standard_shapes/transform"
+require "vector_salad/canvas"
 
 module VectorSalad
   module StandardShapes

data/lib/vector_salad/standard_shapes/oval.rb

@@ -1,3 +1,4 @@
+require "vector_salad/standard_shapes/basic_shape"
 require "vector_salad/standard_shapes/path"
 require "vector_salad/standard_shapes/n"
 require "vector_salad/mixins/at"

data/lib/vector_salad/standard_shapes/polygon.rb

@@ -1,4 +1,5 @@
-require "contracts_contracts"
+require "contracts_builtin"
+require "vector_salad/standard_shapes/basic_shape"
 require "vector_salad/standard_shapes/path"
 require "vector_salad/mixins/at"
 

data/lib/vector_salad/standard_shapes/rect.rb

@@ -1,3 +1,4 @@
+require "vector_salad/standard_shapes/basic_shape"
 require "vector_salad/standard_shapes/path"
 require "vector_salad/standard_shapes/n"
 require "vector_salad/mixins/at"

data/lib/vector_salad/standard_shapes/rotate.rb

@@ -1,4 +1,5 @@
 require "vector_salad/standard_shapes/transform"
+require "vector_salad/canvas"
 
 module VectorSalad
   module StandardShapes

data/lib/vector_salad/standard_shapes/transform.rb

@@ -1,9 +1,7 @@
 require "contracts"
-require "contracts_contracts"
-
+require "contracts_builtin"
 require "vector_salad/dsl"
 require "vector_salad/canvas"
-require "vector_salad/standard_shapes/path"
 
 module VectorSalad
   module StandardShapes
@@ -11,7 +9,8 @@ module VectorSalad
     class Transform
       include VectorSalad::DSL
       include VectorSalad::StandardShapes
-      include Contracts
+      include Contracts::Core
+      include Contracts::Builtin
 
       def canvas
         @canvas ||= VectorSalad::Canvas.new

data/lib/vector_salad/standard_shapes/union.rb

@@ -1,5 +1,4 @@
 require "vector_salad/standard_shapes/clip"
-require "vector_salad/standard_shapes/multi_path"
 
 module VectorSalad
   module StandardShapes

data/lib/vector_salad/version.rb

@@ -1,3 +1,3 @@
 module VectorSalad
-  VERSION = "0.1.3" # Version of VectorSalad
+  VERSION = "0.2.0" # Version of VectorSalad
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vector_salad
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Simon George
@@ -209,7 +209,7 @@ files:
 - examples/triangles.png
 - examples/triangles.rb
 - examples/triangles.svg
-- lib/contracts_contracts.rb
+- lib/contracts_builtin.rb
 - lib/vector_salad.rb
 - lib/vector_salad/canvas.rb
 - lib/vector_salad/dsl.rb
@@ -221,6 +221,7 @@ files:
 - lib/vector_salad/mixins/at.rb
 - lib/vector_salad/mixins/mixins.rb
 - lib/vector_salad/monkeypatches.rb
+- lib/vector_salad/optparse.rb
 - lib/vector_salad/shape_proxy.rb
 - lib/vector_salad/standard_shapes/basic_shape.rb
 - lib/vector_salad/standard_shapes/circle.rb

data/lib/contracts_contracts.rb

@@ -1,32 +0,0 @@
-# @api private
-module Contracts
-  class Coords
-    def self.valid?(val)
-      Contracts::Maybe[[Contracts::Num, Contracts::Num]].valid? val
-    end
-
-    def self.to_s
-      "[Num, Num] an x,y coordinate array"
-    end
-  end
-
-  class Coord
-    def self.valid?(val)
-      Contracts::Num.valid? val
-    end
-
-    def self.to_s
-      "Num; a coordinate"
-    end
-  end
-
-  class PolySides
-    def self.valid?(val)
-      val && val.is_a?(Integer) && val >= 3
-    end
-
-    def self.to_s
-      "Int; sides of the polygon, minimum of 3"
-    end
-  end
-end