readme and REST interface

Author: 5HT

.applist

@@ -1 +1 @@
-[kernel,stdlib,fs,crypto,compiler,syntax_tools,mnesia,ranch,gproc,cowlib,erlydtl,active,cowboy,n2o,markdown,kvs,mad,sh,uu]
+[kernel,stdlib,fs,crypto,compiler,syntax_tools,mnesia,ranch,gproc,cowlib,erlydtl,active,cowboy,n2o,markdown,kvs,mad,rest,sh,uu]

README.md

@@ -1,26 +1,14 @@
 Ukraine United
 ==============
 
-Media in Ukraine and especially in Russia is often purposefully
-inflammatory and divisive. Public does not trust it, yet readily
-consumes the programming where people with opposing political
-opinion get demonized and stigmatized. In-depth analysis in
-English is rare and often incomplete. Overall, as the conflict
-is escalating and the emotions are running high, people are
-rapidly losing the ability to listen to each other.
-
-Ukraine United has no precedent in the mainstream media,
-as it shows contemporary Ukraine from a unique perspective.
-It consists of interviews of people from every region of Ukraine,
-and from different social, religious, and political statuses.
-They speak about the Maidan revolution, the annexation of Crimea,
-the war in the Eastern Ukraine, and the possible resolution of this crisis.
-
-Ukraine United is a platform where people can read each other's
-opinion and realize that they can disagree but still find common
-ground. We want everyone to use their own judgement about the
-situation in Ukraine instead of consuming unprofessional reporting
-and blunt propaganda.
+Features
+--------
+
+* N2O DTL/SPA Application
+* Static HTML Generation
+* Static JSON Generation with REST transformation
+* Active Reloading
+* Built-in Web Server
 
 Prerequisites
 -------------
@@ -37,11 +25,67 @@ Start
 
 And open it in browser [http://localhost:8820](http://localhost:8820)
 
+Usage
+-----
+
+From Erlang:
+
+```erlang
+> interview:get("2014-12.oleg-gubar.en").
+#interview{id = "2014-12.oleg-gubar.en",date = "2014-12",
+           title = undefined,
+           text = <<"Oleg Gubar\nOdessa\nHistorian of the City of Odessa\n\nIn general, I don’t concern myself with polit"/utf8...>>,
+           author = "oleg-gubar"}
+
+> uu:ls().
+[{"2014-07","andrey-volokita","en"},
+ {"2014-07","arina-koltsova","en"},
+ {"2014-12","oleg-gubar","en"}]
+
+> uu:time().
+[{"2013-11-21",<<"Mustafa Nayem issued a call to">>},
+ {"2013-11-22",<<"The number of people increases">>},
+ {"2013-11-23",<<"To install the city New Year t">>},
+ {"2013-11-24",<<"The tent camp is installed at ">>},
+ {"2013-11-25",<<"The tent camp continues to exi">>},
+ {"2013-11-26",<<"The association of two “maid"/utf8>>},
+ {"2014-1-19",<<"About 100 – 500 of demon"/utf8...>>},
+ {"2014-1-20",<<"The opposition on Hr"...>>},
+ {"2014-1-22",<<"The activists Se"...>>},
+ {"2014-1-10",<<"Prime Minist"...>>},
+ {"2014-2-12",<<"Yanukovy"...>>},
+ {"2014-2-17",<<"“Rig"/utf8...>>},
+ {"2014-2-18",<<...>>},
+ {[...],...},
+ {...}|...]
+
+> interview:get().
+[#interview{id = "2014-07.andrey-volokita.en",
+            date = "2014-07",title = undefined,
+            text = <<"Andrey Volokita\nKharkiv\nEnterpreneur\n\nThe views of Kharkovites [citizens of Kharkov, a city "...>>,
+            author = "andrey-volokita"},
+ #interview{id = "2014-07.arina-koltsova.en",
+            date = "2014-07",title = undefined,
+            text = <<"Arina Koltsova\nKiev\nHead of the “Samooborona” of Solomyansky district of Kiev\n\nI arrived"/utf8...>>,
+            author = "arina-koltsova"},
+ #interview{id = "2014-12.oleg-gubar.en",date = "2014-12",
+            title = undefined,
+            text = <<"Oleg Gubar\nOdessa\nHistorian of the City of Odessa\n\nIn general, I don’t concern mysel"/utf8...>>,
+            author = "oleg-gubar"}]
+```
+
+From REST clients:
+
+```sh
+$ curl -I -X GET http://localhost:8820/json/en/2014-07.andrey-volokita.json
+$ curl -I -X GET http://localhost:8820/rest/interview/2014-12.oleg-gubar.en
+$ curl -I -X GET http://localhost:8820/static/interviews/2014-12.oleg-gubar.en.txt
+$ curl -I -X GET http://localhost:8820/static/timeline/2013-11/21-en.txt
+```
+
 Credits
 -------
 
 * Dima Gavrysh
 * Yurii Artyukh
 * Maxim Sokhatsky
-
-

priv/templates/article.dtl

@@ -14,6 +14,7 @@
 <div class=app>
                                         <div align=right>FROM: {{from}}<br>
                                                    PROFESSION: {{to}}<br>
+                                                         JSON: {{json}}<br>
                                                          DATE: {{date}}</div>
                                    {{image}}
      {{body}}

rebar.config

@@ -1,6 +1,7 @@
 {deps_dir, "deps"}.
 {deps, [
     {active,  ".*", {git, "git://github.com/synrc/active", "HEAD"}},
+    {rest,    ".*", {git, "git://github.com/synrc/rest", "HEAD"}},
     {kvs,     ".*", {git, "git://github.com/synrc/kvs", "HEAD"}},
     {erlmarkdown,".*",{git,"git://github.com/erlware/erlmarkdown", "HEAD"}},
     {n2o,     ".*", {git, "git://github.com/5HT/n2o", "HEAD"}}

src/pages/article.erl

@@ -4,26 +4,33 @@
 -include("uu.hrl").
 
 main() ->
-   Author = wf:to_list(wf:q(author)),
-   Date  = wf:to_list(wf:q(date)),
+   Author   = wf:to_list(wf:q(author)),
+   Date     = wf:to_list(wf:q(date)),
    Language = wf:to_list(wf:q(locale)),
    generate(Author,Date,wf:atom([Language])).
 
 generate(Author,Date,Language) ->
-   %io:format("Article Generate: ~p~n",[{Author,Date,Language}]),
-   [Name,Surname] = string:tokens(Author,"-"),
-   {_,#user{name=FullName,city=City,profession=Profession,photo=Photo}} = uu_people:lookup({Author,Language}),
-   {ok,Body} = file:read_file(lists:concat(["priv/static/interviews/",Date,".",Author,".",Language,".txt"])),
-   #dtl{file=article,app=uu,bindings=[{body,markdown:conv_utf8(binary_to_list(Body))},
-                                      {date,Date},
-                                      {from,FullName},
-                                      {to,Profession},
-                                      {image,image(Author,Date)}]}.
+    %io:format("Article Generate: ~p~n",[{Author,Date,Language}]),
+    [Name,Surname] = string:tokens(Author,"-"),
+    {_,#user{name=FullName,city=City,profession=Profession,photo=Photo}} 
+      = uu_people:lookup({Author,Language}),
 
-image(Author,Date) -> [#br{},#image{src=lists:concat(["/static/people/",Author,"/image.jpg"]),width="100%"}].
+    {ok,Body} = file:read_file(lists:concat(["priv/static/interviews/",Date,".",Author,".",Language,".txt"])),
+    JSON = lists:concat(["/json/",Language,"/",Date,".",Author,".json"]),
+    #dtl{file=article,
+         app=uu,
+         bindings=[{body,markdown:conv_utf8(binary_to_list(Body))},
+                   {date,Date},
+                   {json,wf:render(#link{body=JSON,href=JSON})},
+                   {from,FullName},
+                   {to,Profession},
+                   {image,image(Author,Date)}]}.
+
+image(Author,Date) ->
+   [#br{},
+    #image{src=lists:concat(["/static/people/",Author,"/image.jpg"]),width="100%"}].
 
 event(init) ->
-   wf:update(body, #label{body= <<"Україна"/utf8>>}  ),
    wf:info(?MODULE,"Init",[]);
 
 event(_) -> ok.

src/pages/index.erl

@@ -4,33 +4,48 @@
 -include("uu.hrl").
 
 lang() -> string:to_lower(wf:to_list([wf:lang()])).
-main() -> #dtl{file=index,app=uu,bindings=[{news,fetch(news)},
-                                           {body,body()},
-                                           {interviews,fetch(interviews)}]}.
+main() -> #dtl{file=index,
+               app=uu,
+               bindings=[{news,fetch(news,lang(),fun update_file/1)},
+                         {body,body()},
+                         {interviews,fetch(interviews,lang(),fun update_file/1)}]}.
 
-body() ->
-   {_,#user{name=FullName,city=City,profession=Profession,photo=Photo}} =
-                        uu_people:lookup({"dima-gavrysh",wf:to_atom([lang()])}),
-   [ #image{src=Photo},#h2{body=FullName},#panel{body=Profession} ].
+body() -> {_,#user{name=FullName,city=City,profession=Profession,photo=Photo}}
+          = uu_people:lookup({"dima-gavrysh",wf:to_atom([lang()])}),
+        [ #image{src=Photo},#h2{body=FullName},#panel{body=Profession} ].
 
-
-fetch(Name) ->
-    Lang = lang(),
+fetch(Name, Lang, UpdateFile) ->
     List = lists:flatten([ begin
        case string:tokens(F,".") of
-         [D,A,L,"txt"] when L == Lang -> update_file([D,A,L]);
-                    _  -> [] end
-    end || F <- filelib:wildcard(lists:concat(["priv/static/",Name,"/*.txt"])) ]).
+         [D,A,L,"txt"] when L == Lang -> UpdateFile([D,A,L]);
+                    _  -> [] end end
+     || F <- filelib:wildcard(lists:concat(["priv/static/",Name,"/*.txt"])) ]).
 
 update_file([D,A,L]) ->
-    X=string:tokens(D,"/"),
     Language = wf:atom([L]),
-    File = lists:concat([string:join(tl(X),"/"),".",A,".",L,".htm"]),
-    Article = article:generate(A,lists:last(X),Language),
+    X=string:tokens(D,"/"),
+    Date = lists:last(X),
+
+    JSON = lists:concat(["json/",L,"/",Date,".",A,".json"]),
+    HTML = lists:concat(["static/interviews/",L,"/",Date,".",A,".htm"]),
+    Text = lists:concat(["static/interviews/",Date,".",A,".",L,".txt"]),
+
+    io:format("JSON: ~p~n",[JSON]),
+    io:format("HTML: ~p~n",[HTML]),
+    io:format("Text: ~p~n",[Text]),
+
+    {ok,Bin} = file:read_file(hd(X)++"/"++Text),
+    Article = article:generate(A,Date,Language),
     Render = wf:render(Article),
-    file:write_file(lists:concat([hd(X),"/",File]),Render),
-    io:format("HTM updated: ~p~n",[lists:concat([hd(X),"/",File])]),
-    article_link({lists:last(X),A,Language,File}).
+
+    file:write_file(lists:concat([hd(X),"/",HTML]),Render),
+    file:write_file(lists:concat([hd(X),"/",JSON]),
+         iolist_to_binary(
+         n2o_json:encode(
+         interview:to_json(#interview{id=string:join([Date,A,L],"."),date=Date,text=Bin,author=A})))),
+
+    io:format("HTM updated: ~p~n",[lists:concat([hd(X),"/",HTML])]),
+    article_link({lists:last(X),A,Language,HTML}).
 
 article_link({Date,Author,Language,File}) ->
     case uu_people:lookup({Author,Language}) of
@@ -40,8 +55,5 @@ article_link({Date,Author,Language,File}) ->
                            href=File}]);
          _ -> [] end.
 
-event(init) ->
-   wf:update(body, #label{body= <<"Україна"/utf8>>}  ),
-   wf:info(?MODULE,"Init",[]);
-
+event(init) -> wf:info(?MODULE,"Init",[]);
 event(_) -> ok.

src/uu.erl

@@ -1,10 +1,13 @@
 -module(uu).
 -export([active/1]).
+-include("uu.hrl").
 -compile(export_all).
 
+languages() -> [en,ua,ru].
+
 % Active File System Update
 
-active(["deps"|_]) -> ok;
+%active(["deps"|_]) -> ok;
 active(File) ->
     Last   = lists:last(File),
     Tokens = string:tokens(Last,"."),
@@ -22,15 +25,27 @@ active(File) ->
          {_,_} ->  wf:info(?MODULE,"Active Ignore: ~p~n",[File]),
                    active:otp(File) end.
 
-online()       -> ets:select(gproc,fun2ms_all()).
-online_count() -> ets:select_count(gproc,fun2ms_count()).
-fun2ms_all()   -> ets:fun2ms(fun({{{_,_,broadcast},_},D,E}) -> {D,E} end).
-fun2ms_count() -> ets:fun2ms(fun({{{_,_,broadcast},_},D,E}) -> true end).
+% ls - list interviews
+% timeline(ua) -- show timeline event in UA locale
+
+ls()       -> ls(en).
+time()     -> time(en).
+ls(Lang)   -> index:fetch(interviews,wf:to_list(Lang),fun([A,B,C]) -> {lists:last(string:tokens(A,"/")),B,C} end).
+time(Lang) ->
+  [{ lists:concat([Y,"-",M,"-",D]),
+     case unicode:characters_to_binary(
+          binary:part(Text,{0,erlang:min(size(Text),
+          case Lang of en -> 30; _ -> 55 end)})) of
+          {incomplete,B,_} -> B;
+                         E -> E end }
+  || {{{Y,M,D},L},Text} <- uu_timeline:all(), L == Lang ].
 
-log_modules() -> [uu,uu_timeline,index,article,n2o_websocket].
+log_modules() -> [uu,uu_timeline,index,article,interview,n2o_websocket].
 main(A) -> mad_repl:main(A,[]).
 main() -> [].
 event(_) -> ok.
 
-timeline(Lang) -> [ X || {{_,L},_}=X <- uu_timeline:all(), L == Lang ].
-
+online()       -> ets:select(gproc,fun2ms_all()).
+online_count() -> ets:select_count(gproc,fun2ms_count()).
+fun2ms_all()   -> ets:fun2ms(fun({{{_,_,broadcast},_},D,E}) -> {D,E} end).
+fun2ms_count() -> ets:fun2ms(fun({{{_,_,broadcast},_},D,E}) -> true end).

src/uu_sup.erl

@@ -7,24 +7,31 @@ start_link() -> supervisor:start_link({local, ?MODULE}, ?MODULE, []).
 cron(Key) -> {Key,{cron,start_link,[Key]},permanent,2000,worker,[cron]}.
 
 init([]) ->
-
-    wf:info(?MODULE,"~nUnitedUkraine.org WebSocket Server~n",[]),
+    wf:info(?MODULE,"~nN2O WebSocket Server~n",[]),
 
     {ok, _} = cowboy:start_http(http, 100, [{port, wf:config(n2o,port)}],
                                            [{env, [{dispatch, dispatch_rules()}]}]),
 
     kvs:join(),
+
+    [ begin  filelib:ensure_dir(lists:concat(["priv/static/interviews/",Lang,"/"])),
+             filelib:ensure_dir(lists:concat(["priv/json/",Lang,"/"]))
+      end || Lang <- uu:languages() ],
+
     [ ets:insert(globals,X) || X <- uu_people:all() ],
     [ ets:insert(globals,X) || X <- uu_timeline:all() ],
+
     {ok, {{one_for_one, 5, 10}, []}}.
 
 mime() -> [{mimetypes,cow_mimetypes,all}].
 
 dispatch_rules() ->
     cowboy_router:compile(
         [{'_', [
-            {"/static/[...]", n2o_dynalo, {dir, "priv/static", mime()}},
-            {"/n2o/[...]", n2o_dynalo, {dir, "deps/n2o/priv", mime()}},
-            {"/ws/[...]", bullet_handler, [{handler, n2o_bullet}]},
-            {'_', n2o_cowboy, []}
-    ]}]).
+            {"/static/[...]", n2o_dynalo,     {dir, "priv/static",   mime()}},
+            {"/json/[...]",   n2o_dynalo,     {dir, "priv/json",     mime()}},
+            {"/n2o/[...]",    n2o_dynalo,     {dir, "deps/n2o/priv", mime()}},
+            {"/rest/:resource",     rest_cowboy, []},
+            {"/rest/:resource/:id", rest_cowboy, []},
+            {"/ws/[...]",     bullet_handler, [{handler, n2o_bullet}]},
+            {'_',             n2o_cowboy,     []}]}]).