webs 0.1.39 → 0.1.40

data/Rakefile

@@ -3,7 +3,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('webs', '0.1.39') do |p|
+Echoe.new('webs', '0.1.40') do |p|
   p.description    = "Reusable webs stuff."
   p.url            = "https://colczak@github.com/websdev/websgem.git"
   p.author         = "Chuck Olczak"

data/lib/cache/cache.rb

@@ -1,5 +1,6 @@
 module Webs
   mattr_accessor :cache
+
   module Cache
     mattr_accessor :debug
     mattr_accessor :off

data/lib/controller/webs_controller.rb

@@ -8,14 +8,15 @@ module Webs
       end
   
       module ClassMethods
+        mattr_accessor :disable_cache
         def webs_helpers
           helper Webs::Helper::Application
           helper Webs::Helper::Params
           helper Webs::Helper::Tags
-          helper Webs::Cache
+          helper Webs::Cache unless disable_cache
           include Webs::Helper::Params
           include Webs::Helper::Tags
-          include Webs::Cache
+          include Webs::Cache unless disable_cache
           helper_method :webs_site
           helper_method :webs_app_name
           helper_method :webs_permapath

data/lib/helper/tags.rb

@@ -51,7 +51,7 @@ module Webs
 
         html_safe_check( tag )
       end
-      
+
       private
       def html_safe_check s
         return s if s.blank?
@@ -64,14 +64,18 @@ module Webs
 
       def parse_fwml_options tagname, options
         s = ''
-        if ( attrs = options.delete( :fw_attributes ) )
-          s += attr_hash.keys.collect{ |k| %[<fw:fwml-attribute name="#{k}">#{attributes[k]}</fw:fwml-attribute>] }.join( "\n" )
+        intl_attrs = {}
+        options.keys.each do |k|
+          if k.to_s.ends_with?( '_intl' )
+            option_name = k.to_s.gsub( /_intl$/, '' )
+            intl_attrs[option_name] = options.delete( k )
+          end
         end
-        if ( intl_attrs = options.delete( :fw_intl_attrs ) )
-          s += attr_hash.keys.collect{ |k| %[<fw:fwml-attribute name="#{k}">#{attributes[k]}</fw:fwml-attribute>] }.join( "\n" )
+        if intl_attrs
+          s += intl_attrs.keys.collect{ |k| %[<fw:fwml-attribute name="#{k}"><fw:intl>#{intl_attrs[k]}</fw:intl></fw:fwml-attribute>] }.join( "\n" )
         end
         if tagname == 'intl' && ( tokens = options.delete( :tokens ) )
-          s += token_str = tokens.keys.collect{ |k| %[<fw:intl-token name="#{k}">#{tokens[k]}</fw:intl-token>] }.join( "\n" )
+          s += tokens.keys.collect{ |k| %[<fw:intl-token name="#{k}">#{tokens[k]}</fw:intl-token>] }.join( "\n" )
         end
         s
       end

data/lib/webs.rb

@@ -7,7 +7,7 @@ require dir + 'helper/params'
 require dir + 'helper/tags'
 
 module Webs
-  VERSION = '0.1.39'.freeze
+  VERSION = '0.1.40'.freeze
 
   def self.app_title
     APP_NAME.titleize

data/webs.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{webs}
-  s.version = "0.1.39"
+  s.version = "0.1.40"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chuck Olczak"]
-  s.date = %q{2011-06-03}
+  s.date = %q{2011-06-08}
   s.description = %q{Reusable webs stuff.}
   s.email = %q{chuck@webs.com}
   gemfiles = [

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webs
 version: !ruby/object:Gem::Version 
+  hash: 75
   prerelease: 
-  version: 0.1.39
+  segments: 
+  - 0
+  - 1
+  - 40
+  version: 0.1.40
 platform: ruby
 authors: 
 - Chuck Olczak
@@ -10,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-03 00:00:00 -04:00
+date: 2011-06-08 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -81,12 +86,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 11
+      segments: 
+      - 1
+      - 2
       version: "1.2"
 requirements: []