tmx 0.1.3 → 0.1.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 2269a75b8e1f1dd7ce9a4ac399cae4a3538ad5df
+  data.tar.gz: 98f6cb5462d7245e495595dbf851cc1458fee5e1
+SHA512:
+  metadata.gz: cc07f67ec4b9bd782be6c2749ab34424f0ab165e467afb6504d1c46edc7384406e2ba5f62e73c54d70bde545eb6e7d9f42da9399f3c1db96c34ad9094def1477
+  data.tar.gz: 52caa2aef41c92361b404bfaae226d68cb9255b8eab2827c202e75288f4f8e4a3a3874f33a6e4ebcf7547901df4a4122e9b6d98c9274a053fa952d6e4cb38a26

data/lib/tmx.rb

@@ -17,7 +17,9 @@ module Tmx
   #
   def load(filename,options={})
     options = default_options(filename).merge(options)
-    parse contents(filename), options
+
+    # Pass :filename in options for resolving relative "source" paths
+    parse contents(filename), options.merge(:filename => filename)
   end
 
   #

data/lib/tmx/parsers/tmx.rb

@@ -66,7 +66,7 @@ module Tmx
 
           layer_hash["type"] = layer_attr(layer,"type",default: "tilelayer")
           layer_hash["opacity"] = layer_attr(layer,"opacity",default: 1.0).to_f
-          layer_hash["visible"] = (layer.xpath("@visible").text =~ /^false$/ ? false : true)
+          layer_hash["visible"] = to_boolean(layer.xpath("@visible").text)
 
           layer_hash["x"] = layer.xpath("@x").text.to_i
           layer_hash["y"] = layer.xpath("@y").text.to_i
@@ -118,12 +118,29 @@ module Tmx
         data.unpack("V" * (data.length / 4))
       end
 
+      def to_boolean(text)
+        ![ "false", "0" ].include?(text)
+      end
+
       def map_tilesets(xml)
         xml.xpath("map/tileset").map do |tileset|
+          # Firstgid is usually set in the main file,
+          # even if a tileset is read from a separate file.
+          firstgid = tileset.xpath("@firstgid").text.to_i
+
+          source = tileset.xpath("@source")
+          if source && source.size > 0
+            this_dir = @options[:filename] ? File.dirname(@options[:filename]) : "."
+            tileset_path = File.join(this_dir, source.text)
+            contents = File.read(tileset_path)
+            results = Nokogiri::XML(contents)
+            tileset = results.xpath("tileset")
+          end
+
           image = tileset.xpath("image")
 
           properties = {
-            "firstgid" => tileset.xpath("@firstgid").text.to_i,
+            "firstgid" => firstgid || tileset.xpath("@firstgid").text.to_i,
             "name" => tileset.xpath("@name").text,
             "tilewidth" => tileset.xpath("@tilewidth").text.to_i,
             "tileheight" => tileset.xpath("@tileheight").text.to_i,
@@ -132,6 +149,8 @@ module Tmx
             "image" => image.xpath("@source").text,
             "imageheight" => image.xpath("@height").text.to_i,
             "imagewidth" => image.xpath("@width").text.to_i,
+            # "imagetrans" is a color to treat as transparent, like "ff00ff" for magenta.
+            "imagetrans" => image.xpath("@trans").text,
             "properties" => properties(xml)
           }
         end
@@ -148,7 +167,7 @@ module Tmx
               "y" => object.xpath("@y").text.to_i,
               "width" => object.xpath("@width").text.to_i,
               "height" => object.xpath("@height").text.to_i,
-              "visible" => (object.xpath("@visible").text =~ /^false$/ ? false : true),
+              "visible" => to_boolean(object.xpath("@visible").text),
               "properties" => properties(object)
             }
 

data/lib/tmx/version.rb

@@ -1,3 +1,3 @@
 module Tmx
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/spec/features/xml_source_tileset_spec.rb

