colonization 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02d8e24b9f9e6eeb4e775c143eaa014089f816dd
-  data.tar.gz: 1476b843011250a4ff53766bdc976d10a5c6d535
+  metadata.gz: 9351d53d58975968b6a9c7c4625246502821fe12
+  data.tar.gz: b46d5083fc72a7980e15c62777cb0c41ccf1add3
 SHA512:
-  metadata.gz: e8ca96dcfd967a99b112d448e64e310efbc6a673dfad29588776b55b1d973be1ce816cd53b14e105535f6ab634509111ceae57f828e4d51b2c9ee70fd339bf6c
-  data.tar.gz: b3e1069366dd7e1378f6346ca70955859b5a7fff07167175222a5ce8744fb7f0520e1620c8dbd6f7d0e059b7bd463bc8b433f1fbd9f381ee3ddc61db5442284f
+  metadata.gz: 47660950a66d668feb8c4a04041b97a08c10196abb6f4528319edd1dd6c35e7058fb66b073ddc00f3c77f95d614ad22bedcf93c2b857c1a90e20c75f82c3ac49
+  data.tar.gz: 967cb6e497fb73b2606cf9b7dbab994f82b2180aa1ef25e978e121918250cf935233af514474df4b8003992f537f65adc9e1d1af0fa3c1ee893392be1ea4d103

data/lib/colonization/colonizer.rb

@@ -4,7 +4,7 @@ require 'pry'
 
 class Colonization::Colonizer
 
-  DEFAULT_MODEL_INSTANCES_NUMBER = 20
+  DEFAULT_MODEL_INSTANCES_NUMBER = 2
 
   def initialize(model)
     @model = model
@@ -22,7 +22,7 @@ class Colonization::Colonizer
     res = []
 
     (times || model_instances_number).times do
-      res << model.create(params_with_values)
+      res << model.create!(params_with_values)
     end
 
     res
@@ -109,7 +109,7 @@ class Colonization::Colonizer
 
   def strategy(field = nil)
     #TODO config[model][field]
-    { type: :fixed }
+    { type: :default }
   end
 
   def clear_table?

data/lib/colonization/ship.rb

@@ -1,8 +1,10 @@
 require 'colonization/investigator'
-require 'colonization/factory'
+require 'colonization/colonizer'
 
 class Colonization::Ship
 
+  attr_reader :colonizers
+
   def initialize
     models = investigate_database
     @colonizers = get_colonizers(models)
@@ -16,13 +18,13 @@ class Colonization::Ship
   private
 
   def clear_db
-    @colonizers.each do |item|
+    colonizers.each do |item|
       item.clear_table
     end
   end
 
   def populate
-    @colonizers.each do |item|
+    colonizers.each do |item|
       item.print_action
       item.colonize
     end
@@ -34,12 +36,11 @@ class Colonization::Ship
   end
 
   def get_colonizers(colonize_list)
-    colonizers = []
-    colonizer_factory = Colonization::Factory.new
+    result = []
     colonize_list.each do |item|
-      colonizers << colonizer_factory.produce(item)
+      result << Colonization::Colonizer.new(item)
     end
-    colonizers
+    result
   end
 
 end

data/lib/colonization/validators/active_model/absence_validator.rb

@@ -0,0 +1,17 @@
+module Colonization::Validators::ActiveModel
+  class AbsenceValidator
+
+    def initialize(validator)
+      @validator = validator
+    end
+
+    def options
+      @validator.options
+    end
+
+    def type
+      :absence
+    end
+
+  end
+end

data/lib/colonization/validators/active_model/acceptance_validator.rb

@@ -0,0 +1,17 @@
+module Colonization::Validators::ActiveModel
+  class AcceptanceValidator
+
+    def initialize(validator)
+      @validator = validator
+    end
+
+    def options
+      @validator.options
+    end
+
+    def type
+      :acceptance
+    end
+
+  end
+end

data/lib/colonization/validators/active_model/confirmation_validator.rb

@@ -1,26 +1,17 @@
 module Colonization::Validators::ActiveModel
   class ConfirmationValidator
 
-    attr_reader :validator
-
-    def initialize(validator, config)
+    def initialize(validator)
       @validator = validator
-      @config = config
     end
 
-    def add_restriction
-      config[type] = true
+    def options
+      @validator.options
     end
 
-    private
-
     def type
       :confirmation
     end
 
-    def config
-      @config
-    end
-
   end
 end

data/lib/colonization/validators/active_model/exclusion_validator.rb

@@ -1,26 +1,17 @@
 module Colonization::Validators::ActiveModel
   class ExclusionValidator
 
-    attr_reader :validator
-
-    def initialize(validator, config)
+    def initialize(validator)
       @validator = validator
-      @config = config
     end
 
-    def add_restriction
-      config[type] = validator.options[:in] || validator.options[:within]
+    def options
+      @validator.options
     end
 
-    private
-
     def type
       :exclusion
     end
 
-    def config
-      @config
-    end
-
   end
 end

data/lib/colonization/validators/active_model/format_validator.rb

@@ -1,26 +1,21 @@
 module Colonization::Validators::ActiveModel
   class FormatValidator
 
-    attr_reader :validator
-
-    def initialize(validator, config)
+    def initialize(validator)
       @validator = validator
-      @config = config
     end
 
-    def add_restriction
-      config[type] = validator.options[:with]
+    def options
+      @validator.options
     end
 
-    private
+    def value
+      #validator.options[:with]
+    end
 
     def type
       :format
     end
 
-    def config
-      @config
-    end
-
   end
 end

data/lib/colonization/validators/active_model/inclusion_validator.rb

@@ -1,21 +1,16 @@
 module Colonization::Validators::ActiveModel
   class InclusionValidator
 
-    attr_reader :validator
-
-    def initialize(validator, config)
+    def initialize(validator)
       @validator = validator
-      @config = config
     end
 
-    def add_restriction
-      config[type] = validator.options[:in] || validator.options[:within]
+    def options
+      @validator.options
     end
 
-    private
-
-    def config
-      @config
+    def value
+      #validator.options[:in] || validator.options[:within]
     end
 
     def type

data/lib/colonization/validators/active_model/length_validator.rb

@@ -1,26 +1,21 @@
 module Colonization::Validators::ActiveModel
   class LengthValidator
 
-    attr_reader :validator
-
-    def initialize(validator, config)
+    def initialize(validator)
       @validator = validator
-      @config = config
     end
 
-    def add_restriction
-      config[type] = validator.options.slice(:minimum, :maximum, :in, :within, :is)
+    def options
+      @validator.options
     end
 
-    private
+    def value
+      #validator.options.slice(:minimum, :maximum, :in, :within, :is)
+    end
 
     def type
       :length
     end
 
-    def config
-      @config
-    end
-
   end
 end

data/lib/colonization/validators/active_model/numericality_validator.rb

@@ -1,26 +1,21 @@
 module Colonization::Validators::ActiveModel
   class NumericalityValidator
 
-    attr_reader :validator
-
-    def initialize(validator, config)
+    def initialize(validator)
       @validator = validator
-      @config = config
     end
 
-    def add_restriction
-      config[type] = validator.options[:only_integer] ? :only_integer : :all_numbers
+    def options
+      @validator.options
     end
 
-    private
+    def value
+      #validator.options[:only_integer] ? :only_integer : :all_numbers
+    end
 
     def type
       :numericality
     end
 
-    def config
-      @config
-    end
-
   end
 end

data/lib/colonization/validators/active_model/presence_validator.rb

@@ -1,26 +1,17 @@
 module Colonization::Validators::ActiveModel
   class PresenceValidator
 
-    attr_reader :validator
-
-    def initialize(validator, config)
+    def initialize(validator)
       @validator = validator
-      @config = config
     end
 
-    def add_restriction
-      config[type] = true
+    def options
+      @validator.options
     end
 
-    private
-
     def type
       :presence
     end
 
-    def config
-      @config
-    end
-
   end
 end

data/lib/colonization/validators/active_model/with_validator.rb

