godmin 1.0.0 → 1.1.0

data/test/dummy/app/controllers/articles_controller.rb

@@ -1,3 +1,13 @@
 class ArticlesController < ApplicationController
   include Godmin::Resources::ResourceController
+
+  private
+
+  def redirect_after_batch_action_publish
+    articles_path(scope: :published)
+  end
+
+  def redirect_after_batch_action_unpublish
+    articles_path(scope: :unpublished)
+  end
 end

data/test/dummy/app/services/article_service.rb

@@ -5,5 +5,36 @@ class ArticleService
   attrs_for_show :id, :title, :body, :published
   attrs_for_form :title, :body, :published
 
+  scope :unpublished
+  scope :published
+
+  def scope_unpublished(articles)
+    articles.where(published: false)
+  end
+
+  def scope_published(articles)
+    articles.where(published: true)
+  end
+
   filter :title
+
+  def filter_title(articles, value)
+    articles.where(title: value)
+  end
+
+  batch_action :destroy
+  batch_action :publish
+  batch_action :unpublish
+
+  def batch_action_destroy(articles)
+    articles.destroy_all
+  end
+
+  def batch_action_publish(articles)
+    articles.update_all(published: true)
+  end
+
+  def batch_action_unpublish(articles)
+    articles.update_all(published: false)
+  end
 end

data/test/dummy/app/services/secret_article_service.rb

@@ -1,9 +1,2 @@
 class SecretArticleService < ArticleService
-  include Godmin::Resources::ResourceService
-
-  attrs_for_index :id, :title, :published, :created_at
-  attrs_for_show :id, :title, :body, :published
-  attrs_for_form :title, :body, :published
-
-  filter :title
 end

data/test/dummy/db/migrate/20150717121532_create_articles.rb

@@ -3,7 +3,7 @@ class CreateArticles < ActiveRecord::Migration
     create_table :articles do |t|
       t.string :title
       t.text :body
-      t.boolean :published
+      t.boolean :published, default: false
 
       t.timestamps null: false
     end

data/test/dummy/db/schema.rb

@@ -23,9 +23,9 @@ ActiveRecord::Schema.define(version: 20150907133753) do
   create_table "articles", force: :cascade do |t|
     t.string   "title"
     t.text     "body"
-    t.boolean  "published"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.boolean  "published",  default: false
+    t.datetime "created_at",                 null: false
+    t.datetime "updated_at",                 null: false
   end
 
 end

data/test/integration/batch_actions_test.rb

@@ -0,0 +1,51 @@
+require "test_helper"
+
+class BatchActionsTest < ActionDispatch::IntegrationTest
+  def test_batch_action
+    Capybara.current_driver = Capybara.javascript_driver
+
+    Article.create! title: "foo"
+    Article.create! title: "bar"
+
+    visit articles_path
+
+    all("[data-behavior~=batch-actions-checkbox]").each(&:click)
+    within "#actions" do
+      click_link "Destroy"
+    end
+
+    assert_equal 200, page.status_code
+    assert page.has_no_content? "foo"
+    assert page.has_no_content? "bar"
+
+    Capybara.use_default_driver
+  end
+
+  def test_batch_action_redirect
+    Capybara.current_driver = Capybara.javascript_driver
+
+    Article.create! title: "foo"
+
+    visit articles_path
+
+    all("[data-behavior~=batch-actions-checkbox]").each(&:click)
+    within "#actions" do
+      click_link "Publish"
+    end
+
+    assert_equal articles_path(scope: :published), current_path_with_params
+    assert_equal 200, page.status_code
+
+    Capybara.use_default_driver
+  end
+
+  private
+
+  def current_path_with_params
+    "#{current_uri.path}?#{current_uri.query}"
+  end
+
+  def current_uri
+    URI.parse(page.current_url)
+  end
+end

data/test/integration/filters_test.rb

@@ -0,0 +1,21 @@
+require "test_helper"
+
+class FiltersTest < ActionDispatch::IntegrationTest
+  def test_filter
+    Article.create! title: "foo"
+    Article.create! title: "bar"
+
+    visit articles_path
+
+    fill_in "Title", with: "foo"
+    click_button "Filter"
+    assert_equal 200, page.status_code
+    assert page.has_content? "foo"
+    assert page.has_no_content? "bar"
+
+    click_link "Clear filter"
+    assert_equal 200, page.status_code
+    assert page.has_content? "foo"
+    assert page.has_content? "bar"
+  end
+end

data/test/integration/scopes_test.rb

@@ -0,0 +1,23 @@
+require "test_helper"
+
+class ScopesTest < ActionDispatch::IntegrationTest
+  def test_scopes
+    Article.create! title: "foo"
+    Article.create! title: "bar"
+    Article.create! title: "baz", published: true
+
+    visit articles_path
+
+    assert page.has_content? "foo"
+    assert page.has_content? "bar"
+    assert page.has_no_content? "baz"
+
+    within "#scopes" do
+      click_link "Published"
+    end
+
+    assert page.has_no_content? "foo"
+    assert page.has_no_content? "bar"
+    assert page.has_content? "baz"
+  end
+end

data/test/lib/godmin/resolver_test.rb

@@ -17,23 +17,37 @@ module Godmin
       @engine_wrapper_2 = EngineWrapper.new(Admin::Controller)
     end
 
