humanized 0.0.1 → 0.0.2

data/lib/humanized/humanizer.rb

@@ -223,21 +223,7 @@ RB
 # @return [String]
   def [](*args)
     it = args._
-    
-    vars = it.variables
-    default = it.default
-    result = @source.get(it, :default=>default, :accepts=>IS_STRING)
-    result = default unless result.kind_of? String
-    if result.kind_of? String
-      return interpolate(result,vars)
-    else
-      if logger
-        logger.error do
-          "Expected to retrieve a String, but got: #{result.inspect}\n\tQuery: #{it.inspect}"
-        end
-      end
-      return ""
-    end
+    return it.to_humanized(self)
   end
 
 # Stores a translation

data/lib/humanized/query.rb

@@ -283,6 +283,28 @@ module Humanized
       return self
     end
     
+    IS_STRING = lambda{|x| x.kind_of? String }
+    
+    def to_humanized(humanizer)
+      vars = self.variables
+      if vars[:self].respond_to? :to_humanized
+        return vars[:self].to_humanized(humanizer)
+      end
+      default = self.default
+      result = humanizer.source.get(self, :default=>default, :accepts=>IS_STRING)
+      result = default unless result.kind_of? String
+      if result.kind_of? String
+        return humanizer.interpolate(result,vars)
+      else
+        if humanizer.logger
+          humanizer.logger.error do
+            "Expected to retrieve a String, but got: #{result.inspect}\n\tQuery: #{it.path.inspect}"
+          end
+        end
+        return ""
+      end
+    end
+    
     Root = self.new([[]],1)
     None = self.new([],0)
     Meta = self.new([[:__meta__]],1)

data/lib/more/humanized/has_language_code.rb

@@ -0,0 +1,36 @@
+# -*- encoding : utf-8 -*-
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the Affero GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#    (c) 2011 by Hannes Georg
+#
+module Humanized
+
+module HasLanguageCode
+
+  def self.included(base)
+    puts "language code added!"
+    base.class_eval do
+      component :language_code
+    end
+  end
+  
+  def self.extended(object)
+      
+    included( (class << object; self; end) )
+    
+  end
+
+end
+
+end

data/lib/more/humanized/has_parser.rb

@@ -0,0 +1,78 @@
+# -*- encoding : utf-8 -*-
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the Affero GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#    (c) 2011 by Hannes Georg
+#
+module Humanized
+  module HasParser
+  
+    def self.included(base)
+    
+      base.class_eval do
+      
+        component :parser do |value, old|
+        
+          if old.kind_of? Hash
+            result = old.dup
+          else
+            result = {}
+          end
+
+          if value.kind_of? Hash
+            result.update value
+          elsif value.kind_of? Array
+            value.each do |parser|
+              if parser.respond_to? :provides
+                parser.provides.each do |provided|
+                  result[provided] = parser
+                end
+              else
+                raise ArgumentError, "A parser should respond to :provides, got #{parser.inspect}."
+              end
+            end
+          end
+          result
+          
+        end
+        
+      end
+    
+    end
+    
+    def parse(type, string, options={})
+    
+      options = options.dup
+      options[:humanizer] = self
+      options[:type] = type
+      
+      p = parser[type]
+      
+      if p.nil? 
+        result = Parser::ParserMissing.new(string, options)
+      else
+        result = p.parse(string, options)
+      end
+      
+      raise "Expected result to be a kind of Humanized::Parser::Result but #{result.inspect} given." unless result.kind_of? Parser::Result
+      
+      if block_given? and result.success?
+        yield result.value
+      end
+      
+      return result
+      
+    end
+  
+  end
+end

data/lib/more/humanized/localized.rb

@@ -0,0 +1,32 @@
+# -*- encoding : utf-8 -*-
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the Affero GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#    (c) 2011 by Hannes Georg
+#
+module Humanized
+
+  class Localized < Hash
+  
+    def to_humanized(humanizer)
+      lc = humanizer.language_code
+      return self[lc]
+    end
+    
+  end
+=begin
+  def Localized(klass)
+    klass::Localized ||= Class.new(Localized)
+  end
+=end
+end

data/lib/more/humanized/parser/numeric.rb

@@ -16,7 +16,7 @@
 #
 
 require "bigdecimal"
-
+require 'more/humanized/parser'
 module Humanized
 class Parser
 class NumericClass < self
@@ -77,4 +77,4 @@ end
 Numeric = NumericClass.new
 
 end
-end
+end

data/lib/more/humanized/predefined_packages.rb

@@ -0,0 +1,54 @@
+# -*- encoding : utf-8 -*-
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the Affero GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#    (c) 2011 by Hannes Georg
+#
+module Humanized
+
+module PredefinedPackages
+  
+  def predefined_packages
+    @predefined_packages ||= {}
+  end
+  
+  def define(name, &block)
+    raise ArgumentError, "define requires a block" unless block_given?
+    @sync.synchronize(Sync::EX){
+      if predefined_packages.key? name
+        raise ArgumentError, "Package  already defined: '#{name}'"
+      end
+      predefined_packages[name] = block
+    }
+  end
+  
+  def use(*names)
+    unloadeable = []
+    names.each do |name|
+      if predefined_packages.key? name
+        package(name) do
+          self.instance_eval( &predefined_packages[name] )
+        end
+      else
+        unloadeable << name
+      end
+    end
+    if unloadable.any?
+      raise ArgumentError, "Trying to load undefined packages: '#{unloadable.join ', '}'"
+    end
+    return self
+  end
+  
+end
+
+end

data/lib/more/humanized/ruby_compiler.rb

@@ -0,0 +1,52 @@
+# -*- encoding : utf-8 -*-
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the Affero GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#    (c) 2011 by Hannes Georg
+#
+module Humanized
+
+class RubyCompiler < CompilerBase
+  
+  class Environment
+    
+    def initialize(humanizer, variables)
+      @humanizer = humanizer
+      @variables = variables
+    end
+    
+    def method_missing(name, *args, &block)
+      if @variables.key? name
+        return @variables[name]
+      else
+        return eval("@humanizer.interpolater.object.#{name.to_s}(@humanizer,*args,&block)")
+      end
+      super
+    end
+    
+    def __eval__(str)
+      eval(str)
+    end
+    
+  end
+  
+protected
+  def compile!(str)
+    return Compiled.new(str){|humanizer, variables|
+      Environment.new(humanizer, variables).__eval__('%{'+str+'}')
+    }
+  end
+  
+end
+
+end

data/lib/more/humanized/uses_calendar.rb

@@ -0,0 +1,50 @@
+# -*- encoding : utf-8 -*-
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the Affero GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#    (c) 2011 by Hannes Georg
+#
+
+module Humanized
+
+module UsesCalendar
+
+  class << self
+  
+    def included(base)
+      
+      raise ArgumentError, "You can only include UsesCalendar in a Humanizer" unless base <= Humanizer
+      
+      base.class_eval do
+      
+        component :calendar do |value, old|
+          
+          value || old || GregorianCalendar.new
+        
+        end
+      
+      end
+      
+    end
+    
+    def extended(object)
+      
+      included( (class << object; self; end) )
+      
+    end
+    
+  end
+
+end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: humanized
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-10-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facets
-  requirement: &8246820 !ruby/object:Gem::Requirement
+  requirement: &10447780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8246820
+  version_requirements: *10447780
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &8246040 !ruby/object:Gem::Requirement
+  requirement: &10445680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *8246040
+  version_requirements: *10445680
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &8245520 !ruby/object:Gem::Requirement
+  requirement: &10444840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *8245520
+  version_requirements: *10444840
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &8245060 !ruby/object:Gem::Requirement
+  requirement: &10441420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,19 +54,24 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *8245060
+  version_requirements: *10441420
 description: Sick of writing culture dependent code? humanized could be for you.
 email: hannes.georg@googlemail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/more/humanized/has_language_code.rb
+- lib/more/humanized/ruby_compiler.rb
+- lib/more/humanized/uses_calendar.rb
 - lib/more/humanized/yaml_source.rb
+- lib/more/humanized/localized.rb
+- lib/more/humanized/predefined_packages.rb
 - lib/more/humanized/parser.rb
 - lib/more/humanized/parser/date.rb
 - lib/more/humanized/parser/numeric.rb
 - lib/more/humanized/json_source.rb
-- lib/more/humanized/parsing_humanizer.rb
+- lib/more/humanized/has_parser.rb
 - lib/humanized/humanizer.rb
 - lib/humanized/compiler.rb
 - lib/humanized/query.rb

data/lib/more/humanized/parsing_humanizer.rb

@@ -1,73 +0,0 @@
-# -*- encoding : utf-8 -*-
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the Affero GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#    (c) 2011 by Hannes Georg
-#
-require 'humanized/humanizer'
-require 'more/humanized/parser'
-
-module Humanized
-  
-class ParsingHumanizer < Humanizer
-  
-  component :parser do |value, old|
-    
-    if old.kind_of? Hash
-      result = old.dup
-    else
-      result = {}
-    end
-
-    if value.kind_of? Hash
-      result.update value
-    elsif value.kind_of? Array
-      value.each do |parser|
-        if parser.respond_to? :provides
-          parser.provides.each do |provided|
-            result[provided] = parser
-          end
-        else
-          raise ArgumentError, "A parser should respond to :provides, got #{parser.inspect}."
-        end
-      end
-    end
-    result
-  end
-  
-  def parse(type, string, options={})
-    
-    options = options.dup
-    options[:humanizer] = self
-    options[:type] = type
-    
-    p = parser[type]
-    
-    if p.nil? 
-      result = Parser::ParserMissing.new(string, options)
-    else
-      result = p.parse(string, options)
-    end
-    
-    raise "Expected result to be a kind of Humanized::Parser::Result but #{result.inspect} given." unless result.kind_of? Parser::Result
-    
-    if block_given? and result.success?
-      yield result.value
-    end
-    
-    return result
-    
-  end
-  
-end
-end