kirgudu_refs 0.0.2 → 0.0.3

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

@@ -2,29 +2,39 @@ module KirguduRefs
 	module Globe
 		class Region < ::KirguduRefs::BaseModel
 
+			########################################## RELATIONS ########################################
 
-			attr_accessible :area, :coordinates, :country_id, :name, :phone_code, :population, :slug, :state_id, :capital_id, :description, :image_id, :meta_keywords, :meta_description
+			include ::KirguduBase::Models::BasicProperties::Portal
+			include ::KirguduBase::Models::BasicProperties::CreatedBy
+			include ::KirguduBase::Models::BasicProperties::UpdatedBy
 
-			validates_presence_of :name, :country_id, :state_id, :slug
-			validates_presence_of :name, scope: :state_id
-			validates_uniqueness_of :name, :slug, scope: :state_id
-			validate_as_seo_tag :slug
-
-			
+			include ::KirguduRefs::ModelBasicProperties::CountryID
+			include ::KirguduRefs::ModelBasicProperties::StateID
+			include ::KirguduRefs::ModelBasicProperties::RegionID
 
 			include ::KirguduRefs::ModelBasicProperties::CountryID
 			include ::KirguduRefs::ModelBasicProperties::StateID
 			include ::KirguduRefs::ModelBasicProperties::CapitalID
-			
+
 			has_many :cities, class_name: ::KirguduRefs::Globe::City, foreign_key: :region_id
 
+			########################################## VALIDATIONS #######################################
 
+			validates_presence_of :name, :country_id, :state_id, :slug
+			validates_presence_of :name, scope: :state_id
+			validates_uniqueness_of :name, :slug, scope: :country_id
+
+			validates_length_of :name, maximum: 128
+			validates_length_of :slug, maximum: 128
+			validate_as_seo_tag :slug, allow_blank: true
 
 
 			######################################### SCOPES #############################################
 
-			scope :by_country, lambda { |value| where(country_id: value) if value }
-			scope :by_state, lambda { |value| where(state_id: value) if value }
+			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 }
@@ -39,26 +49,11 @@ module KirguduRefs
 					where { (name.like like_value) | (slug.like like_value) }
 				end
 			}
-			scope :with_name, lambda { |value|
-				if value
-					value = value.gsub('%', ' ').strip
-					like_value ="%#{value}%"
-					where { name.like like_value }
-				end
-			}
-			scope :with_slug, lambda { |value|
-				if value
-					value = value.gsub('%', ' ').strip
-					like_value ="%#{value}%"
-					where { slug.like like_value }
-				end
-			}
 
 			def self.apply_filters_to_query(query, filters={})
 				filters ||= {}
 
 				query = query
-				.with_keyword(filters[:keyword])
 				.with_area_min(filters[:area_min])
 				.with_area_max(filters[:area_max])
 				.with_population_min(filters[:population_min])

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

@@ -1,77 +1,74 @@
 module KirguduRefs
-	class Globe::State < ::KirguduRefs::BaseModel
-		attr_accessible :area, :coordinates, :country_id, :name, :phone_code, :population, :slug, :capital_id, :description, :image_id, :meta_keywords, :meta_description, :car_code
+	module Globe
+		class State < ::KirguduRefs::BaseModel
 
+			########################################## RELATIONS ########################################
 
-		validates_presence_of :name, :country_id, :slug
-		validates_uniqueness_of :name, scope: :country_id
-		validates_uniqueness_of :slug, scope: :country_id
-		validate_as_seo_tag :slug
+			include ::KirguduBase::Models::BasicProperties::Portal
+			include ::KirguduBase::Models::BasicProperties::CreatedBy
+			include ::KirguduBase::Models::BasicProperties::UpdatedBy
 
 
-		include ::KirguduRefs::ModelBasicProperties::CountryID
-		include ::KirguduRefs::ModelBasicProperties::CapitalID
+			include ::KirguduRefs::ModelBasicProperties::CountryID
+			include ::KirguduRefs::ModelBasicProperties::CapitalID
 
+			has_many :regions, class_name: ::KirguduRefs::Globe::Region, foreign_key: :state_id
+			has_many :cities, class_name: ::KirguduRefs::Globe::City, foreign_key: :region_id
 
-		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_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
+			validate_as_seo_tag :slug, allow_nil: true
 
+			validates_length_of :meta_keywords, maximum: 200, allow_blank: true
+			validates_length_of :meta_description, maximum: 200, allow_blank: true
 
-		scope :by_country, lambda { |value| where(country_id: value) if value }
-		scope :by_capital, lambda { |value| where(capital_id: value) if value }
+			######################################### SCOPES #############################################
 
-		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 }
+			include ::KirguduBase::Models::Scopes::WithName
+			include ::KirguduBase::Models::Scopes::WithSlug
 
-		scope :with_keyword, lambda { |value|
-			if value
-				value = value.gsub('%', ' ').strip
-				like_value ="%#{value}%"
-				where { (name.like like_value) | (slug.like like_value) | (car_code.like like_value) }
-			end
-		}
-		scope :with_name, lambda { |value|
-			if value
-				value = value.gsub('%', ' ').strip
-				like_value ="%#{value}%"
-				where { name.like like_value }
-			end
-		}
-		scope :with_slug, lambda { |value|
-			if value
-				value = value.gsub('%', ' ').strip
-				like_value ="%#{value}%"
-				where { slug.like like_value }
-			end
-		}
-		scope :with_car_code, lambda { |value|
-			if value
-				value = value.gsub('%', ' ').strip
-				like_value ="%#{value}%"
-				where { car_code.like like_value }
+			scope :by_capital, lambda { |value| where(capital_id: 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
+					value = value.gsub('%', ' ').strip
+					like_value ="%#{value}%"
+					where { (name.like like_value) | (slug.like like_value) | (car_code.like like_value) }
+				end
+			}
+			scope :with_car_code, lambda { |value|
+				if value
+					value = value.gsub('%', ' ').strip
+					like_value ="%#{value}%"
+					where { car_code.like like_value }
+				end
+			}
+
+			def self.apply_filters_to_query(query, filters={})
+				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])
+
+				super(query, filters)
 			end
-		}
-
-		def self.apply_filters_to_query(query, filters={})
-			filters ||= {}
-
-			query = query
-			.with_keyword(filters[:keyword])
-			.with_name(filters[:name])
-			.with_area_min(filters[:area_min])
-			.with_area_max(filters[:area_max])
-			.with_population_min(filters[:population_min])
-			.with_population_max(filters[:population_max])
-			.with_slug(filters[:name])
-			.by_country(filters[:country_id])
-			.by_capital(filters[:capital_id])
-			.with_car_code(filters[:car_code])
-
-			super(query, filters)
 		end
 	end
-end
+end

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

@@ -1,43 +1,47 @@
 module KirguduRefs
-	class Globe::SubwayLine < ::KirguduRefs::BaseModel
+	module Globe
+		class SubwayLine < ::KirguduRefs::BaseModel
 
-		attr_accessible :city_id, :description, :name, :color, :slug, :meta_keywords, :meta_description
+			########################################## RELATIONS ########################################
 
+			include ::KirguduBase::Models::BasicProperties::Portal
+			include ::KirguduBase::Models::BasicProperties::CreatedBy
+			include ::KirguduBase::Models::BasicProperties::UpdatedBy
 
+			include ::KirguduRefs::ModelBasicProperties::CityID
 
-		include ::KirguduRefs::ModelBasicProperties::CityID
+			has_many :stations, class_name: ::KirguduRefs::Globe::SubwayStation, foreign_key: :line_id, dependent: :destroy
 
-		has_many :stations, class_name: ::KirguduRefs::Globe::SubwayStation, foreign_key: :line_id, dependent: :destroy
+			######################################### SCOPES #############################################
 
-		validates_presence_of :city_id, :name, :slug
-		validates_uniqueness_of :name, :slug, scope: :city_id, case_sensitive: false
-		validate_as_seo_tag :slug
+			validates_presence_of :city_id, :name, :slug
+			validates_uniqueness_of :name, :slug, scope: :city_id, case_sensitive: false
 
+			validates_length_of :name, maximum: 128, allow_blank: true
+			validates_length_of :slug, maximum: 128, allow_blank: true
+			validate_as_seo_tag :slug, allow_nil: true
 
+			########################################## VALIDATIONS #######################################
 
-		scope :with_keyword, lambda { |value|
-			if value
-				value = value.gsub('%', ' ').strip
-				like_value ="%#{value}%"
-				where { (name.like like_value) | (slug.like like_value) }
-			end
-		}
-
+			scope :with_keyword, lambda { |value|
+				if value
+					value = value.gsub('%', ' ').strip
+					like_value ="%#{value}%"
+					where { (name.like like_value) | (slug.like like_value) }
+				end
+			}
 
 
-		scope :by_city, lambda { |value| where(city_id: value) if value }
+			def self.apply_filters_to_query(query, filters={})
+				filters ||={}
 
+				query = query
+				.by_city(filters[:city_id])
 
-		def self.apply_filters_to_query(query, filters={})
-			filters ||={}
+				super(query, filters)
+			end
 
-			query = query
-			.with_keyword(filters[:keyword])
-			.by_city(filters[:city_id])
 
-			super(query, filters)
 		end
-
-
 	end
-end
+end

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

@@ -1,65 +1,68 @@
 module KirguduRefs
-	class Globe::SubwayStation < ::KirguduRefs::BaseModel
+	module Globe
+		class SubwayStation < ::KirguduRefs::BaseModel
 
+			########################################## RELATIONS ########################################
 
-		attr_accessible :description, :latitude, :line_id, :longitude, :name, :next_station_id, :previous_station_id, :slug, :meta_keywords, :meta_description
+			include ::KirguduBase::Models::BasicProperties::Portal
+			include ::KirguduBase::Models::BasicProperties::CreatedBy
+			include ::KirguduBase::Models::BasicProperties::UpdatedBy
 
+			include ::KirguduRefs::ModelBasicProperties::CityID
 
-		include ::KirguduRefs::ModelBasicProperties::CityID
+			belongs_to :line, class_name: ::KirguduRefs::Globe::SubwayLine, foreign_key: :line_id
 
-		belongs_to :line, class_name: ::KirguduRefs::Globe::SubwayLine, foreign_key: :line_id
+			belongs_to :previous_station, class_name: ::KirguduRefs::Globe::SubwayStation, foreign_key: :prev_id
+			belongs_to :next_station, class_name: ::KirguduRefs::Globe::SubwayStation, foreign_key: :next_id
 
-		belongs_to :previous_station, class_name: ::KirguduRefs::Globe::SubwayStation, foreign_key: :prev_id
-		belongs_to :next_station, class_name: ::KirguduRefs::Globe::SubwayStation, foreign_key: :next_id
+			########################################## VALIDATIONS #######################################
 
-		validates_presence_of  :line_id, :name, :slug
-		validates_uniqueness_of :slug, scope: :line_id, case_sensitive: false
-		validates_uniqueness_of :name, scope: :line_id, case_sensitive: false
-		validate_as_seo_tag :slug
+			validates_presence_of :line_id, :name, :slug
+			validates_uniqueness_of :slug, scope: :line_id, case_sensitive: false
+			validates_uniqueness_of :name, scope: :line_id, case_sensitive: false
 
 
-		#in_transaction_after_create :process_prev_next_after_update
+			validates_length_of :name, maximum: 128, allow_blank: true
+			validates_length_of :slug, maximum: 128, allow_blank: true
+			validate_as_seo_tag :slug, allow_nil: true
 
+			######################################### SCOPES #############################################
 
+			scope :with_keyword, lambda { |value|
+				if value
+					value = value.gsub('%', ' ').strip
+					like_value ="%#{value}%"
+					where { (name.like like_value) | (slug.like like_value) }
+				end
+			}
 
 
+			scope :by_line, lambda { |value| where(line_id: value) if value }
 
-		scope :with_keyword, lambda { |value|
-			if value
-				value = value.gsub('%', ' ').strip
-				like_value ="%#{value}%"
-				where { (name.like like_value) | (slug.like like_value) }
-			end
-		}
-
-
-		scope :by_line, lambda { |value| where(line_id: value) if value }
 
+			def self.apply_filters_to_query(query, filters={})
+				filters ||={}
 
-		def self.apply_filters_to_query(query, filters={})
-			filters ||={}
+				query = query
+				.by_line(filters[:line_id])
+				.by_city(filters[:city_id])
 
-			query = query
-			.with_keyword(filters[:keyword])
-			.by_line(filters[:line_id])
-			.by_city(filters[:city_id])
-
-			super(query, filters)
-		end
+				super(query, filters)
+			end
 
 
+			def line_name
+				line.name if line
+			end
 
-		def line_name
-			line.name if line
-		end
+			def prev_name
+				previous_station.name if previous_station
+			end
 
-		def prev_name
-			previous_station.name if previous_station
-		end
+			def next_name
+				next_station.name if next_station
+			end
 
-		def next_name
-			next_station.name if next_station
 		end
-
 	end
-end
+end

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

@@ -1,8 +1,43 @@
 module KirguduRefs
-  class Globe::Timezone < ::KirguduRefs::BaseModel
-    attr_accessible :country_id, :dst_offset, :gmt_offset, :name, :raw_offset
+	module Globe
+		class Timezone < ::KirguduRefs::BaseModel
 
+			########################################## RELATIONS ########################################
 
-    validate_as_seo_tag :slug
-  end
-end
+			include ::KirguduBase::Models::BasicProperties::Portal
+			include ::KirguduBase::Models::BasicProperties::CreatedBy
+			include ::KirguduBase::Models::BasicProperties::UpdatedBy
+
+			include ::KirguduRefs::ModelBasicProperties::CountryID
+
+			########################################## VALIDATIONS #######################################
+
+			validates_presence_of :name, :slug, :country_id
+			validates_uniqueness_of :name, :slug, case_sensitive: false, scope: :portal_id
+
+			validates_length_of :name, maximum: 128, allow_blank: true
+			validates_length_of :slug, maximum: 128, allow_blank: true
+			validate_as_seo_tag :slug, allow_nil: true
+
+			######################################### SCOPES #############################################
+
+			scope :with_keyword, lambda { |value|
+				if value
+					value = value.gsub('%', ' ').strip
+					like_value ="%#{value}%"
+					where { (name.like like_value) | (slug.like like_value) }
+				end
+			}
+
+			def self.apply_filters_to_query(query, filters={})
+				filters ||={}
+
+				query = query
+				.by_country(filters[:country_id])
+
+				super(query, filters)
+			end
+
+		end
+	end
+end

data/app/models/kirgudu_refs/it.rb

@@ -1,7 +1,7 @@
 module KirguduRefs
   module It
     def self.table_name_prefix
-      'it_'
+      'kirgudu_refs_it_'
     end
   end
 end