kirgudu_base 0.0.21 → 0.0.22

data/app/models/kirgudu_base/{dynamic_transactions/transaction_injection_builder.rb → dynamic/transactions/injection_builder.rb}

@@ -1,6 +1,5 @@
 module KirguduBase
-	module DynamicTransactions
-		class TransactionInjectionBuilder < ::KirguduBase::DynamicPages::Builder
+	class Dynamic::Transactions::InjectionBuilder < ::KirguduBase::Dynamic::BaseBuilder
 
 			def initialize(&block)
 
@@ -16,27 +15,22 @@ module KirguduBase
 			end
 
 			def flow_position(value)
-				raise "Parameter 'flow_position' must be a Symbol" unless value && value.is_a?(Symbol)
-
 				self.builder_options[:flow_position] = value
 			end
 
 			def action(value)
-				raise "Parameter 'action' must be a Symbol" unless value && value.is_a?(Symbol)
 				self.builder_options[:action] = value
 			end
 
 			def method(value)
-				raise "Parameter 'method' must be a Symbol" unless value && value.is_a?(Symbol)
 				self.builder_options[:method] = value
 			end
 
 			def to_injection
-				element = ::KirguduBase::DynamicTransactions::TransactionInjection.new
+				element = ::KirguduBase::Dynamic::Transactions::Injection.new
 				self.build_element(element)
 				self.validate_generated_element(element)
 				element
 			end
 		end
 	end
-end

data/app/models/kirgudu_base/dynamic_pages/builder.rb

@@ -1,73 +1,72 @@
 module KirguduBase
-	module DynamicPages
-		class Builder
-			def initialize(&block)
-				instance_eval(&block) if block_given?
-			end
+	class DynamicPages::Builder
 
+		def initialize(&block)
+			instance_eval(&block) if block_given?
+		end
 
-			def build_element(element)
-				self.builder_options.each_pair do |key, value|
-					element.send("#{key}=", value)
-				end
-				element.fix_parent_entry(nil)
-				self.validate_generated_element(element)
+
+		def build_element(element)
+			self.builder_options.each_pair do |key, value|
+				element.send("#{key}=", value)
 			end
+			element.fix_parent_entry(nil)
+			self.validate_generated_element(element)
+		end
 
 
-			def builder_options
-				@options = {} unless @options
-				@options
-			end
+		def builder_options
+			@options = {} unless @options
+			@options
+		end
 
-			def validate_empty_parameter(name, value)
-				raise "Parameter \"#{name}\" cannot be empty. If you dont want to assign specific value to this parameter, just delete it from code" unless value
-			end
+		def validate_empty_parameter(name, value)
+			raise "Parameter \"#{name}\" cannot be empty. If you dont want to assign specific value to this parameter, just delete it from code" unless value
+		end
 
-			def valiadte_interger_parameter(name, value)
-				raise "Parameter \"#{name}\" accepts only integer values" unless value.is_a?(Integer)
-			end
+		def valiadte_interger_parameter(name, value)
+			raise "Parameter \"#{name}\" accepts only integer values" unless value.is_a?(Integer)
+		end
 
-			def valiadte_interger_positive_parameter(name, value)
-				raise "Parameter \"#{name}\" accepts only integer values" unless value.is_a?(Integer)
-				raise "Parameter \"#{name}\" accepts only positive values (>=0)" unless value.is_a?(Integer) if value < 0
-			end
+		def valiadte_interger_positive_parameter(name, value)
+			raise "Parameter \"#{name}\" accepts only integer values" unless value.is_a?(Integer)
+			raise "Parameter \"#{name}\" accepts only positive values (>=0)" unless value.is_a?(Integer) if value < 0
+		end
 
 
-			def validate_string_parameter(name, value)
-				raise "Parameter \"#{name}\" must be a \"String\"." unless value && value.is_a?(String)
-			end
+		def validate_string_parameter(name, value)
+			raise "Parameter \"#{name}\" must be a \"String\"." unless value && value.is_a?(String)
+		end
 
-			def validate_symbol_parameter(name, value)
-				raise "Parameter \"#{name}\"must be a :Symbol." unless value && value.is_a?(Symbol)
-			end
+		def validate_symbol_parameter(name, value)
+			raise "Parameter \"#{name}\"must be a :Symbol." unless value && value.is_a?(Symbol)
+		end
 
-			def validate_string_or_symbol_parameter(name, value)
-				raise "Parameter \"#{name}\" must be a \"String\" or a :Symbol." unless value && (value.is_a?(String) || value.is_a?(Symbol))
-			end
+		def validate_string_or_symbol_parameter(name, value)
+			raise "Parameter \"#{name}\" must be a \"String\" or a :Symbol." unless value && (value.is_a?(String) || value.is_a?(Symbol))
+		end
+
+		def validate_generated_element(element)
+			errors = []
+			unless element.valid?
 
-			def validate_generated_element(element)
-				errors = []
-				unless element.valid?
-
-					#raise "ERRORS FOR ELEMENT: #{element.errors.methods.to_json}"
-					element.errors.each do |key, element_errors|
-						errors << "'#{key}' #{element_errors}"
-						#raise "ERROR KEY: #{key}; ERROR MESSAGES: #{element_errors}"
-						#element_errors.each do |element_error|
-						#	errors << "'#{key}' #{element_error}"
-						#end
-					end
+				#raise "ERRORS FOR ELEMENT: #{element.errors.methods.to_json}"
+				element.errors.each do |key, element_errors|
+					errors << "'#{key}' #{element_errors}"
+					#raise "ERROR KEY: #{key}; ERROR MESSAGES: #{element_errors}"
+					#element_errors.each do |element_error|
+					#	errors << "'#{key}' #{element_error}"
+					#end
 				end
-				if errors.length > 0
+			end
+			if errors.length > 0
 
-					raise "ERRORS<br/>
+				raise "ERRORS<br/>
 						   Class: #{element.class}
 						   Name: #{element.name if element.respond_to?(:name)} <br/>
 
 						   #{errors.join('<br/>')}".html_safe
-				end
 			end
 		end
 	end
-end
+end

data/app/models/kirgudu_base/dynamic_pages/data_source.rb

@@ -1,61 +1,60 @@
 module KirguduBase
-	module DynamicPages
-		class DataSource < ::KirguduBase::DynamicPages::Element
-
-			mergeable_attributes :model, :cross_domain, :cache_locally, :url, :data_format, :label_property, :value_property, :type, :http_method
-
-			validates_presence_of :model, :type, :label_property, :value_property
-			validates_presence_of :url, :http_method, if: :is_internet_data_source?
-
-			validates_inclusion_of :type, in: ::KirguduBase::DynamicPages::Enums::SUPPORTED_DATA_SOURCE_TYPES, allow_nil: true
-			validates_inclusion_of :data_format, in: ::KirguduBase::DynamicPages::Enums::SUPPORTED_DATA_FORMATS, allow_nil: true, message: "This Format is not supported. Supported Data Formats are #{::KirguduBase::DynamicPages::Enums::SUPPORTED_DATA_FORMATS.map { |i| ":#{i}" }.join(", ")}"
-
-			validates_inclusion_of :cross_domain, in: [:true, :false], allow_nil: true
-			validates_inclusion_of :cache_locally, in: [:true, :false], allow_nil: true
-
-
-
-
-			def initialize(options = {})
-				self.model = nil
-				self.cross_domain = :false
-				self.cache_locally = :false
-				self.url = nil
-				self.data_format = :json
-				self.label_property = :name
-				self.value_property = :id
-				self.type = :local
-				self.http_method = nil
-
-				super(options)
-			end
-
-
-			attr_accessor :model
-			attr_accessor :cross_domain
-			attr_accessor :cache_locally
-			attr_accessor :url
-			attr_accessor :data_format
-			attr_accessor :label_property
-			attr_accessor :value_property
-			attr_accessor :type
-			attr_accessor :http_method
-
-			def to_external_hash(options = {})
-				options ||= {}
-				options.merge!({
-					               url: self.url,
-				                   data_format: self.data_format,
-				                   http_method: self.http_method,
-				                   label_property: self.label_property,
-				                   value_property: self.value_property
-				               })
-				super(options)
-			end
-
-			def is_internet_data_source?
-				self.type == :jquery || self.type == :jquery_db || self.type == :remote
-			end
+	class DynamicPages::DataSource < ::KirguduBase::DynamicPages::Element
+
+		mergeable_attributes :model, :cross_domain, :cache_locally, :url, :data_format, :label_property, :value_property, :type, :http_method
+
+		validates_presence_of :model, :type, :label_property, :value_property
+		#validates_presence_of :url, :http_method, if: :is_internet_data_source?
+		validates_presence_of :url_path, :http_method, if: :is_internet_data_source?
+
+		validates_inclusion_of :type, in: ::KirguduBase::DynamicPages::Enums::SUPPORTED_DATA_SOURCE_TYPES, allow_nil: true
+		validates_inclusion_of :data_format, in: ::KirguduBase::DynamicPages::Enums::SUPPORTED_DATA_FORMATS, allow_nil: true, message: "This Format is not supported. Supported Data Formats are #{::KirguduBase::DynamicPages::Enums::SUPPORTED_DATA_FORMATS.map { |i| ":#{i}" }.join(", ")}"
+
+		validates_inclusion_of :cross_domain, in: [:true, :false], allow_nil: true
+		validates_inclusion_of :cache_locally, in: [:true, :false], allow_nil: true
+
+
+		def initialize(options = {})
+			self.model = nil
+			self.cross_domain = :false
+			self.cache_locally = :false
+			self.url = nil
+			self.url_path = nil
+			self.data_format = :json
+			self.label_property = :name
+			self.value_property = :id
+			self.type = :local
+			self.http_method = nil
+
+			super(options)
+		end
+
+
+		attr_accessor :model
+		attr_accessor :cross_domain
+		attr_accessor :cache_locally
+		attr_accessor :url
+		attr_accessor :url_path
+		attr_accessor :data_format
+		attr_accessor :label_property
+		attr_accessor :value_property
+		attr_accessor :type
+		attr_accessor :http_method
+
+		def to_external_hash(options = {})
+			options ||= {}
+			options.merge!({
+				               url: self.url,
+				               data_format: self.data_format,
+				               http_method: self.http_method,
+				               label_property: self.label_property,
+				               value_property: self.value_property
+			               })
+			super(options)
+		end
+
+		def is_internet_data_source?
+			self.type == :jquery || self.type == :jquery_db || self.type == :remote
 		end
 	end
 end

data/app/models/kirgudu_base/dynamic_pages/data_source_builder.rb

@@ -1,77 +1,81 @@
 module KirguduBase
-	module DynamicPages
-		class DataSourceBuilder < ::KirguduBase::DynamicPages::Builder
-
-
-
-
-
-			def initialize(&block)
-				raise "Cannot Build Empty Data Source" unless block_given?
-
-				self.builder_options.merge!(
-					{
-						model: nil,
-						cross_domain: nil,
-						url: nil,
-						data_format: nil,
-						label_property: :name,
-						value_property: :id,
-						cache_locally: nil,
-						type: nil,
-					    http_method: nil
-					}
-				)
-
-				super(&block)
-			end
+	class DynamicPages::DataSourceBuilder < ::KirguduBase::DynamicPages::Builder
+
+
+		def initialize(&block)
+			raise "Cannot Build Empty Data Source" unless block_given?
+
+			self.builder_options.merge!(
+				{
+					model: nil,
+					cross_domain: nil,
+					url: nil,
+					data_format: nil,
+					label_property: :name,
+					value_property: :id,
+					cache_locally: nil,
+					type: nil,
+					http_method: nil
+				}
+			)
+
+			super(&block)
+		end
 
 
-			def model(value)
-				self.builder_options[:model] = value
-			end
+		def model(value)
+			self.builder_options[:model] = value
+		end
 
-			def cross_domain(value)
-				self.builder_options[:cross_domain] = value
-			end
+		def cross_domain(value)
+			self.builder_options[:cross_domain] = value
+		end
 
-			def url(value)
-				self.builder_options[:url] = value
-			end
+		def url(value)
+			self.builder_options[:url] = value
+		end
 
-			def data_format(value)
-				self.builder_options[:data_format] = value
-			end
+		def url_path(controller, action, params = {})
+			self.builder_options[:url_path] = {
+				controller: controller,
+			    action: action,
+			    params: params
+			}
+		end
 
-			def label_property(value)
-				self.builder_options[:label_property] = value
-			end
+		def data_format(value)
+			self.builder_options[:data_format] = value
+		end
 
-			def value_property(value)
-				self.builder_options[:value_property] = value
-			end
+		def label_property(value)
+			self.builder_options[:label_property] = value
+		end
 
-			def cache_locally(value)
-				self.builder_options[:cache_locally] = value
-			end
+		def value_property(value)
+			self.builder_options[:value_property] = value
+		end
 
-			def type(value)
-				self.builder_options[:type] = value
-			end
+		def cache_locally(value)
+			self.builder_options[:cache_locally] = value
+		end
 
+		def type(value)
+			self.builder_options[:type] = value
+		end
 
-			def http_method(value)
-				self.builder_options[:http_method] = value
-			end
 
+		def http_method(value)
+			self.builder_options[:http_method] = value
+		end
 
-			def to_element
-				element = ::KirguduBase::DynamicPages::DataSource.new
-				self.build_element(element)
-				self.validate_generated_element(element)
-				element
-			end
 
+		def to_element
+			element = ::KirguduBase::DynamicPages::DataSource.new
+			self.build_element(element)
+			self.validate_generated_element(element)
+			element
 		end
+
 	end
 end
+

data/app/models/kirgudu_base/dynamic_pages/element.rb

@@ -1,6 +1,5 @@
 module KirguduBase
-	module DynamicPages
-		class Element
+	class DynamicPages::Element
 
 			include ActiveModel::Validations
 
@@ -21,7 +20,7 @@ module KirguduBase
 			end
 
 
-			attr_reader :parent_entry
+			attr_accessor :parent_entry
 
 			def fix_parent_entry(parent_entry)
 				if parent_entry
@@ -49,8 +48,6 @@ module KirguduBase
 
 			protected
 
-			attr_writer :parent_entry
-
 		end
 	end
-end
+

data/app/models/kirgudu_base/dynamic_pages/entry.rb

@@ -1,38 +1,36 @@
 module KirguduBase
-	module DynamicPages
-		class Entry < ::KirguduBase::DynamicPages::PageElement
+	class DynamicPages::Entry < ::KirguduBase::DynamicPages::PageElement
 
-			mergeable_attributes :http_method, :is_ajax, :properties, :parent
+		mergeable_attributes :http_method, :is_ajax, :properties, :parent
 
-			fixable_attributes :parent, :properties
+		fixable_attributes :parent, :properties
 
-			validates_inclusion_of :http_method, in: ::KirguduBase::DynamicPages::Enums::SUPPORTED_HTTP_METHODS, allow_nil: true
+		validates_inclusion_of :http_method, in: ::KirguduBase::DynamicPages::Enums::SUPPORTED_HTTP_METHODS, allow_nil: true
 
-			validates_inclusion_of :is_ajax, in: [:true, :false], allow_nil: true
+		validates_inclusion_of :is_ajax, in: [:true, :false], allow_nil: true
 
-			def initialize(options = {})
-				self.is_ajax = nil
-				self.properties = nil
-				self.parent = nil
-				self.http_method = nil
+		def initialize(options = {})
+			self.is_ajax = nil
+			self.properties = nil
+			self.parent = nil
+			self.http_method = nil
 
-				super(options)
-			end
+			super(options)
+		end
 
-			attr_accessor :http_method
-			attr_accessor :is_ajax
-			attr_accessor :properties
-			attr_accessor :parent
+		attr_accessor :http_method
+		attr_accessor :is_ajax
+		attr_accessor :properties
+		attr_accessor :parent
 
 
-			def merge(source_element)
-				#self.properties do |element|
-				#	element.merge(source_element.properties)
-				#end if self.properties && source_element.properties
+		def merge(source_element)
+			#self.properties do |element|
+			#	element.merge(source_element.properties)
+			#end if self.properties && source_element.properties
 
-				self.parent ||= source_entry.parent
-				self.http_method
-			end
+			self.parent ||= source_entry.parent
+			self.http_method
 		end
 	end
-end
+end