mc_dot_art_maker 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 144001b6a79d4c4e769f79d4945856ba6378316d
-  data.tar.gz: fa4e456ade60eadeaafa495078341cad8c1dba22
+  metadata.gz: fe8bba8b3c0dd213bbc1373c7855a5e3e5d525ce
+  data.tar.gz: 1e9ef111cc8d79258a25cc2b3150b2008ab8fc69
 SHA512:
-  metadata.gz: de51d06a5c62a7dda4b4c086bbefb0ed1eb88aa08575e31d44e13129c6cdf309825f8ff167278c951952e17d071ccdc7ed30d57d37ac8a7851e7f1a74ab9cc19
-  data.tar.gz: fdc48d92deb4ab917cdbb8ebc71d1f5535424e87c3ca4d2f9595f62618ee5d9319aa3e1e0aec6470d64b8f6439ee3cff3ada893a2cd61279a3014f14bd2b8568
+  metadata.gz: b156b06c04153393b1538c8c333914112df2a3e27519d03a6a308212ae238b35054f276384ef44dea3900bad695cc09b8022deb0f91ed6e923dec4cc9008f733
+  data.tar.gz: 07e1adbf5b2a86e918f281528f0a188e53f9ce04de02349a4a6de90d7c90b7f6fddd96dc2dc24577aa17a1ebfeca5e460614695efa87cf595e271760be2c4f12

data/lib/mc_dot_art_maker/block_list.rb

@@ -1,9 +1,9 @@
 module MCDotArtMaker
   class BlockList
     include Enumerable
-    include Singleton
-    def initialize
-      @loader = MCDotArtMaker::TextureLoader.new
+    # include Singleton
+    def initialize(jar_path = nil)
+      @loader = MCDotArtMaker::TextureLoader.new(jar_path)
       @blocks = []
 
       # できるだけ多くのブロックを使ったバージョン

data/lib/mc_dot_art_maker/maker.rb

@@ -4,7 +4,7 @@ module MCDotArtMaker
   class Maker
     attr_reader :width, :height, :dots, :image
 
-    def initialize(filename_or_image,dither_method = RiemersmaDitherMethod)
+    def initialize(filename_or_image,dither_method: RiemersmaDitherMethod, jar_path: nil)
       @image =
         case filename_or_image
         when String
@@ -16,9 +16,10 @@ module MCDotArtMaker
 
       @schematic_helper = MCDotArtMaker::SchematicHelper.new
       @schematic_helper.read(File.expand_path('../seed.schematic', __FILE__))
-      @block_list = MCDotArtMaker::BlockList.instance
+      # @block_list = MCDotArtMaker::BlockList.instance
+      @block_list = MCDotArtMaker::BlockList.new(jar_path)
 
-      @calculation_count = 0 # 近似ブロック計算が終わったらインクリメント
+      @calculation_count = 0
       @is_locked = false
 
       MCDotArtMaker::Dot.set_color_palette(@block_list)
@@ -32,7 +33,7 @@ module MCDotArtMaker
     def manipulate
       check_not_locked
       image = yield @image
-      raise(ArgumentError,"Should return Magick::Image object") unless image.class == Magick::Image
+      raise(ArgumentError, "Should return Magick::Image object") unless image.class == Magick::Image
       @image = image
     end
 

data/mc_dot_art_maker.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
 	s.name = 'mc_dot_art_maker'
-	s.version = '0.4.0'
+	s.version = '0.4.1'
 	s.licenses = ['MIT']
 	s.summary = 'Dot Art Maker for Minecraft'
 	s.description = 'Converting images to mosaic arts using Minecraft textures and .schematic files.'
@@ -8,6 +8,8 @@ Gem::Specification.new do |s|
 	s.files = `git ls-files -z`.split("\x0")
 	s.homepage = 'https://github.com/Kumassy/MCDotArtMaker'
 
+	s.required_ruby_version = '>= 2.1.0'
+
 	s.add_development_dependency 'bindata'
 	s.add_development_dependency 'color-rgb'
 	s.add_development_dependency 'nbt_utils'

data/test/test_block_list.rb

@@ -3,15 +3,15 @@ require 'test/unit'
 
 class BlockListTest < Test::Unit::TestCase
   def setup
-    @block_list = MCDotArtMaker::BlockList.instance
+    @block_list = MCDotArtMaker::BlockList.new
   end
 
-  def test_singleton
-    assert_raise(NoMethodError){
-      MCDotArtMaker::BlockList.new
-    }
-    assert_equal(MCDotArtMaker::BlockList,@block_list.class)
-  end
+  # def test_singleton
+  #   assert_raise(NoMethodError){
+  #     MCDotArtMaker::BlockList.new
+  #   }
+  #   assert_equal(MCDotArtMaker::BlockList,@block_list.class)
+  # end
 
   def test_block_list
     assert_equal(58, @block_list.size)

data/test/test_dither_method.rb

@@ -15,7 +15,7 @@ class BlockPaletteTest < Test::Unit::TestCase
   end
   def setup
     METHODS.each do |m|
-      maker = MCDotArtMaker::Maker.new("test/images/src/test_image.jpg",m)
+      maker = MCDotArtMaker::Maker.new("test/images/src/test_image.jpg",dither_method: m)
       maker.texture_image.write "test/images/tmp/dither_methods_#{m}.png"
     end
   end

data/test/test_dot.rb

@@ -3,7 +3,7 @@ require 'test/unit'
 
 class DotTest < Test::Unit::TestCase
   def setup
-    @block_list = MCDotArtMaker::BlockList.instance
+    @block_list = MCDotArtMaker::BlockList.new
     MCDotArtMaker::Dot.set_color_palette(@block_list)
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mc_dot_art_maker
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Kumassy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-05 00:00:00.000000000 Z
+date: 2016-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata
@@ -172,7 +172,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="