cowtech-rails 2.8.2 → 2.8.3

data/app/helpers/cowtech/ruby_on_rails/helpers/ar_crud_helper.rb

@@ -107,7 +107,7 @@ module Cowtech
 					search = "(@#{search}@)"
 					search.gsub!(/(\s+(AND|OR|NOT)\s+)/, "@) \\1 (@")
 
-					# SUBSTITUTE PARAMETERS
+					# Substitute parameters
 					i = -1
 					parameters = {}
 					search.gsub!(/@(.+?)@/) do |s|
@@ -146,18 +146,18 @@ module Cowtech
 
 					self.crud_query_add_condition(data, "(#{self.crud_get_class(data).table_name}.#{self.crud_get_class(data).deleted_column} IS NULL)", {}) if !data[:skip_deleted]
 
-					# GET QUERY
+					# Get query
 					args = params[parameter] if !args
 
 					if args.present? then
 						search, parameters = self.crud_query_parse_search(args)
 
-						# BUILD QUERY
+						# Build query
 						data[:query_params].merge!(parameters)
 						search_query = []
 						fields.each { |field| search_query << "(#{search.gsub("@FIELD@", "#{self.crud_get_class(data).table_name}.#{field.to_s}")})" }
 
-						# ADD OPTIONAL DATA
+						# Add optional data
 						if externals then
 							externals.each do |external|
 								external_query = ""
@@ -230,7 +230,7 @@ module Cowtech
 					sf = sort_by.split("-")
 					rv = OpenStruct.new({:what => mo["what"], :how => mo["how"].upcase})
 
-					# ADAPT SOME PARAMETERS
+					# Adapt some parameters
 					rv.what = "status_id" if rv.what == "status"
 
 					rv

data/app/models/cowtech/ruby_on_rails/models/e_mail.rb

@@ -8,14 +8,19 @@ module Cowtech
 	module RubyOnRails
 		module Models
 			class EMail < ActionMailer::Base
-				def self.setup(method = :smtp, file = nil, raise_config_errors = true)
-					begin
-						rv = YAML.load_file(file || (Rails.root + "config/email.yml"))
-					rescue Exception => e
-						raise e if raise_config_errors
-						rv = {}
-					end
+				def self.setup(method = :smtp, config = nil, raise_config_errors = true)
+					rv = {}
 
+					if config.is_a?(Hash) then
+						rv = config
+					else
+						begin
+							rv = YAML.load_file(config || (Rails.root + "config/email.yml"))
+						rescue Exception => e
+							raise e if raise_config_errors
+							rv = {}
+						end
+					end
 
 					ActionMailer::Base.raise_delivery_errors = true
 					ActionMailer::Base.delivery_method = method
@@ -30,37 +35,35 @@ module Cowtech
 					rv
 				end
 
-				def setup(method = :smtp, file = nil, raise_config_errors = true)
-					@configuration ||= EMail.setup(method, file, raise_config_errors)
+				def setup(method = :smtp, config = nil, raise_config_errors = true)
+					@configuration ||= EMail.setup(method, config, raise_config_errors)
 				end
 
 				def generic(args)
 					# Load configuration
 					if !@configuration then
-						conf = args.delete(:configuration)
+						config = args.delete(:configuration)
 
-						if conf then
-							@configuration = conf
+						if config.is_a?(Hash) then
+							self.setup(config[:method] || args.delete(:method) || :smtp, config)
 						else
 							self.setup(args.delete(:method) || :smtp, args.delete(:configuration_file))
 						end
 					end
 
-					# OTTENIAMO GLI ARGOMENTI
+					# Get arguments and add reply-to
 					args = (args.is_a?(Hash) ? args : args[0]).delete_if { |k,v| v.blank? }
-
-					# AGGIUSTIAMO REPLY TO
 					args[:reply_to] = args[:from] if !args[:reply_to]
 
-					# OTTENIAMO IL BODY
+					# Get body
 					plain_body = args.delete(:body) || args.delete(:plain_body) || args.delete(:text_body) || args.delete(:plain_text) || args.delete(:text)
 					html_body = args.delete(:html_body) || args.delete(:html)
 
 					mail(args) do |format|
-						if plain_body then # SE C'E' PLAIN BODY
+						if plain_body then
 							format.text { render :text => plain_body }
 						end
-						if html_body then # SE C'E' HTML
+						if html_body then
 							format.html { render :text => html_body }
 						end
 					end

data/app/models/cowtech/ruby_on_rails/models/mongoid/cowtech.rb

@@ -75,7 +75,7 @@ module Cowtech
           end
   
           module InstanceMethods
-            # Decommentare per ID di tipo numerico
+            # Decommentare for numeric type ids
             # def safe_id
             #   self.id ? self.id : 0
             # end

data/lib/cowtech/tasks/app.rake

@@ -102,11 +102,11 @@ namespace :css do
 	task :regenerate => :environment do |task|
 		puts "Regenerating CSS..."
 
-		if defined?(Less) then # MORE
+		if defined?(Less) then # More
 			puts "Using More"
 			Rake::Task["more:clean"].execute
 			Rake::Task["more:generate"].execute
-		elsif defined?(Sass) # SASS
+		elsif defined?(Sass) # Sass
 			Sass::Plugin.on_updating_stylesheet do |template, css|
 				puts "[SCSS] Compiling #{template} to #{css} ..."
 			end

data/lib/cowtech/tasks/sql.rake

@@ -80,11 +80,12 @@ module Cowtech
 
 			def self.backup(rake_args)
 				Cowtech::RubyOnRails::Scheduler.log "--- Backupping database ..."
-				# OTTENIAMO LA CONFIGURAZIONE
+
+				# Get configuration
 				db_config = YAML.load_file(Rails.root + "config/database.yml")
 				env = Rails.env
 
-				# ESEGUIAMO
+				# Execute
 				Cowtech::RubyOnRails::MysqlUtils.send("#{db_config[env]["adapter"]}_execute", db_config[env], rake_args)
 			end
 

data/lib/cowtech/version.rb

@@ -9,7 +9,7 @@ module Cowtech
 		module Version
 			MAJOR = 2
 			MINOR = 8
-			PATCH = 2
+			PATCH = 3
 
 			STRING = [MAJOR, MINOR, PATCH].compact.join(".")
 		end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cowtech-rails
 version: !ruby/object:Gem::Version
-  version: 2.8.2
+  version: 2.8.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-04-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cowtech-extensions
-  requirement: &70154552106740 !ruby/object:Gem::Requirement
+  requirement: &70301460461200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70154552106740
+  version_requirements: *70301460461200
 description: A general purpose Rails utility plugin.
 email: shogun_panda@me.com
 executables: []