@@ -1,26 +1,17 @@
 module Colonization::Validators::ActiveModel
   class WithValidator
 
-    attr_reader :validator
-
-    def initialize(validator, config)
+    def initialize(validator)
       @validator = validator
-      @config = config
     end
 
-    def add_restriction
-      config[type] = true
+    def options
+      @validator.options
     end
 
-    private
-
     def type
       :with
     end
 
-    def config
-      @config
-    end
-
   end
 end

data/lib/colonization/validators/active_record/associated_validator.rb

@@ -1,26 +1,17 @@
 module Colonization::Validators::ActiveRecord
   class AssociatedValidator
 
-    attr_reader :validator
-
-    def initialize(validator, config)
+    def initialize(validator)
       @validator = validator
-      @config = config
     end
 
-    def add_restriction
-      config[type] = true
+    def options
+      @validator.options
     end
 
-    private
-
     def type
       :associated
     end
 
-    def config
-      @config
-    end
-
   end
 end

data/lib/colonization/validators/active_record/presence_validator.rb

@@ -1,26 +1,17 @@
 module Colonization::Validators::ActiveRecord
   class PresenceValidator
 
-    attr_reader :validator
-
-    def initialize(validator, config)
+    def initialize(validator)
       @validator = validator
-      @config = config
     end
 
-    def add_restriction
-      config[type] = true
+    def options
+      @validator.options
     end
 
-    private
-
     def type
       :presence
     end
 
-    def config
-      @config
-    end
-
   end
 end

data/lib/colonization/validators/active_record/uniqueness_validator.rb

@@ -1,26 +1,17 @@
 module Colonization::Validators::ActiveRecord
   class UniquenessValidator
 
-    attr_reader :validator
-
-    def initialize(validator, config)
+    def initialize(validator)
       @validator = validator
-      @config = config
     end
 
-    def add_restriction
-      config[type] = true
+    def options
+      @validator.options
     end
 
-    private
-
     def type
       :uniqueness
     end
 
-    def config
-      @config
-    end
-
   end
 end

data/lib/colonization/validators/carrier_wave/download_validator.rb

@@ -1,26 +1,17 @@
 module Colonization::Validators::CarrierWave
   class DownloadValidator
 
-    attr_reader :validator
-
-    def initialize(validator, config)
+    def initialize(validator)
       @validator = validator
-      @config = config
     end
 
-    def add_restriction
-      config[type] = true #TODO
+    def options
+      @validator.options
     end
 
-    private
-
     def type
       :download
     end
 
-    def config
-      @config
-    end
-
   end
 end

data/lib/colonization/validators/carrier_wave/integrity_validator.rb

@@ -1,26 +1,17 @@
 module Colonization::Validators::CarrierWave
   class IntegrityValidator
 
-    attr_reader :validator
-
-    def initialize(validator, config)
+    def initialize(validator)
       @validator = validator
-      @config = config
     end
 
-    def add_restriction
-      config[type] = true #TODO
+    def options
+      @validator.options
     end
 
-    private
-
     def type
       :integrity
     end
 
-    def config
-      @config
-    end
-
   end
 end

data/lib/colonization/validators/carrier_wave/processing_validator.rb

@@ -1,26 +1,17 @@
 module Colonization::Validators::CarrierWave
   class ProcessingValidator
 
-    attr_reader :validator
-
-    def initialize(validator, config)
+    def initialize(validator)
       @validator = validator
-      @config = config
     end
 
-    def add_restriction
-      config[type] = true #TODO
+    def options
+      @validator.options
     end
 
-    private
-
     def type
       :processing
     end
 
-    def config
-      @config
-    end
-
   end
 end

data/lib/colonization/validators/factory.rb

@@ -8,51 +8,56 @@ module Colonization::Validators
   require 'colonization/validators/active_model/numericality_validator'
   require 'colonization/validators/active_model/presence_validator'
   require 'colonization/validators/active_model/with_validator'
+  require 'colonization/validators/active_model/acceptance_validator'
+  require 'colonization/validators/active_model/absence_validator'
+
   require 'colonization/validators/active_record/associated_validator'
   require 'colonization/validators/active_record/presence_validator'
   require 'colonization/validators/active_record/uniqueness_validator'
+
   require 'colonization/validators/carrier_wave/integrity_validator'
   require 'colonization/validators/carrier_wave/processing_validator'
   require 'colonization/validators/carrier_wave/download_validator'
+
   require 'colonization/validators/null_object'
 
   class Factory
-    def produce(validator, validations_config)
+    def produce(validator)
       case validator.class.to_s
       when ::ActiveModel::Validations::PresenceValidator.to_s
-        Colonization::Validators::ActiveModel::PresenceValidator.new(validator, validations_config)
+        Colonization::Validators::ActiveModel::PresenceValidator.new(validator)
       when ::ActiveModel::Validations::InclusionValidator.to_s
-        Colonization::Validators::ActiveModel::InclusionValidator.new(validator, validations_config)
+        Colonization::Validators::ActiveModel::InclusionValidator.new(validator)
       when ::ActiveModel::Validations::WithValidator.to_s
-        Colonization::Validators::ActiveModel::WithValidator.new(validator, validations_config)
+        Colonization::Validators::ActiveModel::WithValidator.new(validator)
       when ::ActiveModel::Validations::NumericalityValidator.to_s
-        Colonization::Validators::ActiveModel::NumericalityValidator.new(validator, validations_config)
+        Colonization::Validators::ActiveModel::NumericalityValidator.new(validator)
       when ::ActiveModel::Validations::LengthValidator.to_s
-        Colonization::Validators::ActiveModel::LengthValidator.new(validator, validations_config)
+        Colonization::Validators::ActiveModel::LengthValidator.new(validator)
       when ::ActiveModel::Validations::FormatValidator.to_s
-        Colonization::Validators::ActiveModel::FormatValidator.new(validator, validations_config)
+        Colonization::Validators::ActiveModel::FormatValidator.new(validator)
       when ::ActiveModel::Validations::ExclusionValidator.to_s
-        Colonization::Validators::ActiveModel::ExclusionValidator.new(validator, validations_config)
+        Colonization::Validators::ActiveModel::ExclusionValidator.new(validator)
       when ::ActiveModel::Validations::ConfirmationValidator.to_s
-        Colonization::Validators::ActiveModel::ConfirmationValidator.new(validator, validations_config)
+        Colonization::Validators::ActiveModel::ConfirmationValidator.new(validator)
       when ::ActiveModel::Validations::AcceptanceValidator.to_s
-        Colonization::Validators::ActiveModel::AcceptanceValidator.new(validator, validations_config)
+        Colonization::Validators::ActiveModel::AcceptanceValidator.new(validator)
       when ::ActiveModel::Validations::AbsenceValidator.to_s
-        Colonization::Validators::ActiveModel::AbsenceValidator.new(validator, validations_config)
+        Colonization::Validators::ActiveModel::AbsenceValidator.new(validator)
       when ::ActiveRecord::Validations::UniquenessValidator.to_s
-        Colonization::Validators::ActiveRecord::UniquenessValidator.new(validator, validations_config)
+        Colonization::Validators::ActiveRecord::UniquenessValidator.new(validator)
       when ::ActiveRecord::Validations::AssociatedValidator.to_s
-        Colonization::Validators::ActiveRecord::AssociatedValidator.new(validator, validations_config)
+        Colonization::Validators::ActiveRecord::AssociatedValidator.new(validator)
       when ::ActiveRecord::Validations::PresenceValidator.to_s
-        Colonization::Validators::ActiveRecord::PresenceValidator.new(validator, validations_config)
+        Colonization::Validators::ActiveRecord::PresenceValidator.new(validator)
       when ::CarrierWave::Validations::ActiveModel::IntegrityValidator.to_s
-        Colonization::Validators::CarrierWave::IntegrityValidator.new(validator, validations_config)
+        Colonization::Validators::CarrierWave::IntegrityValidator.new(validator)
       when ::CarrierWave::Validations::ActiveModel::ProcessingValidator.to_s
-        Colonization::Validators::CarrierWave::ProcessingValidator.new(validator, validations_config)
+        Colonization::Validators::CarrierWave::ProcessingValidator.new(validator)
       when ::CarrierWave::Validations::ActiveModel::DownloadValidator.to_s
-        Colonization::Validators::CarrierWave::DownloadValidator.new(validator, validations_config)
+        Colonization::Validators::CarrierWave::DownloadValidator.new(validator)
       else
-        Colonization::Validators::NullObject.new(validator, validations_config)
+        Colonization::Validators::NullObject.new(validator)
       #when ActiveRecord::Validations::AbsenceValidator #TODO ????
       #when ActiveRecord::Validations::LengthValidator #TODO ????
       end

data/lib/colonization/values_generator.rb

@@ -1,65 +1,152 @@
 require 'colonization/validators/factory'
-require 'colonization/reg_exp_values_generator'
 require 'faker'
 
 class Colonization::ValuesGenerator
 
+  attr_reader :validators, :validators_objects
+
   def initialize(type, validators, strategy)
-    init_config(type)
-    set_validations(custom_validators(validators))
+    @config = { validations: {}, type: type }
+    @validators = validators
+    set_custom_validators_objects
   end
 
   def call
-    #@config[:validations].empty? ? generate_faker_value : generate_custom_value
     generate_faker_value
   end
 
   private
 
-  def init_config(type)
-    @config = { validations: {}, type: type }
-  end
-
-  def custom_validators(validators)
-    res = []
-    factory = Colonization::Validators::Factory.new
-    validators.each do |validator|
-      res << factory.produce(validator, @config[:validations])
-    end
-    res
-  end
-
-  def set_validations(validators)
-    validators.each do |validator|
-      validator.add_restriction
-    end
-  end
-
-  def generate_custom_value
-    Colonization::RegExpValuesGenerator.generate(@config)
-  end
-
   def generate_faker_value
     case @config[:type]
     when :integer
-      Faker::Number.between(1, 2)
+      integer_case
     when :float
-      Faker::Number.decimal(2, 3)
+      float_case
     when :string
-      Faker::Lorem.word
+      string_case
     when :text
-      Faker::Lorem.sentence
+      text_case
     when :date
-      Faker::Time.between(300.days.ago, 300.days.since, :day)
+      date_case
     when :datetime
-      Faker::Time.between(300.days.ago, 300.days.since, :day)
+      datetime_case
     when :boolean
-      [true, false].sample
+      boolean_case
     when :time
-      Faker::Time.between(300.days.ago, 300.days.since, :day)
+      time_case
     else
       raise @config[:type].inspect
     end
   end
 
+  def set_custom_validators_objects
+    @validators_objects = []
+    factory = Colonization::Validators::Factory.new
+    validators.each do |validator|
+      @validators_objects << factory.produce(validator)
+    end
+    @validators_objects
+  end
+
+
+  def integer_case
+    return Faker::Number.between(1, 2) unless validators_objects.present?
+    validators_objects.each do |validator|
+      case validator.type
+      when :acceptance
+        raise DisaparateValidatorError
+      when :presence
+        return Faker::Number.between(1, 2)
+      else
+        raise validator.inspect
+      end
+    end
+  end
+
+  def float_case
+    return Faker::Number.decimal(2, 3) unless validators_objects.present?
+    validators_objects.each do |validator|
+      case validator.type
+      when :acceptance
+        raise DisaparateValidatorError
+      else
+        raise validator.inspect
+      end
+    end
+  end
+
+  def string_case
+    return Faker::Lorem.word unless validators_objects.present?
+    validators_objects.each do |validator|
+      case validator.type
+      when :acceptance
+        return validator.options[:accept].sample if validator.options[:accept].present?
+        return "1"
+      else
+        raise validator.inspect
+      end
+    end
+  end
+
+  def text_case
+    return Faker::Lorem.sentence unless validators_objects.present?
+    validators_objects.each do |validator|
+      case validator.type
+      when :acceptance
+        raise DisaparateValidatorError
+      else
+        raise validator.inspect
+      end
+    end
+  end
+
+  def date_case
+    return Faker::Time.between(300.days.ago, 300.days.since, :day) unless validators_objects.present?
+    validators_objects.each do |validator|
+      case validator.type
+      when :acceptance
+        raise DisaparateValidatorError
+      else
+        raise validator.inspect
+      end
+    end
+  end
+
+  def datetime_case
+    return Faker::Time.between(300.days.ago, 300.days.since, :day) unless validators_objects.present?
+    validators_objects.each do |validator|
+      case validator.type
+      when :acceptance
+        raise DisaparateValidatorError
+      else
+        raise validator.inspect
+      end
+    end
+  end
+
+  def boolean_case
+    return [false, true].sample unless validators_objects.present?
+    validators_objects.each do |validator|
+      case validator.type
+      when :acceptance
+        return true
+      else
+        raise validator.inspect
+      end
+    end
+  end
+
+  def time_case
+    return Faker::Time.between(300.days.ago, 300.days.since, :day) unless validators_objects.present?
+    validators_objects.each do |validator|
+      case validator.type
+      when :acceptance
+        raise DisaparateValidatorError
+      else
+        raise validator.inspect
+      end
+    end
+  end
+
 end

data/lib/colonization/version.rb

@@ -1,3 +1,3 @@
 module Colonization
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: colonization
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Denys Dvoriashyn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-24 00:00:00.000000000 Z
+date: 2016-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,17 +81,15 @@ files:
 - bin/setup
 - colonization.gemspec
 - lib/colonization.rb
-- lib/colonization/absence_validator.rb
-- lib/colonization/acceptance_validator.rb
 - lib/colonization/colonizer.rb
-- lib/colonization/factory.rb
 - lib/colonization/investigator.rb
 - lib/colonization/model_entity.rb
 - lib/colonization/model_field.rb
 - lib/colonization/model_instaces_repository.rb
 - lib/colonization/model_relation.rb
-- lib/colonization/reg_exp_values_generator.rb
 - lib/colonization/ship.rb
+- lib/colonization/validators/active_model/absence_validator.rb
+- lib/colonization/validators/active_model/acceptance_validator.rb
 - lib/colonization/validators/active_model/confirmation_validator.rb
 - lib/colonization/validators/active_model/exclusion_validator.rb
 - lib/colonization/validators/active_model/format_validator.rb

data/lib/colonization/absence_validator.rb

@@ -1,2 +0,0 @@
-class Colonization::Validators::ActiveModel::AbsenceValidator < ActiveModel::Validations::AbsenceValidator
-end

data/lib/colonization/acceptance_validator.rb

@@ -1,2 +0,0 @@
-class Colonization::Validators::ActiveModel::AcceptanceValidator < ActiveModel::Validations::AcceptanceValidator
-end

data/lib/colonization/factory.rb

@@ -1,15 +0,0 @@
-require 'colonization/colonizer'
-
-class Colonization::Factory
-
-  def produce(model)
-    colonizer_class.new(model)
-  end
-
-  private
-
-  def colonizer_class
-    Colonization::Colonizer
-  end
-
-end

data/lib/colonization/reg_exp_values_generator.rb

@@ -1,31 +0,0 @@
-class Colonization::RegExpValuesGenerator
-
-  def generate(config)
-    @config = config
-    @current_reg_exp = default_reg_exp
-    numericality_mutate
-    //
-  end
-
-  private
-
-  def numericality_mutate
-    case config[:numericality]
-    when :only_integer
-      str = @current_reg_exp.source
-      index = str.index('^')
-      str.insert(index,'[1-9]{1,1}\d*')
-      @current_reg_exp = RegExp.new(str)
-    when :all_numbers
-      str = @current_reg_exp.source
-      index = str.index('^')
-      str.insert(index,'[1-9]{1,1}\d*(\.\d+)')
-      @current_reg_exp = RegExp.new(str)
-    end
-  end
-
-  def default_reg_exp
-    /^$/
-  end
-
-end