mongo_mapper-unstable 2010.3.8 → 2010.06.23

data/lib/mongo_mapper/query.rb

@@ -1,130 +0,0 @@
-module MongoMapper
-  # IMPORTANT
-  # This class is private to MongoMapper and should not be considered part of MongoMapper's public API.
-  #
-  class Query
-    OptionKeys = [:fields, :select, :skip, :offset, :limit, :sort, :order]
-
-    attr_reader :model
-
-    def initialize(model, options)
-      raise ArgumentError, "Options must be a hash" unless options.is_a?(Hash)
-      @model, @options, @conditions, @original_options = model, {}, {}, options
-      separate_options_and_conditions
-      add_sci_condition
-    end
-
-    def criteria
-      to_criteria(@conditions)
-    end
-
-    def options
-      fields = @options[:fields] || @options[:select]
-      skip   = @options[:skip]   || @options[:offset] || 0
-      limit  = @options[:limit]  || 0
-      sort   = @options[:sort]   || normalized_sort(@options[:order])
-
-      {:fields => to_fields(fields), :skip => skip.to_i, :limit => limit.to_i, :sort => sort}
-    end
-
-    def to_a
-      [criteria, options]
-    end
-
-    private
-      def separate_options_and_conditions
-        @original_options.each_pair do |key, value|
-          key = key.respond_to?(:to_sym) ? key.to_sym : key
-
-          if OptionKeys.include?(key)
-            @options[key] = value
-          elsif key == :conditions
-            @conditions.update(value)
-          else
-            @conditions[key] = value
-          end
-        end
-      end
-
-      # adds _type single collection inheritance scope for models that need it
-      def add_sci_condition
-        @conditions[:_type] = model.to_s if model.single_collection_inherited?
-      end
-
-      def modifier?(field)
-        field.to_s =~ /^\$/
-      end
-
-      def symbol_operator?(object)
-        object.respond_to?(:field, :operator)
-      end
-
-      def to_criteria(conditions, parent_key=nil)
-        criteria = {}
-
-        conditions.each_pair do |key, value|
-          key = normalized_key(key)
-
-          if model.object_id_key?(key) && value.is_a?(String)
-            value = Mongo::ObjectID.from_string(value)
-          end
-
-          if symbol_operator?(key)
-            value = {"$#{key.operator}" => value}
-            key = normalized_key(key.field)
-          end
-
-          criteria[key] = normalized_value(key, value)
-        end
-
-        criteria
-      end
-
-      def to_fields(fields)
-        return if fields.blank?
-
-        if fields.respond_to?(:flatten, :compact)
-          fields.flatten.compact
-        else
-          fields.split(',').map { |field| field.strip }
-        end
-      end
-
-      def to_order(field, direction=nil)
-        direction ||= 'ASC'
-        direction = direction.upcase == 'ASC' ? 1 : -1
-        [normalized_key(field).to_s, direction]
-      end
-
-      def normalized_key(field)
-        field.to_s == 'id' ? :_id : field
-      end
-
-      def normalized_value(field, value)
-        case value
-          when Array
-            modifier?(field) ? value : {'$in' => value}
-          when Hash
-            to_criteria(value, field)
-          when Time
-            value.utc
-          else
-            value
-        end
-      end
-
-      def normalized_sort(sort)
-        return if sort.blank?
-
-        if sort.respond_to?(:all?) && sort.all? { |s| symbol_operator?(s) }
-          sort.map { |s| to_order(s.field, s.operator) }
-        elsif symbol_operator?(sort)
-          [to_order(sort.field, sort.operator)]
-        else
-          sort.split(',').map do |str|
-            to_order(*str.strip.split(' '))
-          end
-        end
-      end
-  end
-end

data/lib/mongo_mapper/support.rb

@@ -1,215 +0,0 @@
-class Array
-  def self.to_mongo(value)
-    value = value.respond_to?(:lines) ? value.lines : value
-    value.to_a
-  end
-  
-  def self.from_mongo(value)
-    value || []
-  end
-end
-
-class Binary
-  def self.to_mongo(value)
-    if value.is_a?(ByteBuffer)
-      value
-    else
-      value.nil? ? nil : ByteBuffer.new(value)
-    end
-  end
-
-  def self.from_mongo(value)
-    value
-  end
-end
-
-class Boolean
-  BOOLEAN_MAPPING = {
-    true => true, 'true' => true, 'TRUE' => true, 'True' => true, 't' => true, 'T' => true, '1' => true, 1 => true, 1.0 => true,
-    false => false, 'false' => false, 'FALSE' => false, 'False' => false, 'f' => false, 'F' => false, '0' => false, 0 => false, 0.0 => false, nil => false
-  }
-  
-  def self.to_mongo(value)
-    if value.is_a?(Boolean)
-      value
-    else
-      v = BOOLEAN_MAPPING[value]
-      v = value.to_s.downcase == 'true' if v.nil? # Check all mixed case spellings for true
-      v
-    end
-  end
-
-  def self.from_mongo(value)
-    !!value
-  end
-end
-
-class Date
-  def self.to_mongo(value)
-    if value.nil? || value == ''
-      nil
-    else
-      date = value.is_a?(Date) || value.is_a?(Time) ? value : Date.parse(value.to_s)
-      Time.utc(date.year, date.month, date.day)
-    end
-  rescue
-    nil
-  end
-  
-  def self.from_mongo(value)
-    value.to_date if value.present?
-  end
-end
-
-class Float
-  def self.to_mongo(value)
-    value.to_f
-  end
-end
-
-class Hash
-  def self.from_mongo(value)
-    HashWithIndifferentAccess.new(value || {})
-  end
-  
-  def to_mongo
-    self
-  end
-end
-
-class Integer
-  def self.to_mongo(value)
-    value_to_i = value.to_i
-    if value_to_i == 0 && value != value_to_i
-      value.to_s =~ /^(0x|0b)?0+/ ? 0 : nil
-    else
-      value_to_i
-    end
-  end
-end
-
-class NilClass
-  def to_mongo(value)
-    value
-  end
-  
-  def from_mongo(value)
-    value
-  end
-end
-
-class Object
-  # The hidden singleton lurks behind everyone
-  def metaclass
-    class << self; self end
-  end
-
-  def meta_eval(&blk)
-    metaclass.instance_eval(&blk)
-  end
-
-  # Adds methods to a metaclass
-  def meta_def(name, &blk)
-    meta_eval { define_method(name, &blk) }
-  end
-
-  # Defines an instance method within a class
-  def class_def(name, &blk)
-    class_eval { define_method(name, &blk) }
-  end
-  
-  def self.to_mongo(value)
-    value
-  end
-  
-  def self.from_mongo(value)
-    value
-  end
-end
-
-class ObjectId
-  def self.to_mongo(value)
-    if value.blank?
-      nil
-    elsif value.is_a?(Mongo::ObjectID)
-      value
-    else
-      Mongo::ObjectID.from_string(value.to_s)
-    end
-  end
-  
-  def self.from_mongo(value)
-    value
-  end
-end
-
-class Set
-  def self.to_mongo(value)
-    value.to_a
-  end
-  
-  def self.from_mongo(value)
-    Set.new(value || [])
-  end
-end
-
-class String
-  def self.to_mongo(value)
-    value.nil? ? nil : value.to_s
-  end
-  
-  def self.from_mongo(value)
-    value.nil? ? nil : value.to_s
-  end
-end
-
-class SymbolOperator
-  attr_reader :field, :operator
-
-  def initialize(field, operator, options={})
-    @field, @operator = field, operator
-  end unless method_defined?(:initialize)
-end
-
-class Symbol
-  %w(gt lt gte lte ne in nin mod all size where exists asc desc).each do |operator|
-    define_method(operator) do
-      SymbolOperator.new(self, operator)
-    end unless method_defined?(operator)
-  end
-end
-
-class Time
-  def self.to_mongo(value)
-    if value.nil? || value == ''
-      nil
-    else
-      time = value.is_a?(Time) ? value : MongoMapper.time_class.parse(value.to_s)
-      # Convert time to milliseconds since BSON stores dates with that accurracy, but Ruby uses microseconds
-      Time.at((time.to_f * 1000).round / 1000.0).utc if time
-    end
-  end
-  
-  def self.from_mongo(value)
-    if MongoMapper.use_time_zone? && value.present?
-      value.in_time_zone(Time.zone)
-    else
-      value
-    end
-  end
-end
-
-class Mongo::ObjectID
-  alias_method :original_to_json, :to_json
-  
-  def to_json(options = nil)
-    %Q("#{to_s}")
-  end
-end
-
-module MongoMapper
-  module Support
-    autoload :DescendantAppends, 'mongo_mapper/support/descendant_appends'
-    autoload :Find,              'mongo_mapper/support/find'
-  end
-end

data/mongo_mapper.gemspec

@@ -1,196 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{mongo_mapper}
-  s.version = "0.7.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["John Nunemaker"]
-  s.date = %q{2010-02-10}
-  s.default_executable = %q{mmconsole}
-  s.email = %q{nunemaker@gmail.com}
-  s.executables = ["mmconsole"]
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "bin/mmconsole",
-     "lib/mongo_mapper.rb",
-     "lib/mongo_mapper/document.rb",
-     "lib/mongo_mapper/embedded_document.rb",
-     "lib/mongo_mapper/plugins.rb",
-     "lib/mongo_mapper/plugins/associations.rb",
-     "lib/mongo_mapper/plugins/associations/base.rb",
-     "lib/mongo_mapper/plugins/associations/belongs_to_polymorphic_proxy.rb",
-     "lib/mongo_mapper/plugins/associations/belongs_to_proxy.rb",
-     "lib/mongo_mapper/plugins/associations/collection.rb",
-     "lib/mongo_mapper/plugins/associations/embedded_collection.rb",
-     "lib/mongo_mapper/plugins/associations/in_array_proxy.rb",
-     "lib/mongo_mapper/plugins/associations/many_documents_as_proxy.rb",
-     "lib/mongo_mapper/plugins/associations/many_documents_proxy.rb",
-     "lib/mongo_mapper/plugins/associations/many_embedded_polymorphic_proxy.rb",
-     "lib/mongo_mapper/plugins/associations/many_embedded_proxy.rb",
-     "lib/mongo_mapper/plugins/associations/many_polymorphic_proxy.rb",
-     "lib/mongo_mapper/plugins/associations/one_proxy.rb",
-     "lib/mongo_mapper/plugins/associations/proxy.rb",
-     "lib/mongo_mapper/plugins/callbacks.rb",
-     "lib/mongo_mapper/plugins/clone.rb",
-     "lib/mongo_mapper/plugins/descendants.rb",
-     "lib/mongo_mapper/plugins/dirty.rb",
-     "lib/mongo_mapper/plugins/equality.rb",
-     "lib/mongo_mapper/plugins/identity_map.rb",
-     "lib/mongo_mapper/plugins/inspect.rb",
-     "lib/mongo_mapper/plugins/keys.rb",
-     "lib/mongo_mapper/plugins/logger.rb",
-     "lib/mongo_mapper/plugins/pagination.rb",
-     "lib/mongo_mapper/plugins/pagination/proxy.rb",
-     "lib/mongo_mapper/plugins/protected.rb",
-     "lib/mongo_mapper/plugins/rails.rb",
-     "lib/mongo_mapper/plugins/serialization.rb",
-     "lib/mongo_mapper/plugins/validations.rb",
-     "lib/mongo_mapper/query.rb",
-     "lib/mongo_mapper/support.rb",
-     "lib/mongo_mapper/support/descendant_appends.rb",
-     "lib/mongo_mapper/support/find.rb",
-     "mongo_mapper.gemspec",
-     "performance/read_write.rb",
-     "specs.watchr",
-     "test/NOTE_ON_TESTING",
-     "test/functional/associations/test_belongs_to_polymorphic_proxy.rb",
-     "test/functional/associations/test_belongs_to_proxy.rb",
-     "test/functional/associations/test_in_array_proxy.rb",
-     "test/functional/associations/test_many_documents_as_proxy.rb",
-     "test/functional/associations/test_many_documents_proxy.rb",
-     "test/functional/associations/test_many_embedded_polymorphic_proxy.rb",
-     "test/functional/associations/test_many_embedded_proxy.rb",
-     "test/functional/associations/test_many_polymorphic_proxy.rb",
-     "test/functional/associations/test_one_proxy.rb",
-     "test/functional/test_associations.rb",
-     "test/functional/test_binary.rb",
-     "test/functional/test_callbacks.rb",
-     "test/functional/test_dirty.rb",
-     "test/functional/test_document.rb",
-     "test/functional/test_embedded_document.rb",
-     "test/functional/test_identity_map.rb",
-     "test/functional/test_logger.rb",
-     "test/functional/test_modifiers.rb",
-     "test/functional/test_pagination.rb",
-     "test/functional/test_protected.rb",
-     "test/functional/test_string_id_compatibility.rb",
-     "test/functional/test_validations.rb",
-     "test/models.rb",
-     "test/support/custom_matchers.rb",
-     "test/support/timing.rb",
-     "test/test_helper.rb",
-     "test/unit/associations/test_base.rb",
-     "test/unit/associations/test_proxy.rb",
-     "test/unit/serializers/test_json_serializer.rb",
-     "test/unit/test_descendant_appends.rb",
-     "test/unit/test_document.rb",
-     "test/unit/test_dynamic_finder.rb",
-     "test/unit/test_embedded_document.rb",
-     "test/unit/test_keys.rb",
-     "test/unit/test_mongo_mapper.rb",
-     "test/unit/test_pagination.rb",
-     "test/unit/test_plugins.rb",
-     "test/unit/test_query.rb",
-     "test/unit/test_rails.rb",
-     "test/unit/test_rails_compatibility.rb",
-     "test/unit/test_serialization.rb",
-     "test/unit/test_support.rb",
-     "test/unit/test_time_zones.rb",
-     "test/unit/test_validations.rb"
-  ]
-  s.homepage = %q{http://github.com/jnunemaker/mongomapper}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{Awesome gem for modeling your domain and storing it in mongo}
-  s.test_files = [
-    "test/functional/associations/test_belongs_to_polymorphic_proxy.rb",
-     "test/functional/associations/test_belongs_to_proxy.rb",
-     "test/functional/associations/test_in_array_proxy.rb",
-     "test/functional/associations/test_many_documents_as_proxy.rb",
-     "test/functional/associations/test_many_documents_proxy.rb",
-     "test/functional/associations/test_many_embedded_polymorphic_proxy.rb",
-     "test/functional/associations/test_many_embedded_proxy.rb",
-     "test/functional/associations/test_many_polymorphic_proxy.rb",
-     "test/functional/associations/test_one_proxy.rb",
-     "test/functional/test_associations.rb",
-     "test/functional/test_binary.rb",
-     "test/functional/test_callbacks.rb",
-     "test/functional/test_dirty.rb",
-     "test/functional/test_document.rb",
-     "test/functional/test_embedded_document.rb",
-     "test/functional/test_identity_map.rb",
-     "test/functional/test_logger.rb",
-     "test/functional/test_modifiers.rb",
-     "test/functional/test_pagination.rb",
-     "test/functional/test_protected.rb",
-     "test/functional/test_string_id_compatibility.rb",
-     "test/functional/test_validations.rb",
-     "test/models.rb",
-     "test/support/custom_matchers.rb",
-     "test/support/timing.rb",
-     "test/test_helper.rb",
-     "test/unit/associations/test_base.rb",
-     "test/unit/associations/test_proxy.rb",
-     "test/unit/serializers/test_json_serializer.rb",
-     "test/unit/test_descendant_appends.rb",
-     "test/unit/test_document.rb",
-     "test/unit/test_dynamic_finder.rb",
-     "test/unit/test_embedded_document.rb",
-     "test/unit/test_keys.rb",
-     "test/unit/test_mongo_mapper.rb",
-     "test/unit/test_pagination.rb",
-     "test/unit/test_plugins.rb",
-     "test/unit/test_query.rb",
-     "test/unit/test_rails.rb",
-     "test/unit/test_rails_compatibility.rb",
-     "test/unit/test_serialization.rb",
-     "test/unit/test_support.rb",
-     "test/unit/test_time_zones.rb",
-     "test/unit/test_validations.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activesupport>, [">= 2.3"])
-      s.add_runtime_dependency(%q<mongo>, ["= 0.18.3"])
-      s.add_runtime_dependency(%q<jnunemaker-validatable>, ["= 1.8.1"])
-      s.add_development_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
-      s.add_development_dependency(%q<shoulda>, ["= 2.10.2"])
-      s.add_development_dependency(%q<timecop>, ["= 0.3.1"])
-      s.add_development_dependency(%q<mocha>, ["= 0.9.8"])
-    else
-      s.add_dependency(%q<activesupport>, [">= 2.3"])
-      s.add_dependency(%q<mongo>, ["= 0.18.3"])
-      s.add_dependency(%q<jnunemaker-validatable>, ["= 1.8.1"])
-      s.add_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
-      s.add_dependency(%q<shoulda>, ["= 2.10.2"])
-      s.add_dependency(%q<timecop>, ["= 0.3.1"])
-      s.add_dependency(%q<mocha>, ["= 0.9.8"])
-    end
-  else
-    s.add_dependency(%q<activesupport>, [">= 2.3"])
-    s.add_dependency(%q<mongo>, ["= 0.18.3"])
-    s.add_dependency(%q<jnunemaker-validatable>, ["= 1.8.1"])
-    s.add_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
-    s.add_dependency(%q<shoulda>, ["= 2.10.2"])
-    s.add_dependency(%q<timecop>, ["= 0.3.1"])
-    s.add_dependency(%q<mocha>, ["= 0.9.8"])
-  end
-end
-

data/performance/read_write.rb

@@ -1,52 +0,0 @@
-# The purpose of this is to check finding, initializing, 
-# and creating objects (typecasting times/dates and booleans).
-
-require 'pp'
-require 'benchmark'
-require 'rubygems'
-
-# to test with slow version just do this:
-# gem 'mongo_mapper', '0.6.10'
-# and comment out this:
-$:.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
-
-require 'mongo_mapper'
-
-MongoMapper.database = 'testing'
- 
-class Foo
-  include MongoMapper::Document
-  key :approved, Boolean
-  key :count, Integer
-  key :approved_at, Time
-  key :expire_on, Date
-  timestamps!
-end
-Foo.collection.remove
-
-Benchmark.bm(5) do |x|
-  ids = []
-  x.report("write") do
-    1000.times { |i| ids << Foo.create(:count => 0, :approved => true, :approved_at => Time.now, :expire_on => Date.today).id }
-  end
-
-  x.report("read ") do
-    ids.each { |id| Foo.first(:id => id) }
-  end
-end
-
-# I was get something like this on my puny macbook air:
-#            user     system      total        real
-# write  4.810000   0.090000   4.900000 (  5.039949)
-# read   2.730000   0.070000   2.800000 (  2.990749)
-#
-#
-# After these commits:
-#
-#   * http://github.com/jnunemaker/mongomapper/commit/e5091fa140d5fae2721017b53027092233694ee5
-#   * http://github.com/jnunemaker/mongomapper/commit/c22bbde4fa1cfbc310d79cb0e50203310ffb03d1
-#
-# I'm now getting something like this:
-#            user     system      total        real
-# write  1.660000   0.050000   1.710000 (  1.752676)
-# read   1.060000   0.050000   1.110000 (  1.263429)

data/specs.watchr

@@ -1,51 +0,0 @@
-def growl(title, msg, img)
-  %x{growlnotify -m #{ msg.inspect} -t #{title.inspect} --image ~/.watchr/#{img}.png}
-end
-
-def form_growl_message(str)
-  results = str.split("\n").last
-  if results =~ /[1-9]\s(failure|error)s?/
-    growl "Test Results", "#{results}", "fail"
-  elsif results != ""
-    growl "Test Results", "#{results}", "pass"
-  end
-end
-
-def run(cmd)
-  puts(cmd)
-  output = ""
-  IO.popen(cmd) do |com|
-    com.each_char do |c|
-      print c
-      output << c
-      $stdout.flush
-    end
-  end
-  form_growl_message output
-end
-
-def run_test_file(file)
-  run %Q(ruby -I"lib:test" -rubygems #{file})
-end
-
-def run_all_tests
-  run "rake test"
-end
-
-def related_test_files(path)
-  Dir['test/**/*.rb'].select { |file| file =~ /test_#{File.basename(path)}/ }
-end
-
-watch('test/test_helper\.rb') { system('clear'); run_all_tests }
-watch('test/.*/test_.*\.rb') { |m| system('clear'); run_test_file(m[0]) }
-watch('lib/.*') { |m| related_test_files(m[0]).each { |file| run_test_file(file) } }
-
-# Ctrl-\
-Signal.trap('QUIT') do
-  puts " --- Running all tests ---\n\n"
-  run_all_tests
-end
-
-# Ctrl-C
-Signal.trap('INT') { abort("\n") }
-

data/test/support/custom_matchers.rb

@@ -1,55 +0,0 @@
-module CustomMatchers
-  custom_matcher :be_nil do |receiver, matcher, args|
-    matcher.positive_failure_message = "Expected #{receiver} to be nil but it wasn't"
-    matcher.negative_failure_message = "Expected #{receiver} not to be nil but it was"
-    receiver.nil?
-  end
-  
-  custom_matcher :be_blank do |receiver, matcher, args|
-    matcher.positive_failure_message = "Expected #{receiver} to be blank but it wasn't"
-    matcher.negative_failure_message = "Expected #{receiver} not to be blank but it was"
-    receiver.blank?
-  end
-  
-  custom_matcher :be_true do |receiver, matcher, args|
-    matcher.positive_failure_message = "Expected #{receiver} to be true but it wasn't"
-    matcher.negative_failure_message = "Expected #{receiver} not to be true but it was"
-    receiver.eql?(true)
-  end
-  
-  custom_matcher :be_false do |receiver, matcher, args|
-    matcher.positive_failure_message = "Expected #{receiver} to be false but it wasn't"
-    matcher.negative_failure_message = "Expected #{receiver} not to be false but it was"
-    receiver.eql?(false)
-  end
-
-  custom_matcher :be_valid do |receiver, matcher, args|
-    matcher.positive_failure_message = "Expected to be valid but it was invalid #{receiver.errors.inspect}"
-    matcher.negative_failure_message = "Expected to be invalid but it was valid #{receiver.errors.inspect}"
-    receiver.valid?
-  end
-
-  custom_matcher :have_error_on do |receiver, matcher, args|
-    receiver.valid?
-    attribute = args[0]
-    expected_message = args[1]
-    
-    if expected_message.nil?
-      matcher.positive_failure_message = "#{receiver} had no errors on #{attribute}"
-      matcher.negative_failure_message = "#{receiver} had errors on #{attribute} #{receiver.errors.inspect}"
-      !receiver.errors.on(attribute).blank?
-    else
-      actual = receiver.errors.on(attribute)
-      matcher.positive_failure_message = %Q(Expected error on #{attribute} to be "#{expected_message}" but was "#{actual}")
-      matcher.negative_failure_message = %Q(Expected error on #{attribute} not to be "#{expected_message}" but was "#{actual}")
-      actual == expected_message
-    end
-  end
-  
-  custom_matcher :have_index do |receiver, matcher, args|
-    index_name = args[0]
-    matcher.positive_failure_message = "#{receiver} does not have index named #{index_name}, but should"
-    matcher.negative_failure_message = "#{receiver} does have index named #{index_name}, but should not"
-    !receiver.collection.index_information.detect { |index| index[0] == index_name }.nil?
-  end
-end