drg_cms 0.4.39 → 0.4.53

data/lib/tasks/log_statistics.rb

@@ -0,0 +1,66 @@
+##################################################################
+# Short and quick log statistics
+##################################################################
+
+
+##################################################################
+# Return list of selected files.
+##################################################################
+def selected_files
+  Dir["#{ARGV.first}*.log"] 
+end
+
+###################################################################
+# Init some internal vars
+###################################################################
+def init
+  @by_day = [] 
+end
+
+###################################################################
+# Collects total number of requests and respond time for calculating
+# average response time.
+###################################################################
+def response_by_days
+  i = 0
+  selected_files.each do |file_name|
+    result = [file_name[0,6], 0, 0]
+    File.readlines(file_name).each do |line|
+      next unless line.match 'Completed 200 OK in'
+      time = $'.split('ms').first.strip.to_i
+      result[1] += 1
+      result[2] += time
+    end
+    p result
+    @by_day << result
+#     break if (i+=1) > 4
+  end
+end
+
+###################################################################
+# Prints links which resultet in 404 error.
+###################################################################
+def analyze_404
+  i = 0
+  selected_files.each do |file_name|
+    result = [file_name[0,6], 0, 0]
+    url = ''
+    File.readlines(file_name).each do |line|
+      if m = /Started(.*?)for/.match(line)
+        url = m[1]
+      end
+      if m = /404/.match(line)
+        p url.gsub('"','')
+      end
+    end
+  end
+end
+
+#analyze_404
+#exit 0
+
+init
+response_by_days
+p @by_day
+c = @by_day.inject('') {|result, e| result << e.join("\t") + "\n"} 
+File.open('result.txt','w') {|f| f.write(c) }

data/lib/tasks/site_statistics.rake

@@ -46,23 +46,40 @@ reduce =
     p stat
   end
 =end
-  totals = {}
-  visits = DcVisit.only(:session_id, :time).where(:time.gt => @date_from, :time.lt => @date_to).order_by('time asc')
+  p 'Reading visits collection ...'
+  totals    = {}
+  totals_ip = {}
+  visits = DcVisit.only(:session_id, :time,:ip).where(:time.gt => @date_from, :time.lt => @date_to).order_by('time asc')
   visits.each do |visit|
-    key = visit.time.strftime('%Y%m%d') + '_' + visit.session_id
+    key = visit.time.strftime('%Y%m%d') + '_' + visit.session_id.to_s
     totals[key] ||= 0
     totals[key] += 1
+
+    key = visit.time.strftime('%Y%m%d') + '_' + visit.ip.to_s
+    totals_ip[key] ||= 0
+    totals_ip[key] += 1
+  end
+  p 'Calculating totals ....'
+# Totals by unique
+  date_totals = {}
+  totals.each do |total|
+    date = total.first[0,8]
+    date_totals[date] ||= [0,0,0]
+    date_totals[date][0] += total.last
+    date_totals[date][1] += 1
+  end
+# Totals by ip
+  totals_ip.each do |total|
+    date = total.first[0,8]
+    date_totals[date][2] += 1
   end
-  output,old_date,unique,count = '','',0,0
-  totals.to_a.sort! {|x,y| x <=> y}.each do |e|
-    if e.first[0,8] != old_date
-      output << "#{old_date}\t#{unique}\t#{count}\n" unless old_date == ''
-      old_date,unique,count = e.first[0,8], 0, 0
-    end
-    unique += 1
-    count  += e.last
+# Create output file  
+  p 'Creating output ....'
+  output = "date\tunique\tunique_by_ip\tvisits\n"
+  old_date,unique,count = 0,0
+  date_totals.to_a.sort! {|x,y| x <=> y}.each do |e|
+    output << [e.first, e.last[1], e.last[2], e.last[0] ].join("\t") + "\n"
   end
-  output << "#{old_date}\t#{unique}\t#{count}\n"
   filename = Rails.root.join('tmp/','statistics.txt')
   File.open(filename,'w') {|f| f.write(output) }
   p "Statistics saved to #{filename}."

data/test/dummy/app/controllers/application_controller.rb

@@ -1,3 +1,3 @@
-class ApplicationController < ActionController::Base
+class ApplicationController < ActionController::Base #:nodoc:
   protect_from_forgery
 end

data/test/dummy/app/helpers/application_helper.rb

@@ -1,2 +1,2 @@
-module ApplicationHelper
+module ApplicationHelper #:nodoc:
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drg_cms
 version: !ruby/object:Gem::Version
-  version: 0.4.39
+  version: 0.4.53
 platform: ruby
 authors:
 - Damjan Rems
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-02 00:00:00.000000000 Z
+date: 2015-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -108,15 +108,15 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 'DRGCMS: Content management system for Ruby, Rails and MongoDB'
+description: 'DRG CMS: Content management system for Ruby, Rails and MongoDB'
 email:
-- drgcms@gmail.com
+- damjan.rems@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - MIT-LICENSE
-- README.rdoc
+- README.md
 - Rakefile
 - app/assets/images/drg_cms/add.png
 - app/assets/images/drg_cms/arrow_in.png
@@ -129,6 +129,7 @@ files:
 - app/assets/images/drg_cms/edit_design.png
 - app/assets/images/drg_cms/edit_page.png
 - app/assets/images/drg_cms/edit_site.png
+- app/assets/images/drg_cms/file_manager.png
 - app/assets/images/drg_cms/html.png
 - app/assets/images/drg_cms/pin.png
 - app/assets/images/drg_cms/printer.png
@@ -152,9 +153,7 @@ files:
 - app/assets/stylesheets/drg_cms_cms.css
 - app/controllers/cmsedit_controller.rb
 - app/controllers/dc_application_controller.rb
-- app/controllers/dc_at_the_beginning_controller.rb
 - app/controllers/dc_common_controller.rb
-- app/controllers/dc_mail_controller.rb
 - app/controllers/dc_main_controller.rb
 - app/controllers/drgcms_controls/dc_page_controls.rb
 - app/forms/all_options.yml
@@ -167,17 +166,9 @@ files:
 - app/forms/dc_category.yml
 - app/forms/dc_design.yml
 - app/forms/dc_folder_permission.yml
-- app/forms/dc_forum_cat.yml
-- app/forms/dc_forum_forum.yml
-- app/forms/dc_forum_msg.yml
-- app/forms/dc_forum_privmsg.yml
-- app/forms/dc_forum_topic.yml
+- app/forms/dc_ident.yml
 - app/forms/dc_journal.yml
 - app/forms/dc_link.yml
-- app/forms/dc_mail.yml
-- app/forms/dc_mail_address.yml
-- app/forms/dc_mail_list.yml
-- app/forms/dc_mail_list_member.yml
 - app/forms/dc_menu.yml
 - app/forms/dc_menu_item.yml
 - app/forms/dc_page.yml
@@ -202,7 +193,6 @@ files:
 - app/helpers/dc_big_menu_renderer.rb
 - app/helpers/dc_captcha_renderer.rb
 - app/helpers/dc_common_renderer.rb
-- app/helpers/dc_mail_renderer.rb
 - app/helpers/dc_menu_renderer.rb
 - app/helpers/dc_page_renderer.rb
 - app/helpers/dc_part_renderer.rb
@@ -210,8 +200,7 @@ files:
 - app/helpers/dc_poll_renderer.rb
 - app/helpers/dc_renderer.rb
 - app/helpers/dc_simple_menu_renderer.rb
-- app/helpers/drgcms_form_field.rb
-- app/models/__dc_global_data.rb
+- app/models/__dc_stat.rb
 - app/models/dc_ad.rb
 - app/models/dc_ad_stat.rb
 - app/models/dc_big_menu.rb
@@ -222,14 +211,10 @@ files:
 - app/models/dc_design.rb
 - app/models/dc_dummy.rb
 - app/models/dc_folder_permission.rb
-- app/models/dc_global_data.rb
+- app/models/dc_ident.rb
 - app/models/dc_journal.rb
 - app/models/dc_key_value_store.rb
 - app/models/dc_link.rb
-- app/models/dc_mail.rb
-- app/models/dc_mail_address.rb
-- app/models/dc_mail_list.rb
-- app/models/dc_mail_list_member.rb
 - app/models/dc_menu.rb
 - app/models/dc_menu_item.rb
 - app/models/dc_page.rb
@@ -241,7 +226,6 @@ files:
 - app/models/dc_policy_rule.rb
 - app/models/dc_poll.rb
 - app/models/dc_poll_item.rb
-- app/models/dc_sendmail.rb
 - app/models/dc_simple_menu.rb
 - app/models/dc_simple_menu_item.rb
 - app/models/dc_site.rb
@@ -249,6 +233,9 @@ files:
 - app/models/dc_user.rb
 - app/models/dc_user_role.rb
 - app/models/dc_visit.rb
+- app/models/drgcms_form_field.rb
+- app/views/__dc_at_the_beginning/create.html.erb
+- app/views/__dc_at_the_beginning/index.html.erb
 - app/views/cmsedit/_edit_stuff.html.erb
 - app/views/cmsedit/_edit_stuff.js.erb
 - app/views/cmsedit/_form.html.erb
@@ -282,8 +269,10 @@ files:
 - lib/drg_cms/engine.rb
 - lib/drg_cms/version.rb
 - lib/tasks/at_the_beginning.yml
+- lib/tasks/dc_at_the_beginning.rake
 - lib/tasks/dc_cleanup.rake
 - lib/tasks/drg_cms_tasks.rake
+- lib/tasks/log_statistics.rb
 - lib/tasks/send_mail.rake
 - lib/tasks/site_statistics.rake
 - test/drg_cms_test.rb
@@ -340,7 +329,7 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: 'DRGCMS: CMS for Ruby, Rails and MongoDB'
+summary: 'DRG CMS: CMS for Ruby, Rails and MongoDB'
 test_files:
 - test/test_helper.rb
 - test/drg_cms_test.rb

data/README.rdoc

@@ -1,3 +0,0 @@
-= DrgCms
-
-This project rocks and uses MIT-LICENSE.

data/app/controllers/dc_at_the_beginning_controller.rb

@@ -1,120 +0,0 @@
-#--
-# Copyright (c) 2012-2013 Damjan Rems
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#++
-
-########################################################################
-#
-########################################################################
-class DcAtTheBeginningController < DcApplicationController
-
-before_filter :check_if_ok
- 
-########################################################################
-#
-########################################################################
-def index
-end
-
-########################################################################
-#
-########################################################################
-def create
-  if params['password1'] != params['password2']
-    flash[:error] = "Password doesn't match!"
-    return render action: 'index' 
-  end
-  if params['password1'].size < 8
-    flash[:error] = "Please be more creative. Password should be at least 8 characters long!"
-    return render action: 'index' 
-  end
-# New role
-  role = DcPolicyRole.new
-  role.name = 'superadmin'
-  role.system_name = 'superadmin'
-  role.save
-# User
-  usr = DcUser.new
-  usr.username    =  params['username']
-  usr.password    = params['password1']
-  usr.password_confirmation = params['password2']
-  usr.first_name  = 'superadmin'
-  usr.save
-# user role 
-  r = usr.dc_user_roles.new
-  r.dc_policy_role_id = role._id
-  r.save
-# cmsedit permission
-  permission = DcPermission.new
-  permission.table_name = 'Default permission'
-  permission.is_default = true
-  permission.save
-# 
-  r = permission.dc_policy_rules.new
-  r.dc_policy_role_id = role._id
-  r.permission = DcPermission::SUPERADMIN
-  r.save
-# create login poll
-  poll = DcPoll.new
-  poll.name = 'login'
-  poll.display = 'td'
-  poll.operation = 'link'
-  poll.parameters = '/dc_common/process_login'
-  poll.title = 'Autocreated login form'
-  poll.save
-#
-  i = poll.dc_poll_items.new
-  i.name = 'username'
-  i.size = 15
-  i.text = 'Username'
-  i.type = 'text_field'
-  i.save
-#  
-  i = poll.dc_poll_items.new
-  i.name = 'password'
-  i.size = 15
-  i.text = 'Password'
-  i.type = 'password_field'
-  i.save
-#
-  i = poll.dc_poll_items.new
-  i.name = 'send'
-  i.text = 'Login'
-  i.type = 'submit_tag'
-  i.save
-  
-  redirect_to '/cmsedit/login'
-end  
-
-########################################################################
-#
-########################################################################
-def check_if_ok
-  DcPermission.all.delete  
-  DcUserRole.all.delete
-  DcUser.all.delete
-  return dc_render_404('At the beginning: It can only be done in development!') if ENV["RAILS_ENV"] != 'development'
-  return dc_render_404('At the beginning: Permissions table is not empty!') if DcPermission.all.size > 0 
-  return dc_render_404('At the beginning: Roles table is not empty!') if DcUserRole.all.size > 0 
-  return dc_render_404('At the beginning: Users table is not empty!') if DcUser.all.size > 0 
-end
-
-end

data/app/controllers/dc_mail_controller.rb

@@ -1,89 +0,0 @@
-#--
-# Copyright (c) 2012+ Damjan Rems
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#++
-
-#  params[:msg_error] = 'Test mail send!'
-#  params[:record_from] = 'en@mail.com'
-#  params['.div_dc-title'] = 'Nov naslov'
-#  params['#div_dc-title'] = 'Nov naslov'
-#  params['url_'] = 'http://www.ozs.si'
-
-class DcMailController < DcApplicationController
-
-########################################################################
-# Sends test mail to test recipient
-########################################################################
-def send_test_mail
-# Only if loged on  
-  if dc_edit_mode? 
-    call_rake 'drg_cms:sendmail:test', 'MAIL_ID' => params[:id]
-    result = { msg_info: t('drgcms.dc_mail.test_mail_sent') }
-    render json: result.to_json
-  else
-    render nothing: true
-  end
-end
-
-########################################################################
-# Starts sending mail
-########################################################################
-def send_mail
-# Only if loged on  
-  if dc_edit_mode? 
-    doc = DcMail.find(params[:id])
-    if doc.status == 1
-      call_rake 'drg_cms:sendmail:sending', 'MAIL_ID' => params[:id]
-      result = { msg_info: t('drgcms.dc_mail.mail_sent') }
-    else
-      result = { msg_error: t('drgcms.dc_mail.message_status_error') }
-    end  
-    render json: result.to_json
-  else
-    render nothing: true
-  end
-end
-
-########################################################################
-#
-########################################################################
-def subscribe
-
-end
-
-########################################################################
-#
-########################################################################
-def unsubscribe
-
-end
-
-private
-########################################################################
-# Call rake task
-########################################################################
-def call_rake(task, options = {})
-  options[:rails_env] ||= Rails.env
-  args = options.map { |n, v| "#{n.to_s.upcase}='#{v}'" }
-  system "rake #{task} #{args.join(' ')} --trace 2>&1 >> #{Rails.root}/log/rake.log &"
-end
-
-end