@@ -0,0 +1,45 @@
+require 'spec_helper'
+
+describe Tmx, "Map with Source Tileset" do
+
+  let(:fixture_file) { File.join File.dirname(__FILE__), "..", "fixtures", "map-source-tileset.tmx" }
+
+  let(:map) do
+    described_class.load(fixture_file)
+  end
+
+  let(:subject) { map }
+
+  its(:width) { should eq 10 }
+  its(:height) { should eq 20 }
+  its(:tilewidth) { should eq 32 }
+  its(:tileheight) { should eq 32 }
+
+  describe '#layers' do
+    it "has the correct number of layers" do
+      expect(subject.layers).to have(1).item
+    end
+  end
+
+  describe '#tilesets' do
+    it "has the correct number of tilesets" do
+      expect(subject.tilesets).to have(1).item
+    end
+
+    context "when evaluating the first tileset" do
+      let(:subject) { map.tilesets.first }
+
+      its(:firstgid) { should eq 1 }
+      its(:image) { should eq "tiles.png" }
+      its(:imageheight) { should eq 400 }
+      its(:imagewidth) { should eq 640 }
+      its(:margin) { should eq 0 }
+      its(:spacing) { should eq 2 }
+      its(:tileheight) { should eq 32 }
+      its(:tilewidth) { should eq 32 }
+      its(:properties) { should eq({}) }
+    end
+  end
+
+
+end

data/spec/fixtures/map-source-tileset.tmx

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" orientation="orthogonal" width="10" height="20" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" source="tileset.tsx"> </tileset>
+ <layer name="Tile Layer 1" width="10" height="20">
+  <data encoding="base64" compression="zlib">
+   eJxjZmBgYIZiRjTMhISZR9WNqhuB6gBbPgF9
+  </data>
+ </layer>
+</map>

data/spec/fixtures/tileset.tsx

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tileset name="terrain" tilewidth="32" tileheight="32" spacing="2">
+  <image source="tiles.png" width="640" height="400"/>
+</tileset

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tmx
 version: !ruby/object:Gem::Version
-  version: 0.1.3
-  prerelease: 
+  version: 0.1.4
 platform: ruby
 authors:
 - Shawn Anderson
@@ -10,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-22 00:00:00.000000000 Z
+date: 2013-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -23,7 +21,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -31,7 +28,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -39,7 +35,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,11 +73,13 @@ files:
 - spec/features/xml_format_spec.rb
 - spec/features/xml_isometric_spec.rb
 - spec/features/xml_isometric_staggered_spec.rb
+- spec/features/xml_source_tileset_spec.rb
 - spec/fixtures/iso.png
 - spec/fixtures/map-isometric-staggered.json
 - spec/fixtures/map-isometric-staggered.tmx
 - spec/fixtures/map-isometric.json
 - spec/fixtures/map-isometric.tmx
+- spec/fixtures/map-source-tileset.tmx
 - spec/fixtures/map.json
 - spec/fixtures/map_csv.tmx
 - spec/fixtures/map_gzip.tmx
@@ -90,32 +87,32 @@ files:
 - spec/fixtures/map_xml.tmx
 - spec/fixtures/map_zlib.tmx
 - spec/fixtures/tiles.png
+- spec/fixtures/tileset.tsx
 - spec/spec_helper.rb
 - tmx.gemspec
 homepage: https://github.com/shawn42/tmx
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.1.9
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A library for parsing the Tiled Map Editor file format.
 test_files:
 - spec/features/json_format_spec.rb
@@ -125,11 +122,13 @@ test_files:
 - spec/features/xml_format_spec.rb
 - spec/features/xml_isometric_spec.rb
 - spec/features/xml_isometric_staggered_spec.rb
+- spec/features/xml_source_tileset_spec.rb
 - spec/fixtures/iso.png
 - spec/fixtures/map-isometric-staggered.json
 - spec/fixtures/map-isometric-staggered.tmx
 - spec/fixtures/map-isometric.json
 - spec/fixtures/map-isometric.tmx
+- spec/fixtures/map-source-tileset.tmx
 - spec/fixtures/map.json
 - spec/fixtures/map_csv.tmx
 - spec/fixtures/map_gzip.tmx
@@ -137,5 +136,5 @@ test_files:
 - spec/fixtures/map_xml.tmx
 - spec/fixtures/map_zlib.tmx
 - spec/fixtures/tiles.png
+- spec/fixtures/tileset.tsx
 - spec/spec_helper.rb
-has_rdoc: