kirgudu_refs 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2921184033f761699f1a1a7a2c09378a020ce0f
-  data.tar.gz: 2a783224e7ae4cc4a01b600e038fae7b448d79eb
+  metadata.gz: 01ea468d9e566ff2298438e7e21d6d3ead8afd9d
+  data.tar.gz: a52a891c52fc92c0dae316fcb6b162c178013394
 SHA512:
-  metadata.gz: 6d52401653a48fb69f30b9f934024206fc73f854af0deda6ecf5b72f2fbe162f05636f53009389ed9fc0ca6ffd884f9c0b39fe3082ee2869418222a72b38a769
-  data.tar.gz: 24e0c403836194ae67b061840a87d26cbffe376052c38b86dc2edbbc6342a485913136be13e807fc03de0214f85d484b6a71936702de1cddd9ec7099fb8416ac
+  metadata.gz: 5f7b366f0002435e253ea97881a08f577c8100025a8816095ed06133cd55501c0789aa94cf8eecd009620fa67fefc1258f6c78301286804b7aff808c86dd0cb5
+  data.tar.gz: 7c47ec3bd10b5ea48a3450959a95e880b3d59bce3af7091ca2d6847e069330099bdaf808d517de19f6573a875bc2317a3ce131c26ad1cb96b4e645bb880f9aca

data/app/helpers/kirgudu_refs/model_basic_properties.rb

@@ -170,6 +170,75 @@ module KirguduRefs
 			end
 		end
 
+		module ProcessorArchitectureID
+			def self.included(base)
+				base.belongs_to :processor_architecture, class_name: ::KirguduRefs::It::ProcessorArchitecture, foreign_key: :processor_architecture_id
+				base.scope :by_processor_architecture, lambda { |value| base.where(processor_architecture_id: value) if value }
+
+				base.class_eval do
+					include InstanceMethods
+				end
+			end
+
+			module InstanceMethods
+				def processor_architecture_name
+					processor_architecture.name if processor_architecture
+				end
+			end
+		end
+
+
+		module OperatingSystemFamilyID
+			def self.included(base)
+				base.belongs_to :operating_system_family, class_name: ::KirguduRefs::It::OperatingSystemFamily, foreign_key: :operating_system_family_id
+				base.scope :by_operating_system_family, lambda { |value| base.where(operating_system_family_id: value) if value }
+
+				base.class_eval do
+					include InstanceMethods
+				end
+			end
+
+			module InstanceMethods
+				def operating_system_family_name
+					operating_system_family.name if operating_system_family
+				end
+			end
+		end
+
+
+		module OperatingSystemID
+			def self.included(base)
+				base.belongs_to :operating_system, class_name: ::KirguduRefs::It::OperatingSystem, foreign_key: :operating_system_id
+				base.scope :by_operating_system, lambda { |value| base.where(operating_system_id: value) if value }
+
+				base.class_eval do
+					include InstanceMethods
+				end
+			end
+
+			module InstanceMethods
+				def operating_system_name
+					operating_system.name if operating_system
+				end
+			end
+		end
+
+		module BankID
+			def self.included(base)
+				base.belongs_to :bank, class_name: ::KirguduRefs::Finances::Bank, foreign_key: :bank_id
+				base.scope :by_bank, lambda { |value| base.where(bank_id: value) if value }
+
+				base.class_eval do
+					include InstanceMethods
+				end
+			end
+
+			module InstanceMethods
+				def bank_name
+					bank.short_name || bank.name if bank
+				end
+			end
+		end
 
 	end
 end

data/app/models/kirgudu_refs/base_model.rb

@@ -2,13 +2,5 @@ class KirguduRefs::BaseModel < ::KirguduBase::BaseModel
 
 	self.abstract_class = true
 
-	def self.apply_filters_to_query(query, filters={})
-		filters ||={}
 
-		query = query
-		.with_slug(filters[:seo_tag])
-
-
-		super(query, filters)
-	end
 end

data/app/models/kirgudu_refs/finances.rb

@@ -0,0 +1,7 @@
+module KirguduRefs
+  module Finances
+    def self.table_name_prefix
+      'kirgudu_refs_finances_'
+    end
+  end
+end

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

@@ -0,0 +1,116 @@
+# -*- encoding : utf-8 -*-
+
+module KirguduRefs
+	module Finances
+		class Bank < ::KirguduRefs::BaseModel
+
+
+			########################################## 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::CityID
+
+			########################################## VALIDATIONS #######################################
+
+
+			validates_presence_of :name, :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
+
+			validates_length_of :address_actual, :address_legal, maximum: 256, allow_blank: true
+
+			validates_length_of :phone1, :phone2, :phone3, :phone4, maximum: 20, allow_blank: true
+			validates_length_of :telex, :swift, maximum: 50, allow_blank: true
+
+
+			validates_inclusion_of :foundation_year, in: (1900..Date.today.year).to_a, allow_nil: true
+
+			######################################### 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 }
+			scope :with_foundation_year_min, lambda { |value| where { foundation_year >= value } if value }
+			scope :with_foundation_year_max, lambda { |value| where { foundation_year <= value } if value }
+
+
+			scope :with_keyword, lambda { |value|
+				if value
+					value = value.gsub("%", " ").strip
+					like_value ="%#{value}%"
+					where { (name.like like_value) | (short_name.like like_value) | (bik.like like_value) }
+				end
+			}
+			scope :with_short_name, lambda { |value|
+				if value
+					value = value.gsub("%", " ").strip
+					like_value ="%#{value}%"
+					where { short_name.like like_value }
+				end
+			}
+			scope :with_bik, lambda { |value|
+				if value
+					value = value.gsub("%", " ").strip
+					like_value ="%#{value}%"
+					where { bik.like like_value }
+				end
+			}
+			scope :with_correspondent_account, lambda { |value|
+				if value
+					value = value.gsub("%", " ").strip
+					like_value ="%#{value}%"
+					where { correspondent_account.like like_value }
+				end
+			}
+			scope :with_swift, lambda { |value|
+				if value
+					value = value.gsub("%", " ").strip
+					like_value ="%#{value}%"
+					where { swift.like like_value }
+				end
+			}
+
+
+			def self.apply_filters_to_query(query, filters)
+				filters ||= {}
+
+				query = query
+				.with_swift(filters[:swift])
+				.with_bik(filters[:bik])
+				.with_short_name(filters[:short_name])
+				.with_capital_min(filters[:capital_min])
+				.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
+
+			def name_for_breadcrumbs
+				self.short_name
+			end
+
+			def to_s
+				self.short_name
+			end
+
+		end
+	end
+end

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

@@ -1,78 +1,78 @@
 module KirguduRefs
-	class Globe::City < ::KirguduRefs::BaseModel
-		attr_accessible :area, :coordinates, :country_id, :name, :phone_code, :population, :region_id, :slug, :state_id, :description, :meta_keywords, :meta_description, :image_id
+	module Globe
+		class City < ::KirguduRefs::BaseModel
 
+			########################################## RELATIONS ########################################
 
+			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_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::RegionID
+			########################################## VALIDATIONS #######################################
 
+			validates_presence_of :name, :country_id, :state_id, :slug
+			validates_uniqueness_of :name, :slug, scope: :state_id
 
-		has_many :subway_lines, class_name: ::KirguduRefs::Globe::SubwayLine, foreign_key: :city_id, dependent: :destroy
+			validates_length_of :name, maximum: 128, allow_blank: true
+			validates_length_of :slug, maximum: 128, allow_blank: true
+			validate_as_seo_tag :slug
 
+			validates_length_of :meta_keywords, maximum: 200, allow_blank: true
+			validates_length_of :meta_description, maximum: 200, allow_blank: true
 
-		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 }
+			has_many :subway_lines, class_name: ::KirguduRefs::Globe::SubwayLine, foreign_key: :city_id, dependent: :destroy
 
-		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_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
-		}
+			###########################################  SCOPES  #########################################
 
+			include ::KirguduBase::Models::Scopes::WithName
+			include ::KirguduBase::Models::Scopes::WithSlug
 
-		def self.apply_filters_to_query(query, filters={})
-			filters ||= {}
+			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 }
 
-			query = query
-			.with_keyword(filters[:keyword])
-			.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])
+			scope :with_keyword, lambda { |value|
+				if value
+					value = value.gsub('%', ' ').strip
+					like_value ="%#{value}%"
+					where { (name.like like_value) | (slug.like like_value) }
+				end
+			}
 
-			super(query, filters)
-		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_state(filters[:state_id])
+				.by_region(filters[:region_id])
 
-		def capital_name
-			capital.name if capital
-		end
+				super(query, filters)
+			end
 
-		def name_with_country_name
-			"#{name} (#{country_name})"
-		end
 
-		def name_with_country_name_and_state
-			"#{name} (#{country_name}, #{region_name})"
-		end
+			def capital_name
+				capital.name if capital
+			end
 
+			def name_with_country_name
+				"#{name} (#{country_name})"
+			end
 
+			def name_with_country_name_and_state
+				"#{name} (#{country_name}, #{region_name})"
+			end
+
+
+		end
 	end
-end
+end

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

@@ -1,79 +1,95 @@
 module KirguduRefs
-  class Globe::Country < ::KirguduRefs::BaseModel
+	module Globe
+		class Country < ::KirguduRefs::BaseModel
 
+			########################################## RELATIONS ########################################
 
-	  attr_accessible :area, :iso2, :iso3, :name,  :phone_code, :population, :slug, :currency_id, :capital_id, :meta_description, :meta_keywords, :description, :image_id
+			include ::KirguduBase::Models::BasicProperties::Portal
+			include ::KirguduBase::Models::BasicProperties::CreatedBy
+			include ::KirguduBase::Models::BasicProperties::UpdatedBy
 
-	  before_validation :normalize_values
+			include ::KirguduRefs::ModelBasicProperties::CountryID
+			include ::KirguduRefs::ModelBasicProperties::StateID
+			include ::KirguduRefs::ModelBasicProperties::RegionID
 
+			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
 
-	  include ::KirguduRefs::ModelBasicProperties::CurrencyID
+			has_many :states, class_name: ::KirguduRefs::Globe::State, foreign_key: :country_id, dependent: :destroy
+			has_many :regions, class_name: ::KirguduRefs::Globe::Region, foreign_key: :country_id, dependent: :destroy
+			has_many :cities, class_name: ::KirguduRefs::Globe::City, foreign_key: :country_id, dependent: :destroy
 
+			########################################## VALIDATIONS #######################################
 
-	  belongs_to :capital, class_name: ::KirguduRefs::Globe::City, foreign_key: :capital_id
-	  #belongs_to :image, class_name: ::ErpZone::Common::Image, foreign_key: :image_id
+			validates_presence_of :name, :slug, :iso2
+			validates_uniqueness_of :name, :slug, :iso2, case_sensitive: false, scope: :portal_id
 
-	  has_many :states, class_name: ::KirguduRefs::Globe::State, foreign_key: :country_id, dependent: :destroy
-	  has_many :regions, class_name: ::KirguduRefs::Globe::Region, foreign_key: :country_id, dependent: :destroy
-	  has_many :cities, class_name: ::KirguduRefs::Globe::City, foreign_key: :country_id, dependent: :destroy
+			validates_length_of :name, maximum: 128
+			validates_length_of :slug, maximum: 128
+			validate_as_seo_tag :slug, allow_nil: true
 
+			validates_length_of :iso2, is: 2, allow_blank: true
+			validates_length_of :iso3, is: 3, allow_blank: true
 
-	  validates_presence_of :name, :slug, :iso2
-	  validates_uniqueness_of :name, :slug, :iso2, case_sensitive: false
-	  validate_as_seo_tag :slug
+			validates_length_of :meta_keywords, maximum: 200, allow_blank: true
+			validates_length_of :meta_description, maximum: 200, allow_blank: true
 
+			validates_length_of :phone_code, maximum: 10, 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 :by_currency, lambda { |value| where(currency_id: value) if 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_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) }
+				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
-	  }
+			def self.apply_filters_to_query(query, filters={})
+				filters ||= {}
 
-	  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_currency(filters[:currency_id])
+				.by_capital(filters[:capital_id])
 
-		  query = query
-		  .with_keyword(filters[:keyword])
-		  .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])
+				super(query, filters)
+			end
 
-		  super(query, filters)
-	  end
+			def capital_name
+				capital.name if capital
+			end
 
-	  def capital_name
-		  capital.name if capital
-	  end
+			private
+			def normalize_values_before_validation
 
+				self.iso2.upcase!
+				self.iso2.strip!
+				if self.iso3
+					self.iso3.strip!
+					self.iso3.upcase!
+				end
+				self.name.capitalize!
 
-	  private
-	  def normalize_values
+				super
+			end
 
-		  iso2.upcase!
-		  iso2.strip!
-		  if iso3
-			  iso3.strip!
-			  iso3.upcase!
-		  end
-		  name.capitalize!
-	  end
-
-  end
-end
+		end
+	end
+end