lipa-web 0.1.1 → 0.2.0

data/spec/formats/json_spec.rb

@@ -0,0 +1,36 @@
+require File.join(File.dirname(__FILE__), "..", "spec_helper")
+
+describe Lipa::Web::Application do
+  include Rack::Test::Methods
+
+  before :each do
+    @srv = root :srv do  
+      example_node
+
+      node :node_man_json do
+        json { |j| j[:name] = name }
+      end
+    end
+  end
+
+  def app
+    Lipa::Web::Application.new(@srv)
+  end
+
+  it 'should have default json response' 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 have custom json response' do
+    get "node_man_json.json" 
+
+    last_response.header['Content-Type'].should eql("application/json")
+    last_response.body.should ==  '{"name":"node_man_json"}'
+  end
+
+end
+
+

data/spec/formats/xml_spec.rb

@@ -0,0 +1,48 @@
+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")
+
+      example_node
+
+      node :node_with_template do 
+        xml builder("my_template.builder")
+      end
+
+      node :node_man_xml do
+        xml { |xml| xml.name name }
+      end
+    end
+  end
+
+  def app
+    Lipa::Web::Application.new(@srv)
+  end
+
+  it 'should have default xml response' do
+    get "group/test_node.xml" 
+
+    last_response.header['Content-Type'].should eql("application/xml")
+    last_response.body.gsub(/\s*/,'').should == fixture("node.xml").gsub(/\s*/,'')
+  end
+
+  it 'should render custom xml template' do
+    get "/node_with_template.xml" 
+    
+    last_response.header['Content-Type'].should eql("application/xml")
+    last_response.body.gsub(/\s*/, '').should == fixture("node_with_template.xml").gsub(/\s*/,'')
+  end
+
+  it 'should have custom xml response' do
+    get "/node_man_xml.xml"
+    
+
+    last_response.header['Content-Type'].should eql("application/xml")
+    last_response.body.gsub(/\s*/, '').should eql("<name>node_man_xml</name>")
+  end
+end
+

data/spec/server_spec.rb

@@ -39,9 +39,12 @@ describe Lipa::Web::Server do
   end
 
   it 'should default path to dir of views eql "./views"' do
-    @srv.run!
     @srv.views.should eql(File.join(File.absolute_path("."), "views"))
   end
+  
+  it 'should default public folder of views eql "./public"' do
+    @srv.static_folder.should eql(File.join(File.absolute_path("."), "public"))
+  end
 
   def test_server(srv, opts)
     Rack::Server.should_receive(:start).with(opts).and_return(nil)

data/spec/spec_helper.rb

@@ -0,0 +1,26 @@
+require "lipa/web"
+require "rack/test"
+
+def fixture(name)
+  path = File.join(File.dirname(__FILE__), "fixtures", name)
+  File.open(path).read.gsub(/^\s*\n/,'')
+end
+
+def example_node
+  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("../other_node")
+
+      node :child_1
+      node :child_2
+    end
+
+    node :other_node 
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lipa-web
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-05 00:00:00.000000000 Z
+date: 2011-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lipa
-  requirement: &71011880 !ruby/object:Gem::Requirement
+  requirement: &12870400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *71011880
+  version_requirements: *12870400
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &71011620 !ruby/object:Gem::Requirement
+  requirement: &12869580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.3.5
   type: :runtime
   prerelease: false
-  version_requirements: *71011620
+  version_requirements: *12869580
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &71011360 !ruby/object:Gem::Requirement
+  requirement: &12868760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,21 @@ dependencies:
         version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *71011360
+  version_requirements: *12868760
+- !ruby/object:Gem::Dependency
+  name: builder
+  requirement: &12867780 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *12867780
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &71010610 !ruby/object:Gem::Requirement
+  requirement: &12866500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +65,10 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *71010610
+  version_requirements: *12866500
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &71010290 !ruby/object:Gem::Requirement
+  requirement: &13291520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *71010290
+  version_requirements: *13291520
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &71009740 !ruby/object:Gem::Requirement
+  requirement: &13290180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +87,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *71009740
+  version_requirements: *13290180
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &71009510 !ruby/object:Gem::Requirement
+  requirement: &13289020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *71009510
+  version_requirements: *13289020
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &71009170 !ruby/object:Gem::Requirement
+  requirement: &13287940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *71009170
+  version_requirements: *13287940
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &71008760 !ruby/object:Gem::Requirement
+  requirement: &13286980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *71008760
+  version_requirements: *13286980
 - !ruby/object:Gem::Dependency
   name: notes
-  requirement: &71008270 !ruby/object:Gem::Requirement
+  requirement: &13285260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *71008270
+  version_requirements: *13285260
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &71007960 !ruby/object:Gem::Requirement
+  requirement: &13278700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +142,10 @@ dependencies:
         version: 0.6.1
   type: :development
   prerelease: false
-  version_requirements: *71007960
+  version_requirements: *13278700
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &71007580 !ruby/object:Gem::Requirement
+  requirement: &13276780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +153,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *71007580
+  version_requirements: *13276780
 description: 
 email: atimin@gmail.com
 executables: []
@@ -151,18 +162,27 @@ extra_rdoc_files:
 - README.md
 - NEWS.md
 files:
-- lib/lipa/web/application.rb
 - lib/lipa/web/version.rb
-- lib/lipa/web/helpers/html_helper.rb
-- lib/lipa/web/helpers/response_helper.rb
-- lib/lipa/web/helpers/node_helper.rb
+- lib/lipa/web/response.rb
 - lib/lipa/web/helpers.rb
+- lib/lipa/web/application.rb
+- lib/lipa/web/helpers/node.rb
+- lib/lipa/web/helpers/response.rb
+- lib/lipa/web/helpers/html.rb
 - lib/lipa/web/server.rb
+- lib/lipa/web/response/json.rb
+- lib/lipa/web/response/xml.rb
+- lib/lipa/web/response/html.rb
 - lib/lipa/web.rb
 - spec/server_spec.rb
+- spec/spec_helper.rb
 - spec/application_spec.rb
+- spec/formats/xml_spec.rb
+- spec/formats/json_spec.rb
+- spec/formats/html_spec.rb
 - examples/universe.rb
 - examples/hello_word.rb
+- examples/many_objects.rb
 - Rakefile
 - README.md
 - NEWS.md

data/lib/lipa/web/helpers/response_helper.rb

@@ -1,128 +0,0 @@
-=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 "json"
-
-module Lipa
-  module Web
-     module ResponseHelper
-       # 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_format(node)
-        else
-          html_format(node)
-        end
-      end
-
-      private
-      def context(node)
-        node.instance_eval("def binding_for(#{node.attrs.keys.join(",")}) binding; end")
-        node.extend(HtmlHelper)
-        block = block_given? ? Proc.new : nil
-        node.binding_for(*node.eval_attrs.values, &block)
-      end
-
-      def read_template(path)
-        File.open(path).read
-      end
-
-      def default_template
-        path = File.join(File.dirname(__FILE__), '..', 'views', 'node.html.erb') # default path
-        read_template(path)
-      end
-
-      def 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
-
-      def html_format(node)
-        status = 200
-        header = {}
-        body = ""
-
-        if node.html
-          case node.html[:render]
-          when :erb
-            body = render_erb(node)
-            header["Content-Type"] = "text/html"
-          when :text
-            body = node.html[:msg]
-            header["Content-Type"] = "text/plain"
-          end
-        else
-          body = ERB.new(default_template).result(context(node)) 
-        end
-
-        [ status, header, [body]]
-      end
-
-      def json_format(node)
-        status = 200
-        header = {}
-        body = ""
-
-        if node.json
-          j = {}
-          node.json[:block].call(j)
-          body = j.to_json
-        else
-          body = render_default_json(node) 
-        end
-
-        header["Content-Type"] = "application/json"
-        [ status, header, [body]]
-      end
-
-      def 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) }
-        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
-
-      def json_link_to(node)
-        { :name => node.name, :full_name => node.full_name }
-      end
-    end
-  end
-end