admin_data 1.1.12 → 1.1.13

data/lib/admin_data/search.rb

@@ -1,186 +1,188 @@
-module Search
-
-  class Dbbase
-    def initialize(operands, table_name, field_name, operator)
-      @operands = operands
-      @table_name = table_name
-      @field_name = field_name
-      @operator = operator
-    end
+module AdminData
+  module Search
+
+    class Dbbase
+      def initialize(operands, table_name, field_name, operator)
+        @operands = operands
+        @table_name = table_name
+        @field_name = field_name
+        @operator = operator
+      end
 
-    def like_operator
-      'LIKE'
-    end
+      def like_operator
+        'LIKE'
+      end
 
-    def sql_field_name
-      "#{@table_name}.#{@field_name}"
-    end
+      def sql_field_name
+        "#{@table_name}.#{@field_name}"
+      end
 
-    def operands
-      @operands
+      def operands
+        @operands
+      end
     end
-  end
 
-  class PostgresqlSpecific < Dbbase
-    def like_operator
-      'ILIKE'
+    class PostgresqlSpecific < Dbbase
+      def like_operator
+        'ILIKE'
+      end
     end
-  end
 
-  class OracleSpecific < Dbbase
-    def sql_field_name
-      result = super
-      %w(contains is_exactly does_not_contain).include?(@operator) ?  "upper(#{result})" : result
-    end
+    class OracleSpecific < Dbbase
+      def sql_field_name
+        result = super
+        %w(contains is_exactly does_not_contain).include?(@operator) ?  "upper(#{result})" : result
+      end
 
-    def operands
-      result = super
-      %w(contains is_exactly does_not_contain).include?(@operator) ?  result.upcase : result
+      def operands
+        result = super
+        %w(contains is_exactly does_not_contain).include?(@operator) ?  result.upcase : result
+      end
     end
-  end
 
-  class Term
+    class Term
 
-    attr_accessor :error, :table_name, :field, :operator, :operands, :dbbase
+      attr_accessor :error, :table_name, :field, :operator, :operands, :dbbase
 
-    def initialize(klass, value, search_type)
-      @table_name = klass.table_name
-      compute_search_fields(value)
+      def initialize(klass, value, search_type)
+        @table_name = klass.table_name
+        compute_search_fields(value)
 
-      adapter = AdminData.config.adapter_name.downcase
-      if adapter =~ /postgresql/
-        self.dbbase = PostgresqlSpecific.new(@operands, table_name, field, operator)
-      elsif adapter =~ /oracle/
-        self.dbbase = OracleSpecific.new(@operands, table_name, field, operator)
-      else
-        self.dbbase = Dbbase.new(@operands, table_name, field, operator)
+        adapter = AdminData.config.adapter_name.downcase
+        if adapter =~ /postgresql/
+          self.dbbase = PostgresqlSpecific.new(@operands, table_name, field, operator)
+        elsif adapter =~ /oracle/
+          self.dbbase = OracleSpecific.new(@operands, table_name, field, operator)
+        else
+          self.dbbase = Dbbase.new(@operands, table_name, field, operator)
+        end
       end
-    end
 
-    def attribute_condition
-      return if valid? && operand_required? && operands.blank?
-      case operator
-      when 'contains'
-        ["#{sql_field_name} #{like_operator} ?","%#{operands}%"]
+      def attribute_condition
+        return if valid? && operand_required? && operands.blank?
+        case operator
+        when 'contains'
+          ["#{sql_field_name} #{like_operator} ?","%#{operands}%"]
 
-      when 'is_exactly'
-        ["#{sql_field_name} = ?", operands]
+        when 'is_exactly'
+          ["#{sql_field_name} = ?", operands]
 
-      when 'does_not_contain'
-        ["#{sql_field_name} IS NULL OR #{sql_field_name} NOT #{like_operator} ?","%#{operands}%"]
+        when 'does_not_contain'
+          ["#{sql_field_name} IS NULL OR #{sql_field_name} NOT #{like_operator} ?","%#{operands}%"]
 
-      when 'is_false'
-        ["#{sql_field_name} = ?",false]
+        when 'is_false'
+          ["#{sql_field_name} = ?",false]
 
-      when 'is_true'
-        ["#{sql_field_name} = ?",true]
+        when 'is_true'
+          ["#{sql_field_name} = ?",true]
 
-      when 'is_null'
-        ["#{sql_field_name} IS NULL"]
+        when 'is_null'
+          ["#{sql_field_name} IS NULL"]
 
-      when 'is_not_null'
-        ["#{sql_field_name} IS NOT NULL"]
+        when 'is_not_null'
+          ["#{sql_field_name} IS NOT NULL"]
 
-      when 'is_on'
-        ["#{sql_field_name} >= ? AND #{sql_field_name} < ?",   values_after_cast.beginning_of_day,
-        values_after_cast.end_of_day]
+        when 'is_on'
+          ["#{sql_field_name} >= ? AND #{sql_field_name} < ?",   values_after_cast.beginning_of_day,
+          values_after_cast.end_of_day]
 
-      when 'is_on_or_before_date'
-        ["#{sql_field_name} <= ?",values_after_cast.end_of_day]
+        when 'is_on_or_before_date'
+          ["#{sql_field_name} <= ?",values_after_cast.end_of_day]
 
-      when 'is_on_or_after_date'
-        ["#{sql_field_name} >= ?",values_after_cast.beginning_of_day]
+        when 'is_on_or_after_date'
+          ["#{sql_field_name} >= ?",values_after_cast.beginning_of_day]
 
-      when 'is_equal_to'
-        ["#{sql_field_name} = ?",values_after_cast]
+        when 'is_equal_to'
+          ["#{sql_field_name} = ?",values_after_cast]
 
-      when 'greater_than'
-        ["#{sql_field_name} > ?",values_after_cast]
+        when 'greater_than'
+          ["#{sql_field_name} > ?",values_after_cast]
 
-      when 'less_than'
-        ["#{sql_field_name} < ?",values_after_cast]
+        when 'less_than'
+          ["#{sql_field_name} < ?",values_after_cast]
 
-      else
-        # it means user did not select anything in operator. Ignore it.
+        else
+          # it means user did not select anything in operator. Ignore it.
+        end
       end
-    end
 
-    def valid?
-      @error = nil
-      @error = validate
-      @error.blank?
-    end
+      def valid?
+        @error = nil
+        @error = validate
+        @error.blank?
+      end
 
-    private
+      private
 
-    def like_operator
-      dbbase.like_operator
-    end
+      def like_operator
+        dbbase.like_operator
+      end
 
-    def sql_field_name
-      dbbase.sql_field_name
-    end
+      def sql_field_name
+        dbbase.sql_field_name
+      end
 
-    def operands
-      dbbase.operands
-    end
+      def operands
+        dbbase.operands
+      end
 
-    def operand_required?
-      operator =~ /(contains|is_exactly|does_not_contain|is_on |is_on_or_before_date|is_on_or_after_date |greater_than|less_than|is_equal_to)/
-    end
+      def operand_required?
+        operator =~ /(contains|is_exactly|does_not_contain|is_on |is_on_or_before_date|is_on_or_after_date |greater_than|less_than|is_equal_to)/
+      end
 
-    def compute_search_fields(value)
-      @field, @operator, @operands = value.values_at(:col1, :col2, :col3)
-      # field value is directly used in the sql statement. So it is important to sanitize it
-      @field      = @field.gsub(/\W/,'')
-      @operands   = (@operands.blank? ? @operands : @operands.strip)
-    end
+      def compute_search_fields(value)
+        @field, @operator, @operands = value.values_at(:col1, :col2, :col3)
+        # field value is directly used in the sql statement. So it is important to sanitize it
+        @field      = @field.gsub(/\W/,'')
+        @operands   = (@operands.blank? ? @operands : @operands.strip)
+      end
 
-    def values_after_cast
-      case operator
-      when /(is_on|is_on_or_before_date|is_on_or_after_date)/
-        AdminData::DateUtil.parse(operands)
-      when /(is_equal_to|greater_than|less_than)/
-        operands.to_i
-      else
-        operands
+      def values_after_cast
+        case operator
+        when /(is_on|is_on_or_before_date|is_on_or_after_date)/
+          AdminData::DateUtil.parse(operands)
+        when /(is_equal_to|greater_than|less_than)/
+          operands.to_i
+        else
+          operands
+        end
       end
-    end
 
-    def validate
-      case operator
-      when /(is_on|is_on_or_before_date|is_on_or_after_date)/
-        "#{operands} is not a valid date" unless AdminData::DateUtil.valid?(operands)
-      when /(is_equal_to|greater_than|less_than)/
-        unless operands.blank?
-          "#{operands} is not a valid integer" unless operands =~ /^\d+$/
+      def validate
+        case operator
+        when /(is_on|is_on_or_before_date|is_on_or_after_date)/
+          "#{operands} is not a valid date" unless AdminData::DateUtil.valid?(operands)
+        when /(is_equal_to|greater_than|less_than)/
+          unless operands.blank?
+            "#{operands} is not a valid integer" unless operands =~ /^\d+$/
+          end
         end
       end
-    end
 
-  end # end of Term
+    end # end of Term
 
 
-  def build_quick_search_conditions( klass, search_term )
-    return nil if search_term.blank?
-    str_columns = klass.columns.select { |column| column.type.to_s =~ /(string|text)/i }
-    conditions = str_columns.collect do |column|
-      t = Term.new(klass, {:col1 => column.name, :col2 => 'contains', :col3 => search_term}, 'quick_search')
-      t.attribute_condition
+    def build_quick_search_condition( klass, search_term )
+      return nil if search_term.blank?
+      str_columns = klass.columns.select { |column| column.type.to_s =~ /(string|text)/i }
+      conditions = str_columns.collect do |column|
+        t = Term.new(klass, {:col1 => column.name, :col2 => 'contains', :col3 => search_term}, 'quick_search')
+        t.attribute_condition
+      end
+      AdminData::Util.or_merge_conditions(klass, *conditions)
     end
-    AdminData::Util.or_merge_conditions(klass, *conditions)
-  end
 
-  def build_advance_search_conditions(klass, options)
-    values        = ( options.blank? ? [] : options.values )
-    terms         = values.collect {|value| Term.new(klass, value, 'advance_search') }
-    valid_terms   = terms.select{ |t| t.valid? }
-    errors        = (terms - valid_terms).collect { |t| t.error }
-    return {:errors => errors} if errors.any?
+    def build_advance_search_condition(klass, options)
+      values        = ( options.blank? ? [] : options.values )
+      terms         = values.collect {|value| Term.new(klass, value, 'advance_search') }
+      valid_terms   = terms.select{ |t| t.valid? }
+      errors        = (terms - valid_terms).collect { |t| t.error }
+      return {:errors => errors} if errors.any?
 
-    r = klass.unscoped
-    valid_terms.each { |t|  r = r.where(t.attribute_condition) }
-    { :cond => r }
-  end
+      r = klass.unscoped
+      valid_terms.each { |t|  r = r.where(t.attribute_condition) }
+      { :cond => r }
+    end
 
+  end
 end

data/lib/admin_data/version.rb

@@ -1,3 +1,3 @@
 module AdminData
-  VERSION = '1.1.12'
+  VERSION = '1.1.13'
 end

data/lib/admin_data.rb

@@ -13,9 +13,12 @@ module AdminData
   autoload :SetupConfig
   autoload :DateUtil
   autoload :Authenticator
+  autoload :Search
+  autoload :Analytics
 
   include SetupConfig
 
 end
 
 require 'admin_data/railtie'
+require 'admin_data/exceptions'

data/lib/public/javascripts/advance_search/sortby.js

@@ -0,0 +1,14 @@
+$(function(){
+
+	var form = $('#advance_search_form');
+
+	if (form.length === 0) return;
+
+	$('#view_table tr.thead').live('click', function(e){
+		var value = $(e.target).closest('.sortable').attr('data-sortby');
+		$('#advance_search_sortby').val(value);
+		form.submit();
+		return false;
+	});
+
+});

data/lib/public/javascripts/analytics/report.js

@@ -0,0 +1,7 @@
+$(function(){
+
+	$('input[name=report_type]').change(function(){
+		window.location = $(this).val();
+	});
+
+});

data/lib/public/stylesheets/base.css

@@ -902,13 +902,13 @@ table#view_table {
   margin: 5px 0 5px 0;
 	border-collapse: collapse;
 	border-spacing: 0;
+  font-size:13px;
 }
 
 table#view_table th {
 	border: 1px solid #ccc;
 	letter-spacing: 2px;
 	text-align: left;
-	padding: 6px 6px 6px 12px;
 }
 
 
@@ -1107,3 +1107,27 @@ ul#subnav li a:hover {
   color:gray;
 }
 
+th.sortable {
+  background: url("/admin_data/public/images/sort_by_nothing.jpg") no-repeat scroll 0 -4px #CAE8EA;
+  cursor: pointer;
+  padding: 8px 12px 4px 16px;
+  border-bottom: 1px solid #c1dad7;
+  border-right: 1px solid #c1dad7;
+  border-top: 1px solid #c1dad7;
+  color: #4f6b72;
+  letter-spacing: 1px;
+}
+
+th.sortable a {
+  margin-left: 3px;
+  color: #4F6B72;
+}
+
+th.sort_by_desc {
+  background: url("/admin_data/public/images/sort_by_desc.jpg") no-repeat scroll 0 -4px #CAE8EA;
+}
+th.sort_by_asc {
+  background: url("/admin_data/public/images/sort_by_asc.jpg") no-repeat scroll 0 -4px #CAE8EA;
+}
+
+

data/test/rails_root/Gemfile

@@ -1,23 +1,26 @@
 source 'http://rubygems.org'
 
+#gem 'admin_data', :git => 'git://github.com/neerajdotname/admin_data.git'
+gem 'admin_data', :path => File.expand_path("../../..", __FILE__)
+
 gem 'rails', '3.0.3'
 
 gem 'sqlite3-ruby', :require => 'sqlite3'
 
+gem 'pg', '= 0.10.0'
+
+gem "mysql2", '= 0.2.7'
+
 gem 'ruby-debug'
 
 gem 'faker'
 
-#gem 'admin_data', :git => 'git://github.com/neerajdotname/admin_data.git'
-gem 'admin_data', :path => File.expand_path("../../..", __FILE__)
-
-group :development, :test do
-  gem 'factory_girl_rails'
-  gem 'database_cleaner'
-  gem 'shoulda'
-  gem "rspec-rails", ">= 2.0.1"
-  gem "cucumber-rails", ">= 0.3.2"
-  gem "capybara", "= 0.4.0"
-  gem "launchy", ">= 0.3.7"
-end
 
+gem 'factory_girl_rails'
+gem 'database_cleaner'
+gem 'shoulda'
+gem "rspec-rails", ">= 2.0.1"
+gem "cucumber-rails", ">= 0.3.2"
+gem "capybara", "= 0.4.0"
+gem "launchy", ">= 0.3.7"
+gem 'minitest'

data/test/rails_root/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: /Users/nsingh/dev/personal/admin_data
   specs:
-    admin_data (1.1.11)
-      will_paginate (>= 3.0.pre2)
+    admin_data (1.1.12)
+      will_paginate (= 3.0.pre2)
 
 GEM
   remote: http://rubygems.org/
@@ -86,7 +86,10 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
+    minitest (2.2.2)
+    mysql2 (0.2.7)
     nokogiri (1.4.4)
+    pg (0.10.0)
     polyglot (0.3.1)
     rack (1.2.1)
     rack-mount (0.6.13)
@@ -150,6 +153,9 @@ DEPENDENCIES
   factory_girl_rails
   faker
   launchy (>= 0.3.7)
+  minitest
+  mysql2 (= 0.2.7)
+  pg (= 0.10.0)
   rails (= 3.0.3)
   rspec-rails (>= 2.0.1)
   ruby-debug

data/test/rails_root/README.md

@@ -1,11 +1,19 @@
-# This respository is used for running cucumber tests for admin_data#
+# Test setup #
 
-# How do I run test?
-* bundle install
-* rake db:migrate
-* rake db:test:prepare
-* bundle exec cucumber
+    bundle install
+    rake db:migrate
+    rake db:test:prepare
 
+# Cucumber test #
 
-#TODO add test for delete a record
-## TODO add test for destroy a record
+    bundle exec cucumber
+
+# Unit test #
+
+    ruby -I test test/unit/car_test.rb
+
+# Switch database #
+
+    rake db:use:pg
+    rake db:use:sqlite3
+    rake db:use:mysql

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

@@ -0,0 +1,3 @@
+class Car < ActiveRecord::Base
+
+end

data/test/rails_root/config/application.rb

@@ -8,35 +8,8 @@ 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/cucumber.yml

@@ -7,5 +7,3 @@ default: <%= std_opts %> features
 wip: --tags @wip:3 --wip features
 rerun: <%= rerun_opts %> --format rerun --out rerun.txt --strict --tags ~@wip
 javascript: --tags @javascript
-
-

data/test/rails_root/config/database.yml.mysql

@@ -0,0 +1,22 @@
+development:
+  adapter: mysql2
+  encoding: utf8
+  reconnect: false
+  database: admin_data_development
+  pool: 5
+  username: root
+  password: welcome
+  host: localhost
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test:
+  adapter: mysql2
+  encoding: utf8
+  reconnect: false
+  database: admin_data_test
+  pool: 5
+  username: root
+  password: welcome
+  host: localhost

data/test/rails_root/config/database.yml.pg

@@ -0,0 +1,15 @@
+development:
+  adapter: postgresql
+  database: admin_data_development
+  username: <%= ENV['USER'] %>
+  host: localhost
+
+# Warning: The database defined as 'test' will be erased and
+# re-generated from your development database when you run 'rake'.
+# Do not set this db to the same as development or production.
+test: &TEST
+  adapter: postgresql
+  database: admin_data_test
+  username: <%= ENV['USER'] %>
+  host: localhost
+  min_messages: warning

data/test/rails_root/config/{database.yml → database.yml.sqlite3}

@@ -22,4 +22,4 @@ production:
   timeout: 5000
 
 cucumber:
-  <<: *test
+  <<: *test

data/test/rails_root/db/migrate/{20091030202259_create_users.rb → 20091030202259_create_tables.rb}

@@ -1,5 +1,11 @@
-class CreateUsers < ActiveRecord::Migration
+class CreateTables < ActiveRecord::Migration
   def self.up
+
+    create_table :cars do |t|
+      t.string :name
+      t.timestamps
+    end
+
     create_table :users do |t|
       t.string :first_name
       t.string :last_name

data/test/rails_root/db/schema.rb

@@ -12,6 +12,12 @@
 
 ActiveRecord::Schema.define(:version => 20091030202259) do
 
+  create_table "cars", :force => true do |t|
+    t.string   "name"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
   create_table "cities", :force => true do |t|
     t.string   "name"
     t.text     "data"

data/test/rails_root/features/quick_search.feature

@@ -39,17 +39,6 @@ Feature: quick search
     Then I should see "seattle"
     Then I should see population_5000
 
-  Scenario: sorting
-    Given the following user exists:
-      | first_name | last_name |
-      | Mary       | Jane      |
-      | John       | Smith     |
-    Given I visit quick_search page
-    When I select "id asc" from "sortby"
-    When I press "Search"
-    Then verify that user "first_name" is "Mary"
-    Then verify that user "last_name" is "Jane"
-
   Scenario: quick search with search term
     Given the following user exists:
       | first_name | last_name |