Merge branch 'master' of github.com:synrc/nitro

.travis.yml

@@ -0,0 +1,4 @@
+language: erlang
+otp_release:
+  - 19.3
+script: "curl -fsSL https://raw.github.com/synrc/mad/master/mad > mad && chmod +x mad && ./mad dep com"

README.md

@@ -1,6 +1,8 @@
 NITRO: Erlang Records DSL for HTML5
 ===================================
 
+[![Build Status](https://travis-ci.org/synrc/nitro.svg?branch=master)](https://travis-ci.org/synrc/nitro)
+
 Features
 --------
 

rebar.config

@@ -1,2 +1,3 @@
 {lib_dirs,[".."]}.
+{erl_opts, [nowarn_export_all,nowarn_deprecated_function]}.
 {deps, []}.

src/elements/element_script.erl

@@ -31,4 +31,4 @@ render_element(Record) ->
     wf_tags:emit_tag(<<"script">>,
       case Record#script.src of
            [] -> nitro:render(case Record#script.body of undefined -> []; B -> B end);
-           X -> [] end, List).
+           _ -> [] end, List).

src/nitro.erl

@@ -5,8 +5,6 @@
 -behaviour(application).
 -export([start/2, stop/1, init/1]).
 
--record(ev,      { module, msg, trigger, name }).
-
 start(_StartType, _StartArgs) -> supervisor:start_link({local, ?MODULE}, ?MODULE, []).
 stop(_State) -> ok.
 init([]) -> {ok, {{one_for_one, 5, 10}, []}}.

src/nitro_static.erl

@@ -53,7 +53,7 @@ last_modified(Req, State={_, {ok, #file_info{mtime=Modified}}, _}) -> {Modified,
 get_file(Req, State={P, {ok, #file_info{size=_Size}}, _}) ->
     Path = fixpath(P),
     StringPath = nitro:to_list(unicode:characters_to_binary(Path,utf8,utf8)),
-    [_Type,Name|RestPath]=SplitPath = filename:split(StringPath),
+    [_Type,Name|RestPath] = filename:split(StringPath),
     FileName = filename:absname(StringPath),
     Raw = case file:read_file(FileName) of
           {ok,Bin} -> Bin;

src/render/wf_tags.erl

@@ -3,7 +3,7 @@
 -include_lib("nitro/include/nitro.hrl").
 -compile(export_all).
 -define(VOID(Tag),  (Tag == <<"br">>     orelse Tag == <<"hr">>
-              orelse Tag == <<"link">>   orelse Tag == <<"img">> 
+              orelse Tag == <<"link">>   orelse Tag == <<"img">>
               orelse Tag == <<"input">>  orelse Tag == <<"link">>
               orelse Tag == <<"meta">>   orelse Tag == <<"param">>
               orelse Tag == <<"base">>   orelse Tag == <<"area">>
@@ -13,7 +13,7 @@
 emit_tag(TagName, Props) -> [<<"<">>,TagName] ++ write_props(Props) ++ [<<"/>">>].
 emit_tag(TagName, undefined, Props) -> emit_tag(TagName, [], Props);
 emit_tag(TagName, [undefined], Props) -> emit_tag(TagName, [], Props);
-emit_tag(TagName, [], Props) when ?VOID(TagName) -> emit_tag(TagName, Props);
+emit_tag(TagName, <<>>, Props) when ?VOID(TagName) -> emit_tag(TagName, Props);
 emit_tag(TagName, [], Props) -> [<<"<">>,TagName,write_props(Props),<<">">>,<<"</">>,TagName,<<">">>];
 emit_tag(TagName, Content, Props) -> [<<"<">>,TagName,write_props(Props),<<">">>, Content,<<"</">>,TagName,<<">">>].
 write_props(Props) -> lists:map(fun display_property/1, Props).