veritas-sql-generator 0.0.6 → 0.0.7

data/.travis.yml

@@ -1,11 +1,17 @@
+language: ruby
 bundler_args: --without guard metrics
 script: "bundle exec rake spec"
 rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
-  - ruby-head
+  - jruby-18mode
+  - jruby-19mode
+  - rbx-18mode
+  - rbx-19mode
   - ree
-  - jruby
-  - rbx
-  - rbx-2.0
+  - ruby-head
+  - jruby-head
+notifications:
+  email:
+    - dan.kubb@gmail.com

data/Gemfile

@@ -1,8 +1,8 @@
 # encoding: utf-8
 
-source :rubygems
+source 'https://rubygems.org'
 
-gem 'veritas', '~> 0.0.6', :git => 'git://github.com/dkubb/veritas.git'
+gem 'veritas', '~> 0.0.7', :git => 'git://github.com/dkubb/veritas.git'
 
 group :development do
   gem 'backports', '~> 2.3.0'

data/lib/veritas/sql/generator/core_ext/date_time.rb

@@ -3,6 +3,7 @@
 # Extend DateTime with methods available in ruby 1.9
 class DateTime
 
+  # TODO: remove the rbx guard when fractional seconds are handled properly in 1.9 mode
   SEC_FRACTION_MULTIPLIER = RUBY_VERSION < '1.9' ? 60 * 60 * 24 : 1
 
   # Return the DateTime in ISO8601 date-time format

data/lib/veritas/sql/generator/version.rb

@@ -3,7 +3,7 @@
 module Veritas
   module SQL
     module Generator
-      VERSION = '0.0.6'
+      VERSION = '0.0.7'
     end # module Generator
   end # module SQL
 end # module Veritas

data/spec/rcov.opts

@@ -4,3 +4,4 @@
 --xrefs
 --profile
 --text-summary
+--failure-threshold 100

data/spec/spec_helper.rb

@@ -2,7 +2,7 @@
 
 require 'rubygems'
 require 'backports'
-require 'backports/basic_object'
+require 'backports/basic_object' unless RUBY_VERSION >= '1.9.2' && (RUBY_PLATFORM.include?('java') || RUBY_ENGINE == 'rbx')
 require 'veritas-sql-generator'
 require 'spec'
 require 'spec/autorun'

data/spec/unit/date_time/iso8601_spec.rb

@@ -0,0 +1,112 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe DateTime, '#iso8601' do
+
+  # ruby 1.9.3 has problems with fractional nanoseconds
+  def self.it_supports_nanoseconds(message = 'returns the expected date-time', &block)
+    if RUBY_VERSION >= '1.9.3'
+      it(message) { pending('Fix rounding error in 1.9.3', &block) }
+    else
+      it(message, &block)
+    end
+  end
+
+  let(:object)          { described_class.new(2010, 12, 31, 23, 59, 59 + nsec_in_seconds) }
+  let(:nsec_in_seconds) { 1 - Rational(1, 10**9)                                          }
+
+  context 'with no arguments' do
+    subject { object.iso8601 }
+
+    context 'when the datetime is frozen' do
+      before do
+        object.freeze
+      end
+
+      it { should respond_to(:to_s) }
+
+      it_supports_nanoseconds do
+        should == '2010-12-31T23:59:59+00:00'
+      end
+    end
+
+    context 'when the datetime is not frozen' do
+      it { should respond_to(:to_s) }
+
+      it { should == '2010-12-31T23:59:59+00:00' }
+    end
+  end
+
+  context 'with a time scale of 0' do
+    subject { object.iso8601(time_scale) }
+
+    let(:time_scale) { 0 }
+
+    context 'when the datetime is frozen' do
+      before do
+        object.freeze
+      end
+
+      it { should respond_to(:to_s) }
+
+      it_supports_nanoseconds do
+        should == '2010-12-31T23:59:59+00:00'
+      end
+    end
+
+    context 'when the datetime is not frozen' do
+      it { should respond_to(:to_s) }
+
+      it { should == '2010-12-31T23:59:59+00:00' }
+    end
+  end
+
+  context 'with a time scale of 1' do
+    subject { object.iso8601(time_scale) }
+
+    let(:time_scale) { 1 }
+
+    context 'when the datetime is frozen' do
+      before do
+        object.freeze
+      end
+
+      it { should respond_to(:to_s) }
+
+      it_supports_nanoseconds do
+        should == '2010-12-31T23:59:59.9+00:00'
+      end
+    end
+
+    context 'when the datetime is not frozen' do
+      it { should respond_to(:to_s) }
+
+      it { should == '2010-12-31T23:59:59.9+00:00' }
+    end
+  end
+
+  context 'with a time scale of 9' do
+    subject { object.iso8601(time_scale) }
+
+    let(:time_scale) { 9 }
+
+    context 'when the datetime is frozen' do
+      before do
+        object.freeze
+      end
+
+      it { should respond_to(:to_s) }
+
+      it_supports_nanoseconds do
+        should == '2010-12-31T23:59:59.999999999+00:00'
+      end
+    end
+
+    context 'when the datetime is not frozen' do
+      it { should respond_to(:to_s) }
+
+      it { should == '2010-12-31T23:59:59.999999999+00:00' }
+    end
+  end
+end

data/spec/unit/veritas/sql/generator/literal/visit_date_time_spec.rb

@@ -21,16 +21,13 @@ describe SQL::Generator::Literal, '#visit_date_time' do
       its(:to_s) { should eql("'2010-12-31T23:59:59.000000000+00:00'") }
     end
 
-    # rubinius 1.2.3 has problems with fractional seconds above 59
-    unless defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx' && Rubinius::VERSION <= '1.2.3'
-      context 'and the nanoseconds are greater than 0' do
-        let(:nsec)      { 1                                                                       }
-        let(:date_time) { DateTime.new(2010, 12, 31, 23, 59, 59 + nsec_in_seconds, offset).freeze }
+    context 'and the nanoseconds are greater than 0' do
+      let(:nsec)      { 1                                                                       }
+      let(:date_time) { DateTime.new(2010, 12, 31, 23, 59, 59 + nsec_in_seconds, offset).freeze }
 
-        it_should_behave_like 'a generated SQL expression'
+      it_should_behave_like 'a generated SQL expression'
 
-        its(:to_s) { should eql("'2010-12-31T23:59:59.000000001+00:00'") }
-      end
+      its(:to_s) { should eql("'2010-12-31T23:59:59.000000001+00:00'") }
     end
   end
 
@@ -46,16 +43,13 @@ describe SQL::Generator::Literal, '#visit_date_time' do
       its(:to_s) { should eql("'2010-12-31T23:59:59.000000000+00:00'") }
     end
 
-    # rubinius 1.2.3 has problems with fractional seconds above 59
-    unless defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx' && Rubinius::VERSION <= '1.2.3'
-      context 'and the nanoseconds are greater than 0' do
-        let(:nsec)      { 1                                                                       }
-        let(:date_time) { DateTime.new(2010, 12, 31, 15, 59, 59 + nsec_in_seconds, offset).freeze }
+    context 'and the nanoseconds are greater than 0' do
+      let(:nsec)      { 1                                                                       }
+      let(:date_time) { DateTime.new(2010, 12, 31, 15, 59, 59 + nsec_in_seconds, offset).freeze }
 
-        it_should_behave_like 'a generated SQL expression'
+      it_should_behave_like 'a generated SQL expression'
 
-        its(:to_s) { should eql("'2010-12-31T23:59:59.000000001+00:00'") }
-      end
+      its(:to_s) { should eql("'2010-12-31T23:59:59.000000001+00:00'") }
     end
   end
 end

data/spec/unit/veritas/sql/generator/literal/visit_time_spec.rb

@@ -5,9 +5,9 @@ require 'spec_helper'
 describe SQL::Generator::Literal, '#visit_time' do
   subject { object.visit_time(time) }
 
-  # Time#iso8601 is currently broken in JRuby 1.6.2 when fractional seconds are not 0
+  # Time#iso8601 is currently broken in JRuby 1.7.0.dev when fractional seconds are not 0
   def self.time_iso8601_broken?
-    RUBY_PLATFORM.include?('java') && JRUBY_VERSION <= '1.6.2' && RUBY_VERSION >= '1.9.2'
+    RUBY_PLATFORM.include?('java') && JRUBY_VERSION <= '1.7.0.dev' && RUBY_VERSION >= '1.9.2'
   end
 
   let(:described_class) { Class.new(SQL::Generator::Visitor) { include SQL::Generator::Literal } }

data/tasks/metrics/ci.rake

@@ -1,7 +1,7 @@
 desc 'Run metrics with Heckle'
-task :ci => [ 'ci:metrics', :heckle ]
+task :ci => %w[ ci:metrics heckle ]
 
 namespace :ci do
   desc 'Run metrics'
-  task :metrics => [ :verify_measurements, :flog, :flay, :reek, :roodi, 'metrics:all' ]
+  task :metrics => %w[ verify_measurements flog flay reek roodi metrics:all ]
 end

data/tasks/metrics/heckle.rake

@@ -6,7 +6,7 @@ $LOAD_PATH.unshift(File.expand_path('../../../lib', __FILE__))
 begin
   require 'pathname'
   require 'backports'
-  require 'backports/basic_object'
+  require 'backports/basic_object' unless RUBY_VERSION >= '1.9.2' && (RUBY_PLATFORM.include?('java') || RUBY_ENGINE == 'rbx')
   require 'active_support/inflector'
   require 'heckle'
   require 'mspec'
@@ -27,13 +27,16 @@ begin
   end
 
   desc 'Heckle each module and class'
-  task :heckle => :verify_rcov do
+  task :heckle => :rcov do
     unless Ruby2Ruby::VERSION == '1.2.2'
       raise "ruby2ruby version #{Ruby2Ruby::VERSION} may not work properly, 1.2.2 *only* is recommended for use with heckle"
     end
 
     require 'veritas/sql/generator'
-    root_module = 'Veritas::SQL::Generator'
+
+    root_module_regexp = Regexp.union(
+      'Veritas::SQL::Generator'
+    )
 
     spec_dir = Pathname('spec/unit')
 
@@ -50,7 +53,7 @@ begin
     unhandled_mutations = 0
 
     ObjectSpace.each_object(Module) do |mod|
-      next unless mod.name =~ /\A#{root_module}(?::|\z)/
+      next unless mod.name =~ /\A#{root_module_regexp}(?::|\z)/
 
       spec_prefix = spec_dir.join(mod.name.underscore)
 
@@ -135,9 +138,9 @@ begin
         descedant_specs = []
 
         ObjectSpace.each_object(Module) do |descedant|
-          next unless descedant.name =~ /\A#{root_module}(?::|\z)/ && mod >= descedant
+          next unless descedant.name =~ /\A#{root_module_regexp}(?::|\z)/ && mod >= descedant
           descedant_spec_prefix = spec_dir.join(descedant.name.underscore)
-          descedant_specs.concat(Pathname.glob(descedant_spec_prefix.join('*_spec.rb')))
+          descedant_specs << descedant_spec_prefix
 
           if method.to_s == 'initialize'
             descedant_specs.concat(Pathname.glob(descedant_spec_prefix.join('class_methods/new_spec.rb')))
@@ -151,9 +154,8 @@ begin
         descedant_specs = []
 
         ObjectSpace.each_object(Module) do |descedant|
-          next unless descedant.name =~ /\A#{root_module}(?::|\z)/ && mod >= descedant
-          descedant_spec_prefix = spec_dir.join(descedant.name.underscore)
-          descedant_specs.concat(Pathname.glob(descedant_spec_prefix.join('class_methods/*_spec.rb')))
+          next unless descedant.name =~ /\A#{root_module_regexp}(?::|\z)/ && mod >= descedant
+          descedant_specs << spec_dir.join(descedant.name.underscore).join('class_methods')
         end
 
         specs << [ ".#{method}", descedant_specs ]

data/tasks/spec.rake

@@ -1,37 +1,46 @@
 spec_defaults = lambda do |spec|
-  spec.pattern    = 'spec/**/*_spec.rb'
-  spec.libs      << 'lib' << 'spec'
   spec.spec_opts << '--options' << 'spec/spec.opts'
 end
 
 begin
   require 'spec/rake/spectask'
 
-  Spec::Rake::SpecTask.new(:spec, &spec_defaults)
+  desc 'Run all specs'
+  task :spec => %w[ spec:unit spec:integration ]
+
+  namespace :spec do
+    desc 'Run unit specs'
+    Spec::Rake::SpecTask.new(:unit) do |unit|
+      spec_defaults.call(unit)
+      unit.pattern = 'spec/unit/**/*_spec.rb'
+    end
+
+    desc 'Run integration specs'
+    Spec::Rake::SpecTask.new(:integration) do |integration|
+      spec_defaults.call(integration)
+      integration.pattern = 'spec/integration/**/*_spec.rb'
+    end
+  end
 rescue LoadError
