kirgudu_refs 0.0.8 → 0.0.9

data/app/models/kirgudu_refs/concerns/models/territory_area.rb

@@ -0,0 +1,30 @@
+module KirguduRefs
+	module Concerns::Models::TerritoryArea
+		extend ActiveSupport::Concern
+
+		included do
+			before_query :query_add_territory_area
+
+			scope :with_area_me, lambda { |value| where { area >= value } if value }
+			scope :with_area_le, lambda { |value| where { area <= value } if value }
+
+			scope :with_area_m, lambda { |value| where { area > value } if value }
+			scope :with_area_l, lambda { |value| where { area < value } if value }
+
+		end
+
+		def capital_name
+			self.capital.name if self.capital
+		end
+
+		module ClassMethods
+			def query_add_territory_area(query, filters)
+				query
+				.with_area_me(filters[:area_me])
+				.with_area_le(filters[:area_le])
+				.with_area_m(filters[:area_m])
+				.with_area_l(filters[:area_l])
+			end
+		end
+	end
+end

data/app/models/kirgudu_refs/concerns/models/territory_population.rb

@@ -0,0 +1,30 @@
+module KirguduRefs
+	module Concerns::Models::TerritoryPopulation
+		extend ActiveSupport::Concern
+
+		included do
+			before_query :query_add_territory_population
+
+			scope :with_population_me, lambda { |value| where { population >= value } if value }
+			scope :with_population_le, lambda { |value| where { population <= value } if value }
+
+			scope :with_population_m, lambda { |value| where { population > value } if value }
+			scope :with_population_l, lambda { |value| where { population < value } if value }
+
+		end
+
+		def capital_name
+			self.capital.name if self.capital
+		end
+
+		module ClassMethods
+			def query_add_territory_population(query, filters)
+				query
+				.with_population_me(filters[:population_me])
+				.with_population_le(filters[:population_le])
+				.with_population_m(filters[:population_m])
+				.with_population_l(filters[:population_l])
+			end
+		end
+	end
+end

data/app/models/kirgudu_refs/finances/bank.rb

@@ -7,25 +7,25 @@ module KirguduRefs
 
 			########################################## RELATIONS ########################################
 
-			include ::KirguduBase::Models::BasicProperties::Portal
-			include ::KirguduBase::Models::BasicProperties::CreatedBy
-			include ::KirguduBase::Models::BasicProperties::UpdatedBy
+			include ::KirguduBase::Concerns::Models::PortalId
+			include ::KirguduBase::Concerns::Models::CreatedBy
+			include ::KirguduBase::Concerns::Models::UpdatedBy
+			include ::KirguduBase::Concerns::Models::Name
 
-			include ::KirguduRefs::ModelBasicProperties::CountryID
-			include ::KirguduRefs::ModelBasicProperties::StateID
-			include ::KirguduRefs::ModelBasicProperties::CityID
+			include ::KirguduRefs::Concerns::Models::CountryId
+			include ::KirguduRefs::Concerns::Models::StateId
+			include ::KirguduRefs::Concerns::Models::CityId
 
 			########################################## VALIDATIONS #######################################
 
 
-			validates_presence_of :name, :bik, :correspondent_account
+			validates_presence_of :bik, :correspondent_account
 			validates_uniqueness_of :name, :bik, :correspondent_account, scope: :portal_id, case_sensitive: false
 			validates_uniqueness_of :short_name, scope: :portal_id, case_sensitive: false, allow_blank: true
 			validates_uniqueness_of :registration_number, scope: :portal_id, allow_nil: true
 
 			validates_length_of :bik, is: 9
 			validates_length_of :correspondent_account, is: 20
-			validates_length_of :name, maximum: 180
 			validates_length_of :short_name, maximum: 128, allow_blank: true
 			validates_length_of :registration_number, maximum: 40, allow_blank: true
 			validates_length_of :ogrn, is: 13, allow_blank: true
@@ -40,7 +40,6 @@ module KirguduRefs
 
 			######################################### SCOPES #############################################
 
-			include ::KirguduBase::Models::Scopes::WithName
 
 			scope :with_capital_min, lambda { |value| where { authorised_capital >= value } if value }
 			scope :with_capital_max, lambda { |value| where { authorised_capital <= value } if value }
@@ -96,9 +95,6 @@ module KirguduRefs
 				.with_capital_min(filters[:capital_max])
 				.with_foundation_year_min(filters[:foundation_year_min])
 				.with_foundation_year_max(filters[:foundation_year_max])
-				.by_country(filters[:country_id])
-				.by_state(filters[:state_id])
-				.by_city(filters[:city_id])
 
 				super(query, filters)
 			end

data/app/models/kirgudu_refs/globe/city.rb

@@ -4,23 +4,25 @@ module KirguduRefs
 
 			########################################## RELATIONS ########################################
 
-			include ::KirguduBase::Models::BasicProperties::Portal
-			include ::KirguduBase::Models::BasicProperties::CreatedBy
-			include ::KirguduBase::Models::BasicProperties::UpdatedBy
+			include ::KirguduBase::Concerns::Models::PortalId
+			include ::KirguduBase::Concerns::Models::CreatedBy
+			include ::KirguduBase::Concerns::Models::UpdatedBy
+			include ::KirguduBase::Concerns::Models::Name
+			include ::KirguduBase::Concerns::Models::Slug
+
+			include ::KirguduRefs::Concerns::Models::CountryId
+			include ::KirguduRefs::Concerns::Models::StateId
+			include ::KirguduRefs::Concerns::Models::RegionId
+
+			include ::KirguduRefs::Concerns::Models::TerritoryPopulation
+			include ::KirguduRefs::Concerns::Models::TerritoryArea
 
-			include ::KirguduRefs::ModelBasicProperties::CountryID
-			include ::KirguduRefs::ModelBasicProperties::StateID
-			include ::KirguduRefs::ModelBasicProperties::RegionID
 
 			########################################## VALIDATIONS #######################################
 
-			validates_presence_of :name, :country_id, :state_id, :slug
+			validates_presence_of :country_id, :state_id, :slug
 			validates_uniqueness_of :name, :slug, scope: :state_id
 
-			validates_length_of :name, maximum: 128, allow_blank: true
-			validates_length_of :slug, maximum: 128, allow_blank: true
-			validates_slug_format_of :slug, allow_blank: true
-
 			validates_length_of :meta_keywords, maximum: 200, allow_blank: true
 			validates_length_of :meta_description, maximum: 200, allow_blank: true
 
@@ -28,14 +30,7 @@ module KirguduRefs
 
 			###########################################  SCOPES  #########################################
 
-			include ::KirguduBase::Models::Scopes::WithName
-			include ::KirguduBase::Models::Scopes::WithSlug
-
 			scope :with_is_active, lambda { |value| where(is_active: value) if value }
-			scope :with_area_min, lambda { |value| where { area >= value } if value }
-			scope :with_area_max, lambda { |value| where { area <= value } if value }
-			scope :with_population_min, lambda { |value| where { population >= value } if value }
-			scope :with_population_max, lambda { |value| where { population <= value } if value }
 
 			scope :with_keyword, lambda { |value|
 				if value
@@ -49,23 +44,12 @@ module KirguduRefs
 				filters ||= {}
 
 				query = query
-				.with_area_min(filters[:area_min])
-				.with_area_max(filters[:area_max])
-				.with_population_min(filters[:population_min])
-				.with_population_max(filters[:population_max])
-				.by_country(filters[:country_id])
-				.by_state(filters[:state_id])
-				.by_region(filters[:region_id])
 				.with_is_active(filters[:is_active])
 
 				super(query, filters)
 			end
 
 
-			def capital_name
-				capital.name if capital
-			end
-
 			def name_with_country_name
 				"#{name} (#{country_name})"
 			end

data/app/models/kirgudu_refs/globe/continent.rb

@@ -1,19 +1,17 @@
 module KirguduRefs
   class Globe::Continent < ::KirguduRefs::BaseModel
 
-	  include ::KirguduBase::Models::BasicProperties::Portal
-	  include ::KirguduBase::Models::BasicProperties::CreatedBy
-	  include ::KirguduBase::Models::BasicProperties::UpdatedBy
+	  include ::KirguduBase::Concerns::Models::PortalId
+	  include ::KirguduBase::Concerns::Models::CreatedBy
+	  include ::KirguduBase::Concerns::Models::UpdatedBy
+	  include ::KirguduBase::Concerns::Models::Name
+	  include ::KirguduBase::Concerns::Models::Slug
 
 	  ########################################## VALIDATIONS #######################################
 
-	  validates_presence_of :name, :slug, :code
+	  validates_presence_of :code
 	  validates_uniqueness_of :name, :slug, :code, case_sensitive: false, scope: :portal_id
 
-	  validates_length_of :name, maximum: 128
-	  validates_length_of :slug, maximum: 128
-	  validates_slug_format_of :slug, allow_blank: true
-
 	  validates_length_of :code, is: 2, allow_blank: true
 
 	  validates_length_of :meta_keywords, maximum: 200, allow_blank: true
@@ -22,8 +20,6 @@ module KirguduRefs
 
 	  ###########################################  SCOPES  #########################################
 
-	  include ::KirguduBase::Models::Scopes::WithName
-	  include ::KirguduBase::Models::Scopes::WithSlug
 
 	  scope :with_keyword, lambda { |value|
 		  if value
@@ -41,13 +37,8 @@ module KirguduRefs
 		  super(query, filters)
 	  end
 
-	  def capital_name
-		  capital.name if capital
-	  end
-
 	  private
 	  def normalize_values_before_validation
-
 		  self.name.capitalize!
 		  super
 	  end

data/app/models/kirgudu_refs/globe/country.rb

@@ -4,18 +4,6 @@ module KirguduRefs
 
 			########################################## RELATIONS ########################################
 
-			include ::KirguduBase::Models::BasicProperties::Portal
-			include ::KirguduBase::Models::BasicProperties::CreatedBy
-			include ::KirguduBase::Models::BasicProperties::UpdatedBy
-
-			include ::KirguduRefs::ModelBasicProperties::CountryID
-			include ::KirguduRefs::ModelBasicProperties::StateID
-			include ::KirguduRefs::ModelBasicProperties::RegionID
-			include ::KirguduRefs::ModelBasicProperties::ContinentID
-
-			include ::KirguduRefs::ModelBasicProperties::CurrencyID
-
-			belongs_to :capital, class_name: ::KirguduRefs::Globe::City, foreign_key: :capital_id
 			#belongs_to :image, class_name: ::ErpZone::Common::Image, foreign_key: :image_id
 
 			has_many :states, class_name: ::KirguduRefs::Globe::State, foreign_key: :country_id, dependent: :destroy
@@ -23,6 +11,24 @@ module KirguduRefs
 			has_many :cities, class_name: ::KirguduRefs::Globe::City, foreign_key: :country_id, dependent: :destroy
 			has_many :timezones, class_name: ::KirguduRefs::Globe::Timezone, foreign_key: :country_id, dependent: :nullify
 
+			########################################## CONCERNS ########################################
+
+			include ::KirguduBase::Concerns::Models::PortalId
+			include ::KirguduBase::Concerns::Models::CreatedBy
+			include ::KirguduBase::Concerns::Models::UpdatedBy
+
+			include ::KirguduRefs::Concerns::Models::CountryId
+			include ::KirguduRefs::Concerns::Models::StateId
+			include ::KirguduRefs::Concerns::Models::RegionId
+			include ::KirguduRefs::Concerns::Models::ContinentId
+
+			include ::KirguduRefs::Concerns::Models::CurrencyId
+
+			include ::KirguduRefs::Concerns::Models::CapitalId
+
+			include ::KirguduRefs::Concerns::Models::TerritoryPopulation
+			include ::KirguduRefs::Concerns::Models::TerritoryArea
+
 
 			########################################## VALIDATIONS #######################################
 
@@ -30,8 +36,6 @@ module KirguduRefs
 			validates_uniqueness_of :name, :slug, :iso2, case_sensitive: false, scope: :portal_id
 
 			validates_length_of :name, maximum: 128
-			validates_length_of :slug, maximum: 128
-			validates_slug_format_of :slug, allow_blank: true
 
 			validates_length_of :iso2, is: 2, allow_blank: true
 			validates_length_of :iso3, is: 3, allow_blank: true
@@ -43,14 +47,11 @@ module KirguduRefs
 
 			###########################################  SCOPES  #########################################
 
-			include ::KirguduBase::Models::Scopes::WithName
-			include ::KirguduBase::Models::Scopes::WithSlug
-
-			scope :by_capital, lambda { |value| where(capital_id: value) if value }
 
 			scope :with_area_min, lambda { |value| where { area >= value } if value }
-			scope :with_is_active, lambda { |value| where(is_active: value) if value }
+			scope :with_is_active, lambda { |value| where( is_active: value) if value }
 			scope :with_area_max, lambda { |value| where { area <= value } if value }
+			scope :with_area_min, lambda { |value| where { area >= value } if value }
 			scope :with_population_min, lambda { |value| where { population >= value } if value }
 			scope :with_population_max, lambda { |value| where { population <= value } if value }
 
@@ -66,13 +67,6 @@ module KirguduRefs
 				filters ||= {}
 
 				query = query
-				.with_area_min(filters[:area_min])
-				.with_area_max(filters[:area_max])
-				.with_population_min(filters[:population_min])
-				.with_population_max(filters[:population_max])
-				.by_currency(filters[:currency_id])
-				.by_capital(filters[:capital_id])
-				.by_continent(filters[:continent_id])
 				.with_is_active(filters[:is_active])
 
 				super(query, filters)

data/app/models/kirgudu_refs/globe/region.rb

@@ -4,17 +4,21 @@ module KirguduRefs
 
 			########################################## RELATIONS ########################################
 
-			include ::KirguduBase::Models::BasicProperties::Portal
-			include ::KirguduBase::Models::BasicProperties::CreatedBy
-			include ::KirguduBase::Models::BasicProperties::UpdatedBy
+			include ::KirguduBase::Concerns::Models::PortalId
+			include ::KirguduBase::Concerns::Models::CreatedBy
+			include ::KirguduBase::Concerns::Models::UpdatedBy
 
-			include ::KirguduRefs::ModelBasicProperties::CountryID
-			include ::KirguduRefs::ModelBasicProperties::StateID
-			include ::KirguduRefs::ModelBasicProperties::RegionID
+			include ::KirguduBase::Concerns::Models::Name
+			include ::KirguduBase::Concerns::Models::Slug
 
-			include ::KirguduRefs::ModelBasicProperties::CountryID
-			include ::KirguduRefs::ModelBasicProperties::StateID
-			include ::KirguduRefs::ModelBasicProperties::CapitalID
+			include ::KirguduRefs::Concerns::Models::CountryId
+			include ::KirguduRefs::Concerns::Models::StateId
+			include ::KirguduRefs::Concerns::Models::RegionId
+
+			include ::KirguduRefs::Concerns::Models::CapitalId
+
+			include ::KirguduRefs::Concerns::Models::TerritoryPopulation
+			include ::KirguduRefs::Concerns::Models::TerritoryArea
 
 			has_many :cities, class_name: ::KirguduRefs::Globe::City, foreign_key: :region_id
 
@@ -31,17 +35,7 @@ module KirguduRefs
 
 			######################################### SCOPES #############################################
 
-			include ::KirguduBase::Models::Scopes::WithName
-			include ::KirguduBase::Models::Scopes::WithSlug
-
-
-			scope :by_capital, lambda { |value| where(capital_id: value) if value }
-
 			scope :with_is_active, lambda { |value| where(is_active: value) if value }
-			scope :with_area_min, lambda { |value| where { area >= value } if value }
-			scope :with_area_max, lambda { |value| where { area <= value } if value }
-			scope :with_population_min, lambda { |value| where { population >= value } if value }
-			scope :with_population_max, lambda { |value| where { population <= value } if value }
 
 
 			scope :with_keyword, lambda { |value|
@@ -56,13 +50,6 @@ module KirguduRefs
 				filters ||= {}
 
 				query = query
-				.with_area_min(filters[:area_min])
-				.with_area_max(filters[:area_max])
-				.with_population_min(filters[:population_min])
-				.with_population_max(filters[:population_max])
-				.by_country(filters[:country_id])
-				.by_capital(filters[:capital_id])
-				.by_state(filters[:state_id])
 				.with_is_active(filters[:is_active])
 
 				super(query, filters)

data/app/models/kirgudu_refs/globe/state.rb

@@ -4,42 +4,39 @@ module KirguduRefs
 
 			########################################## RELATIONS ########################################
 
-			include ::KirguduBase::Models::BasicProperties::Portal
-			include ::KirguduBase::Models::BasicProperties::CreatedBy
-			include ::KirguduBase::Models::BasicProperties::UpdatedBy
+			include ::KirguduBase::Concerns::Models::PortalId
+			include ::KirguduBase::Concerns::Models::CreatedBy
+			include ::KirguduBase::Concerns::Models::UpdatedBy
+			include ::KirguduBase::Concerns::Models::Name
+			include ::KirguduBase::Concerns::Models::Slug
 
 
-			include ::KirguduRefs::ModelBasicProperties::CountryID
-			include ::KirguduRefs::ModelBasicProperties::CapitalID
+			include ::KirguduRefs::Concerns::Models::CountryId
+			include ::KirguduRefs::Concerns::Models::CapitalId
+
+			include ::KirguduRefs::Concerns::Models::TerritoryPopulation
+			include ::KirguduRefs::Concerns::Models::TerritoryArea
+
 
 			has_many :regions, class_name: ::KirguduRefs::Globe::Region, foreign_key: :state_id
 			has_many :cities, class_name: ::KirguduRefs::Globe::City, foreign_key: :region_id
 
 			########################################## VALIDATIONS #######################################
 
-			validates_presence_of :name, :country_id, :slug
+			validates_presence_of :country_id
 			validates_uniqueness_of :name, scope: :country_id, case_sensitive: false
 			validates_uniqueness_of :slug, scope: :country_id, case_sensitive: false
 
-			validates_length_of :name, maximum: 128, allow_blank: true
-			validates_length_of :slug, maximum: 128, allow_blank: true
-			validates_slug_format_of :slug, allow_blank: true
 
 			validates_length_of :meta_keywords, maximum: 200, allow_blank: true
 			validates_length_of :meta_description, maximum: 200, allow_blank: true
 
 			######################################### SCOPES #############################################
 
-			include ::KirguduBase::Models::Scopes::WithName
-			include ::KirguduBase::Models::Scopes::WithSlug
 
 			scope :by_capital, lambda { |value| where(capital_id: value) if value }
 
 			scope :with_is_active, lambda { |value| where(is_active: value) if value }
-			scope :with_area_min, lambda { |value| where { area >= value } if value }
-			scope :with_area_max, lambda { |value| where { area <= value } if value }
-			scope :with_population_min, lambda { |value| where { population >= value } if value }
-			scope :with_population_max, lambda { |value| where { population <= value } if value }
 
 			scope :with_keyword, lambda { |value|
 				if value
@@ -60,12 +57,6 @@ module KirguduRefs
 				filters ||= {}
 
 				query = query
-				.with_area_min(filters[:area_min])
-				.with_area_max(filters[:area_max])
-				.with_population_min(filters[:population_min])
-				.with_population_max(filters[:population_max])
-				.by_country(filters[:country_id])
-				.by_capital(filters[:capital_id])
 				.with_car_code(filters[:car_code])
 				.with_is_active(filters[:is_active])