localite 0.1.3 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.2.0

data/lib/localite/filter.rb

@@ -0,0 +1,88 @@
+module Localite::Filter
+  module ControllerFilter
+    def self.locale(controller)
+      #
+      # get the current locale
+      locale = begin
+        controller.send(:current_locale)
+      rescue NoMethodError
+      end
+    end
+
+    def self.filter(controller, &block)
+      #
+      # set up localite for this action.
+      Localite.in(locale(controller)) do
+        Localite.html(&block)
+
+        filter_response controller
+      end
+    rescue
+      controller.response.body = "Caught exception: " + CGI::escapeHTML($!.inspect) if Rails.env.development?
+      raise
+    end
+
+    def self.filter_response(controller)
+      next unless controller.response.headers["Content-Type"] =~ /text\/html/
+      controller.response.body = filter_lang_nodes(controller.response.body)
+    end
+
+    def self.filter_lang_nodes(body)
+      doc = Nokogiri.XML "<filter-outer-span>#{body}</filter-outer-span>"
+
+      doc.css("[lang]").each do |node|
+        if Localite.locale.to_s != node["lang"]
+          node.remove
+          next
+        end
+
+        #
+        # we have a node with content specific for the current locale,
+        # i.e. a node to keep. If we find a base locale sibling (i.e. 
+        # with identical attributes but no "lang" attribute) prior 
+        # this node we have to remove that.
+        next unless base = base_node(node)
+        base.remove 
+      end
+
+      doc.css("filter-outer-span").inner_html
+    end
+    
+    def self.base_node(node)
+      previous = node
+      while (previous = previous.previous) && previous.name == "text" do
+        :void
+      end
+
+      return previous if base_node?(node, previous)
+    end
+    
+    def self.base_node?(me, other_node)
+      return false if !other_node
+      return false if me.name != other_node.name
+      return false if other_node.attributes.key?("lang")
+      return false if me.attributes.length != other_node.attributes.length + 1
+
+      # do we have a mismatching attribute?
+      other_node.attributes.each { |k,v| 
+        return false if me.attributes[k] != v 
+      }
+
+      true
+    end
+  end
+
+  module ControllerMethods
+    #
+    # override this method to adjust localite parameters
+    def current_locale
+      return params[:locale] if params[:locale] && params[:locale] =~ /^[a-z][a-z]$/
+      return params[:lang] if params[:lang] && params[:lang] =~ /^[a-z][a-z]$/
+    end
+  end
+  
+  def self.included(klass)
+    klass.send :include, ControllerMethods
+    klass.send :around_filter, ControllerFilter
+  end
+end

data/lib/localite/template.rb

@@ -36,6 +36,10 @@ class Localite::Template < String
     end
 
     def method_missing(sym, *args, &block)
+      unless @host.is_a?(Hash)
+        return @host.send(sym, *args, &block)
+      end
+      
       begin
         return @host.fetch(sym.to_sym)
       rescue IndexError
@@ -93,6 +97,16 @@ module Localite::Template::Etest
     assert_equal "3 Fixnums and 1 Float", Template.run(:text, "{*pl xyz*} and {*pl fl*}", :xyz => [1, 2, 3], :fl => [1.0])
   end
 
+  class Name < String
+    def name
+      self
+    end
+  end
+  
+  def test_nohash
+    assert_equal "abc",                   Template.run(:text, "{*name*}", Name.new("abc"))
+  end
+
   def test_pl
     h = Object.new.extend(Localite::Template::Env::Helpers)
     assert_equal      "1 apple", h.pl("apple", 1)

data/localite.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{localite}
-  s.version = "0.1.3"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["pboy"]
   s.date = %q{2010-05-11}
   s.description = %q{An easy to use localization gem.}
   s.email = %q{eno-pboy@open-lab.org}
-  s.extra_rdoc_files = ["lib/localite.rb", "lib/localite/rails_filter.rb", "lib/localite/scope.rb", "lib/localite/settings.rb", "lib/localite/template.rb", "lib/localite/translate.rb", "tasks/echoe.rake"]
-  s.files = ["Manifest", "Rakefile", "VERSION", "config/dependencies.rb", "config/gem.yml", "lib/localite.rb", "lib/localite/rails_filter.rb", "lib/localite/scope.rb", "lib/localite/settings.rb", "lib/localite/template.rb", "lib/localite/translate.rb", "localite.tmproj", "script/console", "script/rebuild", "tasks/echoe.rake", "test/i18n/de.yml", "test/initializers/fake_rails.rb", "test/test.rb", "localite.gemspec"]
+  s.extra_rdoc_files = ["lib/localite.rb", "lib/localite/filter.rb", "lib/localite/scope.rb", "lib/localite/settings.rb", "lib/localite/template.rb", "lib/localite/translate.rb", "tasks/echoe.rake"]
+  s.files = ["Manifest", "Rakefile", "VERSION", "config/dependencies.rb", "config/gem.yml", "lib/localite.rb", "lib/localite/filter.rb", "lib/localite/scope.rb", "lib/localite/settings.rb", "lib/localite/template.rb", "lib/localite/translate.rb", "localite.tmproj", "script/console", "script/rebuild", "tasks/echoe.rake", "test/i18n/de.yml", "test/initializers/fake_rails.rb", "test/test.rb", "localite.gemspec"]
   s.homepage = %q{http://github.com/pboy/localite}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Localite"]
   s.require_paths = ["lib"]

data/localite.tmproj

@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>currentDocument</key>
+	<string>script/console</string>
 	<key>documents</key>
 	<array>
 		<dict>
@@ -10,7 +12,7 @@
 			<key>name</key>
 			<string>localite</string>
 			<key>regexFolderFilter</key>
-			<string>!.*/(\.[^/]*|CVS|localite|_darcs|_MTN|\{arch\}|blib|.*~\.nib|.*\.(framework|app|pbproj|pbxproj|xcode(proj)?|bundle))$</string>
+			<string>!.*/(\.[^/]*|CVS|_darcs|_MTN|\{arch\}|blib|.*~\.nib|.*\.(framework|app|pbproj|pbxproj|xcode(proj)?|bundle))$</string>
 			<key>sourceDirectory</key>
 			<string></string>
 		</dict>
@@ -18,7 +20,116 @@
 	<key>fileHierarchyDrawerWidth</key>
 	<integer>339</integer>
 	<key>metaData</key>
-	<dict/>
+	<dict>
+		<key>config/dependencies.rb</key>
+		<dict>
+			<key>caret</key>
+			<dict>
+				<key>column</key>
+				<integer>0</integer>
+				<key>line</key>
+				<integer>4</integer>
+			</dict>
+			<key>firstVisibleColumn</key>
+			<integer>0</integer>
+			<key>firstVisibleLine</key>
+			<integer>0</integer>
+		</dict>
+		<key>config/gem.yml</key>
+		<dict>
+			<key>caret</key>
+			<dict>
+				<key>column</key>
+				<integer>0</integer>
+				<key>line</key>
+				<integer>7</integer>
+			</dict>
+			<key>firstVisibleColumn</key>
+			<integer>0</integer>
+			<key>firstVisibleLine</key>
+			<integer>0</integer>
+		</dict>
+		<key>lib/localite.rb</key>
+		<dict>
+			<key>caret</key>
+			<dict>
+				<key>column</key>
+				<integer>24</integer>
+				<key>line</key>
+				<integer>25</integer>
+			</dict>
+			<key>firstVisibleColumn</key>
+			<integer>0</integer>
+			<key>firstVisibleLine</key>
+			<integer>40</integer>
+		</dict>
+		<key>lib/localite/scope.rb</key>
+		<dict>
+			<key>caret</key>
+			<dict>
+				<key>column</key>
+				<integer>0</integer>
+				<key>line</key>
+				<integer>50</integer>
+			</dict>
+			<key>firstVisibleColumn</key>
+			<integer>0</integer>
+			<key>firstVisibleLine</key>
+			<integer>0</integer>
+		</dict>
+		<key>lib/localite/settings.rb</key>
+		<dict>
+			<key>caret</key>
+			<dict>
+				<key>column</key>
+				<integer>0</integer>
+				<key>line</key>
+				<integer>15</integer>
+			</dict>
+			<key>firstVisibleColumn</key>
+			<integer>0</integer>
+			<key>firstVisibleLine</key>
+			<integer>0</integer>
+		</dict>
+		<key>lib/localite/template.rb</key>
+		<dict>
+			<key>caret</key>
+			<dict>
+				<key>column</key>
+				<integer>0</integer>
+				<key>line</key>
+				<integer>54</integer>
+			</dict>
+			<key>firstVisibleColumn</key>
+			<integer>0</integer>
+			<key>firstVisibleLine</key>
+			<integer>31</integer>
+		</dict>
+		<key>script/console</key>
+		<dict>
+			<key>caret</key>
+			<dict>
+				<key>column</key>
+				<integer>47</integer>
+				<key>line</key>
+				<integer>16</integer>
+			</dict>
+			<key>firstVisibleColumn</key>
+			<integer>0</integer>
+			<key>firstVisibleLine</key>
+			<integer>0</integer>
+		</dict>
+	</dict>
+	<key>openDocuments</key>
+	<array>
+		<string>lib/localite.rb</string>
+		<string>lib/localite/scope.rb</string>
+		<string>lib/localite/settings.rb</string>
+		<string>script/console</string>
+		<string>lib/localite/template.rb</string>
+		<string>config/gem.yml</string>
+		<string>config/dependencies.rb</string>
+	</array>
 	<key>showFileHierarchyDrawer</key>
 	<true/>
 	<key>windowFrame</key>

data/script/console

@@ -14,7 +14,7 @@ rescue LoadError
 end
 
 $: << "#{File.dirname(__FILE__)}/../lib"
-load "#{File.dirname(__FILE__)}/../init.rb"
+load "#{File.dirname(__FILE__)}/../lib/localite.rb"
 
 I18n.load_path += Dir["#{File.dirname(__FILE__)}/../test/i18n/*.yml"]
 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 3
-  version: 0.1.3
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - pboy
@@ -37,7 +37,7 @@ extensions: []
 
 extra_rdoc_files: 
 - lib/localite.rb
-- lib/localite/rails_filter.rb
+- lib/localite/filter.rb
 - lib/localite/scope.rb
 - lib/localite/settings.rb
 - lib/localite/template.rb
@@ -50,7 +50,7 @@ files:
 - config/dependencies.rb
 - config/gem.yml
 - lib/localite.rb
-- lib/localite/rails_filter.rb
+- lib/localite/filter.rb
 - lib/localite/scope.rb
 - lib/localite/settings.rb
 - lib/localite/template.rb

data/lib/localite/rails_filter.rb

@@ -1,35 +0,0 @@
-module Localite::RailsFilter
-  def self.filter(controller, &block)
-    #
-    # get the current locale
-    locale = begin
-      controller.send(:current_locale)
-    rescue NoMethodError
-    end
-
-    #
-    # get the current locale
-    begin
-      scope = controller.send(:localite_scope)
-      scope = [ scope ] if scope && !scope.is_a?(Array)
-    rescue NoMethodError
-    end
-
-    #
-    # set up localite for this action.
-    Localite.html do
-      Localite.in(locale) do 
-        Localite.scope(*scope, &block)
-      end
-    end
-  end
-  
-  private
-
-  #
-  # override this method to adjust localite parameters
-  def current_locale
-    return params[:locale] if params[:locale] && params[:locale] =~ /^[a-z][a-z]$/
-    return params[:lang] if params[:lang] && params[:lang] =~ /^[a-z][a-z]$/
-  end
-end