wicket 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4796455f861ca6470c2d70dc0df6ac3cbed39f56
-  data.tar.gz: d7c4009ad2d103dd4df905fd1e0272ed223c2ebb
+  metadata.gz: a1d5db24047874cba578ee40d7b03c7ec2e204f5
+  data.tar.gz: 70c327e69d7a54897fa73436eb13b5d175a5711c
 SHA512:
-  metadata.gz: fb8a84ca13e6a0b698f5b32ba78b059248fcdff3ef4a710fcb0efa10a50de352c7054104c1b0f8781ad95379d9e2417be3dd5e1bfa20678572a0f20caaa447a1
-  data.tar.gz: 95350c86b4d5525324a7b33c8d56c608246b905b89e106c688a3499c969b39ef64f228b77522fab1516719f27bd77b831e3222276d77bd4e10bce2e4629a7f88
+  metadata.gz: 00f66f02b83314f43d2567e7c2324223dd0d769036c27bf9571896330ea485703724a0c3a5d155ed66cab9757c8c7f567cc1f490dcfb474cd9af0739769e8243
+  data.tar.gz: 65885c4b9f665eee96d41cf70ecf1e6587befb6fe64612849df94a281d12198804d6f966a669569a545b45871dbc632a625adefe900fe03057a9f6fdbcd4a047

data/README.md

@@ -8,6 +8,7 @@ Notable features include:
 - Translating line paths into WKT Polygons or Multipolygons
 - Accepting absolute or relative path commands
 - Inversing Y axis measurements (SVG y coordinates decrease as you go up)
+- Decimal math for increased accuracy
 
 Future possible features could include:
 - Translating curved paths
@@ -36,18 +37,27 @@ Or install it yourself as:
 ## Usage
 
 ```ruby
+# one subpath
 path = Wicket::SVGPath.new("M10 10H20l10 10H10z")
 path.to_polygon 
   # => "POLYGON((10.0 -10.0,20.0 -10.0,30.0 -20.0,10.0 -20.0,10.0 -10.0))"
 path.to_multipolygon 
   # => "MULTIPOLYGON(((10.0 -10.0,30.0 -10.0,40.0 -10.0,50.0 -20.0,40.0 -20.0,10.0 -10.0)))"
+
+# two subpaths
+path = Wicket::SVGPath.new("M10 10H20l10 10H10z M100 100h10v10h-10z")
+path.to_polygon # ONLY THE FIRST SUBPATH!
+  # => "POLYGON((10.0 -10.0,20.0 -10.0,30.0 -20.0,10.0 -20.0,10.0 -10.0))"
+path.to_multipolygon # both subpaths
+  # => "MULTIPOLYGON(((10.0 -10.0,30.0 -10.0,40.0 -10.0,50.0 -20.0,40.0 -20.0,10.0 -10.0)),((100 -100,110 -100,110 -110,100 -110,100 -100)))
+
 ```
 
 ## Gotchas
 
 - Wicket assumes that a move command (M or m) is part of the polygon edge. It just so happened that a lot of the data I was working with when creating this project was formatted that way. Eventually I believe this should not be the case and should be able to be toggled on as an option.
 - Polygons are assumed to have no holes, thus everything inside the path is part of the polygon.
-- Each polygon is represented by a subpath. A subpath continues until it is closed by a Z command or by moving or lineing to the starting coordinates. Multiple subpaths are represented as individual elements in `#to_multipolygon`, whereas only the first subpath is represented in `#to_polygon`. Make sure your data does not include multiple subpaths if using the `#to_polygon` method.
+- Each polygon is represented by a subpath. A subpath continues until it is closed by a Z command. Multiple subpaths are represented as individual elements in `#to_multipolygon`, whereas only the first subpath is represented in `#to_polygon`. Make sure your data does not include multiple subpaths if using the `#to_polygon` method.
 
 ## Contributing
 

data/lib/wicket.rb

@@ -1,3 +1,4 @@
+require "bigdecimal"
 require "wicket/version"
 require "wicket/svg_path"
 require "wicket/subpath"

data/lib/wicket/command.rb

@@ -9,14 +9,20 @@ module Wicket
         cursor_start = subpath.cursor_end # get the current position of the cursor
         args = arg_string.to_s.scan(/(?:\-\s*)?\d+(?:\.\d+)?/).flatten # parse out the numerical arguments
         if !args.empty?
+          generate_commands(args,command_class,absolute,cursor_start)
+        else # Must be a Z command
+          [command_class.new(absolute,cursor_start)]
+        end
+      end
+
+      private
+
+        def generate_commands(args,command_class,absolute,cursor_start)
           args.each_slice(command_class.arg_count).map do |slice| # slice them according to the number the code takes
-            slice.map!{|arg| arg.gsub(/\s*/,'').to_f } # remove whitespace and turn into a float
+            slice.map!{|arg| BigDecimal.new(arg.gsub(/\s*/,'')) } # remove whitespace and turn into a decimal
             command_class.new(absolute,cursor_start,*slice)
           end
-        else
-          [command_class.new(absolute,cursor_start)]
         end
-      end
     end
 
     def subpath=(subpath)
@@ -33,7 +39,7 @@ module Wicket
 
       private
         def inverse_values
-          [cursor_end[:x], cursor_end[:y] * -1]
+          [cursor_end[:x].to_s("F"), (cursor_end[:y] * -1).to_s("F")]
         end
   end
 end

data/lib/wicket/subpath.rb

@@ -19,11 +19,7 @@ module Wicket
 
     def closed?
       return false if @commands.empty?
-      if @commands.length > 1
-        first_command.cursor_end == last_command.cursor_end
-      else
-        first_command.cursor_start == first_command.cursor_end
-      end
+      @commands.last.class == Commands::Z
     end
 
     def to_polygon

data/lib/wicket/svg_path.rb

@@ -32,15 +32,5 @@ module Wicket
       def new_subpath
         Subpath.new.tap {|s| @subpaths << s }
       end
-
-      def group_by_subpath(parsed_result)
-        parsed_result.each_with_object([]) do
-        end
-      end
-
-      def parse_arg_string(arg_string)
-        matches = arg_string.scan(/(?:\-\s*)?\d+(?:\.\d+)?/)
-        matches.flatten.map!{|arg| arg.gsub(/\s*/,'').to_f }
-      end
   end
 end

data/lib/wicket/version.rb

@@ -1,3 +1,3 @@
 module Wicket
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/svg_path_spec.rb

@@ -114,13 +114,13 @@ module Wicket
     end
 
     context "the kitchen sink" do
-      let(:path){ SVGPath.new("M749.208,402.3311l14.8604,23.8335l-3.6279,1.7236l-14.4775-23.1108L749.208,402.3311z M775.3047,457.8872l0.0293,33.5894 l-3.9326,0.0044l-0.0225-32.6997L775.3047,457.8872z M764.0645,426.1665l11.2402,31.7207l-3.9268,0.894l-10.9434-30.8901 L764.0645,426.1665z") }
+      let(:path){ SVGPath.new("M293.9214,533.9287l-6.3857-18.1475l3.9316-0.8857l6.0811,17.29L293.9214,533.9287z M287.5356,515.7813V496.5h3.9316v18.3955 L287.5356,515.7813z") }
       it "parses the first subpath to polygon" do
-        expect(path.to_polygon).to eq("POLYGON((227.1177 -371.5405,247.7852 -349.9634,250.373 -353.0425,230.2959 -374.0044,227.1177 -371.5405))")
+        expect(path.to_polygon).to eq("POLYGON((293.9214 -533.9287,287.5357 -515.7812,291.4673 -514.8955,297.5484 -532.1855,293.9214 -533.9287,293.9214 -533.9287))")
       end
 
       it "parses both to a multipolygon" do
-        expect(path.to_multipolygon).to eq("MULTIPOLYGON(((227.1177 -371.5405,247.7852 -349.9634,250.373 -353.0425,230.2959 -374.0044,227.1177 -371.5405)),((197.5977 -356.0957,227.0786 -325.3271,229.667 -328.4067,200.8188 -358.5156,197.5977 -356.0957)))")
+        expect(path.to_multipolygon).to eq("MULTIPOLYGON(((293.9214 -533.9287,287.5357 -515.7812,291.4673 -514.8955,297.5484 -532.1855,293.9214 -533.9287,293.9214 -533.9287)),((287.5356 -515.7813,287.5356 -496.5,291.4672 -496.5,291.4672 -514.8955,287.5356 -515.7813,287.5356 -515.7813)))")
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wicket
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Ryan Urabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-30 00:00:00.000000000 Z
+date: 2014-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler