humanized 0.0.1.alpha → 0.0.1

data/lib/humanized/source.rb

@@ -19,7 +19,12 @@ module Humanized
 # A source lets you lookup,store and load data needed for humanization.
 class Source
   
+  VALUE_KEY = :_
+  
+  NOT_NIL_LAMBDA = lambda{|x| !x.nil? }
+  
   def initialize(data = {})
+    #TODO: data should maybe deep-copied
     @source = data
     @sync = Sync.new
     @loaded = Set.new
@@ -29,11 +34,11 @@ class Source
 # Loads a data-file or a dir of data-files.
 #
 # @param [String] path to a dir or file
-# @option opts [Scope] :scope the root scope, where the loaded data will be stored ( default: L )
+# @option opts [Query] :query the root query, where the loaded data will be stored ( default: Root )
 # @option opts [String] :grep a grep to be used when a dir is given ( default: '**/*.*' )
 # @return self
   def load(path,opts ={})
-    options = {:scope => Scope::Root, :grep => '**/*.*'}.update(opts)
+    options = {:query => Query::Root, :grep => '**/*.*'}.update(opts)
     if File.directory?(path)
       f = File.join(path,options[:grep])
       package('grep:' + f) do
@@ -43,8 +48,8 @@ class Source
             if data
               xpath = file[path.size..(-1-File.extname(file).size)].split('/')
               xpath.shift if xpath.first == ''
-              xscope = options[:scope]._(*xpath.map(&:to_sym))
-              self.store(xscope.first,data)
+              xquery = options[:query]._(*xpath.map(&:to_sym))
+              self.store(xquery.first,data)
             end
           end
         end
@@ -53,7 +58,7 @@ class Source
       package('file:'+path) do
         data = self.read_file(path)
         if data
-          self.store(options[:scope].first,data)
+          self.store(options[:query].first,data)
         end
       end
     end
@@ -90,12 +95,14 @@ class Source
   end
 
 # Retrieves data
-# @param [Scope, #each] scope a scope containing the paths to search for
+# @param [Query, #each] query a query containing the paths to search for
 # @return [String, Object, nil] data
-  def get(scope, default = nil)
-    scope.each do |path|
-      result = find(path, @source)
-      return result unless result.nil?
+  def get(query, options = {})
+    default = options[:default]
+    accepts = options.fetch(:accepts,NOT_NIL_LAMBDA )
+    query.each do |path|
+      v = @source[path]
+      return v if accepts.call(v)
     end
     return default
   end
@@ -104,66 +111,42 @@ class Source
 # @param [Array] path a path to store the data at
 # @param [Object] data the data to store
   def store(path ,data)
-    store!(path, data)
-  end
-  
-protected
-  
-  def store!(path ,str, hsh = @source)
     @sync.synchronize(Sync::EX){
-      hshc = hsh
-      l = path.length - 1
-      if str.kind_of? Hash
-        l += 1
-      end
-      (0...l).each do |i|
-        a = path[i]
-        unless hshc.key?(a)
-          hshc[a] = {}
-        end
-        hshc = hshc[a]
-        while hshc.kind_of? Humanized::Ref
-          hshc = find(hshc, @source)
+      if data.kind_of? Hash
+        data.each do |key, value|
+          if key.kind_of? Array
+            store( path + key, value)
+            next
+          end
+          key = key.to_sym
+          if key == VALUE_KEY
+            store( path, value )
+          else
+            store( path + [key], value)
+          end
         end
-      end
-      if str.kind_of? Hash
-        hshc.deep_merge!(str)
       else
-        hshc[path[l]] = str
+        @source[path] = data
       end
-      return nil
     }
   end
   
+  def inspect
+    "#<#{self.class.name}:#{self.object_id.to_s} | #{@source.size} key(s); loaded: #{@loaded.inspect}>"
+  end
+  
+protected
+  
   def read_file(file)
     ext = File.extname(file)[1..-1]
     meth = "read_#{ext}".to_sym
     if self.respond_to?(meth)
       return self.send(meth,file)
     else
-      warn "No reader found for #{ext}."
+      Humanized.logger.warn "No reader found for #{ext}."
       return nil
     end
   end
   
-  def find(path, hsh)
-    hshc = hsh
-    l = path.length - 1
-    (0...l).each do |i|
-      a = path[i]
-      return nil unless hshc.key?(a)
-      hshc = hshc[a]
-      while hshc.kind_of? Humanized::Ref
-        hshc = find(hshc, @source)
-      end
-      return nil unless hshc.respond_to? :[]
-    end
-    hshc = hshc[path[l]]
-    while hshc.kind_of? Humanized::Ref
-      hshc = find(hshc, @source)
-    end
-    return hshc
-  end
-  
 end
 end

data/lib/more/humanized/parser.rb

@@ -0,0 +1,89 @@
+# -*- 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 Parser
+  
+  class Result
+  
+    attr_reader :parsed_string,
+                :original_string,
+                :value,
+                :options,
+                :success
+    
+    def success?
+      @success
+    end
+    
+    def call
+      if success?
+        yield @value
+      end
+    end
+    
+    def success
+      if block_given?
+        yield(@value) if @success
+        return self
+      end
+      @success
+    end
+    
+    def failure
+      if block_given?
+        yield() unless success?
+        return self
+      end
+      !success?
+    end
+    
+    def initialize(str, options ={}, &block)
+      s = str.dup.freeze
+      @original_string = s
+      @parsed_string = s
+      @options = options
+      @success = false
+      if block
+        instance_eval &block
+      end
+    end
+    
+    def emit(value, parsed_or_options = nil)
+      @value = value
+      @success = true
+      if parsed_or_options.kind_of? String
+        @parsed_string = parsed.dup.freeze
+      elsif parsed_or_options.kind_of? Hash
+        @options.update parsed_or_options
+      end
+      return self
+    end
+    
+  end
+  
+  class ParserMissing < Result
+  end
+  
+  def provides
+    []
+  end
+  
+  
+end
+  
+end

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

@@ -0,0 +1,80 @@
+# -*- 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 "bigdecimal"
+
+module Humanized
+class Parser
+class NumericClass < self
+  
+  def parse(string, options)
+    
+    humanizer = options[:humanizer]
+    if options.key? :default
+      scope = [:numeric, :format]._[options[:format], :default]
+    else
+      scope = [:numeric, :format, :default]._
+    end
+    
+    separator = humanizer.get(scope.separator)
+    delimiter = humanizer.get(scope.delimiter)
+    pedantic = options.fetch(:pedantic, false)
+    
+    result = Result.new(string, options)
+    
+    
+    if pedantic
+      regexp = Regexp.new([
+          '^(-?)(\d{1,3}(?:',
+          Regexp.escape(separator),
+          '\d{3})?)(',
+          Regexp.escape(delimiter),
+          '(\d+))?$'
+        ].join)
+    else
+      regexp = Regexp.new([
+          '^(-?)([\d',
+          Regexp.escape(separator),
+          ']+)(',
+          Regexp.escape(delimiter),
+          '(\d+))?$'
+        ].join)
+    end
+    
+    m = regexp.match(string)
+    
+    if m.nil?
+      return result
+    end
+    
+    result.emit( BigDecimal( [ m[1], m[2].gsub(separator,''),  '.', m[4] ].join ), :precision => (m[4] ? m[4].length : 0) )
+    
+    return result
+    
+  end
+  
+  def provides
+    return [:numeric]
+  end
+  
+  
+end
+
+Numeric = NumericClass.new
+
+end
+end

data/lib/more/humanized/parsing_humanizer.rb

@@ -0,0 +1,73 @@
+# -*- 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

metadata

@@ -1,149 +1,115 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: humanized
-version: !ruby/object:Gem::Version 
-  hash: -1851332166
-  prerelease: 6
-  segments: 
-  - 0
-  - 0
-  - 1
-  - alpha
-  version: 0.0.1.alpha
+version: !ruby/object:Gem::Version
+  version: 0.0.1
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - HannesG
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-03-23 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-10-09 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: facets
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &8246820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *8246820
+- !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &8246040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *8246040
+- !ruby/object:Gem::Dependency
   name: simplecov
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &8245520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *8245520
+- !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &8245060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id004
+  prerelease: false
+  version_requirements: *8245060
 description: Sick of writing culture dependent code? humanized could be for you.
 email: hannes.georg@googlemail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/more/humanized/yaml_source.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/humanized/humanizer.rb
 - lib/humanized/compiler.rb
-- lib/humanized/scope.rb
+- lib/humanized/query.rb
+- lib/humanized/interpolater.rb
 - lib/humanized/interpolation/date.rb
 - lib/humanized/interpolation/german.rb
 - lib/humanized/interpolation/number.rb
 - lib/humanized/interpolation/english.rb
+- lib/humanized/interpolation/default.rb
 - lib/humanized/interpolation/kng.rb
 - lib/humanized/interpolation/conjunctions.rb
 - lib/humanized/core_ext/hash.rb
-- lib/humanized/core_ext/date.rb
 - lib/humanized/core_ext/array.rb
-- lib/humanized/core_ext/time.rb
 - lib/humanized/core_ext/object.rb
 - lib/humanized/core_ext/module.rb
 - lib/humanized/core_ext/string.rb
 - lib/humanized/core_ext/nilclass.rb
-- lib/humanized/core_ext/numeric.rb
 - lib/humanized/core_ext/symbol.rb
 - lib/humanized/source.rb
-- lib/humanized/ref.rb
 - lib/humanized/wrapper.rb
 - lib/humanized.rb
-has_rdoc: true
 homepage: http://github.com/hannesg/humanized
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: advanced i18n for ruby
 test_files: []
-