vitreous_standalone 0.0.15 → 0.0.17

data/Gemfile.lock

@@ -1,9 +1,8 @@
 PATH
   remote: .
   specs:
-    vitreous_standalone (0.0.13)
+    vitreous_standalone (0.0.17)
       json
-      mustache
       sinatra
       vitreous_share
 
@@ -28,7 +27,7 @@ GEM
       rack (~> 1.1)
       tilt (>= 1.2.2, < 2.0)
     tilt (1.3.2)
-    vitreous_share (0.0.21)
+    vitreous_share (0.0.25)
       dropbox
       json
       mustache

data/bin/vitreous_standalone

@@ -15,7 +15,7 @@ rescue LoadError
   require 'vitreous_standalone'
 end
 
-puts "Starting Vitreous Standalone version #{Vitreous::Standalone::VERSION}"
+puts "Starting Vitreous Standalone version '#{Vitreous::Standalone::VERSION}' with Vitreous Share version '#{Vitreous::Share::VERSION}'"
 puts "Go to: http://localhost:4567"
 
 Vitreous::Standalone::App.run!

data/lib/vitreous/standalone/app.rb

@@ -1,6 +1,4 @@
 VITREOUS_FOLDER = ENV['VITREOUS_FOLDER']
-Mustache.template_path = "#{VITREOUS_FOLDER}/template"
-Mustache.template_extension = 'html'
 
 module Vitreous
   module Share
@@ -14,7 +12,12 @@ end
 
 module Vitreous
   module Standalone
-    class App < Sinatra::Base  
+    class App < Sinatra::Base 
+      if( test? )
+        set :raise_errors, true
+        set :show_exceptions, false
+      end
+      
       # assets
       get "/assets/*" do |asset|
         send_file "#{VITREOUS_FOLDER}/template/assets/#{asset}"
@@ -32,20 +35,16 @@ module Vitreous
   
       # element
       get '/*' do |resource|
-        index   = Vitreous::Share::Element.new( create_index )
-        element = Vitreous::Share::IndexSearcher.search( index, "/#{resource}" )
-    
-        raise Sinatra::NotFound  if element.nil?
-  
-        Mustache.render(
-          File.read( "#{VITREOUS_FOLDER}/template/layout.html" ),
-          { 
-            :domain   => 'mydomain.com', 
-            :index    => index, 
-            :element  => element,
-            :assets   => "/assets"
-          }
-        )
+        result = 
+          Vitreous::Share::Render.render(
+            :resource  => "/#{resource}",
+            :index     => create_index,
+            :assets    => '/assets',
+            :templates => "#{VITREOUS_FOLDER}/template"
+          )   
+          
+        status result.status
+        result.body
       end
       
       def create_index

data/lib/vitreous/standalone/version.rb

@@ -1,5 +1,5 @@
 module Vitreous
   module Standalone
-    VERSION = "0.0.15"
+    VERSION = "0.0.17"
   end
 end

data/lib/vitreous_standalone.rb

@@ -1,8 +1,8 @@
 require 'rubygems'
 require 'sinatra/base'
-require 'mustache'
 require 'yaml'
 require 'json'
 require 'vitreous_share'
+
 require File.expand_path "#{File.dirname(__FILE__)}/vitreous/standalone/app.rb"
-require File.expand_path "#{File.dirname(__FILE__)}/vitreous/standalone/version.rb"
+require File.expand_path "#{File.dirname(__FILE__)}/vitreous/standalone/version.rb"

data/test/vitreous_standalone_test.rb

@@ -1,4 +1,5 @@
 ENV['VITREOUS_FOLDER'] = File.expand_path "#{File.dirname(__FILE__)}/fixtures/vitreous_folder"
+ENV['RACK_ENV'] = 'test'
 
 require File.expand_path "#{File.dirname(__FILE__)}/../lib/vitreous_standalone.rb"
 require 'rack/test'
@@ -17,16 +18,19 @@ class VitreousStandaloneTest < Test::Unit::TestCase
   def test_show_root
     get '/'
     assert_equal File.read( "#{FIXTURES_PATH}/responses/show.txt" ), last_response.body
+    assert_equal 200, last_response.status
   end
   
   def test_show_collection
     get '/folder'
     assert_equal File.read( "#{FIXTURES_PATH}/responses/collection.txt" ), last_response.body
+    assert_equal 200, last_response.status
   end
   
   def test_show_element
     get '/folder/file'
     assert_equal File.read( "#{FIXTURES_PATH}/responses/element.txt" ), last_response.body
+    assert_equal 200, last_response.status
   end
   
   def test_404
@@ -49,8 +53,6 @@ class VitreousStandaloneTest < Test::Unit::TestCase
   def test_structure
     get '/structure'
     assert_equal 'application/json', last_response.content_type
-    assert_equal 816, last_response.content_length
+    assert_equal 909, last_response.content_length
   end
-  
-
 end

data/vitreous_standalone.gemspec

@@ -20,7 +20,6 @@ Gem::Specification.new do |s|
   
   s.add_dependency "sinatra"
   s.add_dependency "json"
-  s.add_dependency "mustache"
   s.add_dependency "vitreous_share"
 
   s.files         = `git ls-files`.split("\n")

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 15
-  version: 0.0.15
+  - 17
+  version: 0.0.17
 platform: ruby
 authors: 
 - Fernando Guillen
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-12 00:00:00 +02:00
+date: 2011-08-13 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -100,7 +100,7 @@ dependencies:
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: mustache
+  name: vitreous_share
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -112,19 +112,6 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: vitreous_share
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id008
 description: Standalone version for the VitreousCloud
 email: 
 - fguillen.mail@gmail.com