prayer_times 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e89b6c2230b659b3b2fd707ba5a3c194d65033b
-  data.tar.gz: faa3a09be325715ae026b46db68843e541621e28
+  metadata.gz: 23668ebb639089cdf8451c9c5ffa42702358680a
+  data.tar.gz: cc3dbd842147e4913521cd9ca5f569137bde6075
 SHA512:
-  metadata.gz: 8e9e13fe01d692a5cd75b7ee19f3a88073828a2a434c3968bb3db95412dac5b043e8f972cee7090440ce93f5dd2c4e981f8050b766376ff654bb615d2e978c6d
-  data.tar.gz: c8a69236937c91491578b4f27d54e7807c106c6ac1603dfa7512a959407e09d5100a0ec9f029a4082ebe1e162494757f22580624f3173273f133bb59db7c22ce
+  metadata.gz: 7374364717287c1dc0edd83b2f96325c57d50496b3dc59e8c9b8f98c67a2fd4e74a67dccdde8e2d435e6782e28dfd5cd96ed9c399dfef821415e8255f1f2feb3
+  data.tar.gz: 76e797a4aa71a5662ba2b8bdc0c1831a2627073abd7a51c7b2a223845c2c97a64f7624d7955d55140e592c361b341497a3cb0bcd068f3ec1b21aee36aa1e0685

data/.rspec

@@ -0,0 +1,3 @@
+--color
+--format Nc
+--format=doc

data/.travis.yml

@@ -1,7 +1,23 @@
+bundler_args: --without development
 language: ruby
 rvm:
-  - 1.9.3
   - 1.9.2
+  - 1.9.3
+  - 2.0.0
+  - 2.1
+  - rbx-2
   - jruby-19mode
   - ruby-head
   - jruby-head
+matrix:
+  include:
+    - rvm: jruby-19mode
+      env: JRUBY_OPTS="$JRUBY_OPTS --debug"
+    - rvm: jruby-head
+      env: JRUBY_OPTS="$JRUBY_OPTS --debug"
+  allow_failures:
+    - rvm: jruby-19mode
+    - rvm: jruby-head
+    - rvm: rbx-2
+    - rvm: ruby-head
+  fast_finish: true

data/.yardopts

@@ -0,0 +1,5 @@
+--no-private
+--markup markdown
+-
+README.md
+LICENSE.md

data/Gemfile

@@ -1,4 +1,30 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in prayer_times.gemspec
+gem 'jruby-openssl', :platforms => :jruby
+gem 'rake'
+gem 'yard'
+
+group :development do
+  gem 'pry'
+  gem 'pry-remote'
+  gem 'pry-nav'
+  platforms :ruby_19, :ruby_20, :ruby_21 do
+    gem 'redcarpet'
+  end
+end
+
+group :test do
+  gem 'coveralls', '~> 0.7', :require => false
+  gem 'rspec', '>= 2.14'
+  gem 'rspec-nc'
+  gem 'rubocop', '>= 0.2', :platforms => [:ruby_19, :ruby_20, :ruby_21]
+  gem 'simplecov', '~> 0.9', :require => false
+  if RUBY_VERSION >= "1.9.3"
+    gem 'guard', '~> 2.6'
+    gem 'guard-rspec', '~> 4.2'
+  end
+end
+
+
+# Specify your gem's dependencies in feedlr.gemspec
 gemspec

data/Guardfile

@@ -0,0 +1,5 @@
+guard 'rspec' do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/prayer_times/#{m[1]}_spec.rb" }
+  watch('spec/helper.rb')  { "spec" }
+end

data/README.md

@@ -45,7 +45,7 @@ There are [several methods](https://github.com/Startappz/prayer_times/wiki/Calcu
 ```ruby
 PrayerTimes.calculation_methods
 PrayerTimes.calculation_methods.names
-PrayerTimes.calculation_methods.add("Test", "Testing method", fajr: 16.5, asr: 'Hanafi', isha: '80 min') 
+PrayerTimes.calculation_methods.add("Test", "Testing method", fajr: 16.5, asr: 'Hanafi', isha: '80 min')
 new_method = PrayerTimes.calculation_methods["Test"]
 new_method.description = "new description"
 new_method.settings = {fajr: 19.5, isha: '33 min'}
@@ -70,7 +70,7 @@ pt = PrayerTimes.new("Makkah", options)
 
 ## Help
 
-Your help is appreciated, specially in adjusting the calculation methods and making them more accurate. 
+Your help is appreciated, specially in adjusting the calculation methods and making them more accurate.
 Your contribution is welcome.
 
 ## Contributing

data/Rakefile

@@ -1,11 +1,10 @@
-require "bundler/gem_tasks"
-require 'rake/testtask'
- 
-Rake::TestTask.new do |t|
-  t.libs << 'lib/prayer_times'
-  t.test_files = FileList['test/lib/prayer_times/*_test.rb']
-  t.verbose = true
+require 'rspec/core/rake_task'
+require 'bundler/gem_tasks'
+
+# Default directory to look in is `/specs`
+# Run with `rake spec`
+RSpec::Core::RakeTask.new(:spec) do |task|
+  task.rspec_opts = ['--color', '--format', 'doc']
 end
- 
-task :default => :test
 
+task :default => :spec

data/lib/prayer_times.rb

@@ -1,24 +1,25 @@
 # encoding: UTF-8
 require 'date'
 require 'forwardable'
-require_relative "prayer_times/version"
-require_relative "prayer_times/constants"
-require_relative "prayer_times/math_helpers"
-require_relative "prayer_times/calculation_method"
-require_relative "prayer_times/calculation_methods"
-require_relative "prayer_times/setters"
-require_relative "prayer_times/calculator"
-require_relative "prayer_times/calculation"
+require_relative 'prayer_times/version'
+require_relative 'prayer_times/constants'
+require_relative 'prayer_times/math_helpers'
+require_relative 'prayer_times/calculation_method'
+require_relative 'prayer_times/calculation_methods'
+require_relative 'prayer_times/setters'
+require_relative 'prayer_times/calculator'
+require_relative 'prayer_times/calculation'
 
 module PrayerTimes #:nodoc:
   class << self
     include Setters
 
     attr_reader :iterations_count, :times_names, :calculation_methods,
-      :calculation_method,:time_format, :time_suffixes,:times_offsets,
+      :calculation_method, :time_format, :time_suffixes, :times_offsets,
       :invalid_time
+
     # @see Calculator initializer
-    def new(calc_method=@calucation_method,opts={})
+    def new(calc_method = @calucation_method, opts = {})
       PrayerTimes::Calculator.new(calc_method, opts)
     end
 
@@ -28,8 +29,8 @@ module PrayerTimes #:nodoc:
 
     def set_attributes
       attrs =  [:iterations_count, :times_names, :time_format,
-                :time_suffixes,:times_offsets, :invalid_time]
-      attrs.each {|attr| self.send "#{attr}=", nil}
+                :time_suffixes, :times_offsets, :invalid_time]
+      attrs.each { |attr| send "#{attr}=", nil }
 
       @calculation_methods = CalculationMethods.new
 
@@ -38,5 +39,4 @@ module PrayerTimes #:nodoc:
   end
 
   set_attributes
-
 end

data/lib/prayer_times/calculator.rb

@@ -44,8 +44,8 @@ module PrayerTimes
       Calculation.new(self,
                       date,
                       coords,
-      time_zone + (dst.nil? ? 0 : 1)).
-        compute
+                      time_zone + (dst.nil? ? 0 : 1))
+      .compute
     end
 
     private

data/lib/prayer_times/constants.rb

@@ -32,16 +32,16 @@ module PrayerTimes
     @time_format =    '24h'
 
     # Determines the accepted time format values
-    @accepted_time_formats = ['12h','24h','12hNS','Float']
+    @accepted_time_formats = %w(12h 24h 12hNS Float)
 
     # Times suffixes names to be displayed
-    @time_suffixes=  {:am => 'AM', :pm => 'PM'}
+    @time_suffixes = { am: 'AM', pm: 'PM' }
 
     # What to display when the time is invalid
-    @invalid_time=   '-----'
+    @invalid_time = '-----'
 
     # Time offsets
-    @times_offsets = @times_names.keys.inject({}){ |h,k| h.merge!(k => 0)}
+    @times_offsets = @times_names.keys.reduce({}) { |a, e| a.merge!(e => 0) }
 
     class << self
       attr_reader :iterations_count, :times_names,

data/lib/prayer_times/setters.rb

@@ -7,7 +7,8 @@ module PrayerTimes
     # @param [Integer] num
     #   0 < num < 6
     def iterations_count=(num)
-      @iterations_count = if (Constants.accepted_iterations_count_range).include?(num)
+      @iterations_count =
+      if (Constants.accepted_iterations_count_range).include?(num)
         num
       else
         const_class.iterations_count
@@ -21,7 +22,8 @@ module PrayerTimes
     #   '12hNS':  12-hour format with no suffix,
     #   'Float':  floating point number
     def time_format=(format)
-      @time_format = if Constants.accepted_time_formats.include?(format)
+      @time_format =
+      if Constants.accepted_time_formats.include?(format)
         format
       else
         const_class.time_format
@@ -37,28 +39,29 @@ module PrayerTimes
     # Sets times suffixes
     # @param [Hash] suffixes
     def time_suffixes=(suffixes)
-      s = suffixes.reject{|k,v| !(const_class.time_suffixes.key?(k) and v.is_a?(String))} rescue {}
+      s = suffixes.reject { |k, v| !(const_class.time_suffixes.key?(k) && v.is_a?(String)) } rescue {}
       @time_suffixes = const_class.time_suffixes.merge(s)
     end
 
     # Sets times names
     # @param [Hash] names
     def times_names=(names)
-      s = names.reject{|k,v| !(const_class.times_names.key?(k) and v.is_a?(String))} rescue {}
+      s = names.reject { |k, v| !(const_class.times_names.key?(k) && v.is_a?(String)) } rescue {}
       @times_names = const_class.times_names.merge(s)
     end
 
     # Sets times offsets
     # @param [Hash] offsets
     def times_offsets=(offsets)
-      s = offsets.reject{|k,v| !(const_class.times_offsets.key?(k) and v.is_a?(Numeric))} rescue {}
+      s = offsets.reject { |k, v| !(const_class.times_offsets.key?(k) && v.is_a?(Numeric)) } rescue {}
       @times_offsets = const_class.times_offsets.merge(s)
     end
 
-    # Sets calculation method and the corresponding settings
+    # Sets calculation method && the corresponding settings
     # @param [String] calc_method the method name
     def calculation_method=(calc_method)
-      @calculation_method = if PrayerTimes.calculation_methods.key?(calc_method)
+      @calculation_method =
+      if PrayerTimes.calculation_methods.key?(calc_method)
         const_class.calculation_methods[calc_method]
       else
         PrayerTimes.calculation_method

data/lib/prayer_times/version.rb

@@ -1,5 +1,6 @@
 # encoding: UTF-8
+# PrayerTimes namespace module
 module PrayerTimes
   # Determines the version of this gem
-  VERSION = "0.1.2"
-end
+  VERSION = '0.1.3'
+end

data/prayer_times.gemspec

@@ -4,23 +4,17 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'prayer_times/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "prayer_times"
+  spec.name          = 'prayer_times'
   spec.version       = PrayerTimes::VERSION
-  spec.authors       = ["Khaled alHabache"]
-  spec.email         = ["khellls@gmail.com"]
+  spec.authors       = ['Khaled alHabache']
+  spec.email         = ['khellls@gmail.com']
   spec.description   = %q{Calculates Muslim prayers times in given settings}
   spec.summary       = %q{Muslim prayers times calculator}
-  spec.homepage      = "https://github.com/Startappz/prayer_times/"
-  spec.license       = "GNU LGPL v3.0"
-
+  spec.homepage      = 'https://github.com/Startappz/prayer_times/'
+  spec.license       = 'GNU LGPL v3.0'
+  spec.required_ruby_version = '>= 1.9.2'
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
-
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "minitest"
-  spec.add_development_dependency "coveralls"
-
+  spec.test_files = Dir.glob('spec/**/*')
+  spec.require_paths = ['lib']
 end

data/spec/helper.rb

@@ -0,0 +1,29 @@
+require 'rspec'
+require 'simplecov'
+require 'coveralls'
+
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter
+]
+
+SimpleCov.start do
+  add_filter '/spec/'
+  minimum_coverage(95.0)
+end
+
+require_relative '../lib/prayer_times.rb'
+
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+RSpec.configure do |config|
+  config.run_all_when_everything_filtered = true
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = 'random'
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
+end

data/spec/prayer_times/calculation_method_spec.rb

@@ -0,0 +1,58 @@
+# encoding: UTF-8
+require 'helper'
+
+describe PrayerTimes::CalculationMethod do
+
+  let(:method_name) { 'Medina' }
+  let(:description) { 'Medina testing methods' }
+
+  describe 'Object' do
+    subject { PrayerTimes::CalculationMethod.new(method_name, description, {}) }
+    it { expect(subject).to respond_to(:description) }
+    it { expect(subject).to respond_to(:description=) }
+    it { expect(subject).to respond_to(:settings) }
+    it { expect(subject).to respond_to(:settings=) }
+    it { expect(subject).to respond_to(:offsets) }
+    it { expect(subject).to respond_to(:offsets=) }
+  end
+
+  describe '#initialize' do
+    context 'when method_name and description are provided' do
+      subject { PrayerTimes::CalculationMethod.new(method_name, description) }
+      it { expect(subject.name).to eq(method_name) }
+      it { expect(subject.description).to eq(description) }
+    end
+
+    context 'when settings are not provided' do
+      subject { PrayerTimes::CalculationMethod.new(method_name, description, {}) }
+      it { expect(subject.settings).to eq(PrayerTimes::CalculationMethod.default_settings) }
+    end
+
+    context 'when settings are provided' do
+      let(:opts){{
+                   fajr:       18,
+                   asr:        'Hanafi',
+                   isha:       18
+      }}
+      subject { PrayerTimes::CalculationMethod.new(method_name, description,opts) }
+      it { expect(subject.settings).to eq(PrayerTimes::CalculationMethod.default_settings.merge opts) }
+    end
+
+    context 'when offsets are not provided' do
+      subject { PrayerTimes::CalculationMethod.new(method_name, description, {}, {}) }
+      it { expect(subject.offsets).to eq(PrayerTimes::Constants.times_offsets) }
+    end
+
+    context 'when offsets are provided' do
+      let(:opts){{
+                   fajr:       3,
+                   asr:        -1,
+                   isha:       6
+      }}
+      subject { PrayerTimes::CalculationMethod.new(method_name, description,{},opts) }
+      it { expect(subject.offsets).to eq(PrayerTimes::Constants.times_offsets.merge opts) }
+    end
+
+  end
+
+end

data/spec/prayer_times/calculation_methods_spec.rb

@@ -0,0 +1,38 @@
+# encoding: UTF-8
+require 'helper'
+
+describe PrayerTimes::CalculationMethods do
+  describe '#initialize' do
+    subject { PrayerTimes::CalculationMethods.new }
+    it { expect(subject).to respond_to(:add) }
+    it { expect(subject.keys).to eq(subject.class.default_methods.keys) }
+    it { expect(subject).to respond_to(:[]) }
+    it { expect(subject).to respond_to(:each) }
+    it { expect(subject).to respond_to(:keys) }
+    it { expect(subject).to respond_to(:key?) }
+    it { expect(subject).to respond_to(:delete) }
+  end
+
+  describe '#add' do
+    before do
+      @subject = PrayerTimes::CalculationMethods.new
+      @settings = { fajr: 16.5, asr: 'Hanafi', isha: '80 min' }
+      @offsets = { dhuhr: 2, asr: -1, isha: 3 }
+
+      @new = @subject.add('Test', 'Testing method', @settings, @offsets)
+    end
+    it { expect(@new).to be_a(PrayerTimes::CalculationMethod) }
+    it { expect(@subject['Test']).to eq(@new) }
+    it { expect(@subject['Test'].settings[:fajr]).to eq(16.5) }
+    it { expect(@subject['Test'].settings[:asr]).to eq('Hanafi') }
+    it { expect(@subject['Test'].settings[:isha]).to eq('80 min') }
+    it { expect(@subject['Test'].offsets[:dhuhr]).to eq(2) }
+    it { expect(@subject['Test'].offsets[:asr]).to eq(-1) }
+    it { expect(@subject['Test'].offsets[:isha]).to eq(3) }
+  end
+
+  describe '#names' do
+    subject { PrayerTimes::CalculationMethods.new }
+    it { expect(subject.names).to eq(subject.keys) }
+  end
+end

data/spec/prayer_times/calculation_spec.rb

@@ -0,0 +1,159 @@
+# encoding: UTF-8
+require 'helper'
+
+# Those results are tested against numbers from the js code
+# http://praytimes.org/code/v2/js/PrayTimes.js
+describe PrayerTimes::Calculation do
+  describe '#compute' do
+    context 'when method is MWL' do
+      context 'when date is 2011/2/9, location is Waterloo/Canada and timezone -5' do
+        let(:pt) { PrayerTimes.new}
+        subject{pt.get_times([2011,2,9], [43, -80], -5) }
+        let(:expected) { {
+                           'Imsak' =>  '05:40',
+                           'Fajr' => '05:50',
+                           'Sunrise' => '07:26',
+                           'Dhuhr' => '12:34',
+                           'Asr' => '15:18' ,
+                           'Sunset' => '17:43' ,
+                           'Maghrib' => '17:43' ,
+                           'Isha' => '19:14' ,
+        'Midnight' => '00:35' } }
+        it {expect(subject).to eq(expected) }
+      end
+    end
+
+    context 'when method is Makkah' do
+      let(:method_name) { 'Makkah'}
+
+      context 'time format is 24h and other settings are default' do
+        context 'when date is 2013/12/16, location is Amman/Jordan and timezone 3' do
+          let(:pt) { PrayerTimes.new method_name}
+          subject{pt.get_times([2013,12,16], [31,36], 3) }
+          let(:expected) { {
+                             'Imsak' =>  '05:48',
+                             'Fajr' => '05:58',
+                             'Sunrise' => '07:27',
+                             'Dhuhr' => '12:32',
+                             'Asr' => '15:18' ,
+                             'Sunset' => '17:36' ,
+                             'Maghrib' => '17:36' ,
+                             'Isha' => '19:06' ,
+          'Midnight' => '00:32' } }
+          it {expect(subject).to eq(expected) }
+        end
+      end
+
+      context 'time format is 24h, offsets are custom and other settings are default' do
+        context 'when date is 2013/12/16, location is Amman/Jordan and timezone 3' do
+          let(:pt) { PrayerTimes.new method_name, times_offsets: {fajr: 4, dhuhr: 2, midnight: 1}}
+          subject{pt.get_times([2013,12,16], [31,36], 3) }
+          let(:expected) { {
+                             'Imsak' =>  '05:48',
+                             'Fajr' => '06:02',
+                             'Sunrise' => '07:27',
+                             'Dhuhr' => '12:34',
+                             'Asr' => '15:18' ,
+                             'Sunset' => '17:36' ,
+                             'Maghrib' => '17:36' ,
+                             'Isha' => '19:06' ,
+          'Midnight' => '00:33' } }
+          it {expect(subject).to eq(expected) }
+        end
+      end
+
+
+
+      context 'time format is 24h, times names are custom and settings are default' do
+        context 'when date is 2013/12/16, location is Amman/Jordan and timezone 3' do
+          let(:pt) { PrayerTimes.new method_name, times_names: {asr: 'Aser', isha: 'Ishaa'}}
+          subject{pt.get_times([2013,12,16], [31,36], 3) }
+          let(:expected) { {
+                             'Imsak' =>  '05:48',
+                             'Fajr' => '05:58',
+                             'Sunrise' => '07:27',
+                             'Dhuhr' => '12:32',
+                             'Aser' => '15:18' ,
+                             'Sunset' => '17:36' ,
+                             'Maghrib' => '17:36' ,
+                             'Ishaa' => '19:06' ,
+          'Midnight' => '00:32' } }
+          it {expect(subject).to eq(expected) }
+        end
+      end
+
+      context 'time format is 12h, suffixes are custom and other settings are default' do
+        context 'when date is 2013/12/16, location is Amman/Jordan and timezone 3' do
+          let(:pt) { PrayerTimes.new method_name, time_format: '12h', time_suffixes: {:am => ' صباحا', :pm => ' مساءا'}}
+          subject{pt.get_times([2013,12,16], [31,36], 3) }
+          let(:expected) { {
+                             'Imsak' => '5:48 صباحا',
+                             'Fajr' => '5:58 صباحا',
+                             'Sunrise' => '7:27 صباحا',
+                             'Dhuhr' => '12:32 مساءا',
+                             'Asr' => '3:18 مساءا' ,
+                             'Sunset' => '5:36 مساءا' ,
+                             'Maghrib' => '5:36 مساءا' ,
+                             'Isha' => '7:06 مساءا' ,
+          'Midnight' => '12:32 صباحا' }}
+          it {expect(subject).to eq(expected) }
+        end
+      end
+    end
+
+    context 'when method is Turkey' do
+      context 'when date is 2013/12/17, location is Fatih/Istanbul/Turkey and timezone +2' do
+        let(:pt) { PrayerTimes.new 'Turkey', time_format: '12h'}
+        subject{pt.get_times([2013,12,17], [41.02,28.94], 2) }
+        let(:expected) { {
+                           'Imsak' =>  '5:34AM',
+                           'Fajr' => '5:42AM',
+                           'Sunrise' => '7:16AM',
+                           'Dhuhr' => '12:06PM',
+                           'Asr' => '2:24PM' ,
+                           'Sunset' => '4:37PM' ,
+                           'Maghrib' => '4:46PM' ,
+                           'Isha' => '6:13PM' ,
+        'Midnight' => '12:00AM' }}
+        it {expect(subject).to eq(expected) }
+      end
+    end
+
+    context 'when method is Karachi' do
+      context 'when date is 2013/12/17, location is Islamabad, timezone +5 and format is 12h' do
+        let(:pt) { PrayerTimes.new 'Karachi', time_format: '12h'}
+        subject{pt.get_times([2014,1,23], [33.73,73.06], 5) }
+        let(:expected) { {
+                           'Imsak' =>  '5:33AM',
+                           'Fajr' => '5:43AM',
+                           'Sunrise' => '7:10AM',
+                           'Dhuhr' => '12:20PM',
+                           'Asr' => '3:52PM' ,
+                           'Sunset' => '5:30PM' ,
+                           'Maghrib' => '5:30PM' ,
+                           'Isha' => '6:56PM' ,
+        'Midnight' => '12:20AM' } }
+        it {expect(subject).to eq(expected) }
+      end
+    end
+
+    context 'when method is Kula Malaysia' do
+      context 'when date is 2013/12/17, location is Kula Lumpur, timezone +8 and format is 12h' do
+        let(:pt) { PrayerTimes.new 'Malaysia', time_format: '12h'}
+        subject{pt.get_times([2014,1,23], [3.15,101.69], 8) }
+        let(:expected) { {
+                           'Imsak' =>  '5:54AM',
+                           'Fajr' => '6:07AM',
+                           'Sunrise' => '7:28AM',
+                           'Dhuhr' => '1:26PM',
+                           'Asr' => '4:50PM' ,
+                           'Sunset' => '7:25PM' ,
+                           'Maghrib' => '7:25PM' ,
+                           'Isha' => '8:36PM' ,
+        'Midnight' => '1:25AM' } }
+        it { expect(subject).to eq(expected) }
+      end
+    end
+
+  end
+end