mundo-pepino 0.2.1 → 0.2.2

data/History.txt

@@ -1,3 +1,13 @@
+# encoding: UTF-8
+== 0.2.2 2010-5-17
+  * Two new 'es_ES' steps courtesy of Paco Guzmán:
+    * Set values of an existing resource using a step table. More info at
+      features/es_ES/contexto-asignacion-de-valores-en-recurso-desde-fit-table.feature
+    * Check if something is "readable" in the current page (content without
+      markup). For example "Entonces veo el texto 'texto con marcado'"
+  * One bugfix: user page mappings over MundoPepino Page Interpretation TM.
+  * Other minor bugfixes.
+
 == 0.2.1 2010-4-16
 * Two minor changes:
   * Capybara extensions automagically loaded if Capybara is present

data/lib/mundo_pepino.rb

@@ -60,7 +60,7 @@ module MundoPepino
       String.add_mapper(:translated) do |str|
         if str =~ /^[a-z_]+\.[a-z_]+[a-z_\.]+$/
           I18n.translate(str, :default => str)
-        elsif str =~ /^([a-z_]+\.[a-z_]+[a-z_\.]+),(\{.+\})$/
+        elsif str =~ /^([a-z_]+\.[a-z_]+[a-z_\.]+),(?: )?(\{.+\})$/
           I18n.translate($1, {:default => str}.merge(eval($2)))
         else
           str
@@ -68,9 +68,9 @@ module MundoPepino
       end
       String.add_mapper(:month) {|month| month.capitalize}
       String.add_mapper(:real_value) {|value| value} # true, false...
-      String.add_mapper(:user_page)
+      String.add_mapper(:automagical_page)
       String.add_mapper(:page) do |str|
-        str.to_user_page || (str =~ /^\/.*$|^https?:\/\//i ? str : nil)
+        str.to_automagical_page || (str =~ /^\/.*$|^https?:\/\//i ? str : nil)
       end
     end
 
@@ -94,8 +94,8 @@ module MundoPepino
       config.relation_model_mappings.each {|k,v| String.relation_model_mappings[k] = v}
       config.field_mappings.each {|k,v| String.field_mappings[k] = v}
       # url_mappings are deprecated, use page_mappings instead
-      config.url_mappings.each {|k,v| String.user_page_mappings[k] = v}
-      config.page_mappings.each {|k,v| String.user_page_mappings[k] = v}
+      config.url_mappings.each {|k,v| String.page_mappings[k] = v}
+      config.page_mappings.each {|k,v| String.page_mappings[k] = v}
     end
   end
 end

data/lib/mundo_pepino/capybara/extensions.rb

@@ -41,9 +41,9 @@ module Capextensions
 
     id_prefix ||= options[:id_prefix]
 
-    select date.year, :from => "#{id_prefix}_#{DATE_TIME_SUFFIXES[:year]}"
+    select date.year.to_s, :from => "#{id_prefix}_#{DATE_TIME_SUFFIXES[:year]}"
     select date.strftime('%B'), :from => "#{id_prefix}_#{DATE_TIME_SUFFIXES[:month]}"
-    select date.day, :from => "#{id_prefix}_#{DATE_TIME_SUFFIXES[:day]}"
+    select date.day.to_s, :from => "#{id_prefix}_#{DATE_TIME_SUFFIXES[:day]}"
   end
 
   def select_time(time_to_select, options ={})
@@ -127,4 +127,11 @@ module Capextensions
   end
 end
 
-World(Capextensions)
+World(Capextensions)
+
+module WithinHelpers
+  def with_scope(locator)
+    locator ? within(locator) { yield } : yield
+  end
+end
+World(WithinHelpers)

data/lib/mundo_pepino/es_ES/definitions.rb

@@ -19,18 +19,26 @@ Dado /^(?:que tenemos )?(?:el|la|los|las|el\/la|los\/las) (?:siguientes? )?(.+):
 end 
 
 Dado /^que (?:el|la) (.+) ['"](.+)["'] tiene como (.+) ['"](.+)["'](?: \w+)?$/ do |modelo, nombre, campo, valor|
-  given_resource_has_value_in_field :model => modelo,
+  given_those_resources_have_value_in_field :model => modelo,
     :name => nombre,
     :field => campo,
     :value => valor
 end
 
+Dado /^que (?:el|la) (.+) ['"](.+)["'] tiene:$/ do |modelo, nombre, tabla|
+  given_resource_have_the_following_values_from_step_table :model => modelo, :name => nombre, :table => tabla
+end
+
 Dado /^que dich[oa]s? (.+) tienen? como (.+) ['"](.+)["'](?:.+)?$/i do |modelo, campo, valor|
   given_those_resources_have_value_in_field :model => modelo,
     :field => campo,
     :value => valor
 end
 
+Dado /^que(?: dich[oa]s? (.+))? tiene:$/i do |modelo, tabla|
+  given_resource_have_the_following_values_from_step_table :model => modelo, :table => tabla
+end
+
 Dado /^que (?:el|la) (.+) ['"](.+)["'] tiene (#{_numero_}) (.+?)(?: (?:llamad[oa]s? )?['"](.+)["'])?$/i do |modelo_padre, nombre_del_padre, numero, campo_hijos, nombres|
   given_resource_has_many_children(
     :model => modelo_padre,
@@ -122,7 +130,7 @@ Cuando /^(?:que )?elijo (?:#{_como_}) ?(.+) ['"](.+)["']$/i do |campo, valor|
 end
 
 Cuando /^(?:que )?elijo (?!#{_como_} )(.+)$/i do |texto_de_label|
-  choose texto_de_label.to_unquoted
+  choose texto_de_label.to_unquoted.to_translated
 end
 
 Cuando /^(?:que )?marco (?:#{_como_})? ?(.+)$/i do |campo|
@@ -140,16 +148,12 @@ end
 
 Cuando /^(?:que )?selecciono ["']([^"']+?)["'](?: (?:en (?:el listado de )?|como )(?!#{_fecha_y_o_hora_})(.+))?$/i do |valor, campo|
   begin
-    # TODO
-    # Y selecciono "Hortalizas" en el listado de "Tipos de cultivo"  # lib/mundo_pepino/es_ES/definitions.rb:139
-    # En la página el label es -> "Tipo de cultivo"
+    valor = valor.to_unquoted.to_translated
     if campo
-      select valor, :from => campo.to_unquoted.to_translated # Vía label
+      campo = campo.to_unquoted.to_translated
+      select valor, :from => campo # Vía label
     else
-      # TODO capybara always need a :from
-      #features/es_ES/cuando-selecciono-en-listado.feature:4 # Scenario: Selecciono una opción de una lista (*select*)
-      # Y selecciono "Hortalizas" debo pasar un string vacio por como capybara construye el objeto locator en concreto
-      # el uso de un función s(string) que sanitiza strings
+      # capybara always need a :from
       if defined?(Webrat)
         select valor
       else
@@ -160,7 +164,6 @@ Cuando /^(?:que )?selecciono ["']([^"']+?)["'](?: (?:en (?:el listado de )?|como
     if (defined?(Webrat) && e.is_a?(Webrat::NotFoundError)) || (defined?(Capybara) && e.is_a?(Capybara::ElementNotFound))
       begin
         previous_exception = $!
-        # TODO added to_s to capybara pass the steps
         select(valor, :from => convert_to_field(campo).to_s) # Sin label
       rescue
         raise "#{previous_exception}\nand\n#{$!}"
@@ -213,9 +216,13 @@ Entonces /^(#{_leo_o_no_}) el texto (.+)?$/i do |should, text|
   end
 end
 
-Entonces /^(#{_veo_o_no_}) los siguientes textos:$/i do |should, texts|
+Entonces /^(#{_veo_o_no_}) los siguientes textos(?: #{_dentro_de_} ['"]?(.+?)["']?)?:$/i do |should, selector, texts|
   texts.raw.each do |row|
-    Entonces "#{should} el texto #{row[0]}"
+    if selector
+      Entonces "#{should} el texto #{row[0]} dentro del selector #{selector}"
+    else
+      Entonces "#{should} el texto #{row[0]}"
+    end
   end
 end
 
@@ -225,15 +232,14 @@ Entonces /^(#{_leo_o_no_}) los siguientes textos:$/i do |should, texts|
   end
 end
 
-Entonces /^(#{_veo_o_no_}) #{_la_etiqueta_} (["'].+?['"]|[^ ]+)(?:(?: con)? el (?:valor|texto) )?["']?([^"']+)?["']?$/ do |should, tag, value |
+Entonces /^(#{_veo_o_no_}) #{_la_etiqueta_} (["'].+?['"]|[^ ]+)(?:(?: con)? el (?:valor|texto) )?(.+)?$/ do |should, tag, value |
   lambda {
     # TODO tag in upcase must not be used
     # features/es_ES/veo-etiqueta-con-valor.feature:4
     tag = tag.downcase # Capybara is casesensitive
     # For capybara page.should have_css(tag.to_unquoted, :text => /.*#{Regexp.escape(value.to_translated)}.*/i)
-
     if value
-      response.should have_tag(tag.to_unquoted, /.*#{Regexp.escape(value.to_translated)}.*/i)
+      response.should have_tag(tag.to_unquoted, /.*#{Regexp.escape(value.to_unquoted.to_translated)}.*/i)
     else
       response.should have_tag(tag.to_unquoted)
     end

data/lib/mundo_pepino/es_ES/mappings.rb

@@ -48,7 +48,7 @@ module MundoPepino
         :noviembre       => 'November',
         :diciembre       => 'December'
       }
-      String.page_mappings.merge!({
+      String.automagical_page_mappings.merge!({
         /^la (?:portada|home\s?(?:page)?)$/i => lambda{MundoPepino.world.root_path},
         /^(#{_el_listado_de_}) ([\w]+|['"][\w ]+["'])$/i => 
           lambda{ |el_listado_de, modelo|
@@ -84,7 +84,9 @@ module MundoPepino
               end
             else
               model = modelo.to_unquoted.to_model or raise(MundoPepino::ModelNotMapped.new(modelo))
-              MundoPepino.world.pile_up model.new
+              if dummy_instance = model.new rescue nil
+                MundoPepino.world.pile_up dummy_instance
+              end
               MundoPepino.world.send "#{action}_#{model.name.underscore}_path"
             end
           },

data/lib/mundo_pepino/implementations.rb

@@ -22,34 +22,42 @@ module MundoPepino
 
     # Params:
     #   :model
-    #   :name
     #   :field
     #   :value
-    def given_resource_has_value_in_field(params)
-      if resource = last_mentioned_of(params[:model], params[:name])
-        if field = field_for(resource.class, params[:field])
-          resource.update_attribute field, real_value_for(params[:value])
-          pile_up resource
+    #   :name (optional)
+    def given_those_resources_have_value_in_field(params)
+      if res = params[:name] ? [last_mentioned_of(params[:model], params[:name])] : last_mentioned_of(params[:model])
+
+        if resource_not_respond_to_field?(res, params[:field]) && !resource_respond_to_relation_field?(res, params[:field])
+          params.merge!(:children_field => params[:field], :children_names => params[:value])
+          given_resource_has_many_children(params)
         else
-          raise MundoPepino::FieldNotMapped.new(params[:field])
+          resources, field, values = resources_array_field_and_values(res, params[:field], params[:value])
+          if field
+            resources.each_with_index do |r, i|
+              r.update_attribute field, real_value_for(values[i])
+            end
+            pile_up res
+          else
+            raise MundoPepino::FieldNotMapped.new(params[:field])
+          end
         end
       end
     end
-    
+
     # Params:
-    #   :model
-    #   :field
-    #   :value
-    def given_those_resources_have_value_in_field(params)
-      if res = last_mentioned_of(params[:model])
-        resources, field, values = resources_array_field_and_values(res, params[:field], params[:value])
-        if field
-          resources.each_with_index do |r, i| 
-            r.update_attribute field, real_value_for(values[i])
-          end
-          pile_up res
-        else
-          raise MundoPepino::FieldNotMapped.new(params[:field])
+    # :model (raw) (optional)
+    # :table
+    # :name (optional)
+    def given_resource_have_the_following_values_from_step_table(params)
+      params[:model] = last_mentioned.class.name.downcase if params[:model].nil?
+
+      params[:table].hashes.each do |hash|
+        hash.each_pair do |campo, valor|
+          given_those_resources_have_value_in_field :model => params[:model],
+                                                    :name => params[:name],
+                                                    :field => campo,
+                                                    :value => valor
         end
       end
     end
@@ -58,7 +66,7 @@ module MundoPepino
       children_model = convert_to_model(params[:children_field])
       last_mentioned_resources(params[:model], params[:name]) do |resource|
         attribs = names_for_simple_creation(children_model, 
-          params[:number_of_children].to_number, params[:children_names],
+          (params[:number_of_children] || '1').to_number, params[:children_names],
           parent_options(resource, children_model, params[:children_field]))
         add_resource children_model, attribs, :force_creation => params[:children_names].nil?
       end
@@ -89,8 +97,14 @@ module MundoPepino
       if params[:selector].blank?
         should_or_not_contain_text params
       else
-        within params[:selector] do
-          should_or_not_contain_text params
+        if defined?(Capybara)
+          with_scope params[:selector] do
+            should_or_not_contain_text params
+          end
+        else
+          within params[:selector] do |content|
+            should_or_not_contain_text content, params
+          end
         end
       end
     end
@@ -130,5 +144,16 @@ module MundoPepino
     def then_that_resource_should_have_child(params)
       last_mentioned_should_have_child(params[:children_field], params[:child_name])
     end
+
+    private
+    def resource_not_respond_to_field?(res, field)
+      res = res.is_a?(Array) ? res.first : res
+      field.to_model && !res.respond_to?(field.to_model.name.downcase)
+    end
+
+    def resource_respond_to_relation_field?(res, field)
+      res = res.is_a?(Array) ? res.first : res
+      field_for(res.class, field) && res.respond_to?(field_for(res.class, field))
+    end
   end
 end

data/lib/mundo_pepino/implementations_api.rb

@@ -34,6 +34,14 @@ module MundoPepino
       end
     end
 
+    def hasify(should_or_not)
+      shouldify(should_or_not) == :should ? :have : :have_no
+    end
+
+    def not_hasify(should_or_not)
+      hasify(should_or_not) == :have ? :have_no : :have
+    end
+
     def shouldify(should_or_not)
       should_or_not =~ /^(#{MundoPepino::Matchers::Bites._should_})$/i ? :should : :should_not
     end
@@ -84,7 +92,7 @@ module MundoPepino
 
     def convert_to_field(raw_field, model = nil)
       unless raw_field.nil?
-        if field = field_for(model, raw_field.to_unquoted)
+        if field = field_for(model, raw_field.to_unquoted.to_translated)
           field
         else
           raise MundoPepino::FieldNotMapped.new(raw_field)
@@ -214,7 +222,7 @@ module MundoPepino
       if model = unquoted_model.to_model
         pile_up model.new
         MundoPepino.world.send "#{model.table_name}_path"
-      elsif url = "#{the_page_of} #{raw_model}".to_user_page
+      elsif url = "#{the_page_of} #{raw_model}".to_page
         url
       else
         raise MundoPepino::ModelNotMapped.new(unquoted_model)
@@ -269,12 +277,27 @@ module MundoPepino
       "#{parent_model.name.underscore}_#{child_model.name.pluralize.underscore}_attributes"
     end
 
-    def should_or_not_contain_text(params)
+    def should_or_not_contain_text(*args)
+      params = args.last.is_a?(Hash) ? args.pop : {}
+      content = args.empty? ? nil : args.first
+
       # We can use response and contain with capybara due to capextensions
-      response.send(
-              shouldify(params[:should]),
-              contain(params[:text].to_unquoted.to_translated.to_regexp))
+      if defined?(Capybara)
+        response.should send("#{hasify(params[:should])}_xpath", '/descendant-or-self::*',
+                             :text => params[:text].to_unquoted.to_translated.to_regexp)
+      else
+        if content
+          content.send(
+                  shouldify(params[:should]),
+                  contain(params[:text].to_unquoted.to_translated.to_regexp))
+        else
+          response.send(
+                shouldify(params[:should]),
+                contain(params[:text].to_unquoted.to_translated.to_regexp))
+        end
+      end
     end
   end
 end
 
+

data/lib/mundo_pepino/version.rb

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

data/rails_generators/mundo_pepino/templates/mundo_pepino.rake

@@ -1,10 +1,10 @@
 $:.unshift(RAILS_ROOT + '/vendor/plugins/cucumber/lib')
 $:.unshift(RAILS_ROOT + '/vendor/plugins/mundo-pepino/lib')
-gem 'cucumber', '>= 0.6.2'
+gem 'cucumber' unless File.directory?(File.join(Rails.root, 'vendor/plugins/cucumber'))
 require 'cucumber/rake/task'
 
 Cucumber::Rake::Task.new({:caracteristicas => 'db:test:prepare'}) do |t|
   t.fork = true # You may get faster startup if you set this to false
   t.profile = 'default'
-  #t.cucumber_opts = "--format pretty"
-end
+  t.cucumber_opts = "--format pretty"
+end

data/rails_generators/mundo_pepino_steps/templates/mundo_pepino.rake

@@ -1,10 +1,10 @@
 $:.unshift(RAILS_ROOT + '/vendor/plugins/cucumber/lib')
 $:.unshift(RAILS_ROOT + '/vendor/plugins/mundo-pepino/lib')
-gem 'cucumber', '>= 0.6.2'
+gem 'cucumber' unless File.directory?(File.join(Rails.root, 'vendor/plugins/cucumber'))
 require 'cucumber/rake/task'
 
 Cucumber::Rake::Task.new({:caracteristicas => 'db:test:prepare'}) do |t|
   t.fork = true # You may get faster startup if you set this to false
   t.profile = 'default'
-  #t.cucumber_opts = "--format pretty"
+  t.cucumber_opts = "--format pretty"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mundo-pepino
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - "Fernando Garc\xC3\xADa Samblas"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-16 00:00:00 +02:00
+date: 2010-05-17 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency