admin_data 1.0.22 → 1.1.0

data/lib/admin_data/railtie.rb

@@ -1,18 +1,13 @@
-require 'admin_data_date_validation'
-require 'admin_data/settings'
-require 'admin_data/helpers'
-require 'admin_data/util'
-require 'admin_data/chelper'
-
 module AdminData
   class Engine < Rails::Engine
 
     initializer "admin_data.setup" do
-      AdminData::Config.set = { :adapter_name =>  ActiveRecord::Base.connection.adapter_name }
+      #
     end
 
     rake_tasks do
       #
     end
+
   end
 end

data/lib/admin_data/search.rb

@@ -47,7 +47,7 @@ module Search
       @table_name = klass.table_name
       compute_search_fields(value)
 
-      adapter = AdminData::Config.setting[:adapter_name].downcase
+      adapter = AdminData.config.adapter_name.downcase
       if adapter =~ /postgresql/
         self.dbbase = PostgresqlSpecific.new(@operands, table_name, field, operator)
       elsif adapter =~ /oracle/

data/lib/admin_data/util.rb

@@ -1,190 +1,103 @@
-class AdminData::Util
+module AdminData
+  class Util
 
-  def self.google_hosted_jquery_ui_css(context)
-    if AdminData::Config.setting[:use_google_hosting_for_jquery]
-      jquery_ui_css = 'http://ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/themes/base/jquery-ui.css'
-      jquery_ui_theme_css = 'http://ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/themes/blitzer/jquery-ui.css'
-      context.send(:stylesheet_link_tag, jquery_ui_css, jquery_ui_theme_css)
-    else
-      stylesheet_link_tag('vendor/jquery-ui-1.7.2.custom')
+    def self.label_values_pair_for(model, view)
+      data = model.class.columns.inject([]) do |sum, column|
+        tmp = view.get_value_for_column(column, model, :limit => nil)
+        sum << [ column.name, (tmp.html_safe? ? tmp : view.send(:h,tmp)) ]
+      end
+      extension = Extension.show_info(model)
+      data + extension
     end
-  end
 
-  def self.google_hosted_jquery(context)
-    if AdminData::Config.setting[:use_google_hosting_for_jquery]
-      jquery_min = 'http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js'
-      jquery_ui_min = 'http://ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/jquery-ui.min.js'
-      context.send(:javascript_include_tag, jquery_min, jquery_ui_min)
-    elsif Rails.env.test?
-      #  It is breaking the html markup and test is full of messages like
-      #  ignoring attempt to close string with script Hence not including jquery.form in test
-    else
-      javascript_include_tag('vendor/jquery-1.4.2', 'vendor/jquery-ui-1.7.2.custom.min')
+    def self.custom_value_for_column(column, model)
+      # some would say that if I use try method then I will not be raising exception and
+      # I agree. However in this case for clarity I would prefer to not to have try after each call
+      begin
+        column_name = column.respond_to?(:name) ? column.name : column
+        tmp = AdminData.config.column_settings[model.class.name.to_s]
+        _proc = tmp.fetch(column_name.intern)
+        _proc.call(model)
+      rescue
+        model.send(column_name)
+      end
     end
-  end
-
-  def self.is_allowed_to_view_feed?(controller)
-    return true if Rails.env.development?
 
-    if AdminData::Config.setting[:feed_authentication_user_id].blank?
-      Rails.logger.info 'No user id has been supplied for feed'
-      return false
+    def self.get_serialized_value(html, column_value)
+      html << %{ <i>Cannot edit serialized field.</i> }
+      unless column_value.blank?
+        html << %{ <i>Raw contents:</i><br/> }
+        html << column_value.inspect
+      end
+      html.join
     end
 
-    if AdminData::Config.setting[:feed_authentication_password].blank?
-      Rails.logger.info 'No password has been supplied for feed'
-      return false
+    def self.pluralize(count, text)
+      count > 1 ? text+'s' : text
     end
 
-    stored_userid = AdminData::Config.setting[:feed_authentication_user_id]
-    stored_password = AdminData::Config.setting[:feed_authentication_password]
-    self.perform_basic_authentication(stored_userid, stored_password, controller)
-  end
-
-  def self.perform_basic_authentication(stored_userid, stored_password, controller)
-    controller.authenticate_or_request_with_http_basic do |input_userid, input_password|
-      (input_userid == stored_userid) && (input_password == stored_password)
+    # Rails method merge_conditions ANDs all the conditions. I need to ORs all the conditions
+    def self.or_merge_conditions(klass, *conditions)
+      s = ') OR ('
+      cond = conditions.inject([]) do |sum, condition|
+        condition.blank? ? sum : sum << klass.send(:sanitize_sql, condition)
+      end.compact.join(s)
+      "(#{cond})" unless cond.blank?
     end
-  end
-
 
-  def self.label_values_pair_for(model, view)
-    data = model.class.columns.inject([]) do |sum, column|
-      tmp = view.admin_data_get_value_for_column(column, model, :limit => nil)
-      sum << [ column.name, (tmp.html_safe? ? tmp : view.send(:h,tmp)) ]
+    def self.camelize_constantize(klassu)
+      klasss = klassu.camelize
+      self.constantize_klass(klasss)
     end
-    extension = AdminData::Extension.show_info(model)
-    data + extension
-  end
 
-  def self.custom_value_for_column(column, model)
-    # some would say that if I use try method then I will not be raising exception and
-    # I agree. However in this case for clarity I would prefer to not to have try after each call
-    begin
-      AdminData::Config.setting[:column_settings].fetch(model.class.name.to_s).fetch(column.name.intern).call(model)
-    rescue
-      model.send(column.name)
+    # klass_name = model_name.sub(/\.rb$/,'').camelize
+    # constantize_klass(klass_name)
+    def self.constantize_klass(klass_name)
+      klass_name.split('::').inject(Object) do |klass, part|
+        klass.const_get(part)
+      end
     end
-  end
 
-  def self.get_serialized_value(html, column_value)
-    html << %{ <i>Cannot edit serialized field.</i> }
-    unless column_value.blank?
-      html << %{ <i>Raw contents:</i><br/> }
-      html << column_value.inspect
+    # Usage: write 'hello world' to tmp/hello.txt file
+    # Util.write_to_file('hello world', 'a+', 'tmp', 'hello.txt')
+    def self.write_to_file(data, mode, *path)
+      path = File.expand_path(Rails.root.join(*path.flatten.compact))
+      FileUtils.mkdir_p(File.dirname(path))
+      File.open(path, mode) {|fh| fh.puts(data) }
     end
-    html.join
-  end
 
-  def self.pluralize(count, text)
-    count > 1 ? text+'s' : text
-  end
-
-  # Rails method merge_conditions ANDs all the conditions. I need to ORs all the conditions
-  def self.or_merge_conditions(klass, *conditions)
-    s = ') OR ('
-    cond = conditions.inject([]) do |sum, condition|
-      condition.blank? ? sum : sum << klass.send(:sanitize_sql, condition)
-    end.compact.join(s)
-    "(#{cond})" unless cond.blank?
-  end
-
-  def self.camelize_constantize(klassu)
-    klasss = klassu.camelize
-    self.constantize_klass(klasss)
-  end
-
-  # klass_name = model_name.sub(/\.rb$/,'').camelize
-  # constantize_klass(klass_name)
-  def self.constantize_klass(klass_name)
-    klass_name.split('::').inject(Object) do |klass, part|
-      klass.const_get(part)
+    def self.string_representation_of_data(value)
+      case value
+      when BigDecimal
+        value.to_s
+      when Date, DateTime, Time
+        "'#{value.to_s(:db)}'"
+      else
+        value.inspect
+      end
     end
-  end
 
-  def self.columns_order(klasss)
-    klass = self.constantize_klass(klasss)
-    columns = klass.columns.map(&:name)
-    columns_symbol = columns.map(&:intern)
+    def self.build_sort_options(klass, sortby)
+      klass.columns.inject('') do |result, column|
+        name = column.name
 
-    columns_order = AdminData::Config.setting[:columns_order]
+        selected_text = (sortby == "#{name} desc") ? "selected='selected'" : ''
+        result << "<option value='#{name} desc' #{selected_text}>#{name} desc</option>"
 
-    if columns_order && columns_order[klasss]
-      primary_key = klass.send(:primary_key).intern
-      order = [primary_key] + columns_order.fetch(klasss)
-      order.uniq!
-      sanitized_order = order - (order - columns_symbol)
-      sorted_columns = sanitized_order + (columns_symbol - sanitized_order)
-      return sorted_columns.map(&:to_s)
+        selected_text = (sortby == "#{name} asc") ? "selected='selected'" : ''
+        result << "<option value='#{name} asc' #{selected_text}>#{name} asc</option>"
+      end.html_safe
     end
 
-    # created_at and updated_at should be at the very end
-    if columns_symbol.include? :created_at
-      columns_symbol = (columns_symbol - [:created_at]) + [:created_at]
+    def self.associations_for(klass, association_type)
+      klass.name.camelize.constantize.reflections.values.select do |value|
+        value.macro == association_type
+      end
     end
 
-    if columns_symbol.include? :updated_at
-      columns_symbol = (columns_symbol - [:updated_at]) + [:updated_at]
+    def self.exception_info(e)
+      "#{e.class}: #{e.message}#$/#{e.backtrace.join($/)}"
     end
 
-    columns_symbol.map(&:to_s)
-  end
-
-  # Usage: write 'hello world' to tmp/hello.txt file
-  # Util.write_to_file('hello world', 'a+', 'tmp', 'hello.txt')
-  def self.write_to_file(data, mode, *path)
-    path = File.expand_path(Rails.root.join(*path.flatten.compact))
-    FileUtils.mkdir_p(File.dirname(path))
-    File.open(path, mode) {|fh| fh.puts(data) }
   end
-
-  def self.javascript_include_tag(*args)
-    data = args.inject([]) do |sum, arg|
-      arg = "#{arg}.js" if arg !~ /js$/
-      sum << ['<script type="text/javascript" src="/admin_data/public/js/', arg, '"></script>'].join
-    end
-    data.join("\n")
-  end
-
-  def self.stylesheet_link_tag(*args)
-    data = args.inject([]) do |sum, arg|
-      arg = "#{arg}.css" if arg !~ /css$/
-      sum << ['<link href="/admin_data/public/css/', arg, '" media="screen" rel="stylesheet" type="text/css" />'].join
-    end
-    data.join("\n")
-  end
-  
-  def self.string_representation_of_data(value)
-    case value
-    when BigDecimal
-      value.to_s
-    when Date, DateTime, Time
-      "'#{value.to_s(:db)}'"
-    else
-      value.inspect
-    end
-  end
-
-  def self.build_sort_options(klass, sortby)
-    klass.columns.inject('') do |result, column|
-      name = column.name
-
-      selected_text = (sortby == "#{name} desc") ? "selected='selected'" : ''
-      result << "<option value='#{name} desc' #{selected_text}>#{name} desc</option>"
-
-      selected_text = (sortby == "#{name} asc") ? "selected='selected'" : ''
-      result << "<option value='#{name} asc' #{selected_text}>#{name} asc</option>"
-    end.html_safe
-  end
-
-  def self.associations_for(klass, association_type)
-    klass.name.camelize.constantize.reflections.values.select do |value|
-      value.macro == association_type
-    end
-  end
-
-  def self.exception_info(e)
-    "#{e.class}: #{e.message}#$/#{e.backtrace.join($/)}"
-  end
-
 end

data/lib/admin_data/version.rb

@@ -1,3 +1,3 @@
 module AdminData
-  VERSION = '1.0.22'
+  VERSION = '1.1.0'
 end

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

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

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

@@ -0,0 +1,5 @@
+module ApplicationHelper
+  def foo
+    "inside main app"
+  end
+end

data/test/rails_root/app/models/city.rb

@@ -0,0 +1,22 @@
+class City < ActiveRecord::Base
+
+  validates_presence_of :name
+  validates_uniqueness_of :name
+
+  before_save :populate_data
+
+  serialize :data
+
+  def to_param
+    self.name
+  end
+
+  private
+
+  def populate_data
+    self.data = {:population => 5000}
+  end
+
+
+
+end

data/test/rails_root/app/models/club.rb

@@ -0,0 +1,3 @@
+class Club < ActiveRecord::Base
+  has_and_belongs_to_many :users
+end

data/test/rails_root/app/models/newspaper.rb

@@ -0,0 +1,4 @@
+class Newspaper < ActiveRecord::Base
+  set_table_name :papers
+  set_primary_key :paper_id
+end

data/test/rails_root/app/models/phone_number.rb

@@ -0,0 +1,3 @@
+class PhoneNumber < ActiveRecord::Base
+  belongs_to :user
+end

data/test/rails_root/app/models/user.rb

@@ -0,0 +1,17 @@
+class User < ActiveRecord::Base
+  default_scope :order => 'id'
+
+  serialize :data
+
+  has_many :phone_numbers, :dependent => :destroy
+  has_and_belongs_to_many :clubs
+  has_one :website, :dependent => :destroy
+
+  validates_presence_of :first_name, :age
+  validates_numericality_of :age
+
+  def to_param
+    "#{self.id}-#{self.first_name}-#{self.last_name}".downcase.gsub(/\W/, ' ').strip.gsub(' ', '-').squeeze('-')
+  end
+
+end

data/test/rails_root/app/models/website.rb

@@ -0,0 +1,3 @@
+class Website < ActiveRecord::Base
+  belongs_to :user
+end

data/test/rails_root/config/application.rb

@@ -0,0 +1,42 @@
+require File.expand_path('../boot', __FILE__)
+
+require 'rails/all'
+
+# If you have a Gemfile, require the gems listed there, including any gems
+# you've limited to :test, :development, or :production.
+Bundler.require(:default, Rails.env) if defined?(Bundler)
+
+module AdminDataDemo
+  class Application < Rails::Application
+    # Settings in config/environments/* take precedence over those specified here.
+    # Application configuration should go into files in config/initializers
+    # -- all .rb files in that directory are automatically loaded.
+
+    # Custom directories with classes and modules you want to be autoloadable.
+    # config.autoload_paths += %W(#{config.root}/extras)
+
+    # Only load the plugins named here, in the order given (default is alphabetical).
+    # :all can be used as a placeholder for all plugins not explicitly named.
+    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
+
+    # Activate observers that should always be running.
+    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
+
+    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
+    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
+    config.time_zone = 'Central Time (US & Canada)'
+
+    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
+    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
+    # config.i18n.default_locale = :de
+
+    # JavaScript files you want as :defaults (application.js is always included).
+    # config.action_view.javascript_expansions[:defaults] = %w(jquery rails)
+
+    # Configure the default encoding used in templates for Ruby 1.9.
+    config.encoding = "utf-8"
+
+    # Configure sensitive parameters which will be filtered from the log file.
+    config.filter_parameters += [:password]
+  end
+end

data/test/rails_root/config/boot.rb

@@ -0,0 +1,13 @@
+require 'rubygems'
+
+# Set up gems listed in the Gemfile.
+gemfile = File.expand_path('../../Gemfile', __FILE__)
+begin
+  ENV['BUNDLE_GEMFILE'] = gemfile
+  require 'bundler'
+  Bundler.setup
+rescue Bundler::GemNotFound => e
+  STDERR.puts e.message
+  STDERR.puts "Try running `bundle install`."
+  exit!
+end if File.exist?(gemfile)

data/test/rails_root/config/environment.rb

@@ -0,0 +1,5 @@
+# Load the rails application
+require File.expand_path('../application', __FILE__)
+
+# Initialize the rails application
+AdminDataDemo::Application.initialize!

data/test/rails_root/config/environments/development.rb

@@ -0,0 +1,22 @@
+AdminDataDemo::Application.configure do
+  # Settings specified here will take precedence over those in config/environment.rb
+
+  # In the development environment your application's code is reloaded on
+  # every request.  This slows down response time but is perfect for development
+  # since you don't have to restart the webserver when you make code changes.
+  config.cache_classes = false
+
+  # Log error messages when you accidentally call methods on nil.
+  config.whiny_nils = true
+
+  # Show full error reports and disable caching
+  config.consider_all_requests_local       = true
+  config.action_view.debug_rjs             = true
+  config.action_controller.perform_caching = false
+
+  # Don't care if the mailer can't send
+  config.action_mailer.raise_delivery_errors = false
+
+  # Print deprecation notices to the Rails logger
+  config.active_support.deprecation = :log
+end