yousty-activeadmin 1.0.4.pre → 1.0.5.pre

data/lib/generators/active_admin/install/templates/admin_user.rb.erb

@@ -1,13 +1,22 @@
 ActiveAdmin.register <%= @user_class %> do
+<% unless Rails::VERSION::MAJOR < 4 -%>
+  permit_params :email, :password, :password_confirmation
+
+<% end -%>
   index do
+    selectable_column
+    id_column
     column :email
     column :current_sign_in_at
-    column :last_sign_in_at
     column :sign_in_count
-    default_actions
+    column :created_at
+    actions
   end
 
   filter :email
+  filter :current_sign_in_at
+  filter :sign_in_count
+  filter :created_at
 
   form do |f|
     f.inputs "Admin Details" do
@@ -17,11 +26,5 @@ ActiveAdmin.register <%= @user_class %> do
     end
     f.actions
   end
-<% unless Rails::VERSION::MAJOR < 4 -%>
-  controller do
-    def permitted_params
-      params.permit admin_user: [:email, :password, :password_confirmation]
-    end
-  end
-<% end -%>
+
 end

data/lib/generators/active_admin/install/templates/dashboard.rb

@@ -1,10 +1,10 @@
 ActiveAdmin.register_page "Dashboard" do
 
-  menu :priority => 1, :label => proc{ I18n.t("active_admin.dashboard") }
+  menu priority: 1, label: proc{ I18n.t("active_admin.dashboard") }
 
-  content :title => proc{ I18n.t("active_admin.dashboard") } do
-    div :class => "blank_slate_container", :id => "dashboard_default_message" do
-      span :class => "blank_slate" do
+  content title: proc{ I18n.t("active_admin.dashboard") } do
+    div class: "blank_slate_container", id: "dashboard_default_message" do
+      span class: "blank_slate" do
         span I18n.t("active_admin.dashboard_welcome.welcome")
         small I18n.t("active_admin.dashboard_welcome.call_to_action")
       end

data/lib/generators/active_admin/install/templates/migrations/create_active_admin_comments.rb

@@ -3,9 +3,9 @@ class CreateActiveAdminComments < ActiveRecord::Migration
     create_table :active_admin_comments do |t|
       t.string :namespace
       t.text   :body
-      t.string :resource_id,   :null => false
-      t.string :resource_type, :null => false 
-      t.references :author, :polymorphic => true
+      t.string :resource_id,   null: false
+      t.string :resource_type, null: false
+      t.references :author, polymorphic: true
       t.timestamps
     end
     add_index :active_admin_comments, [:namespace]

data/lib/generators/active_admin/page/USAGE

@@ -0,0 +1,8 @@
+Description:
+    Registers pages with Active Admin
+
+Example:
+    rails generate active_admin:page Thing
+
+    This will create:
+        app/admin/thing.rb

data/lib/generators/active_admin/page/page_generator.rb

@@ -0,0 +1,12 @@
+module ActiveAdmin
+  module Generators
+    class PageGenerator < Rails::Generators::NamedBase
+      source_root File.expand_path('../templates', __FILE__)
+
+      def generate_config_file
+        template "page.rb", "app/admin/#{file_path.tr('/', '_')}.rb"
+      end
+
+    end
+  end
+end

data/lib/generators/active_admin/page/templates/page.rb

@@ -0,0 +1,5 @@
+ActiveAdmin.register_page <%= class_name %> do
+  content do
+    # your content
+  end
+end

data/lib/generators/active_admin/resource/resource_generator.rb

@@ -3,12 +3,10 @@ module ActiveAdmin
     class ResourceGenerator < Rails::Generators::NamedBase
       desc "Registers resources with Active Admin"
 
-      def self.source_root
-        @_active_admin_source_root ||= File.expand_path("../templates", __FILE__)
-      end
+      source_root File.expand_path("../templates", __FILE__)
 
       def generate_config_file
-        template "admin.rb", "app/admin/#{file_path.gsub('/', '_')}.rb"
+        template "admin.rb", "app/admin/#{file_path.tr('/', '_')}.rb"
       end
 
     end

data/lib/generators/active_admin/resource/templates/admin.rb

@@ -1,3 +1,18 @@
 ActiveAdmin.register <%= class_name %> do
 
+<% if Rails::VERSION::MAJOR == 4 || defined?(ActionController::StrongParameters) %>
+  # See permitted parameters documentation:
+  # https://github.com/activeadmin/activeadmin/blob/master/docs/2-resource-customization.md#setting-up-strong-parameters
+  #
+  # permit_params :list, :of, :attributes, :on, :model
+  #
+  # or
+  #
+  # permit_params do
+  #   permitted = [:permitted, :attributes]
+  #   permitted << :other if resource.something?
+  #   permitted
+  # end
+<% end %>
+
 end

data/lib/ransack_ext.rb

@@ -2,11 +2,11 @@
 # identically to the versions given in Ransack.
 #
 Ransack.configure do |config|
-  {'contains'=>'cont', 'starts_with'=>'start', 'ends_with'=>'end'}.each do |old,new|
-    config.add_predicate old, Ransack::Constants::DERIVED_PREDICATES.detect{ |q, args| q == new }[1]
+  {'contains'=>'cont', 'starts_with'=>'start', 'ends_with'=>'end'}.each do |old,current|
+    config.add_predicate old, Ransack::Constants::DERIVED_PREDICATES.detect{ |q, _| q == current }[1]
   end
 
-  {'equals'=>'eq', 'greater_than'=>'gt', 'less_than'=>'lt'}.each do |old,new|
-    config.add_predicate old, arel_predicate: new
+  {'equals'=>'eq', 'greater_than'=>'gt', 'less_than'=>'lt'}.each do |old,current|
+    config.add_predicate old, arel_predicate: current
   end
 end

data/script/local

@@ -19,7 +19,7 @@ Examples:
 end
 
 # Set up some variables
-rails_version = detect_rails_version || '3.0.0'
+rails_version = detect_rails_version!
 
 test_app_dir = ".test-rails-apps"
 test_app_path = "#{test_app_dir}/test-rails-app-#{rails_version}"
@@ -29,7 +29,7 @@ system "mkdir #{test_app_dir}" unless File.exists?(test_app_dir)
 
 # Create the sample rails app if it doesn't already exist
 unless File.exists? test_app_path
-  system "RAILS='#{rails_version}' bundle exec rails new #{test_app_path} -m spec/support/rails_template_with_data.rb"
+  system "RAILS='#{rails_version}' bundle exec rails new #{test_app_path} -m spec/support/rails_template_with_data.rb --skip-bundle"
 end
 
 # Link this rails app

data/script/travis_cache

@@ -0,0 +1,107 @@
+#!/usr/bin/env ruby
+
+require 'base64'
+require 'digest'
+require 'openssl'
+require 'shellwords'
+
+prefix = "ruby_#{RUBY_VERSION}-rails_#{ENV.fetch 'RAILS'}-"
+BUNDLE = prefix + 'bundle'
+APP    = prefix + 'app'
+
+def download_bundle
+  s3 :save, file: "#{BUNDLE}.sha2", as: "remote-#{BUNDLE}.sha2"
+  s3 :save, file: "#{BUNDLE}.tgz",  as: "remote-#{BUNDLE}.tgz", untar: true
+end
+
+def download_app
+  # Force test app re-build if dependencies were updated
+  unless digest_changed? 'Gemfile.lock',   "remote-#{BUNDLE}.sha2", "#{BUNDLE}.sha2"
+    s3 :save,   file: "#{APP}.sha2",   as: "remote-#{APP}.sha2"
+    # Force test app re-build if spec/support changed
+    unless digest_changed? 'spec/support', "remote-#{APP}.sha2",    "#{APP}.sha2"
+      s3 :save, file: "#{APP}.tgz",    as: "remote-#{APP}.tgz", untar: true
+    end
+  end
+end
+
+def upload
+  unless ID && SECRET
+    puts "S3 credentials missing"
+    return
+  end
+
+  [ ['Gemfile.lock', BUNDLE, 'bundle'],
+    ['spec/support', APP,    'spec/rails']
+  ].each do |to_check, name, to_save|
+    puts "=> Checking #{to_check} for changes"
+    if ret = digest_changed?(to_check, "remote-#{name}.sha2", "#{name}.sha2")
+      puts "  => Changes found: #{ret[:old]} -> #{ret[:new]}"
+
+      puts "  => Creating an archive"
+      `tar -cjf #{name}.tgz #{to_save}`
+
+      puts "  => Uploading a new archive"
+      s3 :upload, file: "#{name}.tgz"
+      s3 :upload, file: "#{name}.sha2"
+    else
+      puts "  => There were no changes, doing nothing"
+    end
+  end
+end
+
+def digest_changed?(to_check, old_digest_file, new_digest_file)
+  if File.exists? new_digest_file
+    digest = File.read new_digest_file
+  else
+    # Supports a single file, as well as a folder
+    files   = Dir[to_check, "#{to_check}/**/*"].reject{ |f| File.directory? f }
+    content = files.sort!.map{ |f| File.read f }.join
+    digest  = Digest::SHA2.hexdigest content
+    File.write new_digest_file, digest
+  end
+
+  old_digest = File.read old_digest_file if File.exists? old_digest_file
+
+  {old: old_digest, new: digest} if digest != old_digest
+end
+
+def sign(secret, to_sign)
+  Base64.strict_encode64 OpenSSL::HMAC.digest OpenSSL::Digest::SHA1.new, secret, to_sign
+end
+
+ID     = ENV['AWS_S3_ID']
+SECRET = ENV['AWS_S3_SECRET']
+URL    = 'https://s3.amazonaws.com/ActiveAdmin'
+
+# s3 :list
+# s3 :upload, file: 'foo'
+# s3 :find,   file: 'foo'
+# s3 :save,   file: 'foo', as: 'bar'
+# s3 :save,   file: 'foo', untar: true
+def s3(action, options = {})
+  verb      = {list: :get, upload: :put, find: :get, save: :get}.fetch action
+  file      = options.fetch(:file) unless action == :list
+  extra_arg =  case action
+  when :upload then "-T #{file}"
+  when :save   then options[:as] ? "-o #{options[:as]}" : '-O'
+  end
+  do_after  = "&& tar -xf #{options[:as] || file}" if options[:untar]
+
+  if ID && SECRET
+    now       = Time.now.strftime "%a, %d %b %Y %H:%M:%S %z"
+    signature = sign SECRET, "#{verb.upcase}\n\n\n#{now}\n/ActiveAdmin/#{file}"
+    headers   = ["Authorization: AWS #{ID}:#{signature}", "Date: #{now}"].map do |h|
+      "-H #{Shellwords.escape h}"
+    end.join ' '
+  end
+
+  output = `curl -f #{headers} #{extra_arg} #{URL}/#{file} #{do_after}`
+  [$?.success?, output]
+end
+
+if %w[download_bundle download_app upload].include? ARGV[0]
+  send ARGV[0]
+else
+  raise "unexpected argument(s): #{ARGV}"
+end

data/spec/javascripts/coffeescripts/jquery.aa.flash.js.coffee

@@ -0,0 +1,25 @@
+describe "ActiveAdmin.flash", ->
+  beforeEach ->
+    loadFixtures('flashes.html')
+    @flashes = $(".flashes")
+
+  describe "abstract", ->
+    it "should add a flash box with class and message"
+      ActiveAdmin.flash.abstract "a abstract message", "abstract"
+      flash = @flashes.find(".flash")
+      expect(flash).toHaveClass("abstract")
+      expect(flash.text()).toHaveClass("a abstract message")
+
+  describe "error", ->
+    it "should add a flash box with class and message"
+      ActiveAdmin.flash.abstract "a error message"
+      flash = @flashes.find(".flash")
+      expect(flash).toHaveClass("error")
+      expect(flash.text()).toHaveClass("a error message")
+
+  describe "notice", ->
+    it "should add a flash box with class and message"
+      ActiveAdmin.flash.abstract "a notice message"
+      flash = @flashes.find(".flash")
+      expect(flash).toHaveClass("notice")
+      expect(flash.text()).toHaveClass("a notice message")

data/spec/javascripts/fixtures/flashes.html

@@ -0,0 +1,2 @@
+<div class="flashes">
+</div>

data/spec/rails_helper.rb

@@ -0,0 +1,154 @@
+require 'spec_helper'
+
+module ActiveAdminIntegrationSpecHelper
+  extend self
+
+  def load_defaults!
+    ActiveAdmin.unload!
+    ActiveAdmin.load!
+    ActiveAdmin.register(Category)
+    ActiveAdmin.register(User)
+    ActiveAdmin.register(Post){ belongs_to :user, optional: true }
+    reload_menus!
+  end
+
+  def reload_menus!
+    ActiveAdmin.application.namespaces.each{|n| n.reset_menu! }
+  end
+
+  # Sometimes we need to reload the routes within
+  # the application to test them out
+  def reload_routes!
+    Rails.application.reload_routes!
+  end
+
+  # Helper method to load resources and ensure that Active Admin is
+  # setup with the new configurations.
+  #
+  # Eg:
+  #   load_resources do
+  #     ActiveAdmin.regiser(Post)
+  #   end
+  #
+  def load_resources
+    ActiveAdmin.unload!
+    yield
+    reload_menus!
+    reload_routes!
+  end
+
+  # Sets up a describe block where you can render controller
+  # actions. Uses the Admin::PostsController as the subject
+  # for the describe block
+  def describe_with_render(*args, &block)
+    describe *args do
+      include RSpec::Rails::ControllerExampleGroup
+      render_views
+      # metadata[:behaviour][:describes] = ActiveAdmin.namespaces[:admin].resources['Post'].controller
+      module_eval &block
+    end
+  end
+
+  def arbre(assigns = {}, helpers = mock_action_view, &block)
+    Arbre::Context.new(assigns, helpers, &block)
+  end
+
+  def render_arbre_component(assigns = {}, helpers = mock_action_view, &block)
+    arbre(assigns, helpers, &block).children.first
+  end
+
+  # Setup a describe block which uses capybara and rails integration
+  # test methods.
+  def describe_with_capybara(*args, &block)
+    describe *args do
+      include RSpec::Rails::IntegrationExampleGroup
+      module_eval &block
+    end
+  end
+
+  # Returns a fake action view instance to use with our renderers
+  def mock_action_view(assigns = {})
+    controller = ActionView::TestCase::TestController.new
+    ActionView::Base.send :include, ActionView::Helpers
+    ActionView::Base.send :include, ActiveAdmin::ViewHelpers
+    ActionView::Base.send :include, Rails.application.routes.url_helpers
+    ActionView::Base.new(ActionController::Base.view_paths, assigns, controller)
+  end
+  alias_method :action_view, :mock_action_view
+
+  # A mock resource to register
+  class MockResource
+  end
+
+  def with_translation(translation)
+    I18n.backend.store_translations :en, translation
+    yield
+  ensure
+    I18n.backend.reload!
+  end
+
+end
+
+ENV['RAILS_ENV'] = 'test'
+ENV['RAILS_ROOT'] = File.expand_path("../rails/rails-#{ENV['RAILS']}", __FILE__)
+
+# Create the test app if it doesn't exists
+unless File.exists?(ENV['RAILS_ROOT'])
+  system 'rake setup'
+end
+
+require 'rails'
+require 'active_record'
+require 'active_admin'
+require 'devise'
+ActiveAdmin.application.load_paths = [ENV['RAILS_ROOT'] + "/app/admin"]
+
+require ENV['RAILS_ROOT'] + '/config/environment'
+
+require 'rspec/rails'
+
+# Setup Some Admin stuff for us to play with
+include ActiveAdminIntegrationSpecHelper
+load_defaults!
+reload_routes!
+
+# Disabling authentication in specs so that we don't have to worry about
+# it allover the place
+ActiveAdmin.application.authentication_method = false
+ActiveAdmin.application.current_user_method = false
+
+# Don't add asset cache timestamps. Makes it easy to integration
+# test for the presence of an asset file
+ENV["RAILS_ASSET_ID"] = ''
+
+RSpec.configure do |config|
+  config.use_transactional_fixtures = true
+  config.use_instantiated_fixtures = false
+  config.include Devise::TestHelpers, type: :controller
+  config.render_views = false
+  config.filter_run focus: true
+  config.filter_run_excluding skip: true
+  config.run_all_when_everything_filtered = true
+end
+
+# All RSpec configuration needs to happen before any examples
+# or else it whines.
+require 'integration_example_group'
+RSpec.configure do |c|
+  c.include RSpec::Rails::IntegrationExampleGroup, file_path: /\bspec\/requests\//
+  c.include Devise::TestHelpers, type: :controller
+end
+
+# improve the performance of the specs suite by not logging anything
+# see http://blog.plataformatec.com.br/2011/12/three-tips-to-improve-the-performance-of-your-test-suite/
+Rails.logger.level = 4
+
+
+# Improves performance by forcing the garbage collector to run less often.
+unless ENV['DEFER_GC'] == '0' || ENV['DEFER_GC'] == 'false'
+  require 'support/deferred_garbage_collection'
+  RSpec.configure do |config|
+    config.before(:all) { DeferredGarbageCollection.start }
+    config.after(:all)  { DeferredGarbageCollection.reconsider }
+  end
+end