lipa-web 0.1.1 → 0.2.0

data/lib/lipa/web/helpers/{html_helper.rb → response.rb}

@@ -25,14 +25,13 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 module Lipa
   module Web
-    module HtmlHelper
-      # Make link for node
-      #
-      # @param node [Lipa::Node] linking node
-      # @return [String] html <a href='path/to/node'>name_of_node</a>
-      def link_to(node)
-        %(<a href="#{node.full_name}">#{node.name}</a>)
+     module Helpers
+       module Response
+        def read_template(path)
+          File.open(path).read
+        end
       end
     end
   end
 end
+ 

data/lib/lipa/web/response.rb

@@ -0,0 +1,49 @@
+=begin
+Web access to Lipa
+
+Copyright (c) 2011 Aleksey Timin
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+=end
+
+require "lipa/web/response/html"
+require "lipa/web/response/json"
+require "lipa/web/response/xml"
+
+module Lipa
+  module Web
+     module Response
+       # Rendering node data in format
+       # 
+       # @param node [Lipa::Node] node for rendering
+       # @param format of rendering 
+      def respond(node, format)
+        case format.to_s 
+        when "json"
+          JSON::response(node)
+        when "xml"
+          XML::response(node)
+        else
+          HTML::response(node)
+        end
+      end
+    end
+  end
+end

data/lib/lipa/web/response/html.rb

@@ -0,0 +1,90 @@
+=begin
+Web access to Lipa
+
+Copyright (c) 2011 Aleksey Timin
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+=end
+
+module Lipa
+  module Web
+    module Response
+      module HTML
+        extend Helpers::Response
+
+        def self.response(node)
+          header = {}
+          
+          html = node.html
+          if html
+            if html[:block]
+              body = html[:block].call
+            else
+              case html[:render]
+              when :erb
+                body = render_erb(node)
+                header["Content-Type"] = "text/html"
+              when :text
+                body = html[:msg]
+                header["Content-Type"] = "text/plain"
+              end
+            end
+          else
+            body = render_default_template(node)
+          end
+          [ 200, header, [body]]
+        end
+
+        private
+        def self.context(node)
+          node.instance_eval("def binding_for(#{node.attrs.keys.join(",")}) binding; end")
+          node.extend(Helpers::HTML)
+          block = block_given? ? Proc.new : nil
+          node.binding_for(*node.eval_attrs.values, &block)
+        end
+
+        def self.render_default_template(node)
+          path = File.join(File.dirname(__FILE__), '..', 'views', 'node.html.erb') # default path
+          default_template = read_template(path)
+
+          path = File.join(File.dirname(__FILE__), '..', 'views', 'layout.html.erb') # default path
+          default_layout = read_template(path)
+
+          ERB.new(default_layout).result(
+            context(node) do
+              ERB.new(default_template).result(context(node)) 
+            end
+          )
+        end
+
+        def self.render_erb(node)
+          template = read_template(node.html[:template])
+          root = node.root
+          if root.layout
+            layout = read_template(File.join(root.views, root.layout))
+            ERB.new(layout).result(context(node) { ERB.new(template).result(context(node)) })
+          else
+            ERB.new(template).result(context(node))
+          end
+        end
+      end
+    end
+  end
+end

data/lib/lipa/web/{helpers/node_helper.rb → response/json.rb}

@@ -23,58 +23,40 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =end
 
+require "json"
 module Lipa
   module Web
-    module NodeHelper
+    module Response
+      module JSON
+        def self.response(node)
+          body = if node.json
+                   j = {}
+                   node.json[:block].call(j)
+                   j.to_json
+                 else
+                   render_default_json(node) 
+                 end
 
-      # Assignment erb template fot html response
-      # 
-      # @param path [String] path about views directory 
-      #
-      # @examnple
-      #   node :page_1 do
-      #     html erb("page.html.erb")
-      #   end
-      def erb(path)
-        { :render => :erb, :template => File.join(root.attrs[:views], path) }
-      end
+          [ 200, { "Content-Type" => "application/json" }, [body]]
+        end
 
-      # Assignment text for html response
-      # 
-      # @param msg [String] text message
-      #
-      # @examnple
-      #   node :page_1 do
-      #     html text("Hello World!")
-      #   end
-      def text(msg)
-        { :render => :text, :msg => msg }
-      end
+        private
+        def self.render_default_json(node)
+          j = {}
+          j[:name] = node.name    
+          j[:full_name] = node.full_name
+          j[:parent] = json_link_to(node.parent)
+          j[:children] = node.children.values.each.map {|ch| json_link_to(ch) }
 
-      # Definition html response 
-      #
-      # @see NodeHelpers#erb
-      # @see NodeHelpers#text
-      def html(opts=nil)
-        if opts.nil?
-          @html
-        else
-          @html = opts
+          node.eval_attrs.each_pair do |k,v|
+           j[k] = v.kind_of?(Lipa::Node) ? json_link_to(v) : v
+          end
+
+          j.to_json
         end
-      end
 
-      # Definition json response
-      #
-      # @example
-      #   node :josn_1 do
-      #     json { |j| j[:name] = name }
-      #   end
-      #   # => { "name":"json_1" }
-      def json(&block)
-        if block_given?
-          @json = {:block => block}
-        else
-          @json 
+        def self.json_link_to(node)
+          { :name => node.name, :full_name => node.full_name }
         end
       end
     end

data/lib/lipa/web/response/xml.rb

@@ -0,0 +1,68 @@
+=begin
+Web access to Lipa
+
+Copyright (c) 2011 Aleksey Timin
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+=end
+
+require "builder"
+
+module Lipa
+  module Web
+    module Response
+      module XML
+        extend Helpers::Response
+
+        def self.response(node)
+          xml = Builder::XmlMarkup.new        
+          if node.xml
+            if node.xml[:block]
+              node.xml[:block].call(xml)
+            else
+              case node.xml[:render]
+              when :builder
+                template = read_template(node.xml[:template])
+              end
+              eval(template, context(node,xml))
+            end
+          else
+            eval(default_template, context(node,xml))
+          end
+
+          [200, {"Content-Type" => "application/xml"}, [ xml.target!]]
+        end
+
+        private
+        def self.context(node,xml)
+          node.instance_eval("def binding_for(#{(node.attrs.keys << "xml").join(",")}) binding; end")
+          block = block_given? ? Proc.new : nil
+          node.binding_for(*(node.eval_attrs.values << xml), &block)
+        end
+
+        def self.default_template
+          path = File.join(File.dirname(__FILE__), '..', 'views', 'node.builder') # default path
+          template = read_template(path)
+        end
+      end
+    end
+  end
+end
+

data/lib/lipa/web/version.rb

@@ -25,6 +25,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 module Lipa
   module Web
-    VERSION = "0.1.1"
+    VERSION = "0.2.0"
   end
 end

data/spec/application_spec.rb

@@ -1,36 +1,17 @@
-require "lipa/web"
-require "rack/test"
+require File.join(File.dirname(__FILE__), "spec_helper")
 
 describe Lipa::Web::Application do
   include Rack::Test::Methods
 
   before :each do
     @srv = root :srv do  
-      views File.join(File.dirname(__FILE__), "views")
-      layout  "layout.html.erb"
+      static_folder File.join(File.dirname(__FILE__), "public")
 
       node :group do
         node :test_node do 
-          param_int 20
-          param_bool false
-          param_float 32.2
-          param_string "Hello"
-          param_time Time.new(2000,"jan",1,20,15,1,0)
-          param_proc run{5+3}
-          param_ref ref("../node_with_template")
-
           node :child_1
           node :child_2
         end
-
-        node :node_with_template do 
-          html erb("./my_template.html.erb")
-          json { |j| j[:name] = name }
-        end
-
-        node :node_greater do 
-          html text("Hello world!")
-        end
       end
     end
   end
@@ -56,44 +37,10 @@ describe Lipa::Web::Application do
     last_response.body.should eql("Node is not existence")
   end
 
-  it 'should render default html template' do
-    get "/group/test_node" 
-    
-    last_response.header['Content-Type'].should eql( "text/html")
-    last_response.body.gsub(/^\s*\n/, '').should == fixture("node.html")
-  end
-
-  it 'should render user html template' do
-    get "/group/node_with_template" 
-    
-    last_response.header['Content-Type'].should eql("text/html")
-    last_response.body.gsub(/^\s*\n/, '').should == fixture("node_with_template.html")
-  end
-
-  it 'should render text' do
-    get "/group/node_greater" 
-    
-    last_response.header['Content-Type'].should eql("text/plain")
-    last_response.body.should == "Hello world!"
-  end
-
-  it 'should response in default json format' do
-    get "group/test_node.json" 
-
-    last_response.header['Content-Type'].should eql("application/json")
-    last_response.body.gsub(/\s*/,'').should == fixture("node.json").gsub(/\s*/,'')
-  end
-
-  it 'should response in default json format' do
-    get "group/node_with_template.json" 
-
-    last_response.header['Content-Type'].should eql("application/json")
-    last_response.body.should ==  '{"name":"node_with_template"}'
-  end
-
-  def fixture(name)
-    path = File.join(File.dirname(__FILE__), "fixtures", name)
-    File.open(path).read.gsub(/^\s*\n/,'')
+  it 'should serve statics files in public folder' do
+    get "/css/style.css"
+    last_response.header["Content-Type"].should eql("text/css") 
+    last_response.body.should eql(".h1 { color: #fff; }\n")
   end
 end
 

data/spec/formats/html_spec.rb

@@ -0,0 +1,62 @@
+require File.join(File.dirname(__FILE__), "..", "spec_helper")
+
+describe Lipa::Web::Application do
+  include Rack::Test::Methods
+
+  before :each do
+    @srv = root :srv do  
+      views File.join(File.dirname(__FILE__), "views")
+      layout  "layout.html.erb"
+
+      example_node
+
+      node :node_with_template do 
+        html erb("./my_template.html.erb")
+      end
+
+      node :node_greater do 
+        html text("Hello world!")
+      end
+
+      node :node_man_html do
+        say "Hello"
+        html { "<h1>#{say}</h1>" }
+      end
+    end
+  end
+
+  def app
+    Lipa::Web::Application.new(@srv)
+  end
+
+  it 'should render default html template' do
+    get "/group/test_node" 
+    
+    last_response.header['Content-Type'].should eql( "text/html")
+    last_response.body.gsub(/^\s*\n/, '').should == fixture("node.html")
+  end
+
+  it 'should render custom html template' do
+    get "/node_with_template" 
+    
+    last_response.header['Content-Type'].should eql("text/html")
+    last_response.body.gsub(/^\s*\n/, '').should == fixture("node_with_template.html")
+  end
+
+  it 'should render text' do
+    get "/node_greater" 
+    
+    last_response.header['Content-Type'].should eql("text/plain")
+    last_response.body.should == "Hello world!"
+  end
+
+
+  it 'should have custom html response' do
+    get "/node_man_html" 
+
+    last_response.header['Content-Type'].should eql("text/html")
+    last_response.body.should ==  '<h1>Hello</h1>'
+  end
+end
+
+