lisp-rails-view 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbdddd6688a527855ed9e36b3219ae465820bbaa
-  data.tar.gz: 09f2e4529a22af4ebccd5e28e8b6269a2b6778d9
+  metadata.gz: c891454d8f24a05a1afa27024b8f96d530c6a10c
+  data.tar.gz: de3093264b3b1c573da4ffcb3b2dcdfe9631fe6c
 SHA512:
-  metadata.gz: a98ac529566451e8d0490ed66f4d5ab2c4e7e58b963d6645815402529c7d1fe6fb8fdcbd9bf3ebcd314c3da3c39dac234cf9ff5c1a25753502ba78bd013891b1
-  data.tar.gz: 102a8232c486c37e09d543190b0f375a752bfaf5d6adeb087019632e7b3f33931b4135e65b1e8223c60f47b9cfd772817ed8bb595358089345eea7282538dc9f
+  metadata.gz: 6793b7ca79b2c2e7ddb545ee63b8be73c176824e18578997e526171deaa7ac15c01a6e0d2fe9b1ce84ca45929b74f81868ad7dd36ba1ff62f48674c9a8e50bcf
+  data.tar.gz: ba59381c86e285af79ce1aae879a674f239bc666a205b43b7564c73018f36d509f8146962b3560e50eeff1e693ec367379d27fe3aa7489516022945a09fdb069

data/examples/_partial.html.lisp

@@ -1 +1,5 @@
 (:p "パーシャルの中です。まみむめも。")
+(:div#main
+ (:h3.title "title")
+ (:p#foo.bar "Hello"))
+

data/examples/index.html.lisp

@@ -1,4 +1,4 @@
-(:h1.title "lisp-rails-view Lisp ビューを書く")
+(:h1.title "lisp-rails-view Lisp でビューを書く")
 
 (:h2 "イストール")
 
@@ -28,6 +28,8 @@
 
 (:p "エスケープされるはず。<script>alert(\"hello\");</script>&\"'")
 
+(:p#<x>.<y> :data-foo "<z>" "<&\"'>")
+
 (:h3 "Ruby のコード")
 
 (:p "ふつうに . かスペースです。")
@@ -72,7 +74,7 @@
 
 (:h3 "render")
 
-(:p "パーシャばもなんとか。")
+(:p "パーシャルもなんとか。")
 
 (:p (:pre "(= render (\"partial\"))"))
 (= render ("partial"))

data/lib/lisp-rails-view.rb

@@ -15,7 +15,7 @@ module LispRailsView
 
     def self.call(template)
       file = template.identifier
-      x = `sbcl --script #{LISP} #{file}`
+      x = `LANG=ja_JP.UTF-8 sbcl --script #{LISP} #{file}`
       code = <<EOT
 [].tap do |b__|
 def b__.push(x)
@@ -28,7 +28,7 @@ def b__.push(x)
   end
 end
 #{x}
-end.flatten.join.html_safe
+end.flatten
 EOT
       Rails.logger.debug('$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$')
       Rails.logger.debug(code)
@@ -36,4 +36,17 @@ EOT
       code
     end
   end
+
+  module Helper
+    def _layout_for(name=nil)
+      name ||= :layout
+      view_flow.get(name)
+    end
+  end
+end
+
+module ActionView
+  class Base
+    include LispRailsView::Helper
+  end
 end

data/lib/lisp-rails-view/version.rb

@@ -1,3 +1,3 @@
 module LispRailsView
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/lisp/lisp-rails-view.lisp

@@ -1,27 +1,43 @@
 (defpackage :lisp-rails-view
-  (:use :cl))
+  (:use :cl)
+  (:shadow :#=))
 
 (in-package :lisp-rails-view)
 
 (defvar *buffer* nil)
 
-(defclass raw ()
+(defclass ruby-code ()
   ((value :initarg :value :accessor value)))
 
-(defclass raw= (raw) ())
+(defclass =ruby-code (ruby-code) ())
 
 (defclass html-safe ()
   ((value :initarg :value :accessor value)))
 
-(defun raw (x)
-  (make-instance 'raw :value x))
+(defun ruby-code (x)
+  (make-instance 'ruby-code :value x))
 
-(defun raw= (x)
-  (make-instance 'raw= :value x))
+(defun =ruby-code (x)
+  (make-instance '=ruby-code :value x))
 
 (defun html-safe (x)
   (make-instance 'html-safe :value x))
 
+(defun escape (thing)
+  (with-output-to-string (out)
+    (loop for c across (princ-to-string thing)
+          do (cond ((char= #\& c)
+                    (write-string "&" out))
+                   ((char= #\< c)
+                    (write-string "&lt;" out))
+                   ((char= #\> c)
+                    (write-string "&gt;" out))
+                   ((char= #\" c)
+                    (write-string "&quot;" out))
+                   ((char= #\' c)
+                    (write-string "&#x27;" out))
+                   (t (write-char c out))))))
+
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (defmacro with-reader (&body body)
     `(let ((*readtable* (copy-readtable nil)))
@@ -39,9 +55,31 @@
           do (%eval form))))
 
 (defun flush-buffer (stream)
-  ;;TODO constant の連結
-  (loop for x in (nreverse *buffer*)
-        do (format stream "~a~%" (to-ruby-exp x))))
+  (let (buffer)
+    (labels ((<< (x)
+               (setf buffer
+                     (if buffer
+                         (html-safe
+                          (concatenate 'string (value buffer)
+                                       (if (stringp x)
+                                           (escape x)
+                                           (value x))))
+                         (if (stringp x)
+                             (html-safe (escape x))
+                             x))))
+             (flush ()
+               (when buffer
+                 (%write buffer)
+                 (setf buffer nil)))
+             (%write (x)
+               (format stream "~a~%" (to-ruby-exp x))))
+      (loop for i in (nreverse *buffer*)
+            do (typecase i
+                 ((or string html-safe) (<< i))
+                 (t
+                  (flush)
+                  (%write i))))
+      (flush))))
 
 (defun emit (x)
   (push x *buffer*))
@@ -71,10 +109,10 @@
 (defmethod to-ruby-exp ((x number))
   (to-ruby-exp (princ-to-string x)))
 
-(defmethod to-ruby-exp ((x raw))
+(defmethod to-ruby-exp ((x ruby-code))
   (value x))
 
-(defmethod to-ruby-exp ((x raw=))
+(defmethod to-ruby-exp ((x =ruby-code))
   (format nil "b__.push(~a)" (value x)))
 
 (defmethod to-ruby-exp ((x html-safe))
@@ -88,14 +126,14 @@
 
 (defmethod %eval ((x cons))
   (cond ((eq '= (car x))
-         (emit (raw= (make-ruby-form (cdr x) t))))
+         (emit (=ruby-code (make-ruby-form (cdr x) t))))
         ((keywordp (car x))
          (process-tag x))
         ((and (symbolp (car x))
               (fboundp (car x)))
          (emit (eval x)))
         (t
-         (emit (raw (make-ruby-form x))))))
+         (emit (ruby-code (make-ruby-form x))))))
 
 (defun process-tag (form)
   (multiple-value-bind (tag id classes) (parse-tag (car form))
@@ -109,15 +147,15 @@
       (emit (html-safe (with-output-to-string (out)
                          (format out "<~a" tag)
                          (when id
-                           (format out " id=\"~a\"" id))
+                           (format out " id=\"~a\"" (escape id)))
                          (when classes
-                           (format out " class=\"~{~a~^ ~}\"" classes))
+                           (format out " class=\"~{~a~^ ~}\"" (mapcar #'escape classes)))
                          (loop for (k . v) in attributes do
                            (if (constantp v)
                                (if (eq v t)
-                                   (format out " ~a" k)
-                                   (format out " ~a=\"~a\"" k v))
-                               (format out "#{~a == true ? \"~a\" : \"~a=\"~a\"\"}" v k k v)))
+                                   (format out " ~a" (escape k))
+                                   (format out " ~a=\"~a\"" (escape k) (escape v)))
+                               (format out "#{~a == true ? \" ~a\" : \" ~a=\"~a\"\"}" v k k v)))
                          (if /-p
                              (write-string " />" out)
                              (write-string ">" out)))))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lisp-rails-view
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - TAHARA Yoshinori
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-08 00:00:00.000000000 Z
+date: 2015-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler