RubyGems - old_sql - Versions diffs - 1.3.0 → 1.4.0 - Mend

old_sql 1.3.0 → 1.4.0

Files changed (9) hide show

data/Gemfile +0 -2
data/app/controllers/old_sql/report_controller.rb +12 -2
data/app/views/old_sql/errors/401.html.erb +25 -0
data/app/views/old_sql/report/print.html.erb +1 -1
data/lib/extensions/action_controller/base.rb +0 -4
data/lib/generators/old_sql/copy_assets_generator.rb +38 -0
data/lib/generators/old_sql/old_sql_generator.rb +5 -0
data/lib/old_sql.rb +31 -0
metadata +7 -27

data/Gemfile CHANGED Viewed

@@ -3,9 +3,7 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
-gem "sanitize"
 gem "devise"
-gem "cancan"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/app/controllers/old_sql/report_controller.rb CHANGED Viewed

@@ -9,6 +9,7 @@ module OldSql
     helper_method :jqgrid_col_model
     helper_method :jqgrid_col_names
+    helper_method :strip_html
     layout "old_sql/report.html.erb"
@@ -61,7 +62,7 @@ module OldSql
             @report[:rows].each do |row|
               rec = []
               row[:cell].each do |cell|
-                rec << Sanitize.clean(cell.to_s)
+                rec << strip_html(cell.to_s).gsub("\n","")
               end
               csv << rec
             end
@@ -97,7 +98,7 @@ module OldSql
     private
       def ensure_old_sql_admin!
-        raise CanCan::AccessDenied unless current_user.old_sql_admin?
+        render_error(Exception.new "Old SQL Access Denied.") unless current_user.old_sql_admin?
       end
       def _init
@@ -154,6 +155,15 @@ module OldSql
           return nil
         end
       end
+      def render_error(exception)
+        logger.error(exception)
+        render :template => "old_sql/errors/401.html.erb", :status => 401
+      end
+      def strip_html html
+        OldSql.strip_html html
+      end
   end
 end

data/app/views/old_sql/errors/401.html.erb ADDED Viewed

@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>You are not authorized to access this page. (401)</title>
+  <style type="text/css">
+    body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
+    div.dialog {
+      width: 25em;
+      padding: 0 4em;
+      margin: 4em auto 0 auto;
+      border: 1px solid #ccc;
+      border-right-color: #999;
+      border-bottom-color: #999;
+    }
+    h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
+  </style>
+</head>
+<body>
+  <!-- This file lives in public/401.html -->
+  <div class="dialog">
+    <h1>You are not authorized to access this page.</h1>
+  </div>
+</body>
+</html>

data/app/views/old_sql/report/print.html.erb CHANGED Viewed

@@ -52,7 +52,7 @@ th {
 			<tr>
 				<% first_cell=true %>
 				<%row[:cell].each do |c|%>
-					<% cleaned_cell = Sanitize.clean(c.to_s) %>
+					<% cleaned_cell = strip_html(c.to_s).gsub("\n","") %>
 					<% if first_cell==true %>
 						<td><%=cleaned_cell%></td>
 					<% else %>

data/lib/extensions/action_controller/base.rb CHANGED Viewed

@@ -1,7 +1,3 @@
 class ActionController::Base
-  def self.authenticate(options = {})
-    raise Exception, "Authenticate cannot be called on ActionController::Base. Only it's subclasses" if self ==  ActionController::Base
-  end
 end

data/lib/generators/old_sql/copy_assets_generator.rb ADDED Viewed

@@ -0,0 +1,38 @@
+module OldSql
+  class CopyAssetsGenerator < Rails::Generators::Base
+    source_root File.expand_path('../templates', __FILE__)
+    desc "Old SQL Copy Assets"
+    def copy_assets
+    end
+    def create_old_sql_dirs
+      empty_directory "#{app_path}/public/stylesheets/old_sql"
+      empty_directory "#{app_path}/app/views/layouts/old_sql"
+    end
+    def copy_old_sql_files
+      copy_file "#{gem_path}/public/stylesheets/old_sql/old_sql.css", "#{app_path}/public/stylesheets/old_sql/old_sql.css"
+      copy_file "#{gem_path}/app/views/layouts/old_sql/report.html.erb", "#{app_path}/app/views/layouts/old_sql/report.html.erb"
+    end
+    private
+    def app_path
+      app_path = Rails.public_path.split("/")
+      app_path.delete_at(-1)
+      app_path = app_path.join("/")
+      app_path
+    end
+    def gem_path
+      gem_path = __FILE__
+      gem_path = gem_path.split("/")
+      gem_path = gem_path[0..-5]
+      gem_path = gem_path.join("/")
+      gem_path
+    end
+  end
+end

data/lib/generators/old_sql/old_sql_generator.rb CHANGED Viewed

@@ -15,6 +15,11 @@ Devise, but want use another model than the default 'user' you can provide the
 custom model name as an argument:
   rails g old_sql:install member
+To copy file assets, old_sql.css and the layout for the report view, to your
+installation, execute:
+  rails g old_sql:copy_assets
 "
     end

data/lib/old_sql.rb CHANGED Viewed

@@ -35,6 +35,37 @@ module OldSql
   def self.setup
     yield self
   end
+  def self.strip_html html
+    text = html.
+    gsub(/(&nbsp;|\n|\s)+/im, ' ').squeeze(' ').strip.
+    gsub(/<([^\s]+)[^>]*(src|href)=\s*(.?)([^>\s]*)\3[^>]*>\4<\/\1>/i, '\4')
+    links = []
+    linkregex = /<[^>]*(src|href)=\s*(.?)([^>\s]*)\2[^>]*>\s*/i
+    while linkregex.match(text)
+      links << $~[3]
+      text.sub!(linkregex, "[#{links.size}]")
+    end
+    text = CGI.unescapeHTML(
+      text.
+        gsub(/<(script|style)[^>]*>.*<\/\1>/im, '').
+        gsub(/<!--.*-->/m, '').
+        gsub(/<hr(| [^>]*)>/i, "___\n").
+        gsub(/<li(| [^>]*)>/i, "\n* ").
+        gsub(/<blockquote(| [^>]*)>/i, '> ').
+        gsub(/<(br)(| [^>]*)>/i, "\n").
+        gsub(/<(\/h[\d]+|p)(| [^>]*)>/i, "\n\n").
+        gsub(/<[^>]*>/, '')
+    ).lstrip.gsub(/\n[ ]+/, "\n") + "\n"
+    for i in (0...links.size).to_a
+      text = text + "\n  [#{i+1}] <#{CGI.unescapeHTML(links[i])}>" unless links[i].nil?
+    end
+    links = nil
+    text
+  end
 end
 require 'extensions/action_controller/base'

metadata CHANGED Viewed

@@ -2,7 +2,7 @@
 name: old_sql
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Eddie Gonzales
@@ -13,7 +13,7 @@ cert_chain: []
 date: 2011-06-11 00:00:00 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: sanitize
+  name: devise
   requirement: &id001 !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -23,31 +23,9 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: *id001
-- !ruby/object:Gem::Dependency
-  name: devise
-  requirement: &id002 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: "0"
-  type: :runtime
-  prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency
-  name: cancan
-  requirement: &id003 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: "0"
-  type: :runtime
-  prerelease: false
-  version_requirements: *id003
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &id004 !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ">="
@@ -55,7 +33,7 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id004
+  version_requirements: *id002
 description: OldSQL is a Rails Engine database reporting gem that uses plain old SQL
 email: egonzales@pureplay.com
 executables: []
@@ -72,6 +50,7 @@ files:
 - Rakefile
 - app/controllers/old_sql/report_controller.rb
 - app/views/layouts/old_sql/report.html.erb
+- app/views/old_sql/errors/401.html.erb
 - app/views/old_sql/report/datagrid.html.erb
 - app/views/old_sql/report/index.html.erb
 - app/views/old_sql/report/print.html.erb
@@ -79,6 +58,7 @@ files:
 - config/routes.rb
 - lib/extensions/action_controller/base.rb
 - lib/generators/old_sql/USAGE
+- lib/generators/old_sql/copy_assets_generator.rb
 - lib/generators/old_sql/install_devise_migrations_generator.rb
 - lib/generators/old_sql/install_generator.rb
 - lib/generators/old_sql/install_migrations_generator.rb
@@ -200,7 +180,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      hash: -1147415374575206566
+      hash: -2148067506136069246
       segments:
       - 0
       version: "0"