vitreous_share 0.0.27 → 0.0.31

data/lib/vitreous/share/element.rb

@@ -14,6 +14,15 @@ module Vitreous
         end
       end
 
+
+      def not_found?
+        @hash['type'] == 'not_found'
+      end
+      
+      def home?
+        @hash['type'] == 'home'
+      end
+      
       def collection?
         @hash['type'] == 'collection'
       end

data/lib/vitreous/share/indexer.rb

@@ -18,7 +18,8 @@ module Vitreous
         {
           'title'     => Vitreous::Share::IndexerUtils.to_title( structure['name'] ),
           'link'      => '/',
-          'type'      => 'collection',
+          'slug'      => '',
+          'type'      => 'home',
           'elements'  => tree( structure['elements'].select { |e| !(e['name'] =~ /^_/) }.sort { |x, y| x['name'] <=> y['name'] } )
         }.merge( 
           Vitreous::Share::IndexerUtils.meta_properties(
@@ -30,7 +31,8 @@ module Vitreous
       def generate_not_found( structure )
         {
           'title'       => 'Not found',
-          'type'        => 'item',
+          'type'        => 'not_found',
+          'slug'        => 'not_found',
           'elements'    => [],
         }.merge( 
           Vitreous::Share::IndexerUtils.meta_properties(
@@ -44,6 +46,7 @@ module Vitreous
           {
             'title'    => Vitreous::Share::IndexerUtils.to_title( e[0]['name'] ),
             'link'     => Vitreous::Share::IndexerUtils.to_link( e[0]['path'] ),
+            'slug'     => Vitreous::Share::IndexerUtils.to_slug( e[0]['path'] ),
             'type'     => e.any? { |e2| e2['type'] == 'directory' } ? 'collection' : 'item',
             'elements' => tree( e[0]['elements'].sort { |x, y| x['name'] <=> y['name'] } )
           }.merge( Vitreous::Share::IndexerUtils.meta_properties( e ) )

data/lib/vitreous/share/indexer_utils.rb

@@ -21,6 +21,12 @@ module Vitreous
         end.join('/')
       end
       
+      def self.full_path_to_slug( path )
+        return ''  if path.empty?
+        
+        to_slug( remove_extensions( path.split('/').last ) )
+      end
+      
       def self.to_slug( string )
         to_title( string ).
           downcase.

data/lib/vitreous/share/version.rb

@@ -1,5 +1,5 @@
 module Vitreous
   module Share
-    VERSION = "0.0.27"
+    VERSION = "0.0.31"
   end
 end

data/test/element_test.rb

@@ -7,8 +7,10 @@ class ElementTest < Test::Unit::TestCase
     
     assert_equal( 'fixtures', home.title )
     assert_equal( '/', home.link )
-    assert_equal( true, home.collection? )
+    assert_equal( true, home.home? )
     assert_equal( false, home.item? )
+    assert_equal( false, home.collection? )
+    assert_equal( false, home.not_found? )
     assert_equal( 3, home.elements.size )
     assert_equal( 1, home.items.size )
     assert_equal( 2, home.collections.size )

data/test/fixtures/folder_structure/_home.txt

@@ -1 +1 @@
-root content
+home content

data/test/fixtures/index.json

@@ -2,16 +2,19 @@
   "home": {
     "title": "fixtures",
     "link": "/",
-    "type": "collection",
+    "slug": "",
+    "type": "home",
     "elements": [
       {
         "title": "subfolder 1",
         "link": "/subfolder-1",
+        "slug": "subfolder-1",
         "type": "collection",
         "elements": [
           {
             "title": "bbb",
             "link": "/subfolder-1/bbb",
+            "slug": "bbb",
             "type": "item",
             "elements": [
 
@@ -36,6 +39,7 @@
           {
             "title": "aaa",
             "link": "/subfolder-1/aaa",
+            "slug": "aaa",
             "type": "item",
             "elements": [
 
@@ -60,11 +64,13 @@
           {
             "title": "subsubfolder 1",
             "link": "/subfolder-1/subsubfolder-1",
+            "slug": "subsubfolder-1",
             "type": "collection",
             "elements": [
               {
                 "title": "file 1",
                 "link": "/subfolder-1/subsubfolder-1/file-1",
+                "slug": "file-1",
                 "type": "item",
                 "elements": [
 
@@ -101,11 +107,13 @@
       {
         "title": "subfolder 2",
         "link": "/subfolder-2",
+        "slug": "subfolder-2",
         "type": "collection",
         "elements": [
           {
             "title": "file 1",
             "link": "/subfolder-2/file-1",
+            "slug": "file-1",
             "type": "item",
             "elements": [
 
@@ -124,6 +132,7 @@
       {
         "title": "file 1",
         "link": "/file-1",
+        "slug": "file-1",
         "type": "item",
         "elements": [
 
@@ -160,21 +169,22 @@
       "wadus uri"
     ],
     "jpg": "wadus uri",
-    "description": "root content",
+    "description": "home content",
     "descriptions": [
-      "root content"
+      "home content"
     ],
-    "txt": "root content",
+    "txt": "home content",
     "jpgs": [
       "wadus uri"
     ],
     "txts": [
-      "root content"
+      "home content"
     ]
   },
   "not_found": {
     "title": "Not found",
-    "type": "item",
+    "type": "not_found",
+    "slug": "not_found",
     "elements": [
 
     ],

data/test/fixtures/render_collection.txt

@@ -11,3 +11,5 @@ assets: /assets_path
     collection txt: file content
     collection description: file content
     collection file: wadus uri
+    collection link: /subfolder-1
+    collection slug: subfolder-1

data/test/fixtures/render_home.txt

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

data/test/fixtures/render_item.txt

@@ -11,3 +11,5 @@ assets: /assets_path
     item txt: file content
     item description: file content
     item file: 
+    item link: /subfolder-1/subsubfolder-1/file-1
+    item slug: file-1

data/test/fixtures/render_not_found.txt

@@ -6,8 +6,10 @@ assets: /assets_path
     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
+    not_found title: Not found
+    not_found jpg: wadus uri
+    not_found txt: This is the not found item
+    not_found description: This is the not found item
+    not_found file: wadus uri
+    not_found link: 
+    not_found slug: not_found

data/test/fixtures/structure.json

@@ -129,7 +129,7 @@
       "elements": [
 
       ],
-      "content": "root content"
+      "content": "home content"
     },
     {
       "name": "_not_found.jpg",

data/test/fixtures/template/collection.html

@@ -3,3 +3,5 @@ collection jpg: {{jpg}}
 collection txt: {{txt}}
 collection description: {{description}}
 collection file: {{file}}
+collection link: {{link}}
+collection slug: {{slug}}

data/test/fixtures/template/home.html

@@ -0,0 +1,7 @@
+home title: {{title}}
+home jpg: {{jpg}}
+home txt: {{txt}}
+home description: {{description}}
+home file: {{file}}
+home link: {{link}}
+home slug: {{slug}}

data/test/fixtures/template/item.html

@@ -3,3 +3,5 @@ item jpg: {{jpg}}
 item txt: {{txt}}
 item description: {{description}}
 item file: {{file}}
+item link: {{link}}
+item slug: {{slug}}

data/test/fixtures/template/layout.html

@@ -10,10 +10,16 @@ assets: {{assets}}
 {{/home}}
 
 {{#element}}
+  {{#home?}}
+    {{>home}}
+  {{/home?}}
   {{#collection?}}
     {{>collection}}
   {{/collection?}}
   {{#item?}}
     {{>item}}
   {{/item?}}
+  {{#not_found?}}
+    {{>not_found}}
+  {{/not_found?}}
 {{/element}}

data/test/fixtures/template/not_found.html

@@ -0,0 +1,7 @@
+not_found title: {{title}}
+not_found jpg: {{jpg}}
+not_found txt: {{txt}}
+not_found description: {{description}}
+not_found file: {{file}}
+not_found link: {{link}}
+not_found slug: {{slug}}

data/test/indexer_utils_test.rb

@@ -11,6 +11,23 @@ class IndexerUtilsTest < Test::Unit::TestCase
     )
   end
   
+  def test_full_path_to_slug
+    assert_equal( 
+      'pepe-y-jun', 
+      Vitreous::Share::IndexerUtils.to_slug( '/folder 1/folder 2/001 pepe y juán.txt' )
+    )
+    
+    assert_equal( 
+      '', 
+      Vitreous::Share::IndexerUtils.to_slug( '/' )
+    )
+    
+    assert_equal( 
+      '', 
+      Vitreous::Share::IndexerUtils.to_slug( '' )
+    )
+  end
+  
   def test_to_slug
     assert_equal( 
       'pepe-y-jun', 

data/test/render_test.rb

@@ -41,7 +41,7 @@ class IndexerTest < Test::Unit::TestCase
     assert_equal( File.read( "#{FIXTURES_PATH}/render_item.txt" ), result.body )
   end
   
-  def test_render_root
+  def test_render_home
     index = JSON.load( File.read( "#{FIXTURES_PATH}/index.json" ) )
     result = 
       Vitreous::Share::Render.render(
@@ -53,12 +53,12 @@ class IndexerTest < Test::Unit::TestCase
     
     # # write fixture
     # puts "This should be commented out!"
-    # File.open( "#{FIXTURES_PATH}/render_root.txt", 'w' ) do |f|
+    # File.open( "#{FIXTURES_PATH}/render_home.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 )
+    assert_equal( File.read( "#{FIXTURES_PATH}/render_home.txt" ), result.body )
   end
   
   def test_render_not_found

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 27
-  version: 0.0.27
+  - 31
+  version: 0.0.31
 platform: ruby
 authors: 
 - Fernando Guillen
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-16 00:00:00 +02:00
+date: 2011-08-23 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -173,13 +173,15 @@ files:
 - test/fixtures/folder_structure/file 1.txt
 - test/fixtures/index.json
 - test/fixtures/render_collection.txt
+- test/fixtures/render_home.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/home.html
 - test/fixtures/template/item.html
 - test/fixtures/template/layout.html
+- test/fixtures/template/not_found.html
 - test/index_searcher_test.rb
 - test/indexer_test.rb
 - test/indexer_utils_test.rb
@@ -241,13 +243,15 @@ test_files:
 - test/fixtures/folder_structure/file 1.txt
 - test/fixtures/index.json
 - test/fixtures/render_collection.txt
+- test/fixtures/render_home.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/home.html
 - test/fixtures/template/item.html
 - test/fixtures/template/layout.html
+- test/fixtures/template/not_found.html
 - test/index_searcher_test.rb
 - test/indexer_test.rb
 - test/indexer_utils_test.rb

data/test/fixtures/render_root.txt

@@ -1,13 +0,0 @@
-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