admin_data 1.1.9 → 1.1.10

data/app/controllers/admin_data/application_controller.rb

@@ -10,7 +10,7 @@ module AdminData
 
     before_filter :build_klasses, :build_drop_down_for_klasses, :check_page_parameter, :prepare_drop_down_klasses
 
-    attr_reader :klass, :model
+    attr_reader :klass
 
     protected
 
@@ -56,13 +56,6 @@ module AdminData
       end
     end
 
-    def _build_custom_klasses
-      _build_all_klasses.compact.select do |klass_local|
-        @klass = klass_local
-        is_allowed_to_view_klass?
-      end
-    end
-
     def remove_klasses_without_table(klasses)
       klasses.select { |k| k.ancestors.include?(ActiveRecord::Base) && k.connection.table_exists?(k.table_name) }
     end

data/app/controllers/admin_data/crud_controller.rb

@@ -82,8 +82,8 @@ module AdminData
       condition = {primary_key => conditional_id}
 
       _proc = AdminData.config.find_conditions[@klass.name]
-      if _proc && find_conditions = _proc.call(params)
-        condition = find_conditions.fetch(:conditions) if find_conditions.has_key?(:conditions)
+      if _proc && (find_conditions = _proc.call(params)) && find_conditions.has_key?(:conditions)
+        condition = find_conditions.fetch(:conditions)
       end
 
       unless @model = @klass.find(:first, :conditions => condition)

data/app/controllers/admin_data/feed_controller.rb

@@ -2,6 +2,8 @@ module AdminData
 
   class FeedController < ApplicationController
 
+    before_filter :ensure_is_allowed_to_view_feed
+
     def index
       if params[:klasss].blank?
         render :text => "Usage: http://localhost:3000/admin_data/feed/user replace user with your model name"

data/app/controllers/admin_data/public_controller.rb

@@ -8,20 +8,18 @@ module AdminData
         render :nothing => true, :status => 404 and return
       end
 
-      opts = {:text => File.read(path), :cache => true}
-
       case params[:file]
       when /\.css$/i
-        opts[:content_type] = "text/css"
+        content_type = "text/css"
       when /\.js$/i
-        opts[:content_type] = "text/javascript"
+        content_type = "text/javascript"
       when /\.png$/i
-        opts[:content_type] = "image/png"
+        content_type = "image/png"
       else
         render :nothing => true, :status => 404 and return
       end
 
-      render opts
+      render({:text => File.read(path), :cache => true, :content_type => content_type})
     end
 
   end

data/app/controllers/admin_data/search_controller.rb

@@ -75,7 +75,9 @@ module AdminData
           render :text => "#{params[:base]} is an invalid value", :status => :not_found
           return
         end
-        if ActiveRecordUtil.declared_has_many_association_names(model_klass).include?(params[:children]) || ActiveRecordUtil.declared_habtm_association_names(model_klass).include?(params[:children])
+
+        ar_util = ActiveRecordUtil.new(model_klass)
+        if ar_util.declared_has_many_association_names.include?(params[:children]) || ar_util.declared_habtm_association_names.include?(params[:children])
           #proceed
         else
           render :text => "#{params[:children]} is not a valid has_many association", :status => :not_found

data/app/helpers/admin_data/application_helper.rb

@@ -62,7 +62,7 @@ module AdminData
     end
 
     def has_one(model, klass)
-      tmp = AdminData::ActiveRecordUtil.declared_has_one_association_names(klass)
+      tmp = AdminData::ActiveRecordUtil.new(klass).declared_has_one_association_names
       tmp.inject('') do |output, ho|
         begin
           label = ho
@@ -79,13 +79,13 @@ module AdminData
     end
 
     def has_many_data(model, klass)
-      array = AdminData::ActiveRecordUtil.declared_has_many_association_names(klass).map do |m|
+      array = AdminData::ActiveRecordUtil.new(klass).declared_has_many_association_names.map do |m|
         begin
           count = model.send(m.intern).count
           label = m.to_s + '(' + count.to_s + ')'
           output = label
           if count > 0
-            has_many_klass_name = AdminData::ActiveRecordUtil.klass_for_association_type_and_name(model.class, :has_many, m).name.underscore
+            has_many_klass_name = AdminData::ActiveRecordUtil.new(model.class).klass_for_association_type_and_name(:has_many, m).name.underscore
             output = link_to(label, admin_data_search_path(  :klass => has_many_klass_name,
             :children => m,
             :base => klass.name.underscore,
@@ -100,7 +100,7 @@ module AdminData
     end
 
     def belongs_to_data(model, klass)
-      AdminData::ActiveRecordUtil.declared_belongs_to_association_names(klass).map do |assoc_name|
+      AdminData::ActiveRecordUtil.new(klass).declared_belongs_to_association_names.map do |assoc_name|
         begin
           output = assoc_name
           if belongs_to_record = model.send(assoc_name)
@@ -114,14 +114,14 @@ module AdminData
     end
 
     def habtm_data(model, klass)
-      AdminData::ActiveRecordUtil.declared_habtm_association_names(klass).map do |assoc_name|
+      AdminData::ActiveRecordUtil.new(klass).declared_habtm_association_names.map do |assoc_name|
         begin
           count = model.send(assoc_name.intern).count
           label = assoc_name + '(' + count.to_s + ')'
           output = label
 
           if count > 0 then
-            has_many_klass_name = AdminData::ActiveRecordUtil.klass_for_association_type_and_name(model.class, :has_and_belongs_to_many, assoc_name).name.underscore
+            has_many_klass_name = AdminData::ActiveRecordUtil.new(model.class).klass_for_association_type_and_name(:has_and_belongs_to_many, assoc_name).name.underscore
             output = link_to(label, admin_data_search_path(  :klass => has_many_klass_name,
             :children => assoc_name,
             :base => klass.name.underscore,
@@ -148,7 +148,7 @@ module AdminData
 
       if col.primary
         html <<  model.new_record? ? '(auto)' : model.id
-      elsif get_reflection_for_column(klass, col) && AdminData.config.display_assoc?( klass.name ) 
+      elsif get_reflection_for_column(klass, col) && AdminData.config.display_assoc?( klass.name )
         form_field_for_association_records(klass, col, f, html)
       else
         handle_column_type(col, html, model, column_value, f)
@@ -180,7 +180,7 @@ module AdminData
     def form_field_for_habtm_records(klass, model, f, html)
       begin
         html = []
-        AdminData::ActiveRecordUtil.delcared_habtm_association_names(klass).each do |k|
+        AdminData::ActiveRecordUtil.new(klass).delcared_habtm_association_names.each do |k|
           assoc_klass = AdminData::Util.get_class_name_for_habtm_association(model, k)
 
           html << "<div class='col_box'>"

data/app/views/admin_data/crud/association/_association_info.html.erb

@@ -1,7 +1,7 @@
 <div class="block rounded">
   <h3>Association Information</h3>
   <div class='content association_info'>
-    <% if AdminData::ActiveRecordUtil.has_association_info?(klass) %>
+    <% if AdminData::ActiveRecordUtil.new(klass).has_association_info? %>
       <%= render 'admin_data/crud/association/belongs_to_info' ,  :klass => klass, :model => model %>
       <%= render 'admin_data/crud/association/has_one_info',      :klass => klass, :model => model %>
       <%= render 'admin_data/crud/association/has_many_info' ,    :klass => klass, :model => model %>

data/app/views/admin_data/crud/association/_belongs_to_info.html.erb

@@ -1,4 +1,4 @@
-<% if AdminData::ActiveRecordUtil.declared_belongs_to_association_names(klass).any? %>
+<% if AdminData::ActiveRecordUtil.new(klass).declared_belongs_to_association_names.any? %>
   <p class='belongs_to'>
     <strong>belongs_to :</strong>
     &nbsp;

data/app/views/admin_data/crud/association/_habtm_info.html.erb

@@ -1,4 +1,4 @@
-<% if AdminData::ActiveRecordUtil.declared_habtm_association_names(klass).any? %>
+<% if AdminData::ActiveRecordUtil.new(klass).declared_habtm_association_names.any? %>
   <p>
     <strong>has_and_belongs_to_many :</strong>
     <%= habtm_data(model, klass).html_safe %>

data/app/views/admin_data/crud/association/_has_many_info.html.erb

@@ -1,4 +1,4 @@
-<% if AdminData::ActiveRecordUtil.declared_has_many_association_names(klass).any? %>
+<% if AdminData::ActiveRecordUtil.new(klass).declared_has_many_association_names.any? %>
   <p>
     <strong>has_many :</strong>
     <%= has_many_data(model, klass).html_safe %>

data/app/views/admin_data/crud/association/_has_one_info.html.erb

@@ -1,4 +1,4 @@
-<% if AdminData::ActiveRecordUtil.declared_has_one_association_names(klass).any? %>
+<% if AdminData::ActiveRecordUtil.new(klass).declared_has_one_association_names.any? %>
   <p>
     <strong>has_one :</strong>
     <%= has_one(model, klass).html_safe %>

data/app/views/admin_data/crud/misc/_form.html.erb

@@ -8,7 +8,7 @@
   </div>
 <% end %>
 
-<% if AdminData::ActiveRecordUtil.declared_habtm_association_names(klass).any? %>
+<% if AdminData::ActiveRecordUtil.new(klass).declared_habtm_association_names.any? %>
   <div class='data'>
     <%= form_field_for_habtm_records(klass, @model, f, '').html_safe %>
   </div>

data/config/routes.rb

@@ -1,9 +1,5 @@
 Rails.application.routes.draw do
 
-  namespace(:admin_data) do
-    match '/feed/:klasss' => "feed#index", :defaults => { :format =>'rss' }, :as => :feed
-  end
-
   namespace(:admin_data) do
     scope :admin_data do
       controller "crud" do
@@ -23,8 +19,13 @@ Rails.application.routes.draw do
       end
 
       match '/table_structure/:klass' => "table_structure#index", :as => :table_structure
+
       match '/quick_search/:klass' => "search#quick_search",      :as => :search
+
       match '/advance_search/:klass' => "search#advance_search",  :as => :advance_search
+
+      match '/feed/:klasss' => "feed#index", :defaults => { :format =>'rss' }, :as => :feed
+
       match '/public/*file' => "public#serve"
 
       root :to => "home#index"

data/lib/admin_data/active_record_util.rb

@@ -1,54 +1,50 @@
 module AdminData
   class ActiveRecordUtil
 
+    attr_accessor :klass
+
+    def initialize(klass)
+      @klass = klass
+    end
+
     # class User
     #   has_and_belongs_to_many :clubs
     # end
     #
-    # User.declared_habtm_association_names(Club)
+    # ActiveRecordUtil.new(User).declared_habtm_association_names
     # #=> ['clubs']
-    def self.declared_habtm_association_names(klass)
-      delcared_association_names_for(klass, :has_and_belongs_to_many).map(&:name).map(&:to_s)
+    def declared_habtm_association_names
+      delcared_association_names_for(:has_and_belongs_to_many).map(&:name).map(&:to_s)
     end
 
     # class User
     #   belongs_to :club
     # end
     #
-    # User.declared_belongs_to_association_names(Club)
+    # ActiveRecordUtil.new(User).declared_belongs_to_association_names
     # #=> ['club']
-    def self.declared_belongs_to_association_names(klass)
-      delcared_association_names_for(klass, :belongs_to).map(&:name).map(&:to_s)
+    def declared_belongs_to_association_names
+      delcared_association_names_for(:belongs_to).map(&:name).map(&:to_s)
     end
 
     # class User
     #   has_one :car
     # end
     #
-    # User.declared_has_one_association_names(Car)
+    # ActiveRecordUtil.new(User).declared_has_one_association_names
     # #=> ['car']
-    def self.declared_has_one_association_names(klass)
-      delcared_association_names_for(klass, :has_one).map(&:name).map(&:to_s)
+    def declared_has_one_association_names
+      delcared_association_names_for(:has_one).map(&:name).map(&:to_s)
     end
 
     # class User
     #   has_many :cars
     # end
     #
-    # User.declared_has_many_association_names(Car)
+    # ActiveRecordUtil.new(User).declared_has_many_association_names
     # #=> ['cars']
-    def self.declared_has_many_association_names(klass)
-      delcared_association_names_for(klass, :has_many).map(&:name).map(&:to_s)
-    end
-
-    # returns declared association names like
-    # #=> ['comments']
-    # #=> ['positive_comments']
-    # #=> ['negative_comments']
-    def self.delcared_association_names_for(klass, association_type)
-      klass.name.camelize.constantize.reflections.values.select do |value|
-        value.macro == association_type
-      end
+    def declared_has_many_association_names
+      delcared_association_names_for(:has_many).map(&:name).map(&:to_s)
     end
 
     # returns an array of classes
@@ -57,11 +53,11 @@ module AdminData
     #   has_and_belongs_to_many :clubs
     # end
     #
-    # ActiveRecordUtil.habtm_klasses_for(User)
+    # ActiveRecordUtil.new(User).habtm_klasses_for
     # #=> [Club]
-    def self.habtm_klasses_for(klass)
-      declared_habtm_association_names(klass).map do |assoc_name|
-        klass_for_association_type_and_name(klass, :has_and_belongs_to_many, assoc_name)
+    def habtm_klasses_for
+      declared_habtm_association_names.map do |assoc_name|
+        klass_for_association_type_and_name(:has_and_belongs_to_many, assoc_name)
       end
     end
 
@@ -71,23 +67,35 @@ module AdminData
     #   has_many :comments
     # end
     #
-    # ActiveRecordUtil.klass_for_association_type_and_name(User, :has_many, 'comments') #=> Comment
+    # ActiveRecordUtil.new(User).klass_for_association_type_and_name(:has_many, 'comments')
+    # #=> Comment
     #
-    def self.klass_for_association_type_and_name(klass, association_type, association_name)
+    def klass_for_association_type_and_name(association_type, association_name)
       data = klass.name.camelize.constantize.reflections.values.detect do |value|
         value.macro == association_type && value.name.to_s == association_name
       end
       data.klass if data # output of detect from hash is an array with key and value
     end
-    # TODO test with polymorphic
-
 
     # returns false if the given Klass has no association info. Otherwise returns true.
-    def self.has_association_info?(k)
-      AdminData::ActiveRecordUtil.declared_belongs_to_association_names(k).any? ||
-      AdminData::ActiveRecordUtil.declared_has_many_association_names(k).any? ||
-      AdminData::ActiveRecordUtil.declared_has_many_association_names(k).any? ||
-      AdminData::ActiveRecordUtil.declared_habtm_association_names(k).any?
+    def has_association_info?
+      declared_belongs_to_association_names.any? ||
+      declared_has_many_association_names.any? ||
+      declared_has_many_association_names.any? ||
+      declared_habtm_association_names.any?
+    end
+
+    private
+
+    # returns declared association names like
+    #
+    # #=> ['comments']
+    # #=> ['positive_comments']
+    # #=> ['negative_comments']
+    def delcared_association_names_for(association_type)
+      klass.name.camelize.constantize.reflections.values.select do |value|
+        value.macro == association_type
+      end
     end
 
   end

data/lib/admin_data/authenticator.rb

@@ -8,7 +8,7 @@ module AdminData
     end
 
     def verify(controller)
-      controller.authenticate_or_request_with_http_basic { |_userid, _password| (_userid == @userid) && (_password == @password) }
+      controller.authenticate_or_request_with_http_basic { |_u, _p| (_u == @userid) && (_p == @password) }
     end
 
   end

data/lib/admin_data/version.rb

@@ -1,3 +1,3 @@
 module AdminData
-  VERSION = '1.1.9'
+  VERSION = '1.1.10'
 end

data/test/rails_root/features/step_definitions/feed_steps.rb

@@ -1,8 +1,24 @@
-AdminData::Authenticator.extend(
-  Module.new{
-    def verify(controller)
-      #TODO use rspec double code here. This is a very bad hack
+def mock_authenticator_with_authentication_returning_true
+  #TODO use rspec double code here. This is a very bad hack
+  AdminData::Authenticator.class_eval do
+    def verify(*args)
       true
     end
-  }
-)
+  end
+end
+
+def mock_authenticator_with_authentication_returning_false
+  AdminData::Authenticator.class_eval do
+    def verify(*args)
+      false
+    end
+  end
+end
+
+When /^mocked feed authentication returns true$/ do
+  mock_authenticator_with_authentication_returning_true
+end
+
+When /^mocked feed authentication returns false$/ do
+  mock_authenticator_with_authentication_returning_false
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: admin_data
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: false
   segments: 
   - 1
   - 1
-  - 9
-  version: 1.1.9
+  - 10
+  version: 1.1.10
 platform: ruby
 authors: 
 - Neeraj Singh
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-22 00:00:00 -05:00
+date: 2010-12-23 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency