rayo 0.3.0 → 0.3.1

data/README.rdoc

@@ -149,7 +149,7 @@ Rayo supports transparent caching of your generated pages in filesystem which is
 
 Every page after request are written to corresponding file in cache directory, so next requests will be served from there. And if you configure your web server to search for files in cache directory ruby application will not be touched at all.
 
-For single-domain setups it may be useful to point <tt>cache_dir</tt> to the public location, so it will be served by web-server without additional configuration. 
+For single-domain setups it may be useful to point <tt>cache_dir</tt> to the public location, so it will be served by web-server without additional configuration.
 
 == Planned features
 

data/lib/rayo/tags/property_tags.rb

@@ -33,7 +33,7 @@ module Rayo::Tags::PropertyTags
   end
 
   tag 'url' do |tag|
-    u = "/#{tag.locals.page.lang}/#{tag.locals.page.path.join('/')}"
+    u = "/#{tag.attr['lang'] || tag.locals.page.lang}/#{tag.locals.page.path.join('/')}"
     u << ".#{tag.globals.format}" if tag.globals.format != tag.globals.config.default_format
     u
   end
@@ -42,12 +42,28 @@ module Rayo::Tags::PropertyTags
     "<a href=\"#{send 'tag:path', tag}\">#{tag.single? ? send( 'tag:title', tag ) : tag.expand}</a>"
   end
 
+  tag 'if_lang' do |tag|
+    if_matches( tag.locals.page.lang, tag ) ? tag.expand : ''
+  end
+
+  tag 'unless_lang' do |tag|
+    if_matches( tag.locals.page.lang, tag ) ? '' : tag.expand
+  end
+
   tag 'if_url' do |tag|
-    if_url( tag ) && tag.expand || ''
+    if_matches( tag.locals.page.path.join('/'), tag ) ? tag.expand : ''
   end
 
   tag 'unless_url' do |tag|
-    if_url( tag ) && '' || tag.expand
+    if_matches( tag.locals.page.path.join('/'), tag ) ? '' : tag.expand
+  end
+
+  tag 'if_domain' do |tag|
+    (tag.locals.page.storage.config.respond_to?(:name) && if_matches( tag.locals.page.storage.config.name, tag )) ? tag.expand : ''
+  end
+
+  tag 'unless_domain' do |tag|
+    (tag.locals.page.storage.config.respond_to?(:name) && if_matches( tag.locals.page.storage.config.name, tag )) ? '' : tag.expand
   end
 
   tag 'date' do |tag|
@@ -70,8 +86,8 @@ module Rayo::Tags::PropertyTags
     end
   end
 
-  def if_url( tag )
-    tag.locals.page.path =~ Regexp.new( tag.attr['matches'] )
+  def if_matches( prop, tag )
+    prop =~ Regexp.new( tag.attr['matches'] )
   end
 
 end

data/lib/rayo/version.rb

@@ -2,7 +2,7 @@ module Rayo
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 3
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rayo
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Alexey Noskov
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-20 00:00:00 +03:00
+date: 2011-03-01 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency