neri 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6cb041288c1942341b776e35972c8acfe2d0795
-  data.tar.gz: 7b139e1faa036adef2ad529d2d2b093dd05a863c
+  metadata.gz: 67233b2846e6e38f9bc09eb3a467513054dc3fb8
+  data.tar.gz: 50e5ccdbb4e581ec797c4e1f063f2a5f385c6788
 SHA512:
-  metadata.gz: d9b21cbe796bedd13e7797083cf4b9ca18ca72589fa8d0ed086f99b106ff89ebb7096709553954d3dbc0f2dd3b476ad0eee2efd3430ceef659057089271e7473
-  data.tar.gz: 4787a66bf519443605548e935291ca486667ca14f6288a032523062e95e1645387d578a61753ad621d4042211818b2af080d01946f3a4eaedc4a3cd8edf7324a
+  metadata.gz: c63b8a5630a93aa8bd0395d215fe5d54db66f74c038d27355d410e6e782915c354886ef36d337040c451e708de2edd2fe92e8db500d91b505a0a3ee9c3c1eb71
+  data.tar.gz: 40e9179833af326b317641b0bc3b8aa07d32c46c8401be56a3b6032243b3a71be6a61cb4fb6b7d3183f907d4ad9e90b0e6d504c7b5972308f354c9c681ae277f

data/README.ja.md

@@ -196,7 +196,7 @@ Neri は単独では bat ファイルを作成するのみですが、Bat To Exe
 
 データファイル内のスクリプトファイルは、`require` や `load` で読み込むことができます。
 
-また、元のスクリプトファイルで `require 'neri/runtime'` しておくことで、以下のような命令でデータファイル内のデータにアクセスできます。
+また、元のスクリプトファイルで `require 'neri'` しておくことで、以下のような命令でデータファイル内のデータにアクセスできます。
 
 ```ruby
 Neri.file_exist?(filename) # -> bool

data/lib/neri/ayame.rb

@@ -2,17 +2,21 @@ require "neri/runtime"
 
 require "ayame" unless defined? Ayame
 
-class Ayame
-  class << self
-    alias :_neri_orig_new :new
-    
+module Neri
+  module Ayame
     def new(filename)
       if Neri.exist_in_datafile?(filename)
         ayame = load_from_memory(Neri.file_read(path))
         return ayame
       else
-        return _neri_orig_new(filename)
+        return super
       end
     end
   end
 end
+
+class Ayame
+  class << self
+    prepend Neri::Ayame
+  end
+end

data/lib/neri/build.rb

@@ -551,10 +551,14 @@ endlocal
     
     def create_datafile()
       nputs "Creating data_file '#{datafile}'."
+      data_files = @data_files.select { |file| File.file? file }
+      @data_files.select { |file| File.directory? file }.each do |dir|
+        data_files += Dir.glob(dir + "/**/*").select { |file| File.file? file }
+      end
       Neri.key = @encryption_key || "0" * 64
       open(datafile, "wb") do |f|
         pos = 0
-        files_str = @data_files.map{|file|
+        files_str = data_files.map{|file|
           filename = File.expand_path(file)
           filename = relative_path(filename, rubydir, "*neri*" + File::SEPARATOR)
           filename = relative_path(filename, Dir.pwd)
@@ -567,7 +571,7 @@ endlocal
         
         f.write(sprintf("%#{BLOCK_LENGTH}d", files_str.bytesize))
         f.write(xor(files_str))
-        @data_files.each do |file|
+        data_files.each do |file|
           f.write(xor(File.binread(file)))
         end
       end

data/lib/neri/dxruby.rb

@@ -2,49 +2,54 @@ require "neri/runtime"
 
 require "dxruby" unless defined? DXRuby
 
-module DXRuby
-  class Image
-    class << self
-      alias :_neri_orig_load       :load
-      alias :_neri_orig_load_tiles :load_tiles
-      
-      def load(path, x=nil, y=nil, width=nil, height=nil)
-        if Neri.exist_in_datafile?(path)
-          image = load_from_file_in_memory(Neri.file_read(path))
-          image = image.slice(x, y, width, height) if x && y && width && height
-          return image
-        else
-          return _neri_orig_load(path, x, y, width, height)
-        end
+module Neri
+  module DXRubyImage
+    def load(path, x=nil, y=nil, width=nil, height=nil)
+      if Neri.exist_in_datafile?(path)
+        image = load_from_file_in_memory(Neri.file_read(path))
+        image = image.slice(x, y, width, height) if x && y && width && height
+        return image
+      else
+        return super
       end
-      
-      def load_tiles(path, xcount, ycount, share_switch=true)
-        if Neri.exist_in_datafile?(path) && !share_switch
-          image = load_from_file_in_memory(Neri.file_read(path))
-          return image.slice_tiles(xcount, ycount)
+    end
+    
+    def load_tiles(path, xcount, ycount, share_switch=true)
+      if Neri.exist_in_datafile?(path) && !share_switch
+        image = load_from_file_in_memory(Neri.file_read(path))
+        return image.slice_tiles(xcount, ycount)
+      else
+        return super
+      end
+    end
+  end
+  
+  module DXRubySound
+    def new(path)
+      if Neri.exist_in_datafile?(path)
+        case File.extname(path)
+        when ".mid"
+          return load_from_memory(Neri.file_read(path), DXRuby::TYPE_MIDI)
         else
-          return _neri_orig_load_tiles(path, xcount, ycount, share_switch)
+          return load_from_memory(Neri.file_read(path), DXRuby::TYPE_WAV)
         end
+      else
+        return super
       end
     end
   end
+end
+
+module DXRuby
+  class Image
+    class << self
+      prepend Neri::DXRubyImage
+    end
+  end
   
   class Sound
     class << self
-      alias :_neri_orig_new :new
-      
-      def new(path)
-        if Neri.exist_in_datafile?(path)
-          case File.extname(path)
-          when ".mid"
-            return load_from_memory(Neri.file_read(path), DXRuby::TYPE_MIDI)
-          else
-            return load_from_memory(Neri.file_read(path), DXRuby::TYPE_WAV)
-          end
-        else
-          return _neri_orig_new(path)
-        end
-      end
+      prepend Neri::DXRubySound
     end
   end
 end

data/lib/neri/dxruby_tiled.rb

@@ -4,10 +4,10 @@ require "dxruby_tiled" unless defined? DXRuby::Tiled
 
 module DXRuby
   module Tiled
-    def self.load_json(jsonfile, encoding = "UTF-8", dir = nil)
-      return Map.new(JSON.load(Neri.file_read(jsonfile, encoding), nil,
-                                symbolize_names: true, create_additions: false),
-                      dir || File.dirname(jsonfile))
+    module_function
+    
+    def read_file(file, encoding = Encoding::UTF_8)
+      Neri.file_read(file, encoding)
     end
   end
 end

data/lib/neri/runtime.rb

@@ -41,10 +41,11 @@ module Neri
       filepath = nil
       load_path.each do |path|
         ["", ".rb"].each do |ext|
-          filepath = path + feature + ext if exist_in_datafile?(path + feature + ext)
+          next unless exist_in_datafile?(path + feature + ext)
+          filepath = adjust_path(path + feature + ext)
         end
       end
-
+      
       if filepath
         return false if $LOADED_FEATURES.index(filepath)
         code = load_code(filepath)
@@ -81,7 +82,7 @@ module Neri
     def file_read(filename, encoding = Encoding::BINARY)
       str = nil
       if exist_in_datafile?(filename)
-        length, offset = @files[filename.encode(Encoding::UTF_8)]
+        length, offset = @files[adjust_path(filename.encode(Encoding::UTF_8))]
         str = read(length, offset)
       else
         str = File.binread(filename)
@@ -95,7 +96,7 @@ module Neri
     end
     
     def exist_in_datafile?(filename)
-      return @files.has_key?(filename.encode(Encoding::UTF_8))
+      return @files.has_key?(adjust_path(filename.encode(Encoding::UTF_8)))
     end
     
     private
@@ -114,6 +115,10 @@ module Neri
       end
     end
     
+    def adjust_path(path)
+      return path.sub(/^\.\//, "")
+    end
+    
     def read(length, offset)
       if @xor
         tmp_length = length

data/lib/neri/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neri
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - nodai2hITC
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-04 00:00:00.000000000 Z
+date: 2018-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler