cowtech-rails 2.7.1.0 → 2.8.0.0

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

@@ -48,7 +48,7 @@ module Cowtech
         end
         
         def get_param(key, default = nil)
-          if params[key].blank? then default else params[key] end
+          params[key].blank? ? default : params[key]
         end
 
         def _normalize_type(format = nil)

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

@@ -83,7 +83,7 @@ module Cowtech
           self.crud_query_initialize(data) if !data[:query_initialized]
           query = data[:query_expr] if !query
 
-          query.count.times do |i| query[i] = "(#{query[i]})" end
+          query.count.times { |i| query[i] = "(#{query[i]})" }
           query.join(" AND ")
         end
 
@@ -98,7 +98,7 @@ module Cowtech
           self.crud_query_initialize(data) if !data[:query_initialized]
 
           expr = [expr] if !expr.respond_to?(:each)    
-          expr.each do |e| data[:query_expr] << e end
+          expr.each { |e| data[:query_expr] << e }
 
           data[:query_params].merge!(params)
         end
@@ -155,7 +155,7 @@ module Cowtech
             # BUILD QUERY
             data[:query_params].merge!(parameters)
             search_query = []
-            fields.each do |field| search_query << "(#{search.gsub("@FIELD@", "#{self.crud_get_class(data).table_name}.#{field.to_s}")})" end
+            fields.each { |field| search_query << "(#{search.gsub("@FIELD@", "#{self.crud_get_class(data).table_name}.#{field.to_s}")})" }
 
             # ADD OPTIONAL DATA
             if externals then
@@ -164,7 +164,7 @@ module Cowtech
     
                 if !external[:manual] then
                   external_conds = []
-                  external.fetch(:fields, []).each do |external_field| external_conds << "(#{search.gsub("@FIELD@", "#{external[:table]}.#{external_field.to_s}")})" end
+                  external.fetch(:fields, []).each { |external_field| external_conds << "(#{search.gsub("@FIELD@", "#{external[:table]}.#{external_field.to_s}")})" }
                   external_field = external.fetch(:external_field, "id")
                   external_query = "(#{external.fetch(:field, "id")} IN (SELECT #{external.fetch(:external_field, "id")} FROM #{external[:table]} WHERE #{external_conds.join(" OR ")}))" 
                 else
@@ -211,12 +211,12 @@ module Cowtech
         end
 
         def crud_form_submit_label
-          if self.crud_get_form_data.new_record? then "Create" else "Edit" end
+          self.crud_get_form_data.new_record? ? "Create" : "Edit"
         end
 
         def crud_get_page_param(key = :page, upperbound = -1)
           page = params[key]
-          page = if params[key].is_valid_integer? then params[key].to_integer else 1 end
+          page = params[key].is_valid_integer? ? params[key].to_integer : 1
           page = 1 if page < 1
           page = upperbound if (upperbound > 0 && page > upperbound)
           page
@@ -242,7 +242,7 @@ module Cowtech
           bounds = OpenStruct.new({:total => 0, :first => 0, :last => 0, :pages => 0, :page => 1, :per_page => 1})
 
           if records != nil && records.count > 0 then
-            per_page = (if per_page.is_valid_integer? then per_page else records[0].class.per_page end).to_integer
+            per_page = (per_page.is_valid_integer? ? per_page : records[0].class.per_page).to_integer
             per_page = records.count if per_page < 1
             bounds.total = records.count
             bounds.per_page = per_page
@@ -260,7 +260,7 @@ module Cowtech
 
         def crud_update_params
           blacklist = ["controller", "action", "id"]
-          session["params-#{self.location_name}"] = (params.delete_if {|k,v| blacklist.include?(k) || params[k].is_a?(Tempfile)})
+          session["params-#{self.location_name}"] = (params.delete_if { |k,v| blacklist.include?(k) || params[k].is_a?(Tempfile)})
         end
 
         def crud_end_write_action(additional = nil, absolute = false)
@@ -276,7 +276,7 @@ module Cowtech
           end
 
           if additional != nil then
-            additional.each do |k, v| rp[k] = v end
+            additional.each { |k, v| rp[k] = v }
           end
 
           url_for(rp)

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

@@ -31,7 +31,7 @@ module Cowtech
 					
 					final_msg = []					
 					final_msg << self.debug_timestamp if !no_timestamp
-					tags.collect {|tag| "[" + tag + "]" }.each { |tag| final_msg << tag } if tags.present?
+					tags.collect { |tag| "[" + tag + "]" }.each { |tag| final_msg << tag } if tags.present?
 					final_msg << msg					
 					final_msg = final_msg.join(" ")
 					

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

@@ -14,7 +14,7 @@ module Cowtech
           elsif field.is_a?(Float) then
             field.format_number
           elsif field.blank? || field.strip.blank? then
-            (if default then default else "Not set" end)
+            (default ? default : "Not set")
           else
             field
           end
@@ -35,7 +35,7 @@ module Cowtech
         end
 
         def text_class(val, additional = nil)
-          "class=\"text #{if additional.blank? then nil else additional end} #{if val.blank? then "unset" else nil end}\""
+          "class=\"text #{additional.blank? ? nil : additional} #{val.blank? ? "unset" : nil}\""
         end
       end
     end

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

@@ -69,7 +69,7 @@ module Cowtech
             if condition.is_a?(Hash) then
               condition.each_pair do |key, val|
                 if key == "$or" then
-                  @mongo_query = @mongo_query.any_of(val)
+                  @mongo_query = @mongo_query.any_of(val) # TODO: This don't work as expected. See: https://github.com/mongoid/mongoid/issues/569
                 else
                   @mongo_query = @mongo_query.where({key => val})
                 end                 
@@ -86,7 +86,7 @@ module Cowtech
             # Operate on parenthesis. If unbalanced, no substitution is done
             if search.gsub(/[^(]/mi, "").strip.length == search.gsub(/[^)]/mi, "").strip.length then
               # Split token
-              search = search.split(/(\s(AND|OR)\s)|([\(\)])/).select{|t| !t.empty? && t !~ /^(AND|OR)$/}
+              search = search.split(/(\s(AND|OR)\s)|([\(\)])/).select{ |t| !t.empty? && t !~ /^(AND|OR)$/}
 
               # Replace tokens
               search = search.collect { |token|
@@ -128,7 +128,6 @@ module Cowtech
             end
 
             # Now add external fields
-            # TODO: Can we enhance this?
             (args[:external] || []).each do |external|
               external_query = external[:class].not_deleted
 							eor_query = []
@@ -136,7 +135,7 @@ module Cowtech
                 eor_query << {field.to_sym => Regexp.new(expr, Regexp::EXTENDED | Regexp::MULTILINE | Regexp::IGNORECASE)}
               end
 
-              ids = external_query.any_of(eor_query).only(:id).all.collect {|r| r.id }
+              ids = external_query.any_of(eor_query).only(:id).all.collect { |r| r.id }
               or_query << {external[:foreign_key].in => ids} if ids.count > 0
             end    
 
@@ -207,7 +206,7 @@ module Cowtech
 
         def mongo_update_params(args = {})
           blacklist = self.mongo_update_params_black_list(args)
-          session["params-#{self.location_name}"] = (params.delete_if {|k,v| blacklist.include?(k) || params[k].is_a?(Tempfile) || params[k].blank?})
+          session["params-#{self.location_name}"] = (params.delete_if { |k,v| blacklist.include?(k) || params[k].is_a?(Tempfile) || params[k].blank?})
         end
 
         def mongo_end_write_action(args = {})

data/app/models/cowtech/ruby_on_rails/models/ar/model_base.rb

@@ -27,7 +27,7 @@ module Cowtech
             end
         
             def safe_id
-              if self.id then self.id else 0 end
+              self.id || 0
             end
         
             def editable?(user = nil)

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

@@ -41,7 +41,7 @@ module Cowtech
           end
           
           # OTTENIAMO GLI ARGOMENTI
-          args = (if args.is_a?(Hash) then args else args[0] end).delete_if { |k,v| v.blank? }
+          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]
@@ -52,10 +52,10 @@ module Cowtech
 
           mail(args) do |format|
             if plain_body then # SE C'E' PLAIN BODY
-              format.text do render :text => plain_body end
+              format.text { render :text => plain_body }
             end
             if html_body then # SE C'E' HTML
-              format.html do render :text => html_body end
+              format.html { render :text => html_body }
             end
           end
         end

data/lib/cowtech/scheduler.rb

@@ -36,7 +36,7 @@ module Cowtech
 				rv = ""
 				
 				rv += "[#{Time.now.strftime("%Y-%m-%d %T")}] " if !options[:no_time]
-				rv += options[:prefix].ensure_array.collect {|p| "[" + p.center(6, " ") + "]" }.join(" ")  + " " if options[:prefix].present?
+				rv += options[:prefix].ensure_array.collect { |p| "[" + p.center(6, " ") + "]" }.join(" ")  + " " if options[:prefix].present?
 				rv += message
 				
 				rv
@@ -54,7 +54,7 @@ module Cowtech
 					args_string = args.present? ? " with arguments #{args.to_json}" : ""
 
 					task = Rake::Task[name]
-					values = task.arg_names.collect {|a| args[a.to_sym] }
+					values = task.arg_names.collect { |a| args[a.to_sym] }
 
 					self.log(label + args_string + " ...", {:prefix => ["RAKE", "START", name]})
 					task.reenable
@@ -87,14 +87,14 @@ module Cowtech
 				  PhusionPassenger.on_event(:starting_worker_process) do |forked|
 				    if forked && !FileTest.exists?(@pid) then
 							self.log("Starting process with PID #{$$}", {:prefix => ["WORKER", "START"]})
-				      File.open(@pid, "w") {|f| f.write($$) }
+				      File.open(@pid, "w") { |f| f.write($$) }
 				      self.handle_plain
 				    end
 				  end
 			
 				  PhusionPassenger.on_event(:stopping_worker_process) do
 				    if FileTest.exists?(@pid) then
-				      if File.open(@pid, "r") {|f| pid = f.read.to_i} == $$ then
+				      if File.open(@pid, "r") { |f| pid = f.read.to_i} == $$ then
 								self.log("Stopped process with PID #{$$}", {:prefix => ["WORKER", "STOP"]})
 				        File.delete(@pid)
 				      end

data/lib/cowtech/tasks/app.rake

@@ -8,18 +8,18 @@ module Cowtech
   module RubyOnRails
     class AppUtils
       def self.run_command(cmd)
-        IO.popen(cmd, "r") do |f| puts f.gets end
+        IO.popen(cmd, "r") { |f| puts f.gets }
       end
 
       def self.get_version(as_string = true)
         info = YAML.load_file(Rails.root + "config/application_info.yml")
-        (if as_string then "Current application info --- Version #{info["version"]} - Release date: #{info["release-date"]}" else info end)
+        (as_string ? "Current application info --- Version #{info["version"]} - Release date: #{info["release-date"]}" : info)
       end
 
       def self.set_version(info)
         puts "--- Setting application version ..."
 				version = Cowtech::RubyOnRails::AppUtils.get_version(false)
-        File.open(Rails.root + "config/application_info.yml", "w") do |f| f.write(version.merge(info.stringify_keys).to_yaml) end
+        File.open(Rails.root + "config/application_info.yml", "w") { |f| f.write(version.merge(info.stringify_keys).to_yaml) }
         puts Cowtech::RubyOnRails::AppUtils.get_version
       end
 

data/lib/cowtech/tasks/log.rake

@@ -11,11 +11,11 @@ module Cowtech
       @@log_compressed_extension = "bz2"
 
       def self.generate_new_name(base, i = 0)
-        (Rails.root + "backups/logs/#{base}#{if i > 0 then "-#{i}" else "" end}").to_s  
+        (Rails.root + "backups/logs/#{base}#{i > 0 ? "-#{i}" : ""}").to_s  
       end
 
       def self.run_command(cmd)
-        IO.popen(cmd) do |f| print f.gets end
+        IO.popen(cmd) { |f| print f.gets }
       end
 
       def self.rotate(rake_args)

data/lib/cowtech/tasks/server.rake

@@ -24,18 +24,18 @@ module Cowtech
 
       def self.save_config(args = nil)
         args = Cowtech::RubyOnRails::ServerUtils.load_config if !args
-        File.open(Rails.root + @@yml_path, "w") do |f| f.write(YAML::dump(args)) end
+        File.open(Rails.root + @@yml_path, "w") { |f| f.write(YAML::dump(args)) }
       end
 
       def self.stringify_keys(hash)
         rv = {}
-        hash.each do |k, v| rv[k.to_s] = v end
+        hash.each { |k, v| rv[k.to_s] = v }
         rv
       end
 
       def self.merge(base, other)
         rv = {}
-        base.each do |k, v| rv[k] = if other[k] then other[k] else v end end
+        base.each { |k, v| rv[k] = (other[k] ? other[k] : v)  }
         rv
       end
 

data/lib/cowtech/version.rb

@@ -8,8 +8,8 @@ module Cowtech
   module Rails
     module Version
       MAJOR = 2
-      MINOR = 7
-      PATCH = 1
+      MINOR = 8
+      PATCH = 0
       BUILD = 0
 
       STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cowtech-rails
 version: !ruby/object:Gem::Version
-  version: 2.7.1.0
+  version: 2.8.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-07 00:00:00.000000000Z
+date: 2012-01-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cowtech-extensions
-  requirement: &70220120113560 !ruby/object:Gem::Requirement
+  requirement: &70338148676940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70220120113560
+  version_requirements: *70338148676940
 description: A general purpose Rails utility plugin.
 email: shogun_panda@me.com
 executables: []