yousty-activeadmin 1.0.4.pre → 1.0.5.pre

data/spec/support/rails_template_with_data.rb

@@ -7,7 +7,7 @@ apply File.expand_path("../rails_template.rb", __FILE__)
 end
 
 scopes = <<-EOF
-  scope :all, :default => true
+  scope :all, default: true
 
   scope :drafts do |posts|
     posts.where(["published_at IS NULL"])
@@ -22,23 +22,23 @@ scopes = <<-EOF
   end
 
   scope :my_posts do |posts|
-    posts.where(:author_id => current_admin_user.id)
+    posts.where(author_id: current_admin_user.id)
   end
 EOF
-inject_into_file 'app/admin/posts.rb', scopes , :after => "ActiveAdmin.register Post do\n"
+inject_into_file 'app/admin/posts.rb', scopes , after: "ActiveAdmin.register Post do\n"
 
 # Setup some default data
 append_file "db/seeds.rb", <<-EOF
   users = ["Jimi Hendrix", "Jimmy Page", "Yngwie Malmsteen", "Eric Clapton", "Kirk Hammett"].collect do |name|
     first, last = name.split(" ")
-    User.create!  :first_name => first,
-                  :last_name => last,
-                  :username => [first,last].join('-').downcase,
-                  :age => rand(80)
+    User.create!  first_name: first,
+                  last_name: last,
+                  username: [first,last].join('-').downcase,
+                  age: rand(80)
   end
 
   categories = ["Rock", "Pop Rock", "Alt-Country", "Blues", "Dub-Step"].collect do |name|
-    Category.create! :name => name
+    Category.create! name: name
   end
 
   published_at_values = [Time.now.utc - 5.days, Time.now.utc - 1.day, nil, Time.now.utc + 3.days]
@@ -47,12 +47,12 @@ append_file "db/seeds.rb", <<-EOF
     user = users[i % users.size]
     cat = categories[i % categories.size]
     published_at = published_at_values[i % published_at_values.size]
-    Post.create :title => "Blog Post \#{i}",
-                :body => "Blog post \#{i} is written by \#{user.username} about \#{cat.name}",
-                :category => cat,
-                :published_at => published_at,
-                :author => user,
-                :starred => true
+    Post.create title: "Blog Post \#{i}",
+                body: "Blog post \#{i} is written by \#{user.username} about \#{cat.name}",
+                category: cat,
+                published_at: published_at,
+                author: user,
+                starred: true
   end
 EOF
 

data/spec/support/templates/admin/stores.rb

@@ -1,11 +1,9 @@
 ActiveAdmin.register Store do
 
-  controller do
-    def permitted_params
-      params.permit store: [:name]
-    end if Rails::VERSION::MAJOR == 4
+  if Rails::VERSION::MAJOR == 4
+    permit_params :name
   end
 
-  index :pagination_total => false
+  index pagination_total: false
 
 end

data/spec/support/templates/policies/active_admin/comment_policy.rb

@@ -0,0 +1,9 @@
+module ActiveAdmin
+  class CommentPolicy < ApplicationPolicy
+    class Scope < Struct.new(:user, :scope)
+      def resolve
+        scope
+      end
+    end
+  end
+end

data/spec/support/templates/policies/active_admin/page_policy.rb

@@ -0,0 +1,18 @@
+module ActiveAdmin
+  class PagePolicy < ApplicationPolicy
+    class Scope < Struct.new(:user, :scope)
+      def resolve
+        scope
+      end
+    end
+
+    def show?
+      case record.name
+      when "Dashboard"
+        true
+      else
+        false
+      end
+    end
+  end
+end

data/spec/support/templates/policies/admin_user_policy.rb

@@ -0,0 +1,11 @@
+class AdminUserPolicy < ApplicationPolicy
+  class Scope < Struct.new(:user, :scope)
+    def resolve
+      scope
+    end
+  end
+
+  def destroy?
+    record != user
+  end
+end

data/spec/support/templates/policies/application_policy.rb

@@ -0,0 +1,45 @@
+class ApplicationPolicy
+  attr_reader :user, :record
+
+  def initialize(user, record)
+    @user = user
+    @record = record
+  end
+
+  def index?
+    true
+  end
+
+  def show?
+    scope.where(:id => record.id).exists?
+  end
+
+  def new?
+    create?
+  end
+
+  def create?
+    true
+  end
+
+  def edit?
+    update?
+  end
+
+  def update?
+    true
+  end
+
+  def destroy?
+    true
+  end
+
+  def destroy_all?
+    true
+  end
+
+
+  def scope
+    Pundit.policy_scope!(user, record.class)
+  end
+end

data/spec/support/templates/policies/category_policy.rb

@@ -0,0 +1,7 @@
+class CategoryPolicy < ApplicationPolicy
+  class Scope < Struct.new(:user, :scope)
+    def resolve
+      scope
+    end
+  end
+end

data/spec/support/templates/policies/post_policy.rb

@@ -0,0 +1,15 @@
+class PostPolicy < ApplicationPolicy
+  class Scope < Struct.new(:user, :scope)
+    def resolve
+      scope
+    end
+  end
+
+  def update?
+    record.author == user
+  end
+
+  def destroy?
+    update?
+  end
+end

data/spec/support/templates/policies/store_policy.rb

@@ -0,0 +1,11 @@
+class StorePolicy < ApplicationPolicy
+  class Scope < Struct.new(:user, :scope)
+    def resolve
+      scope
+    end
+  end
+
+  def destroy?
+    false
+  end
+end

data/spec/support/templates/policies/user_policy.rb

@@ -0,0 +1,11 @@
+class UserPolicy < ApplicationPolicy
+  class Scope < Struct.new(:user, :scope)
+    def resolve
+      scope
+    end
+  end
+
+  def destroy_all?
+    true
+  end
+end

data/spec/support/templates/post_decorator.rb

@@ -1,53 +1,11 @@
-# Minimal example of a decorator
-require_dependency 'post'
+require 'draper'
 
-# DelegateClass(Post) does not delegate attribute methods
-# in some environments:
-# http://travis-ci.org/#!/gregbell/active_admin/jobs/2021466
-#
-class PostDecorator < SimpleDelegator
-  delegate :id, :to => :__getobj__
-
-  def self.decorate(object)
-    new(object)
-  end
-
-  def self.decorate_collection(collection)
-    DecoratedEnumerableProxy.new(collection)
-  end
-
-  def self.model_name
-    ActiveModel::Name.new Post
-  end
+class PostDecorator < Draper::Decorator
+  decorates :post
+  delegate_all
 
   def decorator_method
     'A method only available on the decorator'
   end
-
-  # Minimal example of decorating a collection.
-  # A full example can be found in the draper project:
-  # https://github.com/jcasimir/draper/blob/master/lib/draper/decorated_enumerable_proxy.rb
-  class DecoratedEnumerableProxy < DelegateClass(ActiveRecord::Relation)
-    include Enumerable
-
-    delegate :as_json, :collect, :map, :each, :[], :all?, :include?, :first, :last, :shift, :to => :decorated_collection
-
-    def klass
-      PostDecorator
-    end
-
-    def wrapped_collection
-      __getobj__
-    end
-
-    def decorated_collection
-      @decorated_collection ||= wrapped_collection.collect { |member| klass.decorate(member) }
-    end
-    alias_method :to_ary, :decorated_collection
-
-    def each(&blk)
-      to_ary.each(&blk)
-    end
-  end
 end
 

data/spec/unit/abstract_view_factory_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 require 'active_admin/abstract_view_factory'
 
@@ -13,20 +13,20 @@ describe ActiveAdmin::AbstractViewFactory do
     end
 
     it "should respond to :my_new_view_class" do
-      view_factory.respond_to? :my_new_view_class
+      expect(view_factory.respond_to? :my_new_view_class).to be true
     end
 
     it "should respond to :my_new_view_class=" do
-      view_factory.respond_to? :my_new_view_class=
+      expect(view_factory.respond_to? :my_new_view_class=).to be true
     end
 
     it "should generate a getter method" do
-      view_factory.my_new_view_class.should == view
+      expect(view_factory.my_new_view_class).to eq view
     end
 
     it "should be settable view a setter method" do
       view_factory.my_new_view_class = "Some Obj"
-      view_factory.my_new_view_class.should == "Some Obj"
+      expect(view_factory.my_new_view_class).to eq "Some Obj"
     end
   end
 
@@ -36,12 +36,12 @@ describe ActiveAdmin::AbstractViewFactory do
     end
 
     it "should be available through array syntax" do
-      view_factory[:my_new_view_class].should == view
+      expect(view_factory[:my_new_view_class]).to eq view
     end
 
     it "should be settable through array syntax" do
       view_factory[:my_new_view_class] = "My New View Class"
-      view_factory[:my_new_view_class].should == "My New View Class"
+      expect(view_factory[:my_new_view_class]).to eq "My New View Class"
     end
   end
 
@@ -50,12 +50,12 @@ describe ActiveAdmin::AbstractViewFactory do
       ActiveAdmin::AbstractViewFactory.register my_default_view_class: view
     end
     it "should generate a getter method" do
-      view_factory.my_default_view_class.should == view
+      expect(view_factory.my_default_view_class).to eq view
     end
     it "should be settable view a setter method and not change default" do
       view_factory.my_default_view_class = "Some Obj"
-      view_factory.my_default_view_class.should == "Some Obj"
-      view_factory.default_for(:my_default_view_class).should == view
+      expect(view_factory.my_default_view_class).to eq "Some Obj"
+      expect(view_factory.default_for(:my_default_view_class)).to eq view
     end
   end
 
@@ -71,7 +71,7 @@ describe ActiveAdmin::AbstractViewFactory do
 
     it "should use the subclass implementation" do
       factory = subclass.new
-      factory.my_subclassed_view.should == "From Subclass"
+      expect(factory.my_subclassed_view).to eq "From Subclass"
     end
   end
 

data/spec/unit/action_builder_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe 'defining new actions from registration blocks' do
 
@@ -24,13 +24,13 @@ describe 'defining new actions from registration blocks' do
       end
 
       it "should create a new public instance method" do
-        controller.public_instance_methods.collect(&:to_s).should include("comment")
+        expect(controller.public_instance_methods.collect(&:to_s)).to include("comment")
       end
       it "should add itself to the member actions config" do
-        controller.active_admin_config.member_actions.size.should == 1
+        expect(controller.active_admin_config.member_actions.size).to eq 1
       end
       it "should create a new named route" do
-        Rails.application.routes.url_helpers.methods.collect(&:to_s).should include("comment_admin_post_path")
+        expect(Rails.application.routes.url_helpers.methods.collect(&:to_s)).to include("comment_admin_post_path")
       end
     end
 
@@ -41,20 +41,20 @@ describe 'defining new actions from registration blocks' do
         end
       end
       it "should still generate a new empty action" do
-        controller.public_instance_methods.collect(&:to_s).should include("comment")
+        expect(controller.public_instance_methods.collect(&:to_s)).to include("comment")
       end
     end
 
     context "with :title" do
       let(:action!) do
         ActiveAdmin.register Post do
-          member_action :comment, :title => "My Awesome Comment"
+          member_action :comment, title: "My Awesome Comment"
         end
       end
 
       subject { find_before_filter controller, :comment }
 
-      it { should set_page_title_to "My Awesome Comment" }
+      it { is_expected.to set_page_title_to "My Awesome Comment", for: controller }
     end
   end
 
@@ -76,13 +76,13 @@ describe 'defining new actions from registration blocks' do
         end
       end
       it "should create a new public instance method" do
-        controller.public_instance_methods.collect(&:to_s).should include("comments")
+        expect(controller.public_instance_methods.collect(&:to_s)).to include("comments")
       end
       it "should add itself to the member actions config" do
-        controller.active_admin_config.collection_actions.size.should == 1
+        expect(controller.active_admin_config.collection_actions.size).to eq 1
       end
       it "should create a new named route" do
-        Rails.application.routes.url_helpers.methods.collect(&:to_s).should include("comments_admin_posts_path")
+        expect(Rails.application.routes.url_helpers.methods.collect(&:to_s)).to include("comments_admin_posts_path")
       end
     end
     context "without a block" do
@@ -92,34 +92,40 @@ describe 'defining new actions from registration blocks' do
         end
       end
       it "should still generate a new empty action" do
-        controller.public_instance_methods.collect(&:to_s).should include("comments")
+        expect(controller.public_instance_methods.collect(&:to_s)).to include("comments")
       end
     end
     context "with :title" do
       let(:action!) do
         ActiveAdmin.register Post do
-          collection_action :comments, :title => "My Awesome Comments"
+          collection_action :comments, title: "My Awesome Comments"
         end
       end
 
       subject { find_before_filter controller, :comments }
 
-      it { should set_page_title_to "My Awesome Comments" }
+      it { is_expected.to set_page_title_to "My Awesome Comments", for: controller }
     end
   end
 
   def find_before_filter(controller, action)
-    controller._process_action_callbacks.detect { |f| f.kind == :before && f.options[:only] == [action] }
+    finder = if ActiveAdmin::Dependency.rails? '>= 4.1.0'
+      ->c { c.kind == :before && c.instance_variable_get(:@if) == ["action_name == '#{action}'"] }
+    else
+      ->c { c.kind == :before && c.options[:only] == [action] }
+    end
+
+    controller._process_action_callbacks.detect &finder
   end
 
-  RSpec::Matchers.define :set_page_title_to do |expected|
+  RSpec::Matchers.define :set_page_title_to do |expected, options|
     match do |filter|
       filter.raw_filter.call
-      @actual = filter.klass.instance_variable_get(:@page_title)
-      @actual == expected
+      @actual = options[:for].instance_variable_get(:@page_title)
+      expect(@actual).to eq expected
     end
 
-    failure_message_for_should do |filter|
+    failure_message do |filter|
       message = "expected before_filter to set the @page_title to '#{expected}', but was '#{@actual}'"
     end
   end