gbtiles 0.0.3 → 0.1.0

data/lib/gbtiles/gbr/tile_set/objects/tile_import.rb

@@ -5,34 +5,17 @@ module GBTiles
         class TileImport < GBTiles::GBR::TileSet::Object
 
           attr_accessor :tile_id
-          @tile_id
-
           attr_accessor :file_name
-          @file_name
-
           attr_accessor :file_type
-          @file_type
-
           attr_accessor :from_tile
-          @from_tile
-
           attr_accessor :to_tile
-          @to_tile
-
           attr_accessor :tile_count
-          @tile_count
-
           attr_accessor :color_conversion
-          @color_conversion
-
           attr_accessor :first_byte
-          @first_byte
-
           attr_accessor :binary_file_type
-          @binary_file_type
 
           def initialize
-            super GBTiles::GBR::TileSet::ObjectType::TILE_IMPORT
+            super GBTiles::GBR::TileSet::OBJECT_TYPE[:tile_import]
           end
 
           def self.initFromBitString src

data/lib/gbtiles/gbr/tile_set/objects/tile_pal.rb

@@ -5,22 +5,13 @@ module GBTiles
         class TilePal < GBTiles::GBR::TileSet::Object
 
           attr_accessor :id
-          @id
-
           attr_accessor :count
-          @count
-
           attr_accessor :color_set
-          @color_set
-
           attr_accessor :sgb_count
-          @sgb_count
-
           attr_accessor :sgb_color_set
-          @sgb_color_set
 
           def initialize
-            super GBTiles::GBR::TileSet::ObjectType::TILE_PAL
+            super GBTiles::GBR::TileSet::OBJECT_TYPE[:tile_pal]
           end
 
           def self.initFromBitString src

data/lib/gbtiles/gbr/tile_set/objects/tile_settings.rb

@@ -5,40 +5,19 @@ module GBTiles
         class TileSettings < GBTiles::GBR::TileSet::Object
 
           attr_accessor :tile_id
-          @tile_id
-
           attr_accessor :simple
-          @simple
-
           attr_accessor :flags
-          @flags
-
           attr_accessor :left_color
-          @left_color
-
           attr_accessor :right_color
-          @right_color
-
           attr_accessor :split_width
-          @split_width
-
           attr_accessor :split_height
-          @split_height
-
           attr_accessor :split_order
-          @split_order
-
           attr_accessor :color_set
-          @color_set
-
           attr_accessor :bookmarks
-          @bookmarks
-
           attr_accessor :auto_update
-          @auto_update
 
           def initialize
-            super GBTiles::GBR::TileSet::ObjectType::TILE_SETTINGS
+            super GBTiles::GBR::TileSet::OBJECT_TYPE[:tile_settings]
           end
 
           def self.initFromBitString src

data/lib/gbtiles/gbr/tile_set/objects/unknown.rb

@@ -5,7 +5,6 @@ module GBTiles
         class Unknown < GBTiles::GBR::TileSet::Object
 
           attr_accessor :object_data
-          @object_data
 
         end
       end

data/lib/gbtiles/gbr/tile_set/sgb_palettes.rb

@@ -1,13 +1,13 @@
 module GBTiles
   module GBR
     module TileSet
-      module SGBPalettes
-        NONE                = 0
-        CONSTANT_PER_ENTRY  = 1
-        2_BITS_PER_ENTRY    = 2
-        4_BITS_PER_ENTRY    = 3
-        1_BYTE_PER_ENTRY    = 4
-      end
+      SGB_PALETTES = {
+        :none                 => 0,
+        :constant_per_entry   => 1,
+        :per_entry_2_bits     => 2, # 2_bits_per_entry
+        :per_entry_4_bits     => 3, # 4_bits_per_entry
+        :per_entry_1_byte     => 4  # 1_byte_per_entry
+      }
     end
   end
 end

data/lib/gbtiles/gbr/tile_set/split_order.rb

@@ -1,13 +1,13 @@
 module GBTiles
   module GBR
     module TileSet
-      module SplitOrder
-        LRTB = 0
-        HORIZONTAL = 0
+      SPLIT_ORDER = {
+        :lrtb       => 0,
+        :horizontal => 0,
 
-        TBLR = 1
-        VERTICAL = 1
-      end
+        :tblr       => 1,
+        :vertical   => 1
+      }
     end
   end
 end

data/lib/gbtiles/gbr/tile_set/tile_set.rb

@@ -4,51 +4,62 @@ module GBTiles
       class TileSet
 
         attr_accessor :objects
-        @objects
 
         def initialize
           @objects = []
         end
 
-        def producers
+        def producer
           @objects.select{ |a|
-            a.is_a? GBTiles::GBR::TileSet::Objects::Producer
+            a.object_type == GBTiles::GBR::TileSet::OBJECT_TYPE[:producer]
           }
         end
 
         def tile_data
           @objects.select{ |a|
-            a.is_a? GBTiles::GBR::TileSet::Objects::TileData
+            a.object_type == GBTiles::GBR::TileSet::OBJECT_TYPE[:tile_data]
           }
         end
 
         def tile_settings
           @objects.select{ |a|
-            a.is_a? GBTiles::GBR::TileSet::Objects::TileSettings
+            a.object_type == GBTiles::GBR::TileSet::OBJECT_TYPE[:tile_settings]
           }
         end
 
         def tile_export
           @objects.select{ |a|
-            a.is_a? GBTiles::GBR::TileSet::Objects::TileExport
+            a.object_type == GBTiles::GBR::TileSet::OBJECT_TYPE[:tile_export]
           }
         end
 
         def tile_import
           @objects.select{ |a|
-            a.is_a? GBTiles::GBR::TileSet::Objects::TileImport
+            a.object_type == GBTiles::GBR::TileSet::OBJECT_TYPE[:tile_import]
           }
         end
 
         def palettes
           @objects.select{ |a|
-            a.is_a? GBTiles::GBR::TileSet::Objects::Palettes
+            a.object_type == GBTiles::GBR::TileSet::OBJECT_TYPE[:palettes]
           }
         end
 
         def tile_pal
           @objects.select{ |a|
-            a.is_a? GBTiles::GBR::TileSet::Objects::TilePal
+            a.object_type == GBTiles::GBR::TileSet::OBJECT_TYPE[:tile_pal]
+          }
+        end
+
+        def deleted
+          @objects.select{ |a|
+            a.object_type == GBTiles::GBR::TileSet::OBJECT_TYPE[:deleted]
+          }
+        end
+
+        def unknown
+          @objects.select{ |a|
+            GBTiles::GBR::TileSet::OBJECT_TYPE.key(a.object_type).nil?
           }
         end
       end

data/lib/gbtiles/{data_type.rb → helpers/data_type.rb}

@@ -1,6 +1,10 @@
 module GBTiles
   module DataType
-    def self.string(src, length = nil)
+    def self.string src, length = nil
+      if src.nil? then
+        return nil
+      end
+
       if !length.nil? then
         string = src.slice(0, length)
       else
@@ -11,14 +15,18 @@ module GBTiles
         string = string.split(/\0/).first
       end
 
-      if !string.nil?
+      if !string.nil? then
         string = string.unpack("A*")[0]
       end
 
       string
     end
 
-    def self.string!(src, length = nil)
+    def self.string! src, length = nil
+      if src.nil? then
+        return nil
+      end
+
       if !length.nil? then
         string = src.slice!(0, length)
       else 
@@ -31,42 +39,42 @@ module GBTiles
     # WORD
     # LITTLE ENDIAN
     # 2 BYTES
-    def self.word(src)
+    def self.word src
       src.slice(0, 2).unpack("v*")[0]
     end
 
-    def self.word!(src)
+    def self.word! src
       self.word(src.slice!(0, 2))
     end
 
     # BYTE
     # 1 BYTE
-    def self.byte(src)
+    def self.byte src
       src.slice(0, 1).unpack("C*")[0]
     end
 
-    def self.byte!(src)
+    def self.byte! src
       self.byte(src.slice!(0, 1))
     end
 
     # BOOLEAN
     # 1 BYTE
-    def self.boolean(src)
+    def self.boolean src
       src.slice!(0, 1).unpack("C")[0].eql? 1
     end
 
-    def self.boolean!(src)
+    def self.boolean! src
       self.boolean(src.slice!(0, 1))
     end
 
     # LITTLE ENDIAN
     # 32 BIT INTEGER
     # 4 BYTES
-    def self.long(src)
+    def self.long src
       src.slice(0, 4).unpack("V*")[0]
     end
 
-    def self.long!(src)
+    def self.long! src
       self.long(src.slice!(0, 4))
     end
   end

data/lib/gbtiles/version.rb

@@ -1,3 +1,3 @@
 module GBTiles
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gbtiles
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Bashkim Isai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-31 00:00:00.000000000 Z
+date: 2015-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -24,6 +24,48 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.12.2
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.3.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.3.0
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.10.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.10.0
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 'Allows files created by Harry Mulder''s Game Boy Map Builder and Game
   Boy Tile Designer to be converted in to different file formats for use in Game Boy
   game development (e.g.: with GBDK)'
@@ -38,12 +80,12 @@ files:
 - README.md
 - bin/gbm
 - bin/gbr
-- lib/gbtiles/data_type.rb
 - lib/gbtiles/gbm/cli/convert.rb
 - lib/gbtiles/gbm/export/asm/asm.h.erb
 - lib/gbtiles/gbm/export/asm/asm.rb
 - lib/gbtiles/gbm/export/asm/asm.s.erb
 - lib/gbtiles/gbm/import/gbm_file.rb
+- lib/gbtiles/gbm/layer.rb
 - lib/gbtiles/gbm/map/map_set.rb
 - lib/gbtiles/gbm/map/object.rb
 - lib/gbtiles/gbm/map/object_type.rb
@@ -74,6 +116,7 @@ files:
 - lib/gbtiles/gbr/tile_set/sgb_palettes.rb
 - lib/gbtiles/gbr/tile_set/split_order.rb
 - lib/gbtiles/gbr/tile_set/tile_set.rb
+- lib/gbtiles/helpers/data_type.rb
 - lib/gbtiles/helpers/fixnum.rb
 - lib/gbtiles/version.rb
 homepage: http://github.com/bashaus/gbtiles
@@ -97,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Converts .GBR and .GBM files to different Game Boy formats