simple_admin 0.2.1 → 0.3.0

data/README.rdoc

@@ -32,7 +32,12 @@ Bundle install:
 
 Generate out the configuration:
 
-    rails g simple_admin
+    rails g simple_admin:install
+
+Install the assets into your public folder so that they can be served
+by your web server instead of being served through rails.
+
+    rails g simple_admin:assets
 
 Add any administration interfaces (for example, in app/admin/posts.rb):
 
@@ -284,13 +289,15 @@ default styling from active_admin relies on formtastic output.
 
 The +stylesheet+ and +javascript+ properties are used within the admin
 layout and are defaulted to the active_admin styles and scripts. You
-may want to override these styles, or simply move them to your public
-folder so that they are not served through rails. These properties allow
+may want to override these styles, or simply use the asset pipeline
+instead of installing them to your public folder. These properties allow
 you to manage where the assets are stored (either within the default
-pipeline or no):
+pipeline or no). By default, SimpleAdmin assumes you have run the
+asset generator (rails g simple_admin:assets) and that these files
+live within your public folder:
 
-    config.stylesheet = "simple_admin/active_admin.css"
-    config.javascript = "simple_admin/active_admin.js"
+    config.stylesheet = "/stylesheets/simple_admin/active_admin.css"
+    config.javascript = "/javascripts/simple_admin/active_admin.js"
 
 == Testing
 

data/Rakefile

@@ -19,7 +19,8 @@ task :sample do
   Dir.chdir "spec/sample"
 
   # Generate our initializer into the sample application
-  system "rails g #{ENGINE}"
+  system "rails g #{ENGINE}:install"
+  system "rails g #{ENGINE}:assets"
 
   # Make a place and a thing
   system "rails g scaffold place name:string"

data/app/assets/stylesheets/simple_admin/active_admin.css

@@ -275,10 +275,10 @@ th, td, caption {
         background: #7b8389;
         color: #fff; }
       #header ul#tabs > li.has_nested > a {
-        background: url("/assets/simple_admin/active_admin/nested_menu_arrow.gif") no-repeat 89% 50%;
+        background: url("/images/simple_admin/active_admin/nested_menu_arrow.gif") no-repeat 89% 50%;
         padding-right: 20px; }
       #header ul#tabs > li.has_nested.current > a {
-        background: #7b8389 url("/assets/simple_admin/active_admin/nested_menu_arrow_dark.gif") no-repeat 89% 50%;
+        background: #7b8389 url("/images/simple_admin/active_admin/nested_menu_arrow_dark.gif") no-repeat 89% 50%;
         padding-right: 20px; }
       #header ul#tabs > li:hover > a {
         background: #7b8389;
@@ -295,7 +295,7 @@ th, td, caption {
         -webkit-border-top-left-radius: 10px;
         z-index: 800;
         border-bottom: 5px solid #7b8389;
-        background: #7b8389 url("/assets/simple_admin/active_admin/nested_menu_arrow_dark.gif") no-repeat 89% 50%; }
+        background: #7b8389 url("/images/simple_admin/active_admin/nested_menu_arrow_dark.gif") no-repeat 89% 50%; }
       #header ul#tabs > li:hover ul {
         display: block; }
       #header ul#tabs > li ul {
@@ -952,7 +952,7 @@ table {
       text-decoration: none;
       display: block; }
     table th.sortable a {
-      background: url("/assets/simple_admin/active_admin/orderable.png") no-repeat 0 4px;
+      background: url("/images/simple_admin/active_admin/orderable.png") no-repeat 0 4px;
       padding-left: 13px; }
     table th.sorted-asc a {
       background-position: 0 -27px; }

data/app/helpers/simple_admin/admin_helper.rb

@@ -7,5 +7,6 @@ module SimpleAdmin
     include SimpleAdmin::FilterHelper
     include SimpleAdmin::SidebarHelper
     include SimpleAdmin::PathHelper
+    include SimpleAdmin::AssetsHelper
   end
 end

data/app/helpers/simple_admin/assets_helper.rb

@@ -0,0 +1,12 @@
+module SimpleAdmin
+  module AssetsHelper
+    def simple_admin_stylesheet_link_tag(*args)
+      stylesheet_link_tag(*args)
+    end
+
+    def simple_admin_javascript_include_tag(*args)
+      javascript_include_tag(*args)
+    end
+  end
+end
+

data/app/views/layouts/simple_admin.html.erb

@@ -5,8 +5,8 @@
     <%- if protect_against_forgery? -%>
       <meta name="authenticity-token" id="authenticity-token" content="<%= form_authenticity_token %>" />
     <%- end -%>
-    <%= stylesheet_link_tag SimpleAdmin.stylesheet %>
-    <%= javascript_include_tag SimpleAdmin.javascript %>
+    <%= simple_admin_stylesheet_link_tag SimpleAdmin.stylesheet %>
+    <%= simple_admin_javascript_include_tag SimpleAdmin.javascript %>
   </head>
   <body class="index admin_occasions">
     <div id="wrapper">

data/lib/rails/generators/simple_admin/assets/assets_generator.rb

@@ -0,0 +1,24 @@
+require 'rails/generators'
+
+module SimpleAdmin
+  class AssetsGenerator < Rails::Generators::Base
+    desc <<-CONTENT
+    This will install the admin assets into your public \
+    folder. If you want to move these files you can adjust \
+    your config/initializer/simple_admin.rb and modify the \
+    config.javascripts and config.stylesheets. \
+    \
+    The default theme comes from ActiveAdmin.
+
+    CONTENT
+
+    def self.source_root
+      File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..')
+    end
+
+    def copy_assets_folder
+      directory 'app/assets', 'public'
+    end
+
+  end
+end

data/lib/rails/generators/simple_admin/install/install_generator.rb

@@ -0,0 +1,35 @@
+require 'rails/generators'
+require 'rails/generators/migration'
+
+module SimpleAdmin
+  class InstallGenerator < Rails::Generators::Base
+    desc <<-CONTENT
+    This will mount SimpleAdmin in your routes.rb using the admin \
+    path. It will also install a simple_admin initializer file in \
+    your config where you can setup the options.\
+    \
+    Once complete, register admin interfaces like app/admin/posts.rb:\
+    \
+      SimpleAdmin.register :posts do\
+      end\
+
+    CONTENT
+
+    def self.source_root
+      File.join(File.dirname(__FILE__), '..', 'templates')
+    end
+
+    def copy_initializer_file
+      copy_file 'initializer.rb', 'config/initializers/simple_admin.rb'
+    end
+
+    def app_admin
+      empty_directory('app/admin')
+    end
+
+    def add_simple_admin_routes
+      simple_admin_routes = %(mount SimpleAdmin::Engine => '/admin'\n)
+      route simple_admin_routes
+    end
+  end
+end

data/lib/rails/generators/simple_admin/templates/initializer.rb

@@ -65,12 +65,14 @@ SimpleAdmin.setup do |config|
 
   # The +stylesheet+ and +javascript+ properties are used within the admin
   # layout and are defaulted to the active_admin styles and scripts. You
-  # may want to override these styles, or simply move them to your public
-  # folder so that they are not served through rails. These properties allow
+  # may want to override these styles, or simply use the asset pipeline
+  # instead of installing them to your public folder. These properties allow
   # you to manage where the assets are stored (either within the default
-  # pipeline or no):
+  # pipeline or no). By default, SimpleAdmin assumes you have run the
+  # asset generator (rails g simple_admin:assets) and that these files
+  # live within your public folder:
   #
-  # config.stylesheet = "simple_admin/active_admin.css"
-  # config.javascript = "simple_admin/active_admin.js"
+  # config.stylesheet = "/stylesheets/simple_admin/active_admin.css"
+  # config.javascript = "/javascripts/simple_admin/active_admin.js"
 
 end

data/lib/simple_admin.rb

@@ -31,11 +31,11 @@ module SimpleAdmin
     end
 
     def stylesheet
-      @@stylesheet || "simple_admin/active_admin.css"
+      @@stylesheet || "/stylesheets/simple_admin/active_admin.css"
     end
 
     def javascript
-      @@javascript || "simple_admin/active_admin.js"
+      @@javascript || "/javascripts/simple_admin/active_admin.js"
     end
 
     def registered

data/lib/simple_admin/engine.rb

@@ -4,7 +4,7 @@ require 'rails'
 module SimpleAdmin
   class Engine < Rails::Engine
     isolate_namespace SimpleAdmin
-    initializer 'simple_admin' do
+    initializer 'simple_admin' do |app|
       if Rails.env == "development"
         simple_admin_reloader = ActiveSupport::FileUpdateChecker.new(Dir["app/admin/**/*"], true) do
           SimpleAdmin.unregister

data/lib/simple_admin/version.rb

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

data/spec/simple_admin/simple_admin_spec.rb

@@ -42,13 +42,13 @@ describe SimpleAdmin do
   end
 
   it "has a default stylesheet" do
-    SimpleAdmin.stylesheet.should == "simple_admin/active_admin.css"
+    SimpleAdmin.stylesheet.should == "/stylesheets/simple_admin/active_admin.css"
     SimpleAdmin.setup {|config| config.stylesheet = "nyan-cat.css"}
     SimpleAdmin.stylesheet.should == "nyan-cat.css"
   end
 
   it "has a default script" do
-    SimpleAdmin.javascript.should == "simple_admin/active_admin.js"
+    SimpleAdmin.javascript.should ==  "/javascripts/simple_admin/active_admin.js"
     SimpleAdmin.setup {|config| config.javascript = "nyan-cat.js"}
     SimpleAdmin.javascript.should == "nyan-cat.js"
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_admin
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
-  - 1
-  version: 0.2.1
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Jeff Rafter
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-22 00:00:00 -07:00
+date: 2011-06-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -197,6 +197,7 @@ files:
 - app/assets/stylesheets/simple_admin/active_admin.css
 - app/controllers/simple_admin/admin_controller.rb
 - app/helpers/simple_admin/admin_helper.rb
+- app/helpers/simple_admin/assets_helper.rb
 - app/helpers/simple_admin/display_helper.rb
 - app/helpers/simple_admin/filter_helper.rb
 - app/helpers/simple_admin/header_helper.rb
@@ -212,7 +213,8 @@ files:
 - app/views/simple_admin/admin/new.html.erb
 - app/views/simple_admin/admin/show.html.erb
 - config/routes.rb
-- lib/rails/generators/simple_admin/simple_admin_generator.rb
+- lib/rails/generators/simple_admin/assets/assets_generator.rb
+- lib/rails/generators/simple_admin/install/install_generator.rb
 - lib/rails/generators/simple_admin/templates/initializer.rb
 - lib/simple_admin.rb
 - lib/simple_admin/attributes.rb

data/lib/rails/generators/simple_admin/simple_admin_generator.rb

@@ -1,33 +0,0 @@
-require 'rails/generators'
-require 'rails/generators/migration'
-
-class SimpleAdminGenerator < Rails::Generators::Base
-  desc <<-CONTENT
-  This will mount SimpleAdmin in your routes.rb using the admin \
-  path. It will also install a simple_admin initializer file in \
-  your config where you can setup the options.\
-  \
-  Once complete, register admin interfaces like app/admin/posts.rb:\
-  \
-    SimpleAdmin.register :posts do\
-    end\
-
-  CONTENT
-
-  def self.source_root
-    File.join(File.dirname(__FILE__), 'templates')
-  end
-
-  def copy_initializer_file
-    copy_file 'initializer.rb', 'config/initializers/simple_admin.rb'
-  end
-
-  def app_admin
-    empty_directory('app/admin')
-  end
-
-  def add_simple_admin_routes
-    simple_admin_routes = %(mount SimpleAdmin::Engine => '/admin'\n)
-    route simple_admin_routes
-  end
-end