mundo-pepino 0.1.6 → 0.1.7

data/lib/mundo_pepino/resources_history.rb

@@ -37,7 +37,7 @@ module MundoPepino
       end
     end
 
-    class NotFoundInDatabase
+    class NotFoundInDatabase < ResourceNotFound
       def initialize(model, value='')
         super "#{model} #{value} not found in database"
       end
@@ -88,10 +88,10 @@ module MundoPepino
       pile_up res
     end
   
-    def add_resource_from_database(modelo, nombre)
-      model = modelo.to_unquoted.to_model
+    def add_resource_from_database(raw_model, name)
+      model = raw_model.to_unquoted.to_model
       field = field_for(model)
-      if resource = model.send("find_by_#{field}", nombre)
+      if resource = model.send("find_by_#{field}", name)
         pile_up resource
       else
         NotFoundInDatabase.new(model, name)
@@ -123,27 +123,31 @@ module MundoPepino
       end
     end
   
-    def last_mentioned_of(modelo, with_name = nil)
-      if model = modelo.to_model
+    def last_mentioned_of(raw_model, with_name = nil)
+      if model = raw_model.to_model
         resource = if with_name
-          detect_first @resources.flatten, [model, with_name]
+          if mentioned = detect_first(resources_flatten, [model, with_name])
+            mentioned
+          else
+            add_resource_from_database(raw_model, with_name)
+          end
         elsif(last_mentioned.mr_model == model)
           last_mentioned
         else
           if group = recursive_group_search(model, @resources[1..-1])
             group
           else
-            detect_first @resources.flatten, model
+            detect_first resources_flatten, model
           end
         end
         resource || raise(ResourceNotFound.new("model:#{model.name}, name:#{with_name||'nil'}"))
       else
-        raise ModelNotMapped.new(modelo)
+        raise ModelNotMapped.new(raw_model)
       end
     end
   
     def last_mentioned_called(name)
-      detect_first @resources.flatten, name
+      detect_first resources_flatten, name
     end
   
     def recursive_group_search(model, resources)
@@ -181,22 +185,26 @@ module MundoPepino
         if valores.size == mentioned.size
           [mentioned, valores]
         else
-          [mentioned, [ valor ] * mentioned.size]
+          [mentioned, [valor] * mentioned.size]
         end
       else
-        [[ mentioned ], [ valor ]]
+        [[mentioned], [valor]]
       end
       field, values = if (child_model = campo.to_model)
-        child_name_field = field_for(mentioned.mr_model)
+        child_name_field = field_for(child_model)
         values = add_resource(child_model,
           valores.map { |val| { child_name_field => val } })
         values = [ values ] unless values.is_a?(Array)
-        [ campo.to_field || child_model.name.underscore, values ]
+        [field_for(mentioned.mr_model, campo) || child_model.name.underscore, values]
       else
-        [ field_for(mentioned.mr_model, campo), valores ]
+        [field_for(mentioned.mr_model, campo), valores]
       end 
       [resources, field, values]
     end
+
+    def resources_flatten
+      (@resources || []).flatten
+    end
   
     def method_missing(method, *args, &block)
       if (method.to_s =~ /^last_mentioned_(.+)$/)

data/lib/mundo_pepino/version.rb

@@ -2,7 +2,7 @@ module MundoPepino #:nodoc:
   class VERSION #:nodoc:
     MAJOR = 0
     MINOR = 1
-    TINY  = 6
+    TINY  = 7
     PATCH = nil # Set to nil for official release
 
     STRING = [MAJOR, MINOR, TINY, PATCH].compact.join('.')

data/lib/mundo_pepino.rb

@@ -35,9 +35,10 @@ module MundoPepino
       String.add_mapper(:content_type,
         /\.png$/   => 'image/png',
         /\.jpe?g$/ => 'image/jpg',
-        /\.gif$/   => 'image/gif') { |str| 'text/plain' }
-      String.add_mapper(:underscored) { |string| string.gsub(/ +/, '_') }
-      String.add_mapper(:unquoted) { |str| str =~ /^['"](.*)['"]$/ ? $1 : str}
+        /\.gif$/   => 'image/gif') {|str| 'text/plain'}
+      String.add_mapper(:underscored) {|string| string.gsub(/ +/, '_')}
+      String.add_mapper(:unquoted) {|str| str =~ /^['"](.*)['"]$/ ? $1 : str}
+      String.add_mapper(:regexp) {|str| str =~ /\/.+\/[a-z]*/ ? eval(str) : /#{Regexp.escape(str)}/m }
       String.add_mapper(:translated) do |str|
         if str =~ /^[a-z_]+\.[a-z_]+[a-z_\.]+$/
           I18n.translate(str, :default => str)
@@ -47,13 +48,7 @@ module MundoPepino
           str
         end
       end
-      String.add_mapper(:url) do |string|
-        if world.respond_to? :path_to
-          world.path_to string
-        else
-          string if string =~ /^\/.*$|^https?:\/\//i
-        end
-      end
+      String.add_mapper(:url) {|str| str if str =~ /^\/.*$|^https?:\/\//i}
     end
 
     def config

data/rails_generators/mundo_pepino/templates/mundo_pepino_es_ES.rb

@@ -24,6 +24,22 @@ MundoPepino.configure do |config|
     # TRADUCCIÓN ESPECÍFICA PARA UN MODELO
     # /^Orchard::longitud(es)?$/   => :longitude
   }
+  
+  config.url_mappings = {
+    # TRADUCCIÓN DE RUTAS/URLS AQUÍ
+    # Hardcoded
+    #/^la página de registro/i => '/users/new',
+    # From app routes:
+    #/^la página de inicio de sesión/i => lambda {
+    #  MundoPepino.world.new_session_path
+    #},
+    # And the fancy one: specific resource page
+    #/^la página de(?:l| la) (.+) ["'](.+)['"]$/ => lambda {|captures|
+    #  if model = captures[0].to_model
+    #    MundoPepino.world.send "#{model.name.underscore}_path", model.find_by_name(captures[1])
+    #  end
+    #}
+  }
 end
 
 Before do

data/rails_generators/mundo_pepino_steps/templates/mundo_pepino_es_ES.rb

@@ -26,6 +26,22 @@ MundoPepino.configure do |config|
     # TRADUCCIÓN ESPECÍFICA PARA UN MODELO
     # /^Orchard::longitud(es)?$/   => 'longitude'
   }
+
+  config.url_mappings = {
+    # TRADUCCIÓN DE RUTAS/URLS AQUÍ
+    # Hardcoded
+    #/^la página de registro/i => '/users/new',
+    # From app routes:
+    #/^la página de inicio de sesión/i => lambda {
+    #  MundoPepino.world.new_session_path
+    #},
+    # And the fancy one: specific resource page
+    #/^la página de(?:l| la) (.+) ["'](.+)['"]$/ => lambda {|captures|
+    #  if model = captures[0].to_model
+    #    MundoPepino.world.send "#{model.name.underscore}_path", model.find_by_name(captures[1])
+    #  end
+    #}
+  }
 end
 
 Before do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mundo-pepino
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors: 
 - "Fernando Garc\xC3\xADa Samblas"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-13 00:00:00 +01:00
+date: 2009-11-23 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency