[nongnu] elpa/pacmacs 04f7ce0793 464/472: Merge pull request #210 from codingteam/refactor/rename-image-module

[ELPA Syncer]

branch: elpa/pacmacs
commit 04f7ce079313a53f8d660b8729f908737863c233
Merge: c6436982fe d47f57fa86
Author: Alexey Kutepov <reximkut@gmail.com>
Commit: Alexey Kutepov <reximkut@gmail.com>

    Merge pull request #210 from codingteam/refactor/rename-image-module
    
    Rename image module to walls module
---
 pacmacs-anim.el                                       |  5 ++++-
 pacmacs-render.el                                     |  5 ++++-
 pacmacs-image.el => pacmacs-walls.el                  | 10 ++--------
 pacmacs.el                                            |  2 +-
 test/pacmacs-anim-test.el                             |  5 +++++
 test/pacmacs-render-test.el                           |  6 ++++++
 test/{pacmacs-image-test.el => pacmacs-walls-test.el} | 12 ------------
 7 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/pacmacs-anim.el b/pacmacs-anim.el
index efcdda75e6..4f90abb721 100644
--- a/pacmacs-anim.el
+++ b/pacmacs-anim.el
@@ -35,9 +35,12 @@
 (require 'json)
 (require 'dash)
 
-(require 'pacmacs-image)
+(require 'pacmacs-walls)
 (require 'pacmacs-utils)
 
+(defun pacmacs-load-image (filename)
+  (create-image filename 'xpm nil :heuristic-mask t))
+
 (defun pacmacs-make-anim (frames sprite-sheet)
   (list :frames frames
         :current-frame 0
diff --git a/pacmacs-render.el b/pacmacs-render.el
index 7c996a9b01..9d6328fe9f 100644
--- a/pacmacs-render.el
+++ b/pacmacs-render.el
@@ -32,7 +32,7 @@
 
 ;;; Code:
 
-(require 'pacmacs-image)
+(require 'pacmacs-walls)
 (require 'pacmacs-anim)
 (require 'pacmacs-board)
 
@@ -44,6 +44,9 @@
      (let ((inhibit-read-only t))
        ,@body)))
 
+(defun pacmacs-insert-image (resource resource-vector)
+  (insert-image resource " " nil resource-vector))
+
 (defun pacmacs--render-empty-cell ()
   (pacmacs-insert-image (pacmacs--create-wall-tile
                          40 40
diff --git a/pacmacs-image.el b/pacmacs-walls.el
similarity index 96%
rename from pacmacs-image.el
rename to pacmacs-walls.el
index 6f2e3d25aa..77c72b223e 100644
--- a/pacmacs-image.el
+++ b/pacmacs-walls.el
@@ -1,4 +1,4 @@
-;;; pacmacs-image.el --- Pacman for Emacs -*- lexical-binding: t -*-
+;;; pacmacs-walls.el --- Pacman for Emacs -*- lexical-binding: t -*-
 
 ;; Copyright (C) 2015 Codingteam
 
@@ -47,12 +47,6 @@
   (interactive)
   (clrhash pacmacs--wall-tiles-cache))
 
-(defun pacmacs-load-image (filename)
-  (create-image filename 'xpm nil :heuristic-mask t))
-
-(defun pacmacs-insert-image (resource resource-vector)
-  (insert-image resource " " nil resource-vector))
-
 (defun pacmacs--put-wall-tile-corner (bits row column weight weights-to-color)
   (dotimes (i weight)
     (dotimes (j weight)
@@ -229,6 +223,6 @@ size of the tile. All the created tiles are cached."
                                'xpm t))
                pacmacs--wall-tiles-cache))))
 
-(provide 'pacmacs-image)
+(provide 'pacmacs-walls)
 
 ;;; pacmacs-anim.el ends here
diff --git a/pacmacs.el b/pacmacs.el
index 488bb3e4cc..bd2b2455fd 100644
--- a/pacmacs.el
+++ b/pacmacs.el
@@ -44,7 +44,7 @@
 
 (require 'pacmacs-anim)
 (require 'pacmacs-board)
-(require 'pacmacs-image)
+(require 'pacmacs-walls)
 (require 'pacmacs-utils)
 (require 'pacmacs-render)
 (require 'pacmacs-score)
diff --git a/test/pacmacs-anim-test.el b/test/pacmacs-anim-test.el
index b4465ce23e..d057be4df4 100644
--- a/test/pacmacs-anim-test.el
+++ b/test/pacmacs-anim-test.el
@@ -1,3 +1,8 @@
+(ert-deftest pacmacs-load-image-test ()
+  (with-mock
+   (mock (create-image "pew" 'xpm nil :heuristic-mask t) => 42 :times 1)
+   (should (= 42 (pacmacs-load-image "pew")))))
+
 (ert-deftest pacmacs-make-anim-test ()
   (should (equal (list :frames (list 1 2 3 4 5)
                        :current-frame 0
diff --git a/test/pacmacs-render-test.el b/test/pacmacs-render-test.el
index 599bf3cc16..58bc7b6d19 100644
--- a/test/pacmacs-render-test.el
+++ b/test/pacmacs-render-test.el
@@ -1,3 +1,9 @@
+(ert-deftest pacmacs-insert-image-test ()
+  (let ((resource "khooy")
+        (resource-vector "pew"))
+    (with-mock
+     (mock (insert-image resource " " nil resource-vector) => 42 :times 1)
+     (should (= 42 (pacmacs-insert-image resource resource-vector))))))
 
 (ert-deftest pacmacs--render-track-board-test ()
   (let ((track-board (pacmacs--make-board 2 2)))
diff --git a/test/pacmacs-image-test.el b/test/pacmacs-walls-test.el
similarity index 90%
rename from test/pacmacs-image-test.el
rename to test/pacmacs-walls-test.el
index e5aea1c6e6..5e9c1a2826 100644
--- a/test/pacmacs-image-test.el
+++ b/test/pacmacs-walls-test.el
@@ -1,15 +1,3 @@
-(ert-deftest pacmacs-load-image-test ()
-  (with-mock
-   (mock (create-image "pew" 'xpm nil :heuristic-mask t) => 42 :times 1)
-   (should (= 42 (pacmacs-load-image "pew")))))
-
-(ert-deftest pacmacs-insert-image-test ()
-  (let ((resource "khooy")
-        (resource-vector "pew"))
-    (with-mock
-     (mock (insert-image resource " " nil resource-vector) => 42 :times 1)
-     (should (= 42 (pacmacs-insert-image resource resource-vector))))))
-
 (ert-deftest pacmacs--put-wall-tile-corner-test ()
   (let ((input-wall-tile [[nil nil nil]
                           [nil nil nil]