sorcery 0.1.0 → 0.1.4

data/spec/rails3/user_reset_password_spec.rb

@@ -0,0 +1,198 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "User with reset_password submodule" do
+  before(:all) do
+    ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/reset_password")
+  end
+  
+  after(:all) do
+    ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/reset_password")
+  end
+
+  # ----------------- PLUGIN CONFIGURATION -----------------------
+  describe User, "loaded plugin configuration" do
+  
+    before(:all) do
+      plugin_model_configure([:reset_password], :reset_password_mailer => ::SorceryMailer)
+    end
+  
+    after(:each) do
+      User.sorcery_config.reset!
+    end
+    
+    it "should respond to 'deliver_reset_password_instructions!'" do
+      create_new_user
+      @user.should respond_to(:deliver_reset_password_instructions!)
+    end
+    
+    it "should respond to 'reset_password_token_valid?'" do
+      create_new_user
+      @user.should respond_to(:reset_password_token_valid?)
+    end
+    
+    it "should respond to 'reset_password!" do
+      create_new_user
+      @user.should respond_to(:reset_password!)
+    end
+    
+    it "should respond to 'load_from_reset_password_token'" do
+      create_new_user
+      User.should respond_to(:load_from_reset_password_token)
+    end
+    
+    it "should allow configuration option 'reset_password_token_attribute_name'" do
+      plugin_set_model_config_property(:reset_password_token_attribute_name, :my_code)
+      User.sorcery_config.reset_password_token_attribute_name.should equal(:my_code)
+    end
+    
+    it "should allow configuration option 'reset_password_mailer'" do
+      plugin_set_model_config_property(:reset_password_mailer, TestUser)
+      User.sorcery_config.reset_password_mailer.should equal(TestUser)
+    end
+    
+    it "should allow configuration option 'reset_password_email_method_name'" do
+      plugin_set_model_config_property(:reset_password_email_method_name, :my_mailer_method)
+      User.sorcery_config.reset_password_email_method_name.should equal(:my_mailer_method)
+    end
+    
+    it "should allow configuration option 'reset_password_expiration_period'" do
+      plugin_set_model_config_property(:reset_password_expiration_period, 16)
+      User.sorcery_config.reset_password_expiration_period.should equal(16)
+    end
+    
+    it "should allow configuration option 'reset_password_email_sent_at_attribute_name'" do
+      plugin_set_model_config_property(:reset_password_email_sent_at_attribute_name, :blabla)
+      User.sorcery_config.reset_password_email_sent_at_attribute_name.should equal(:blabla)
+    end
+    
+    it "should allow configuration option 'reset_password_time_between_emails'" do
+      plugin_set_model_config_property(:reset_password_time_between_emails, 16)
+      User.sorcery_config.reset_password_time_between_emails.should equal(16)
+    end
+  end
+
+  # ----------------- PLUGIN ACTIVATED -----------------------
+  describe User, "when activated with sorcery" do
+  
+    before(:all) do
+      plugin_model_configure([:reset_password], :reset_password_mailer => ::SorceryMailer)
+    end
+  
+    before(:each) do
+      User.delete_all
+    end
+
+    it "load_from_reset_password_token should return user when token is found" do
+      create_new_user
+      @user.deliver_reset_password_instructions!
+      User.load_from_reset_password_token(@user.reset_password_token).should == @user
+    end
+    
+    it "load_from_reset_password_token should NOT return user when token is NOT found" do
+      create_new_user
+      @user.deliver_reset_password_instructions!
+      User.load_from_reset_password_token("a").should == nil
+    end
+    
+    it "load_from_reset_password_token should return user when token is found and not expired" do
+      create_new_user
+      plugin_set_model_config_property(:reset_password_expiration_period, 500)
+      @user.deliver_reset_password_instructions!
+      User.load_from_reset_password_token(@user.reset_password_token).should == @user
+    end
+    
+    it "load_from_reset_password_token should NOT return user when token is found and expired" do
+      create_new_user
+      plugin_set_model_config_property(:reset_password_expiration_period, 0.1)
+      @user.deliver_reset_password_instructions!
+      sleep 0.5
+      User.load_from_reset_password_token(@user.reset_password_token).should == nil
+    end
+    
+    it "load_from_reset_password_token should return nil if token is blank" do
+      User.load_from_reset_password_token(nil).should == nil
+      User.load_from_reset_password_token("").should == nil
+    end
+    
+    it "'deliver_reset_password_instructions!' should generate a reset_password_token" do
+      create_new_user
+      @user.reset_password_token.should be_nil
+      @user.deliver_reset_password_instructions!
+      @user.reset_password_token.should_not be_nil
+    end
+
+    it "the reset_password_token should be random" do
+      create_new_user
+      plugin_set_model_config_property(:reset_password_time_between_emails, 0)
+      @user.deliver_reset_password_instructions!
+      old_password_code = @user.reset_password_token
+      @user.deliver_reset_password_instructions!
+      @user.reset_password_token.should_not == old_password_code
+    end
+
+    it "should send an email on reset" do
+      create_new_user
+      old_size = ActionMailer::Base.deliveries.size
+      @user.deliver_reset_password_instructions!
+      ActionMailer::Base.deliveries.size.should == old_size + 1
+    end
+
+    it "when reset_password! is called, should delete reset_password_token" do
+      create_new_user
+      @user.deliver_reset_password_instructions!
+      @user.reset_password_token.should_not be_nil
+      @user.reset_password!(:password => "blabulsdf")
+      @user.save!
+      @user.reset_password_token.should be_nil
+    end
+    
+    it "code isn't valid if expiration passed" do
+      create_new_user
+      plugin_set_model_config_property(:reset_password_expiration_period, 0.1)
+      @user.deliver_reset_password_instructions!
+      sleep 0.5
+      @user.reset_password_token_valid?.should == false
+    end
+    
+    it "code is valid if it's the same code and expiration period did not pass" do
+      create_new_user
+      plugin_set_model_config_property(:reset_password_expiration_period, 300)
+      @user.deliver_reset_password_instructions!
+      @user.reset_password_token_valid?.should == true
+    end
+    
+    it "code is valid if it's the same code and expiration period is nil" do
+      create_new_user
+      plugin_set_model_config_property(:reset_password_expiration_period, nil)
+      @user.deliver_reset_password_instructions!
+      @user.reset_password_token_valid?.should == true
+    end
+    
+    it "should not send an email if time between emails has not passed since last email" do
+      create_new_user
+      plugin_set_model_config_property(:reset_password_time_between_emails, 10000)
+      old_size = ActionMailer::Base.deliveries.size
+      @user.deliver_reset_password_instructions!
+      ActionMailer::Base.deliveries.size.should == old_size + 1
+      @user.deliver_reset_password_instructions!
+      ActionMailer::Base.deliveries.size.should == old_size + 1
+    end
+    
+    it "should send an email if time between emails has passed since last email" do
+      create_new_user
+      plugin_set_model_config_property(:reset_password_time_between_emails, 0.5)
+      old_size = ActionMailer::Base.deliveries.size
+      @user.deliver_reset_password_instructions!
+      ActionMailer::Base.deliveries.size.should == old_size + 1
+      sleep 0.5
+      @user.deliver_reset_password_instructions!
+      ActionMailer::Base.deliveries.size.should == old_size + 2
+    end
+    
+    it "if mailer is nil on activation, throw exception!" do
+      expect{plugin_model_configure([:reset_password])}.to raise_error(ArgumentError)
+    end
+    
+  end
+  
+end

data/spec/rails3/user_spec.rb

@@ -93,7 +93,7 @@ describe "User with no submodules (core)" do
   # ----------------- PLUGIN ACTIVATED -----------------------
   describe User, "when activated with sorcery" do
     before(:all) do
-      plugin_model_configure
+      plugin_model_configure()
     end
   
     before(:each) do
@@ -137,7 +137,7 @@ describe "User with no submodules (core)" do
     
     it "should encrypt password when a new user is saved" do
       create_new_user
-      @user.send(User.sorcery_config.crypted_password_attribute_name).should == User.encrypt('secret',@user.salt)
+      User.sorcery_config.encryption_provider.matches?(@user.send(User.sorcery_config.crypted_password_attribute_name),'secret',@user.salt).should be_true
     end
 
     it "should clear the virtual password field if the encryption process worked" do
@@ -171,14 +171,14 @@ describe "User with no submodules (core)" do
       create_new_user
       @user.email = "blup@bla.com"
       @user.save!
-      @user.send(User.sorcery_config.crypted_password_attribute_name).should == User.encrypt('secret',@user.salt)
+      User.sorcery_config.encryption_provider.matches?(@user.send(User.sorcery_config.crypted_password_attribute_name),'secret',@user.salt).should be_true
     end
 
     it "should replace the crypted_password in case a new password is set" do
       create_new_user
       @user.password = 'new_secret'
       @user.save!
-      @user.send(User.sorcery_config.crypted_password_attribute_name).should == User.encrypt('new_secret',@user.salt)
+      User.sorcery_config.encryption_provider.matches?(@user.send(User.sorcery_config.crypted_password_attribute_name),'secret',@user.salt).should be_false
     end
 
   end
@@ -209,6 +209,10 @@ describe "User with no submodules (core)" do
         def self.encrypt(*tokens)
           tokens.flatten.join('').gsub(/e/,'A')
         end
+        
+        def self.matches?(crypted,*tokens)
+          crypted = encrypt(*tokens)
+        end
       end
       plugin_set_model_config_property(:encryption_algorithm, :custom)
       plugin_set_model_config_property(:custom_encryption_provider, MyCrypto)

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: sorcery
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 0
-  version: 0.1.0
+  prerelease: 
+  version: 0.1.4
 platform: ruby
 authors: 
 - Noam Ben Ari
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-01 00:00:00 +02:00
+date: 2011-02-19 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,13 +18,9 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 3
-        version: 3.0.3
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: *id001
@@ -39,10 +31,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 3
-        - 0
         version: 2.3.0
   type: :development
   prerelease: false
@@ -54,8 +42,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   prerelease: false
@@ -67,8 +53,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   prerelease: false
@@ -80,8 +64,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   prerelease: false
@@ -93,70 +75,52 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 6
-        - 0
         version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: cucumber
+  name: bundler
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: jeweler
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
+        version: 1.5.2
   type: :development
   prerelease: false
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  name: simplecov
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 5
-        - 2
-        version: 1.5.2
+        version: 0.3.8
   type: :development
   prerelease: false
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: simplecov
+  name: bcrypt-ruby
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 3
-        - 8
-        version: 0.3.8
-  type: :development
+        version: 2.1.4
+  type: :runtime
   prerelease: false
   version_requirements: *id010
 description: Provides common authentication needs such as signing in/out, activating by email and resetting password.
@@ -177,10 +141,11 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
-- features/support/env.rb
 - lib/sorcery.rb
 - lib/sorcery/controller.rb
+- lib/sorcery/controller/submodules/activity_logging.rb
 - lib/sorcery/controller/submodules/brute_force_protection.rb
+- lib/sorcery/controller/submodules/http_basic_auth.rb
 - lib/sorcery/controller/submodules/remember_me.rb
 - lib/sorcery/controller/submodules/session_timeout.rb
 - lib/sorcery/crypto_providers/aes256.rb
@@ -191,9 +156,12 @@ files:
 - lib/sorcery/crypto_providers/sha512.rb
 - lib/sorcery/engine.rb
 - lib/sorcery/model.rb
-- lib/sorcery/model/submodules/password_reset.rb
+- lib/sorcery/model/submodules/activity_logging.rb
+- lib/sorcery/model/submodules/brute_force_protection.rb
 - lib/sorcery/model/submodules/remember_me.rb
+- lib/sorcery/model/submodules/reset_password.rb
 - lib/sorcery/model/submodules/user_activation.rb
+- sorcery.gemspec
 - spec/Gemfile
 - spec/Gemfile.lock
 - spec/Rakefile
@@ -232,9 +200,11 @@ files:
 - spec/rails3/app_root/config/locales/en.yml
 - spec/rails3/app_root/config/routes.rb
 - spec/rails3/app_root/db/migrate/activation/20101224223622_add_activation_to_users.rb
+- spec/rails3/app_root/db/migrate/activity_logging/20101224223624_add_activity_logging_to_users.rb
+- spec/rails3/app_root/db/migrate/brute_force_protection/20101224223626_add_brute_force_protection_to_users.rb
 - spec/rails3/app_root/db/migrate/core/20101224223620_create_users.rb
-- spec/rails3/app_root/db/migrate/password_reset/20101224223622_add_password_reset_to_users.rb
 - spec/rails3/app_root/db/migrate/remember_me/20101224223623_add_remember_me_token_to_users.rb
+- spec/rails3/app_root/db/migrate/reset_password/20101224223622_add_reset_password_to_users.rb
 - spec/rails3/app_root/db/schema.rb
 - spec/rails3/app_root/db/seeds.rb
 - spec/rails3/app_root/lib/tasks/.gitkeep
@@ -258,14 +228,18 @@ files:
 - spec/rails3/app_root/test/test_helper.rb
 - spec/rails3/app_root/test/unit/user_test.rb
 - spec/rails3/app_root/vendor/plugins/.gitkeep
+- spec/rails3/controller_activity_logging_spec.rb
 - spec/rails3/controller_brute_force_protection_spec.rb
+- spec/rails3/controller_http_basic_auth_spec.rb
 - spec/rails3/controller_remember_me_spec.rb
 - spec/rails3/controller_session_timeout_spec.rb
 - spec/rails3/controller_spec.rb
 - spec/rails3/spec_helper.rb
 - spec/rails3/user_activation_spec.rb
-- spec/rails3/user_password_reset_spec.rb
+- spec/rails3/user_activity_logging_spec.rb
+- spec/rails3/user_brute_force_protection_spec.rb
 - spec/rails3/user_remember_me_spec.rb
+- spec/rails3/user_reset_password_spec.rb
 - spec/rails3/user_spec.rb
 - spec/sorcery_crypto_providers_spec.rb
 - spec/spec_helper.rb
@@ -283,21 +257,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Magical authentication for Rails 3 applications
@@ -320,22 +290,28 @@ test_files:
 - spec/rails3/app_root/config/initializers/session_store.rb
 - spec/rails3/app_root/config/routes.rb
 - spec/rails3/app_root/db/migrate/activation/20101224223622_add_activation_to_users.rb
+- spec/rails3/app_root/db/migrate/activity_logging/20101224223624_add_activity_logging_to_users.rb
+- spec/rails3/app_root/db/migrate/brute_force_protection/20101224223626_add_brute_force_protection_to_users.rb
 - spec/rails3/app_root/db/migrate/core/20101224223620_create_users.rb
-- spec/rails3/app_root/db/migrate/password_reset/20101224223622_add_password_reset_to_users.rb
 - spec/rails3/app_root/db/migrate/remember_me/20101224223623_add_remember_me_token_to_users.rb
+- spec/rails3/app_root/db/migrate/reset_password/20101224223622_add_reset_password_to_users.rb
 - spec/rails3/app_root/db/schema.rb
 - spec/rails3/app_root/db/seeds.rb
 - spec/rails3/app_root/test/performance/browsing_test.rb
 - spec/rails3/app_root/test/test_helper.rb
 - spec/rails3/app_root/test/unit/user_test.rb
+- spec/rails3/controller_activity_logging_spec.rb
 - spec/rails3/controller_brute_force_protection_spec.rb
+- spec/rails3/controller_http_basic_auth_spec.rb
 - spec/rails3/controller_remember_me_spec.rb
 - spec/rails3/controller_session_timeout_spec.rb
 - spec/rails3/controller_spec.rb
 - spec/rails3/spec_helper.rb
 - spec/rails3/user_activation_spec.rb
-- spec/rails3/user_password_reset_spec.rb
+- spec/rails3/user_activity_logging_spec.rb
+- spec/rails3/user_brute_force_protection_spec.rb
 - spec/rails3/user_remember_me_spec.rb
+- spec/rails3/user_reset_password_spec.rb
 - spec/rails3/user_spec.rb
 - spec/sorcery_crypto_providers_spec.rb
 - spec/spec_helper.rb

data/features/support/env.rb

@@ -1,13 +0,0 @@
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-
-$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../../lib')
-require 'sorcery'
-
-require 'rspec/expectations'

data/lib/sorcery/model/submodules/password_reset.rb

@@ -1,64 +0,0 @@
-module Sorcery
-  module Model
-    module Submodules
-      # This submodule adds the ability to reset password via email confirmation.
-      module PasswordReset        
-        def self.included(base)
-          base.sorcery_config.class_eval do
-            attr_accessor :reset_password_code_attribute_name,        # reset password code attribute name.
-                          :sorcery_mailer,                            # mailer class. Needed.
-                          :reset_password_email_method_name           # reset password email method on your mailer class.
-
-          end
-          
-          base.sorcery_config.instance_eval do
-            @defaults.merge!(:@reset_password_code_attribute_name => :reset_password_code,
-                             :@sorcery_mailer                     => nil,
-                             :@reset_password_email_method_name   => :reset_password_email)
-
-            reset!
-          end
-          
-          base.class_eval do
-            clear_reset_password_code_proc = Proc.new do |record|
-              record.valid? && record.send(sorcery_config.password_attribute_name)
-            end
-            
-            before_save :clear_reset_password_code, :if =>clear_reset_password_code_proc
-          end
-          
-          base.sorcery_config.after_config << :validate_mailer_defined
-          
-          base.extend(ClassMethods)
-          base.send(:include, InstanceMethods)
-        end
-        
-        module ClassMethods
-          def validate_mailer_defined
-            msg = "To use password_reset submodule, you must define a mailer (config.sorcery_mailer = YourMailerClass)."
-            raise ArgumentError, msg if @sorcery_config.sorcery_mailer == nil
-          end
-        end
-        
-        module InstanceMethods
-          def reset_password!
-            config = sorcery_config
-            self.send(:"#{config.reset_password_code_attribute_name}=", generate_random_code)
-            self.class.transaction do
-              self.save!(:validate => false)
-              generic_send_email(:reset_password_email_method_name)
-            end
-          end
-
-          protected
-
-          def clear_reset_password_code
-            config = sorcery_config
-            self.send(:"#{config.reset_password_code_attribute_name}=", nil)
-          end
-        end
-        
-      end
-    end
-  end
-end

data/spec/rails3/app_root/db/migrate/password_reset/20101224223622_add_password_reset_to_users.rb

@@ -1,9 +0,0 @@
-class AddPasswordResetToUsers < ActiveRecord::Migration
-  def self.up
-    add_column :users, :reset_password_code, :string, :default => nil
-  end
-
-  def self.down
-    remove_column :users, :reset_password_code
-  end
-end

data/spec/rails3/user_password_reset_spec.rb

@@ -1,76 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe "User with password_reset submodule" do
-  before(:all) do
-    ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/password_reset")
-  end
-  
-  after(:all) do
-    ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/password_reset")
-  end
-
-  # ----------------- PLUGIN CONFIGURATION -----------------------
-  describe User, "loaded plugin configuration" do
-  
-    before(:all) do
-      plugin_model_configure([:password_reset], :sorcery_mailer => ::SorceryMailer)
-    end
-  
-    after(:each) do
-      User.sorcery_config.reset!
-    end
-    
-    it "should respond to 'reset_password!'" do
-      create_new_user
-      @user.should respond_to(:reset_password!)
-    end
-  end
-
-  # ----------------- PLUGIN ACTIVATED -----------------------
-  describe User, "when activated with sorcery" do
-  
-    before(:all) do
-      plugin_model_configure([:password_reset], :sorcery_mailer => ::SorceryMailer)
-    end
-  
-    before(:each) do
-      User.delete_all
-    end
-
-    it "'reset_password!' should generate a reset_password_code" do
-      create_new_user
-      @user.reset_password_code.should be_nil
-      @user.reset_password!
-      @user.reset_password_code.should_not be_nil
-    end
-
-    it "the reset_password_code should be random" do
-      create_new_user
-      @user.reset_password!
-      old_password_code = @user.reset_password_code
-      @user.reset_password!
-      @user.reset_password_code.should_not == old_password_code
-    end
-
-    it "should send an email on reset" do
-      create_new_user
-      old_size = ActionMailer::Base.deliveries.size
-      @user.reset_password!
-      ActionMailer::Base.deliveries.size.should == old_size + 1
-    end
-
-    it "when a new password is set, should delete reset_password_code" do
-      create_new_user
-      @user.reset_password!
-      @user.reset_password_code.should_not be_nil
-      @user.password = "blabulsdf"
-      @user.save!
-      @user.reset_password_code.should be_nil
-    end
-    
-    it "if mailer is nil on activation, throw exception!" do
-      expect{plugin_model_configure([:password_reset])}.to raise_error(ArgumentError)
-    end
-  end
-  
-end