simple_admin 0.1.0 → 0.2.1

data/LICENSE

@@ -0,0 +1,56 @@
+MIT LICENSE
+
+Copyright (c) 2011 Jeff Rafter
+
+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.
+
+
+Some of the code contained in this project is subject to additional
+Copyright and license:
+
+Original license from ActiveAdmin, Greg Bell
+--------------------------------------------
+
+Copyright (c) 2010 Greg Bell, VersaPay Corporation
+
+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.
+
+Iconic Icons are designed by P.J. Onori and are shared under
+the Creative Commons Attribution-Share Alike 3.0 license:
+http://creativecommons.org/licenses/by-sa/3.0/us
+http://somerandomdude.com/projects/iconic/
+

data/README.rdoc

@@ -19,7 +19,8 @@ set of features.
 
 == Getting started
 
-In your Gemfile, include simple_admin and formtastic:
+In your Gemfile, include simple_admin and formtastic (and fastercsv
+if you are on an older version of Ruby):
 
     gem "simple_admin"
     gem "formtastic"
@@ -184,7 +185,7 @@ of rendering:
 
     SimpleAdmin.register :post do
       index do
-        sidebar :title => 'Intersting post stats' do
+        sidebar do
           # Within index you have @collection, in other views you have @resource
           your_post_stats_helper(@collection)
         end
@@ -217,6 +218,11 @@ generated at initialization. Available actions are:
 * create
 * update
 
+You can also see the routes that are generated by your admin interfaces
+by running:
+
+    rake routes:simple_admin
+
 == Configuration options
 
 All of the configuration for SimpleAdmin happens within the

data/app/controllers/simple_admin/admin_controller.rb

@@ -5,8 +5,8 @@ module SimpleAdmin
   class AdminController < ::ApplicationController
     before_filter :require_user
     before_filter :lookup_interface
+    before_filter :lookup_before
     before_filter :lookup_resource, :only => [:show, :edit, :update, :destroy]
-    before_filter :handle_before
 
     unloadable
 
@@ -25,7 +25,6 @@ module SimpleAdmin
     end
 
     def show
-      @resource = @interface.constant.find(params[:id])
       respond_with(@resource)
     end
 
@@ -93,23 +92,23 @@ module SimpleAdmin
       raise UnknownAdminInterface.new("Could not find the interface for simple admin") unless @interface
     end
 
-    def lookup_resource
-      @resource = @interface.constant.find(params[:id])
-    end
-
-    def handle_before
+    def lookup_before
       @interface.before.each do |before|
         next unless before[:actions].include?(params[:action].to_sym)
         instance_eval(&before[:data])
       end
     end
 
+    def lookup_resource
+      @resource ||= @interface.constant.find(params[:id])
+    end
+
     def clean_search_params(search_params)
       return {} unless search_params.is_a?(Hash)
       search_params = search_params.dup
       search_params.delete_if do |key, value|
         value == "" ||
-        ["utf8", "scope", "commit", "action", "order", "interface", "controller", "format"].include?(key)
+        ["utf8", "scope", "commit", "action", "order", "interface", "controller", "format", "page"].include?(key)
       end
       search_params
     end

data/app/helpers/simple_admin/display_helper.rb

@@ -26,7 +26,7 @@ module SimpleAdmin
 
     def data_for(col)
       value = if col.data
-        col.data.call(@resource, col)
+        instance_exec(@resource, &col.data)
       elsif col.attribute.to_s =~ /^([\w]+)_id$/ && @resource.respond_to?($1.to_sym)
         pretty_format(@resource.send($1))
       else

data/app/helpers/simple_admin/filter_helper.rb

@@ -68,38 +68,52 @@ module SimpleAdmin
       else
         association_name
       end
-      input_name = (input_name + "_eq").to_sym
+      input_name = (input_name.to_s + "_eq").to_sym
       collection = find_collection_for_column(klass, association_name, options)
       [ label(input_name, method.to_s.titlecase),
         select_tag(input_name, options_for_select(collection, params[input_name]), :include_blank => options[:include_blank] || 'Any')
       ].join("\n").html_safe
     end
 
+    def generate_association_input_name(klass, method) #:nodoc:
+      if reflection = reflection_for(klass, method)
+        if [:has_and_belongs_to_many, :has_many].include?(reflection.macro)
+          "#{method.to_s.singularize}_ids"
+        else
+          reflection.options[:foreign_key] || "#{method}_id"
+        end
+      else
+        method
+      end.to_sym
+    end
+
     def find_collection_for_column(klass, column, options) #:nodoc:
       collection = if options[:collection]
-        options.delete(:collection)
+        collection = options.delete(:collection)
+        collection = collection.to_a if collection.is_a?(Hash)
+        collection.map { |o| [pretty_format(o.first), o.last] }
       elsif reflection = reflection_for(klass, column)
         options[:find_options] ||= {}
         if conditions = reflection.options[:conditions]
           options[:find_options][:conditions] = reflection.klass.merge_conditions(conditions, options[:find_options][:conditions])
         end
-        reflection.klass.find(:all, options[:find_options])
+        collection = reflection.klass.find(:all, options[:find_options])
+        collection.map { |o| [pretty_format(o), o.id] }
       else
         boolean_collection(klass, column, options)
       end
-      collection = collection.to_a if collection.is_a?(Hash)
-      collection.map { |o| [pretty_format(o), o.id] }
-    end
+      collection
+   end
 
     def boolean_collection(klass, column, options)
       [['Yes', true], ['No', false]]
     end
 
     def filter_check_boxes_input(klass, method, options = {})
-      input_name = (generate_association_input_name(method).to_s + "_in").to_sym
-      collection = find_collection_for_column(method, options)
-      selected_values = klass.send(input_name) || []
-      checkboxes = template.content_tag :div, :class => "check_boxes_wrapper" do
+      input_name = (generate_association_input_name(klass, method).to_s + "_in").to_sym
+      collection = find_collection_for_column(klass, method, options)
+      selected_values = params[input_name] || []
+      checkboxes = content_tag :div, :class => "check_boxes_wrapper" do
         collection.map do |c|
           label = c.is_a?(Array) ? c.first : c
           value = c.is_a?(Array) ? c.last : c

data/app/helpers/simple_admin/sidebar_helper.rb

@@ -1,9 +1,11 @@
 module SimpleAdmin
   module SidebarHelper
     def sidebars
-      @interface.sidebars_for(:index).each do |sidebar|
-        instance_exec(sidebar, &sidebar[:data])
+      content = "".html_safe
+      @interface.sidebars_for(params[:action].to_sym).each do |sidebar|
+        content << instance_eval(&sidebar[:data])
       end
+      content
     end
   end
 end

data/app/helpers/simple_admin/title_helper.rb

@@ -12,7 +12,7 @@ module SimpleAdmin
       options = @interface.options_for(params[:action].to_sym)
       case options[:title]
       when Proc
-        options[:title].call(@resource)
+        instance_exec(@resource, &options[:title])
       when Symbol
         if @resource
           @resource.send(optons[:title])

data/app/views/simple_admin/admin/index.csv.erb

@@ -8,7 +8,7 @@
     @collection.each do |object|
       csv << cols.map do |col|
         if col.data
-          col.data.call(object, col)
+          instance_exec(object, &col.data)
         else
           pretty_format(object.send(col.attribute))
         end

data/app/views/simple_admin/admin/index.html.erb

@@ -36,7 +36,7 @@
                   <% @interface.attributes_for(:index).each do |col| %>
                     <td>
                       <% if col.data %>
-                        <%= col.data.call(object, col) %>
+                        <%= instance_exec(object, &col.data) %>
                       <% else %>
                         <%= pretty_format(object.send(col.attribute)) %>
                       <% end %>
@@ -66,7 +66,7 @@
     <div class="panel_contents">
       <%= form_tag '', :class => "q_search", :id => "q_search", :method => "get" do %>
         <% @interface.filters_for(:index).each do |col| %>
-          <%= filter_for(col.attribute, @interface.constant) %>
+          <%= filter_for(col.attribute, @interface.constant, col.options) %>
         <% end %>
         <div class="buttons">
           <input name="commit" type="submit" value="Filter" />

data/lib/simple_admin.rb

@@ -1,5 +1,12 @@
 module SimpleAdmin
   require 'simple_admin/engine' if defined?(Rails) && Rails::VERSION::MAJOR == 3
+  require 'simple_admin/interface'
+  require 'simple_admin/builder'
+  require 'simple_admin/section'
+  require 'simple_admin/attributes'
+  require 'simple_admin/filters'
+  require 'simple_admin/breadcrumbs'
+
 
   mattr_accessor :require_user_method,
                  :current_user_method,
@@ -36,7 +43,7 @@ module SimpleAdmin
         @@registered = []
         # We load up all of the admin files on launch, if they change you need to restart
         begin
-          Dir[Rails.root.join("app/admin/**/*.rb")].each {|f| require f}
+          Dir[Rails.root.join("app/admin/**/*.rb")].each {|f| load f}
         rescue LoadError => e
           # For certain kinds of load errors, we want to give a more helpful message
           if e.message.match(/Expected .* to define .*/)
@@ -49,6 +56,11 @@ module SimpleAdmin
       @@registered
     end
 
+    # Clear the routes and registered interfaces
+    def unregister
+      @@registered = nil
+    end
+
     # Called by the initializer
     #
     #   SimpleAdmin.setup do |config|

data/lib/simple_admin/builder.rb

@@ -31,5 +31,8 @@ module SimpleAdmin
       @interface.before << options
     end
 
+    # Comfort the masses
+    alias_method :before_filter, :before
+
   end
 end

data/lib/simple_admin/engine.rb

@@ -4,5 +4,17 @@ require 'rails'
 module SimpleAdmin
   class Engine < Rails::Engine
     isolate_namespace SimpleAdmin
+    initializer 'simple_admin' do
+      if Rails.env == "development"
+        simple_admin_reloader = ActiveSupport::FileUpdateChecker.new(Dir["app/admin/**/*"], true) do
+          SimpleAdmin.unregister
+          Rails.application.reload_routes!
+        end
+
+        ActionDispatch::Callbacks.to_prepare do
+          simple_admin_reloader.execute_if_updated
+        end
+      end
+    end
   end
 end

data/lib/simple_admin/interface.rb

@@ -7,7 +7,7 @@ module SimpleAdmin
     def initialize(resource, options={}, &block)
       if resource.is_a?(Class)
         @constant = resource
-        @symbol = resource.name.downcase.to_sym
+        @symbol = resource.name.underscore.to_sym
       else
         @constant = resource.to_s.camelize.singularize.constantize
         @symbol = resource.to_sym
@@ -22,19 +22,20 @@ module SimpleAdmin
     end
 
     def filters_for(sym)
-      section(sym).options[:filters].attributes
+      options_for(sym)[:filters].attributes
     end
 
     def attributes_for(sym)
-      section(sym).options[:attributes].attributes
+      options_for(sym)[:attributes].attributes
     end
 
     def sidebars_for(sym)
-      section(sym).options[:sidebars] || []
+      options_for(sym)[:sidebars] || []
     end
 
     def options_for(sym)
-      section(sym).options
+      sym = :form if [:new, :edit].include?(sym)
+      section(sym).options || {}
     end
 
     def actions

data/lib/simple_admin/version.rb

@@ -1,3 +1,3 @@
 module SimpleAdmin
-  VERSION = "0.1.0"
+  VERSION = "0.2.1"
 end

data/lib/tasks/routes.rake

@@ -0,0 +1,31 @@
+# Based on the routes.rake tasks from Rails
+namespace :routes do
+  desc 'Print out all defined routes in match order, with names. Target specific controller with CONTROLLER=x.'
+  task :simple_admin => :environment do
+    all_routes = SimpleAdmin::Engine.routes.routes
+
+    if ENV['CONTROLLER']
+      all_routes = all_routes.select{ |route| route.defaults[:controller] == ENV['CONTROLLER'] }
+    end
+
+    routes = all_routes.collect do |route|
+
+      reqs = route.requirements.dup
+      reqs[:to] = route.app unless route.app.class.name.to_s =~ /^ActionDispatch::Routing/
+      reqs = reqs.empty? ? "" : reqs.inspect
+
+      {:name => route.name.to_s, :verb => route.verb.to_s, :path => route.path, :reqs => reqs}
+    end
+
+     # Skip the route if it's internal info route
+    routes.reject! { |r| r[:path] =~ %r{/rails/info/properties|^/assets} }
+
+    name_width = routes.map{ |r| r[:name].length }.max
+    verb_width = routes.map{ |r| r[:verb].length }.max
+    path_width = routes.map{ |r| r[:path].length }.max
+
+    routes.each do |r|
+      puts "#{r[:name].rjust(name_width)} #{r[:verb].ljust(verb_width)} #{r[:path].ljust(path_width)} #{r[:reqs]}"
+    end
+  end
+end

data/spec/controllers/simple_admin/admin_controller_spec.rb

@@ -14,7 +14,7 @@ describe SimpleAdmin::AdminController do
 
     it "should render the sidebars" do
       SimpleAdmin.expects(:success)
-      @block = Proc.new {|sidebar| SimpleAdmin.success if sidebar[:title] == 'Awes!' }
+      @block = Proc.new { SimpleAdmin.success }
       @sidebar = {:title => 'Awes!', :data => @block}
       SimpleAdmin::Interface.any_instance.expects(:sidebars_for).with(:index).returns([@sidebar])
       get :index, :interface => "things"

data/spec/simple_admin/interface_spec.rb

@@ -1,11 +1,19 @@
 require 'spec_helper'
 
+class ThingWithCrazyClassName < Thing; end
+
 describe SimpleAdmin::Interface do
   it "accepts a constant as the resource" do
     @interface = SimpleAdmin.register(Thing)
     @interface.constant.should == Thing
   end
 
+  it "accepts a crazy constant as the resource" do
+    @interface = SimpleAdmin.register(ThingWithCrazyClassName)
+    @interface.constant.should == ThingWithCrazyClassName
+    @interface.member.should == "thing_with_crazy_class_name"
+  end
+
   it "accepts a symbol as the resource" do
     @interface = SimpleAdmin.register(:thing)
     @interface.constant.should == Thing

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_admin
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 21
   prerelease: 
   segments: 
   - 0
+  - 2
   - 1
-  - 0
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Jeff Rafter
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-21 00:00:00 -07:00
+date: 2011-06-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -184,6 +184,7 @@ files:
 - .gitignore
 - .rspec
 - Gemfile
+- LICENSE
 - README.rdoc
 - Rakefile
 - TODO.rdoc
@@ -222,6 +223,7 @@ files:
 - lib/simple_admin/interface.rb
 - lib/simple_admin/section.rb
 - lib/simple_admin/version.rb
+- lib/tasks/routes.rake
 - rails/init.rb
 - simple_admin.gemspec
 - spec/acceptance/admin_thing_spec.rb