omf_sfa 0.1.1 → 0.1.2

data/lib/omf-sfa/am/am-rest/rest_handler.rb

@@ -100,8 +100,8 @@ module OMF::SFA::AM::Rest
       @@html_template =  File::read(fname)
     end
 
-    def self.convert_to_html(body, env, opts = {}, collections = Set.new)
-      self.new().convert_to_html(body, env, opts, collections)
+    def self.render_html(parts)
+      self.new().render_html(parts)
     end
 
 
@@ -476,6 +476,35 @@ module OMF::SFA::AM::Rest
     end
 
     public
+
+    # Render an HTML page using the resource's template. The
+    # template is populated with information provided in 'parts'
+    #
+    # * :title - HTML title
+    # * :service - Service path (usually a set of <a>)
+    # * :content - Main content
+    # * :footer - Optional footer
+    # * :result - hash or array describing the result (may used by JS to further format)
+    #
+    def render_html(parts = {})
+      tmpl = html_template()
+      if (result = parts[:result])
+        tmpl = tmpl.gsub('##JS##', JSON.pretty_generate(result))
+      end
+      title = parts[:title] || @@service_name
+      tmpl = tmpl.gsub('##TITLE##', title)
+      if (service = parts[:service])
+        tmpl = tmpl.gsub('##SERVICE##', service)
+      end
+      if (content = parts[:content])
+        tmpl = tmpl.gsub('##CONTENT##', content)
+      end
+      if (footer = parts[:footer])
+        tmpl = tmpl.gsub('##FOOTER##', footer)
+      end
+      tmpl
+    end
+
     def convert_to_html(body, env, opts, collections = Set.new)
       req = ::Rack::Request.new(env)
       opts = {
@@ -483,22 +512,28 @@ module OMF::SFA::AM::Rest
         level: 0,
         href_prefix: "#{req.path}/"
       }.merge(opts)
-      tmpl = html_template()
-      tmpl = tmpl.gsub('##JS##', JSON.pretty_generate(body))
+      #tmpl = html_template()
+      #tmpl = tmpl.gsub('##JS##', JSON.pretty_generate(body))
 
       #h1 = "<h1>#{@@service_name || env["HTTP_HOST"]}</h1>"
-      tmpl = tmpl.gsub('##TITLE##', @@service_name || env["HTTP_HOST"])
+      #tmpl = tmpl.gsub('##TITLE##', @@service_name || env["HTTP_HOST"])
       path = req.path.split('/').select { |p| !p.empty? }
       h2 = ["<a href='/?_format=html&_level=0'>ROOT</a>"]
       path.each_with_index do |s, i|
         h2 << "<a href='/#{path[0 .. i].join('/')}?_format=html&_level=#{i % 2 ? 0 : 1}'>#{s}</a>"
       end
-      tmpl = tmpl.gsub('##SERVICE##', h2.join('/'))
+      #tmpl = tmpl.gsub('##SERVICE##', h2.join('/'))
 
       res = []
       _convert_obj_to_html(body, nil, res, opts)
-      tmpl.gsub('##CONTENT##', res.join("\n"))
 
+      #tmpl.gsub('##CONTENT##', res.join("\n"))
+      render_html(
+        result: body,
+        title: @@service_name || env["HTTP_HOST"],
+        service: h2.join('/'),
+        content: res.join("\n")
+      )
     end
 
     def html_template()

data/lib/omf-sfa/version.rb

@@ -1,4 +1,4 @@
 module OMF; module SFA
   #VERSION = "6.0.0.pre.1"
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end; end

data/omf_sfa.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
 
   # specify any dependencies here; for example:
   s.add_development_dependency "minitest", "~> 4.3.3"
-  s.add_runtime_dependency "nokogiri", "= 1.5.5"
+  s.add_runtime_dependency "nokogiri", "~> 1.5.5"
   s.add_runtime_dependency "erector", "~> 0.8.3"
   s.add_runtime_dependency "rack", "~> 1.3.5"
   s.add_runtime_dependency "thin", "~> 1.3.1"
@@ -40,7 +40,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "rack-rpc", "~> 0.0.6"
   s.add_runtime_dependency "data_mapper", "~> 1.2.0"
   s.add_runtime_dependency "bluecloth", "~> 2.2.0"
-  s.add_runtime_dependency "omf_common", "= 6.0.0.pre.10"
-  s.add_runtime_dependency "eventmachine", "~> 0.12.10"
+  s.add_runtime_dependency "omf_common", "~> 6.0.0.pre.10"
+  s.add_runtime_dependency "eventmachine", "~> 1.0.3"
   s.add_runtime_dependency "em-minitest-spec", "~> 1.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omf_sfa
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-13 00:00:00.000000000 Z
+date: 2014-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -32,7 +32,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.5.5
   type: :runtime
@@ -40,7 +40,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.5.5
 - !ruby/object:Gem::Dependency
@@ -336,7 +336,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 6.0.0.pre.10
   type: :runtime
@@ -344,7 +344,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 6.0.0.pre.10
 - !ruby/object:Gem::Dependency
@@ -354,7 +354,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.12.10
+        version: 1.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -362,7 +362,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.12.10
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: em-minitest-spec
   requirement: !ruby/object:Gem::Requirement