godmin 0.10.3 → 0.11.0

data/test/lib/godmin/resolver_test.rb

@@ -28,6 +28,12 @@ module Godmin
       end
     end
 
+    def test_engine_resolver_template_paths_when_prefix_contains_godmin
+      namespaced_as "namespace" do
+        assert_equal [], EngineResolver.new("controller_name").template_paths("godmin/namespace/prefix", false)
+      end
+    end
+
     def test_godmin_resolver_template_paths
       namespaced_as "namespace" do
         assert_equal [

data/test/lib/godmin/resources/resource_service/batch_actions_test.rb

@@ -0,0 +1,45 @@
+require "test_helper"
+
+module Godmin
+  module ResourceService
+    class BatchActionsTest < ActiveSupport::TestCase
+      def setup
+        resource_class = Class.new do
+          def self.find(ids)
+            ids
+          end
+        end
+
+        @article_service = ArticleService.new(resource_class: resource_class)
+      end
+
+      def test_batch_action
+        assert @article_service.batch_action(:unpublish, [:foo, :bar])
+        assert_equal [:foo, :bar], @article_service.called_methods[:batch_actions][:unpublish]
+      end
+
+      def test_batch_action_when_it_does_not_exist
+        assert_not @article_service.batch_action(:foobar, [:foo, :bar])
+        assert_equal nil, @article_service.called_methods[:batch_actions][:foobar]
+      end
+
+      def test_batch_action_exists
+        assert @article_service.batch_action?(:unpublish)
+      end
+
+      def test_batch_action_does_not_exist
+        assert_not @article_service.batch_action?(:foobar)
+      end
+
+      def test_batch_action_map_with_default_options
+        expected_batch_action_map = { only: nil, except: nil, confirm: false }
+        assert_equal expected_batch_action_map, @article_service.batch_action_map[:unpublish]
+      end
+
+      def test_batch_action_map_with_custom_options
+        expected_batch_action_map = { only: :unpublished, except: :published, confirm: true }
+        assert_equal expected_batch_action_map, @article_service.batch_action_map[:publish]
+      end
+    end
+  end
+end

data/test/lib/godmin/resources/resource_service/filters_test.rb

@@ -0,0 +1,32 @@
+require "test_helper"
+
+module Godmin
+  module ResourceService
+    class FiltersTest < ActiveSupport::TestCase
+      def setup
+        @article_service = ArticleService.new
+      end
+
+      def test_calls_one_filter
+        @article_service.apply_filters({ title: "foobar" }, :resources)
+        assert_equal [:resources, "foobar"], @article_service.called_methods[:filters][:title]
+      end
+
+      def test_calls_multiple_filters
+        @article_service.apply_filters({ title: "foobar", country: "Sweden" }, :resources)
+        assert_equal [:resources, "foobar"], @article_service.called_methods[:filters][:title]
+        assert_equal [:resources, "Sweden"], @article_service.called_methods[:filters][:country]
+      end
+
+      def test_filter_map_with_default_options
+        expected_filter_map = { as: :string, option_text: "to_s", option_value: "id", collection: nil }
+        assert_equal expected_filter_map, @article_service.filter_map[:title]
+      end
+
+      def test_filter_map_with_custom_options
+        expected_filter_map = { as: :select, option_text: "to_s", option_value: "id", collection: %w(Sweden Canada) }
+        assert_equal expected_filter_map, @article_service.filter_map[:country]
+      end
+    end
+  end
+end

data/test/lib/godmin/resources/resource_service/ordering_test.rb

@@ -0,0 +1,37 @@
+require "test_helper"
+
+module Godmin
+  module ResourceService
+    class OrderingTest < ActiveSupport::TestCase
+      def setup
+        resource_class = Class.new do
+          def self.table_name
+            "articles"
+          end
+        end
+
+        @resources_class = Class.new do
+          attr_reader :order_param
+
+          def order(order_param)
+            @order_param = order_param
+          end
+        end
+
+        @article_service = ArticleService.new(resource_class: resource_class)
+      end
+
+      def test_apply_order
+        resources = @resources_class.new
+        @article_service.apply_order("title_desc", resources)
+        assert_equal "articles.title desc", resources.order_param
+      end
+
+      def test_apply_order_without_order
+        resources = @resources_class.new
+        @article_service.apply_order("", resources)
+        assert_equal nil, resources.order_param
+      end
+    end
+  end
+end

data/test/lib/godmin/resources/resource_service/pagination_test.rb

@@ -0,0 +1,31 @@
+require "test_helper"
+
+module Godmin
+  module ResourceService
+    class PaginationTest < ActiveSupport::TestCase
+      def setup
+        @article_service = ArticleService.new
+
+        resources_class = Class.new do
+          def limit(_limit_param)
+            self
+          end
+
+          def offset(_offset_param)
+            self
+          end
+        end
+
+        @resources = resources_class.new
+      end
+
+      def test_paginator_is_set_correctly
+        @article_service.apply_pagination(1, @resources)
+
+        assert_kind_of Paginator, @article_service.paginator
+        assert_equal   1,         @article_service.paginator.current_page
+        assert_equal   25,        @article_service.paginator.per_page
+      end
+    end
+  end
+end

data/test/lib/godmin/resources/resource_service/scopes_test.rb

@@ -0,0 +1,57 @@
+require "test_helper"
+
+module Godmin
+  module ResourceService
+    class ScopesTest < ActiveSupport::TestCase
+      class NoScopesService
+        include Godmin::Resources::ResourceService
+      end
+
+      def setup
+        @article_service = ArticleService.new
+      end
+
+      def test_returns_resources_when_no_scopes_are_defined
+        @foo_thing = NoScopesService.new
+        assert_equal :resources, @foo_thing.apply_scope("", :resources)
+      end
+
+      def test_calls_default_scope
+        @article_service.apply_scope("", :resources)
+        assert_equal :resources, @article_service.called_methods[:scopes][:unpublished]
+      end
+
+      def test_calls_non_default_scope
+        @article_service.apply_scope("published", :resources)
+        assert_equal :resources, @article_service.called_methods[:scopes][:published]
+      end
+
+      def test_calls_unimplemented_scope
+        assert_raises NotImplementedError do
+          @article_service.apply_scope("trashed", :resources)
+        end
+      end
+
+      def test_current_scope
+        @article_service.apply_scope("", :resources)
+        assert_equal "unpublished", @article_service.scope
+      end
+
+      def test_currently_scoped_by
+        @article_service.apply_scope("", :resources)
+        assert     @article_service.scoped_by?("unpublished")
+        assert_not @article_service.scoped_by?("published")
+      end
+
+      def test_scope_count
+        assert_equal 2, @article_service.scope_count("unpublished")
+        assert_equal 1, @article_service.scope_count("published")
+      end
+
+      def test_scope_map
+        assert_equal({ default: true }, @article_service.scope_map[:unpublished])
+        assert_equal({ default: false }, @article_service.scope_map[:published])
+      end
+    end
+  end
+end

data/test/lib/godmin/resources/resource_service_test.rb

@@ -0,0 +1,21 @@
+require "test_helper"
+
+module Godmin
+  class ResourceServiceTest < ActiveSupport::TestCase
+    def setup
+      @article_service = ArticleService.new
+    end
+
+    def test_resource_class
+      assert_equal Article, @article_service.resource_class
+    end
+
+    def test_attrs_for_index
+      assert_equal [:id, :title, :country], @article_service.attrs_for_index
+    end
+
+    def test_attrs_for_form
+      assert_equal [:id, :title, :country, :body], @article_service.attrs_for_form
+    end
+  end
+end

data/test/test_helper.rb

@@ -3,6 +3,11 @@ ENV["RAILS_ENV"] = "test"
 
 require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 require "rails/test_help"
+require "minitest/reporters"
+
+Minitest::Reporters.use! [Minitest::Reporters::DefaultReporter.new(
+  color: true
+)]
 
 Rails.backtrace_cleaner.remove_silencers!
 
@@ -19,3 +24,60 @@ def namespaced_as(namespace)
   yield
   Godmin.namespace = nil
 end
+
+# module Godmin
+  class Article
+  end
+
+  class ArticleService
+    include Godmin::Resources::ResourceService
+
+    mattr_accessor :called_methods do
+      { scopes: {}, filters: {}, batch_actions: {} }
+    end
+
+    attrs_for_index :id, :title, :country
+    attrs_for_form :id, :title, :country, :body
+
+    scope :unpublished, default: true
+    scope :published
+
+    filter :title
+    filter :country, as: :select, collection: %w(Sweden Canada)
+
+    batch_action :unpublish
+    batch_action :publish, confirm: true, only: :unpublished, except: :published
+
+    def resources_relation
+      [:foo, :bar, :baz]
+    end
+
+    def scope_unpublished(resources)
+      called_methods[:scopes][:unpublished] = resources
+      resources.slice(1, 3)
+    end
+
+    def scope_published(resources)
+      called_methods[:scopes][:published] = resources
+      resources.slice(0, 1)
+    end
+
+    def filter_title(resources, value)
+      called_methods[:filters][:title] = [resources, value]
+      resources
+    end
+
+    def filter_country(resources, value)
+      called_methods[:filters][:country] = [resources, value]
+      resources
+    end
+
+    def batch_action_unpublish(resources)
+      called_methods[:batch_actions][:unpublish] = resources
+    end
+
+    def batch_action_publish(resources)
+      called_methods[:batch_actions][:publish] = resources
+    end
+  end
+# end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: godmin
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.11.0
 platform: ruby
 authors:
 - Jens Ljungblad
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-18 00:00:00.000000000 Z
+date: 2015-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
@@ -122,14 +122,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -144,6 +144,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  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-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: pry
+  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'
 description: Godmin is an admin framework for Rails 4+
 email:
 - info@varvet.se
@@ -152,7 +194,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".hound.yml"
 - ".rubocop.yml"
 - ".travis.yml"
 - CHANGELOG.md
@@ -200,10 +241,11 @@ files:
 - lib/generators/godmin/policy/templates/policy.rb
 - lib/generators/godmin/resource/resource_generator.rb
 - lib/generators/godmin/resource/templates/resource_controller.rb
+- lib/generators/godmin/resource/templates/resource_service.rb
 - lib/godmin.rb
-- lib/godmin/application.rb
+- lib/godmin/application_controller.rb
 - lib/godmin/authentication.rb
-- lib/godmin/authentication/sessions.rb
+- lib/godmin/authentication/sessions_controller.rb
 - lib/godmin/authentication/user.rb
 - lib/godmin/authorization.rb
 - lib/godmin/authorization/policy.rb
@@ -217,14 +259,16 @@ files:
 - lib/godmin/helpers/forms.rb
 - lib/godmin/helpers/tables.rb
 - lib/godmin/helpers/translations.rb
+- lib/godmin/paginator.rb
 - lib/godmin/rails.rb
 - lib/godmin/resolver.rb
-- lib/godmin/resource.rb
-- lib/godmin/resource/batch_actions.rb
-- lib/godmin/resource/filters.rb
-- lib/godmin/resource/ordering.rb
-- lib/godmin/resource/pagination.rb
-- lib/godmin/resource/scopes.rb
+- lib/godmin/resources/resource_controller.rb
+- lib/godmin/resources/resource_service.rb
+- lib/godmin/resources/resource_service/batch_actions.rb
+- lib/godmin/resources/resource_service/filters.rb
+- lib/godmin/resources/resource_service/ordering.rb
+- lib/godmin/resources/resource_service/pagination.rb
+- lib/godmin/resources/resource_service/scopes.rb
 - lib/godmin/version.rb
 - lib/tasks/godmin_tasks.rake
 - screenshot.png
@@ -260,18 +304,25 @@ files:
 - test/dummy/config/initializers/wrap_parameters.rb
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
-- test/dummy/db/test.sqlite3
+- test/dummy/db/schema.rb
 - test/dummy/lib/assets/.keep
 - test/dummy/log/.keep
-- test/dummy/log/development.log
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
 - test/godmin_test.rb
 - test/integration/navigation_test.rb
+- test/lib/godmin/helpers/filters_test.rb
+- test/lib/godmin/paginator_test.rb
 - test/lib/godmin/policy_finder_test.rb
 - test/lib/godmin/resolver_test.rb
+- test/lib/godmin/resources/resource_service/batch_actions_test.rb
+- test/lib/godmin/resources/resource_service/filters_test.rb
+- test/lib/godmin/resources/resource_service/ordering_test.rb
+- test/lib/godmin/resources/resource_service/pagination_test.rb
+- test/lib/godmin/resources/resource_service/scopes_test.rb
+- test/lib/godmin/resources/resource_service_test.rb
 - test/test_helper.rb
 - vendor/assets/javascripts/bootstrap-datetimepicker.js
 - vendor/assets/stylesheets/bootstrap-datetimepicker.css
@@ -332,17 +383,24 @@ test_files:
 - test/dummy/config/initializers/wrap_parameters.rb
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
-- test/dummy/db/test.sqlite3
+- test/dummy/db/schema.rb
 - test/dummy/lib/assets/.keep
 - test/dummy/log/.keep
-- test/dummy/log/development.log
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
 - test/godmin_test.rb
 - test/integration/navigation_test.rb
+- test/lib/godmin/helpers/filters_test.rb
+- test/lib/godmin/paginator_test.rb
 - test/lib/godmin/policy_finder_test.rb
 - test/lib/godmin/resolver_test.rb
+- test/lib/godmin/resources/resource_service/batch_actions_test.rb
+- test/lib/godmin/resources/resource_service/filters_test.rb
+- test/lib/godmin/resources/resource_service/ordering_test.rb
+- test/lib/godmin/resources/resource_service/pagination_test.rb
+- test/lib/godmin/resources/resource_service/scopes_test.rb
+- test/lib/godmin/resources/resource_service_test.rb
 - test/test_helper.rb
 has_rdoc: