vitreous_share 0.0.21 → 0.0.23

data/lib/vitreous/share/index_searcher.rb

@@ -11,6 +11,10 @@ module Vitreous
 
         return nil
       end
+      
+      def self.not_found( index )
+        Vitreous::Share::Element.new( index.not_found )
+      end
     end
   end
 end

data/lib/vitreous/share/indexer.rb

@@ -9,10 +9,11 @@ module Vitreous
         structure = @structure
         
         {
-          'title'    => Vitreous::Share::IndexerUtils.to_title( structure['name'] ),
-          'link'     => Vitreous::Share::IndexerUtils.to_link( structure['path'] ),
-          'type'     => 'collection',
-          'elements' => tree( structure['elements'].select { |e| !(e['name'] =~ /^_root\./) }.sort { |x, y| x['name'] <=> y['name'] } )
+          'not_found' => generate_not_found( structure ),
+          'title'     => Vitreous::Share::IndexerUtils.to_title( structure['name'] ),
+          'link'      => Vitreous::Share::IndexerUtils.to_link( structure['path'] ),
+          'type'      => 'collection',
+          'elements'  => tree( structure['elements'].select { |e| !(e['name'] =~ /^_/) }.sort { |x, y| x['name'] <=> y['name'] } )
         }.merge( 
           Vitreous::Share::IndexerUtils.meta_properties(
             structure['elements'].select { |e| e['name'] =~ /^_root\./ } 
@@ -31,6 +32,20 @@ module Vitreous
         end
       end
       
+      def generate_not_found( structure )
+        {
+          'title'       => 'Not found',
+          'type'        => 'item',
+          'elements'    => [],
+          'txt'         => 'Not found',
+          'description' => 'Not found'
+        }.merge( 
+          Vitreous::Share::IndexerUtils.meta_properties(
+            structure['elements'].select { |e| e['name'] =~ /^_not_found\./ } 
+          )
+        )
+      end
+      
       def json
         JSON.pretty_generate( generate )
       end

data/lib/vitreous/share/indexer_utils.rb

@@ -80,10 +80,6 @@ module Vitreous
         
         return result
       end
-      
-      def self.meta_wildcards( meta )
-        
-      end
     end
   end
 end

data/lib/vitreous/share/render.rb

@@ -0,0 +1,33 @@
+module Vitreous
+  module Share
+    module Render
+      def self.render( opts )
+        index   = Vitreous::Share::Element.new( opts[:index] )
+        element = Vitreous::Share::IndexSearcher.search( index, opts[:resource] )
+        status  = 200
+        
+        if element.nil?
+          element = Vitreous::Share::IndexSearcher.not_found( index )
+          status  = 404
+        end
+  
+        Mustache.template_path = opts[:templates]
+        
+        body = 
+          Mustache.render(
+            File.read( "#{opts[:templates]}/layout.html" ),
+            { 
+              :index    => index, 
+              :element  => element,
+              :assets   => opts[:assets]
+            }
+          )
+          
+        OpenStruct.new(
+          :status => status,
+          :body   => body
+        )
+      end
+    end
+  end
+end

data/lib/vitreous/share/version.rb

@@ -1,5 +1,5 @@
 module Vitreous
   module Share
-    VERSION = "0.0.21"
+    VERSION = "0.0.23"
   end
 end

data/lib/vitreous_share.rb

@@ -4,6 +4,8 @@ require 'mustache'
 require 'rdiscount'
 require 'ostruct'
 
+Mustache.template_extension = 'html'
+
 require "#{File.dirname(__FILE__)}/vitreous/vitreous"
 require "#{File.dirname(__FILE__)}/vitreous/share/indexer_utils"
 require "#{File.dirname(__FILE__)}/vitreous/share/version"
@@ -13,3 +15,4 @@ require "#{File.dirname(__FILE__)}/vitreous/share/dropbox_structure"
 require "#{File.dirname(__FILE__)}/vitreous/share/indexer"
 require "#{File.dirname(__FILE__)}/vitreous/share/index_searcher"
 require "#{File.dirname(__FILE__)}/vitreous/share/element"
+require "#{File.dirname(__FILE__)}/vitreous/share/render"

data/test/fixtures/folder_structure/_not_found.txt

@@ -0,0 +1 @@
+This is the not found item

data/test/fixtures/index.json

@@ -1,4 +1,27 @@
 {
+  "not_found": {
+    "title": "Not found",
+    "type": "item",
+    "elements": [
+
+    ],
+    "txt": "This is the not found item",
+    "description": "This is the not found item",
+    "file": "wadus uri",
+    "files": [
+      "wadus uri"
+    ],
+    "jpg": "wadus uri",
+    "descriptions": [
+      "This is the not found item"
+    ],
+    "jpgs": [
+      "wadus uri"
+    ],
+    "txts": [
+      "This is the not found item"
+    ]
+  },
   "title": "fixtures",
   "link": "/",
   "type": "collection",

data/test/fixtures/render_collection.txt

@@ -0,0 +1,13 @@
+assets: /assets_path
+
+    collection: subfolder 1
+      item: bbb
+      item: aaa
+    collection: subfolder 2
+      item: file 1
+
+    collection title: subfolder 1
+    collection jpg: wadus uri
+    collection txt: file content
+    collection description: file content
+    collection file: wadus uri

data/test/fixtures/render_item.txt

@@ -0,0 +1,13 @@
+assets: /assets_path
+
+    collection: subfolder 1
+      item: bbb
+      item: aaa
+    collection: subfolder 2
+      item: file 1
+
+    item title: file 1
+    item jpg: 
+    item txt: file content
+    item description: file content
+    item file: 

data/test/fixtures/render_not_found.txt

@@ -0,0 +1,13 @@
+assets: /assets_path
+
+    collection: subfolder 1
+      item: bbb
+      item: aaa
+    collection: subfolder 2
+      item: file 1
+
+    item title: Not found
+    item jpg: wadus uri
+    item txt: This is the not found item
+    item description: This is the not found item
+    item file: wadus uri

data/test/fixtures/render_root.txt

@@ -0,0 +1,13 @@
+assets: /assets_path
+
+    collection: subfolder 1
+      item: bbb
+      item: aaa
+    collection: subfolder 2
+      item: file 1
+
+    collection title: fixtures
+    collection jpg: wadus uri
+    collection txt: root content
+    collection description: root content
+    collection file: wadus uri

data/test/fixtures/structure.json

@@ -111,6 +111,26 @@
       ],
       "content": null
     },
+    {
+      "name": "_not_found.jpg",
+      "path": "/_not_found.jpg",
+      "uri": "wadus uri",
+      "type": "file",
+      "elements": [
+
+      ],
+      "content": null
+    },
+    {
+      "name": "_not_found.txt",
+      "path": "/_not_found.txt",
+      "uri": "wadus uri",
+      "type": "file",
+      "elements": [
+
+      ],
+      "content": "This is the not found item"
+    },
     {
       "name": "_root.jpg",
       "path": "/_root.jpg",

data/test/fixtures/template/collection.html

@@ -0,0 +1,5 @@
+collection title: {{title}}
+collection jpg: {{jpg}}
+collection txt: {{txt}}
+collection description: {{description}}
+collection file: {{file}}

data/test/fixtures/template/item.html

@@ -0,0 +1,5 @@
+item title: {{title}}
+item jpg: {{jpg}}
+item txt: {{txt}}
+item description: {{description}}
+item file: {{file}}

data/test/fixtures/template/layout.html

@@ -0,0 +1,19 @@
+assets: {{assets}}
+
+{{#index}}
+  {{#collections}}
+    collection: {{title}}
+    {{#items}}
+      item: {{title}}
+    {{/items}}
+  {{/collections}}
+{{/index}}
+
+{{#element}}
+  {{#collection?}}
+    {{>collection}}
+  {{/collection?}}
+  {{#item?}}
+    {{>item}}
+  {{/item?}}
+{{/element}}

data/test/indexer_utils_test.rb

@@ -51,7 +51,7 @@ class IndexerUtilsTest < Test::Unit::TestCase
     structure = JSON.load( File.read( "#{FIXTURES_PATH}/structure.json" ) )
     
     groups = Vitreous::Share::IndexerUtils.grouping( structure['elements'] )
-    assert_equal( 4, groups.size )
+    assert_equal( 5, groups.size )
   end
   
   def test_meta_properties

data/test/render_test.rb

@@ -0,0 +1,83 @@
+require File.expand_path( "#{File.dirname(__FILE__)}/test_helper" )
+
+class IndexerTest < Test::Unit::TestCase
+  def test_render_collection
+    index = JSON.load( File.read( "#{FIXTURES_PATH}/index.json" ) )
+    result = 
+      Vitreous::Share::Render.render(
+        :resource  => '/subfolder-1',
+        :index     => index,
+        :assets    => '/assets_path',
+        :templates => "#{FIXTURES_PATH}/template"
+      )
+    
+    # # write fixture
+    # puts "This should be commented out!"
+    # File.open( "#{FIXTURES_PATH}/render_collection.txt", 'w' ) do |f|
+    #   f.write result.body
+    # end
+    
+    assert_equal( 200, result.status )
+    assert_equal( File.read( "#{FIXTURES_PATH}/render_collection.txt" ), result.body )
+  end
+  
+  def test_render_item
+    index = JSON.load( File.read( "#{FIXTURES_PATH}/index.json" ) )
+    result = 
+      Vitreous::Share::Render.render(
+        :resource  => '/subfolder-1/subsubfolder-1/file-1',
+        :index     => index,
+        :assets    => '/assets_path',
+        :templates => "#{FIXTURES_PATH}/template"
+      )
+    
+    # # write fixture
+    # puts "This should be commented out!"
+    # File.open( "#{FIXTURES_PATH}/render_item.txt", 'w' ) do |f|
+    #   f.write result.body
+    # end
+    
+    assert_equal( 200, result.status )
+    assert_equal( File.read( "#{FIXTURES_PATH}/render_item.txt" ), result.body )
+  end
+  
+  def test_render_root
+    index = JSON.load( File.read( "#{FIXTURES_PATH}/index.json" ) )
+    result = 
+      Vitreous::Share::Render.render(
+        :resource  => '/',
+        :index     => index,
+        :assets    => '/assets_path',
+        :templates => "#{FIXTURES_PATH}/template"
+      )
+    
+    # # write fixture
+    # puts "This should be commented out!"
+    # File.open( "#{FIXTURES_PATH}/render_root.txt", 'w' ) do |f|
+    #   f.write result.body
+    # end
+    
+    assert_equal( 200, result.status )
+    assert_equal( File.read( "#{FIXTURES_PATH}/render_root.txt" ), result.body )
+  end
+  
+  def test_render_not_found
+    index = JSON.load( File.read( "#{FIXTURES_PATH}/index.json" ) )
+    result = 
+      Vitreous::Share::Render.render(
+        :resource  => '/wadus/not/found',
+        :index     => index,
+        :assets    => '/assets_path',
+        :templates => "#{FIXTURES_PATH}/template"
+      )
+    
+    # # write fixture
+    # puts "This should be commented out!"
+    # File.open( "#{FIXTURES_PATH}/render_not_found.txt", 'w' ) do |f|
+    #   f.write result.body
+    # end
+    
+    assert_equal( 404, result.status )
+    assert_equal( File.read( "#{FIXTURES_PATH}/render_not_found.txt" ), result.body )
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 21
-  version: 0.0.21
+  - 23
+  version: 0.0.23
 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 
@@ -148,6 +148,7 @@ files:
 - lib/vitreous/share/indexer.rb
 - lib/vitreous/share/indexer_utils.rb
 - lib/vitreous/share/local_structure.rb
+- lib/vitreous/share/render.rb
 - lib/vitreous/share/version.rb
 - lib/vitreous/vitreous.rb
 - lib/vitreous_share.rb
@@ -162,6 +163,8 @@ files:
 - test/fixtures/folder_structure/01 subfolder 1/002 aaa.txt
 - test/fixtures/folder_structure/01 subfolder 1/subsubfolder 1/file 1.txt
 - test/fixtures/folder_structure/02 subfolder 2/file 1.txt
+- test/fixtures/folder_structure/_not_found.jpg
+- test/fixtures/folder_structure/_not_found.txt
 - test/fixtures/folder_structure/_root.jpg
 - test/fixtures/folder_structure/_root.txt
 - test/fixtures/folder_structure/file 1.jpg
@@ -169,11 +172,19 @@ files:
 - test/fixtures/folder_structure/file 1.thumb.txt
 - test/fixtures/folder_structure/file 1.txt
 - test/fixtures/index.json
+- test/fixtures/render_collection.txt
+- test/fixtures/render_item.txt
+- test/fixtures/render_not_found.txt
+- test/fixtures/render_root.txt
 - test/fixtures/structure.json
+- test/fixtures/template/collection.html
+- test/fixtures/template/item.html
+- test/fixtures/template/layout.html
 - test/index_searcher_test.rb
 - test/indexer_test.rb
 - test/indexer_utils_test.rb
 - test/local_structure_test.rb
+- test/render_test.rb
 - test/test_helper.rb
 - vitreous_share.gemspec
 has_rdoc: true
@@ -220,6 +231,8 @@ test_files:
 - test/fixtures/folder_structure/01 subfolder 1/002 aaa.txt
 - test/fixtures/folder_structure/01 subfolder 1/subsubfolder 1/file 1.txt
 - test/fixtures/folder_structure/02 subfolder 2/file 1.txt
+- test/fixtures/folder_structure/_not_found.jpg
+- test/fixtures/folder_structure/_not_found.txt
 - test/fixtures/folder_structure/_root.jpg
 - test/fixtures/folder_structure/_root.txt
 - test/fixtures/folder_structure/file 1.jpg
@@ -227,9 +240,17 @@ test_files:
 - test/fixtures/folder_structure/file 1.thumb.txt
 - test/fixtures/folder_structure/file 1.txt
 - test/fixtures/index.json
+- test/fixtures/render_collection.txt
+- test/fixtures/render_item.txt
+- test/fixtures/render_not_found.txt
+- test/fixtures/render_root.txt
 - test/fixtures/structure.json
+- test/fixtures/template/collection.html
+- test/fixtures/template/item.html
+- test/fixtures/template/layout.html
 - test/index_searcher_test.rb
 - test/indexer_test.rb
 - test/indexer_utils_test.rb
 - test/local_structure_test.rb
+- test/render_test.rb
 - test/test_helper.rb