-  task :spec do
-    abort 'rspec is not available. In order to run spec, you must: gem install rspec'
+  %w[ spec spec:unit spec:integration ].each do |name|
+    task name do
+      abort "rspec is not available. In order to run #{name}, you must: gem install rspec"
+    end
   end
 end
 
 begin
   require 'rcov'
-  require 'spec/rake/verify_rcov'
 
   Spec::Rake::SpecTask.new(:rcov) do |rcov|
     spec_defaults.call(rcov)
     rcov.rcov      = true
+    rcov.pattern   = 'spec/unit/**/*_spec.rb'
     rcov.rcov_opts = File.read('spec/rcov.opts').split(/\s+/)
   end
-
-  RCov::VerifyTask.new(:verify_rcov => :rcov) do |rcov|
-    rcov.threshold = 100
-  end
 rescue LoadError
-  %w[ rcov verify_rcov ].each do |name|
-    task name do
-      abort "rcov is not available. In order to run #{name}, you must: gem install rcov"
-    end
+  task :rcov do
+    abort 'rcov is not available. In order to run rcov, you must: gem install rcov'
   end
 end
 

data/veritas-sql-generator.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "veritas-sql-generator"
-  s.version = "0.0.6"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Kubb"]
-  s.date = "2011-10-04"
+  s.date = "2012-03-08"
   s.description = "Generate SQL from a veritas relation"
   s.email = "dan.kubb@gmail.com"
   s.extra_rdoc_files = [
@@ -61,7 +61,7 @@ Gem::Specification.new do |s|
     "spec/spec.opts",
     "spec/spec_helper.rb",
     "spec/unit/date/iso8601_spec.rb",
-    "spec/unit/date_time/iso_8601_spec.rb",
+    "spec/unit/date_time/iso8601_spec.rb",
     "spec/unit/veritas/sql/generator/attribute/visit_veritas_attribute_spec.rb",
     "spec/unit/veritas/sql/generator/class_methods/parenthesize_spec.rb",
     "spec/unit/veritas/sql/generator/direction/visit_veritas_relation_operation_order_ascending_spec.rb",
@@ -157,21 +157,21 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "https://github.com/dkubb/veritas-sql-generator"
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.16"
   s.summary = "Relational algebra SQL generator"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<veritas>, ["~> 0.0.6"])
+      s.add_runtime_dependency(%q<veritas>, ["~> 0.0.7"])
       s.add_development_dependency(%q<backports>, ["~> 2.3.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<rake>, ["~> 0.9.2"])
       s.add_development_dependency(%q<rspec>, ["~> 1.3.2"])
       s.add_development_dependency(%q<yard>, ["~> 0.7.2"])
     else
-      s.add_dependency(%q<veritas>, ["~> 0.0.6"])
+      s.add_dependency(%q<veritas>, ["~> 0.0.7"])
       s.add_dependency(%q<backports>, ["~> 2.3.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<rake>, ["~> 0.9.2"])
@@ -179,7 +179,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<yard>, ["~> 0.7.2"])
     end
   else
-    s.add_dependency(%q<veritas>, ["~> 0.0.6"])
+    s.add_dependency(%q<veritas>, ["~> 0.0.7"])
     s.add_dependency(%q<backports>, ["~> 2.3.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
     s.add_dependency(%q<rake>, ["~> 0.9.2"])

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: veritas-sql-generator
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Dan Kubb
@@ -15,28 +15,27 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-04 00:00:00 Z
+date: 2012-03-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 17
         segments: 
         - 0
         - 0
-        - 6
-        version: 0.0.6
-  version_requirements: *id001
+        - 7
+        version: 0.0.7
+  prerelease: false
+  requirement: *id001
   name: veritas
 - !ruby/object:Gem::Dependency 
   type: :development
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -47,12 +46,12 @@ dependencies:
         - 3
         - 0
         version: 2.3.0
-  version_requirements: *id002
+  prerelease: false
+  requirement: *id002
   name: backports
 - !ruby/object:Gem::Dependency 
   type: :development
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -63,12 +62,12 @@ dependencies:
         - 6
         - 4
         version: 1.6.4
-  version_requirements: *id003
+  prerelease: false
+  requirement: *id003
   name: jeweler
 - !ruby/object:Gem::Dependency 
   type: :development
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -79,12 +78,12 @@ dependencies:
         - 9
         - 2
         version: 0.9.2
-  version_requirements: *id004
+  prerelease: false
+  requirement: *id004
   name: rake
 - !ruby/object:Gem::Dependency 
   type: :development
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -95,12 +94,12 @@ dependencies:
         - 3
         - 2
         version: 1.3.2
-  version_requirements: *id005
+  prerelease: false
+  requirement: *id005
   name: rspec
 - !ruby/object:Gem::Dependency 
   type: :development
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -111,7 +110,8 @@ dependencies:
         - 7
         - 2
         version: 0.7.2
-  version_requirements: *id006
+  prerelease: false
+  requirement: *id006
   name: yard
 description: Generate SQL from a veritas relation
 email: dan.kubb@gmail.com
@@ -167,7 +167,7 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/unit/date/iso8601_spec.rb
-- spec/unit/date_time/iso_8601_spec.rb
+- spec/unit/date_time/iso8601_spec.rb
 - spec/unit/veritas/sql/generator/attribute/visit_veritas_attribute_spec.rb
 - spec/unit/veritas/sql/generator/class_methods/parenthesize_spec.rb
 - spec/unit/veritas/sql/generator/direction/visit_veritas_relation_operation_order_ascending_spec.rb
@@ -289,7 +289,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: Relational algebra SQL generator

data/spec/unit/date_time/iso_8601_spec.rb

@@ -1,115 +0,0 @@
-# encoding: utf-8
-
-require 'spec_helper'
-
-describe DateTime, '#iso8601' do
-
-  # ruby 1.9.3 has problems with fractional nanoseconds
-  def self.it_supports_nanoseconds(message = 'returns the expected date-time', &block)
-    if RUBY_VERSION >= '1.9.3'
-      it(message) { pending('Fix rounding error in 1.9.3', &block) }
-    else
-      it(message, &block)
-    end
-  end
-
-  let(:object)          { described_class.new(2010, 12, 31, 23, 59, 59 + nsec_in_seconds) }
-  let(:nsec_in_seconds) { 1 - Rational(1, 10**9)                                          }
-
-  # rubinius 1.2.3 has problems with fractional seconds above 59
-  unless defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx' && Rubinius::VERSION <= '1.2.3'
-    context 'with no arguments' do
-      subject { object.iso8601 }
-
-      context 'when the datetime is frozen' do
-        before do
-          object.freeze
-        end
-
-        it { should respond_to(:to_s) }
-
-        it_supports_nanoseconds do
-          should == '2010-12-31T23:59:59+00:00'
-        end
-      end
-
-      context 'when the datetime is not frozen' do
-        it { should respond_to(:to_s) }
-
-        it { should == '2010-12-31T23:59:59+00:00' }
-      end
-    end
-
-    context 'with a time scale of 0' do
-      subject { object.iso8601(time_scale) }
-
-      let(:time_scale) { 0 }
-
-      context 'when the datetime is frozen' do
-        before do
-          object.freeze
-        end
-
-        it { should respond_to(:to_s) }
-
-        it_supports_nanoseconds do
-          should == '2010-12-31T23:59:59+00:00'
-        end
-      end
-
-      context 'when the datetime is not frozen' do
-        it { should respond_to(:to_s) }
-
-        it { should == '2010-12-31T23:59:59+00:00' }
-      end
-    end
-
-    context 'with a time scale of 1' do
-      subject { object.iso8601(time_scale) }
-
-      let(:time_scale) { 1 }
-
-      context 'when the datetime is frozen' do
-        before do
-          object.freeze
-        end
-
-        it { should respond_to(:to_s) }
-
-        it_supports_nanoseconds do
-          should == '2010-12-31T23:59:59.9+00:00'
-        end
-      end
-
-      context 'when the datetime is not frozen' do
-        it { should respond_to(:to_s) }
-
-        it { should == '2010-12-31T23:59:59.9+00:00' }
-      end
-    end
-
-    context 'with a time scale of 9' do
-      subject { object.iso8601(time_scale) }
-
-      let(:time_scale) { 9 }
-
-      context 'when the datetime is frozen' do
-        before do
-          object.freeze
-        end
-
-        it { should respond_to(:to_s) }
-
-        it_supports_nanoseconds do
-          should == '2010-12-31T23:59:59.999999999+00:00'
-        end
-      end
-
-      context 'when the datetime is not frozen' do
-        it { should respond_to(:to_s) }
-
-        it { should == '2010-12-31T23:59:59.999999999+00:00' }
-      end
-    end
-  end
-end