+    def test_engine_resolver_when_not_namespaced
+      resolver = EngineResolver.new("articles", @engine_wrapper_1)
+
+      assert_equal [
+        "resource"
+      ], resolver.template_paths("articles")
+    end
+
+    def test_engine_resolver_when_namespaced
+      resolver = EngineResolver.new("godmin/resolver_test/admin/articles", @engine_wrapper_2)
+
+      assert_equal [
+        "godmin/resolver_test/admin/resource"
+      ], resolver.template_paths("godmin/resolver_test/admin/articles")
+    end
+
     def test_godmin_resolver_when_not_namespaced
-      resolver = Resolver.new("articles", @engine_wrapper_1)
+      resolver = GodminResolver.new("articles", @engine_wrapper_1)
 
       assert_equal [
-        File.join(@engine_wrapper_1.root, "app/views/resource"),
-        File.join(Godmin::Engine.root, "app/views/godmin/articles"),
-        File.join(Godmin::Engine.root, "app/views/godmin/resource")
+        "articles",
+        "resource"
       ], resolver.template_paths("articles")
     end
 
     def test_godmin_resolver_when_namespaced
-      resolver = Resolver.new("godmin/resolver_test/admin/articles", @engine_wrapper_2)
+      resolver = GodminResolver.new("godmin/resolver_test/admin/articles", @engine_wrapper_2)
 
       assert_equal [
-        File.join(@engine_wrapper_2.root, "app/views/godmin/resolver_test/admin/resource"),
-        File.join(Godmin::Engine.root, "app/views/godmin/articles"),
-        File.join(Godmin::Engine.root, "app/views/godmin/resource")
+        "articles",
+        "resource"
       ], resolver.template_paths("godmin/resolver_test/admin/articles")
     end
   end

data/test/test_helper.rb

@@ -4,15 +4,16 @@ CodeClimate::TestReporter.start
 # Configure Rails Environment
 ENV["RAILS_ENV"] = "test"
 
-require File.expand_path("../dummy/config/environment.rb",  __FILE__)
+require File.expand_path("../dummy/config/environment.rb", __FILE__)
 require "rails/test_help"
 require "capybara/rails"
+require "capybara/poltergeist"
 require "minitest/reporters"
 require "pry"
 
 # TODO: what to call these?
-require File.expand_path("../fakes/article.rb",  __FILE__)
-require File.expand_path("../fakes/article_service.rb",  __FILE__)
+require File.expand_path("../fakes/article.rb", __FILE__)
+require File.expand_path("../fakes/article_service.rb", __FILE__)
 
 Minitest::Reporters.use! [Minitest::Reporters::DefaultReporter.new(
   color: true
@@ -28,6 +29,21 @@ if ActiveSupport::TestCase.method_defined?(:fixture_path=)
   ActiveSupport::TestCase.fixture_path = File.expand_path("../fixtures", __FILE__)
 end
 
+class ActiveRecord::Base
+  mattr_accessor :shared_connection
+  @@shared_connection = nil
+
+  def self.connection
+    @@shared_connection || retrieve_connection
+  end
+end
+
+# Forces all threads to share the same connection. This works on
+# Capybara because it starts the web server in a thread.
+ActiveRecord::Base.shared_connection = ActiveRecord::Base.connection
+
+Capybara.javascript_driver = :poltergeist
+
 class ActionDispatch::IntegrationTest
   include Capybara::DSL
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: godmin
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Jens Ljungblad
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-13 00:00:00.000000000 Z
+date: 2015-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
@@ -186,6 +186,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-reporters
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -201,7 +215,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest-reporters
+  name: poltergeist
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -294,6 +308,7 @@ files:
 - app/views/layouts/godmin/application.html.erb
 - app/views/layouts/godmin/login.html.erb
 - config/locales/en.yml
+- config/locales/pt-BR.yml
 - config/locales/sv.yml
 - config/routes.rb
 - godmin.gemspec
@@ -327,6 +342,7 @@ files:
 - lib/godmin/paginator.rb
 - lib/godmin/resolver.rb
 - lib/godmin/resources/resource_controller.rb
+- lib/godmin/resources/resource_controller/batch_actions.rb
 - lib/godmin/resources/resource_service.rb
 - lib/godmin/resources/resource_service/batch_actions.rb
 - lib/godmin/resources/resource_service/filters.rb
@@ -410,10 +426,13 @@ files:
 - test/dummy/public/favicon.ico
 - test/fakes/article.rb
 - test/fakes/article_service.rb
+- test/integration/batch_actions_test.rb
 - test/integration/column_ordering_test.rb
 - test/integration/column_overriding_test.rb
 - test/integration/filter_overriding_test.rb
+- test/integration/filters_test.rb
 - test/integration/partial_overriding_test.rb
+- test/integration/scopes_test.rb
 - test/integration/sign_in_test.rb
 - test/integration/template_overriding_test.rb
 - test/integration/welcome_test.rb
@@ -529,10 +548,13 @@ test_files:
 - test/dummy/public/favicon.ico
 - test/fakes/article.rb
 - test/fakes/article_service.rb
+- test/integration/batch_actions_test.rb
 - test/integration/column_ordering_test.rb
 - test/integration/column_overriding_test.rb
 - test/integration/filter_overriding_test.rb
+- test/integration/filters_test.rb
 - test/integration/partial_overriding_test.rb
+- test/integration/scopes_test.rb
 - test/integration/sign_in_test.rb
 - test/integration/template_overriding_test.rb
 - test/integration/welcome_test.rb