rails-add_ons 2.0.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3db1c2410a1e776a8d8678c5a6d1088d24603da0
-  data.tar.gz: 2a864f0367a54fee3f7db6d3d4b406d58ea09986
+  metadata.gz: 38dfc7296961120d4480e74f0e8ae4f37639d5b4
+  data.tar.gz: dc9461478a926c1b05b3a4d58224e7a10e39e5e4
 SHA512:
-  metadata.gz: 8b123f820904f730d11c0e25bef48dc37374726b9dd70e5c238e7bb29fc93812e78e62bbe5f99a3e163326bf66342d6c62b7ec68a9d333751f9d8b8882be01eb
-  data.tar.gz: fd2501a293c35b191add5e2a08f82545f66ff84fbed6d0186fa60263023d6c95a93a4ae076fc7ca60548014d1d8dd9136ef48ca2deccf27240cd1ed38550c560
+  metadata.gz: 368ee1a7318c3c181c362280a8042ba49a8e53678aff8af2506ab97e648fb9f157c7d580bb64d281672205a98565dff37b638f263ca98df6b8c8835d5654202d
+  data.tar.gz: 7d75f4bcda5f292c1cbec5952e7f0b480c24bafedeba2a4c72928b2d665890ee4095cd82a3c19f7280d57df26808a1cc936992be733ce7c8127d379c44f24655

data/app/components/component/collection_table.rb

@@ -1,5 +1,7 @@
 module Component
   class CollectionTable < Base
+    include AwesomeNestedSetConcern
+
     SIZE_MAP = {
       default: nil,
       small:   :sm
@@ -13,18 +15,23 @@ module Component
     end
 
     def column(name, options = {}, &block)
+      options.reverse_merge!(render_as: :default)
       options.reverse_merge!(block: block) if block_given?
       @columns[name] = options
     end
+    def timestamp(name, options = {}, &block)
+      options.reverse_merge!(render_as: :timestamp, format: nil)
+      column(name, options, &block)
+    end
 
     def timestamps(options = {})
-      column(:created_at, options)
-      column(:updated_at, options)
+      timestamp(:created_at, options)
+      timestamp(:updated_at, options)
     end
 
     def association(name, options = {}, &block)
-      options.reverse_merge!(block: block) if block_given?
-      @columns[name] = options
+      options.reverse_merge!(render_as: :association)
+      column(name, options, &block)
     end
 
     private
@@ -76,5 +83,9 @@ module Component
       classes << "table-#{size}"    if size.present?
       classes
     end
+
+    def t(key, options = {})
+      I18n.t("#{self.class.name.underscore.gsub('/', '.')}#{key}", options)
+    end
   end
 end

data/app/components/component/resource_table.rb

@@ -1,5 +1,7 @@
 module Component
   class ResourceTable < Base
+    attr_reader :resource
+
     def initialize(*args)
       super
       @rows           = {}
@@ -8,18 +10,24 @@ module Component
     end
 
     def row(name, options = {}, &block)
+      options.reverse_merge!(render_as: :default)
       options.reverse_merge!(block: block) if block_given?
       @rows[name] = options
     end
 
+    def timestamp(name, options = {}, &block)
+      options.reverse_merge!(render_as: :timestamp, format: nil)
+      row(name, options, &block)
+    end
+
     def timestamps(options = {})
-      row(:created_at, options)
-      row(:updated_at, options)
+      timestamp(:created_at, options)
+      timestamp(:updated_at, options)
     end
 
     def association(name, options = {}, &block)
-      options.reverse_merge!(block: block) if block_given?
-      @rows[name] = options
+      options.reverse_merge!(render_as: :association)
+      row(name, options, &block)
     end
 
     private

data/app/concerns/component/collection_table/awesome_nested_set_concern.rb

@@ -0,0 +1,10 @@
+module Component
+  module CollectionTable::AwesomeNestedSetConcern
+    extend ActiveSupport::Concern
+
+    def awesome_nested_set_actions(name, options = {}, &block)
+      options.reverse_merge!(render_as: :awesome_nested_set, scope: nil, title: t('.column_titles.awesome_nested_set'))
+      column(name, options, &block)
+    end
+  end
+end

data/app/concerns/resources_controller/sorting.rb

@@ -12,12 +12,7 @@ module ResourcesController::Sorting
       end
 
       sort_direction = (params[:sort_direction] || :asc)
-
-      if Rails.version < '4.0.0'
-        base_scope.order("#{params[:sort_by]} #{sort_direction}")
-      else
-        base_scope.order(params[:sort_by] => sort_direction)
-      end
+      base_scope.reorder("#{params[:sort_by]} #{sort_direction}")
     else
       base_scope
     end

data/app/views/component/_collection_table.haml

@@ -26,7 +26,4 @@
             %td{ td_options }= options[:block].call(resource)
           - else
             %td{ td_options }
-              - if options[:label_method].present?
-                = resource.send(name).send(options[:label_method])
-              - else
-                = resource.send(name)
+              = render partial: "component/table/body_cells/#{options[:render_as]}", locals: { resource: resource, name: name, options: options }

data/app/views/component/_resource_table.haml

@@ -12,7 +12,4 @@
           = options[:block].call(resource)
       - else
         %td
-          - if options[:label_method].present?
-            = resource.send(name).send(options[:label_method])
-          - else
-            = resource.send(name)
+          = render partial: "component/table/body_cells/#{options[:render_as]}", locals: { resource: resource, name: name, options: options }

data/app/views/component/table/body_cells/_association.haml

@@ -0,0 +1,14 @@
+- label = if options[:label_method].present?
+  - resource.send(name).send(options[:label_method])
+- else
+  - resource.send(name)
+- link_to = options[:link_to]
+- case link_to
+  - when Proc
+    = link_to(label, link_to.call(resource))
+  - when String
+    = link_to(label, link_to)
+  - when Symbol
+    = link_to(label, send(link_to))
+  - when nil
+    = label

data/app/views/component/table/body_cells/_awesome_nested_set.haml

@@ -0,0 +1,9 @@
+:ruby
+  data_attributes = {
+    'awesome-nested-set-item':                true,
+    'awesome-nested-set-item-uid':            resource.to_param,
+    'awesome-nested-set-item-on-drop-target': url_for([:reposition, resource])
+  }
+  data_attributes['awesome-nested-set-item-scope'] = scope.call(model) if options[:scope].present?
+%span.btn.btn-xs.btn-default.awesome-nested-set-item{ data: data_attributes }
+  %span.glyphicon.glyphicon-sort

data/app/views/component/table/body_cells/_default.haml

@@ -0,0 +1,4 @@
+- if options[:label_method].present?
+  = resource.send(name).send(options[:label_method])
+- else
+  = resource.send(name)

data/app/views/component/table/body_cells/_timestamp.haml

@@ -0,0 +1,7 @@
+- if options[:label_method].present?
+  = resource.send(name).send(options[:label_method])
+- else
+  - if (value = resource.send(name)).present? && options[:format].present?
+    = I18n.l(value, format: options[:format])
+  - else
+    = value

data/config/locales/de.yml

@@ -3,6 +3,8 @@ de:
     i18n: Sprache
   component:
     collection_table:
+      column_titles:
+        awesome_nested_set: Sortieren
       delete: Löschen
       edit: Bearbeiten
       show: Anzeigen

data/lib/rails/add_ons/shoulda/matchers/implement_create_action_matcher.rb

@@ -0,0 +1,125 @@
+module Rails
+  module AddOns
+    module Shoulda
+      module Matchers
+        # Example:
+        #
+        #    RSpec.describe '/posts', type: :feature do
+        #      it {
+        #        expect(subject).to implement_create_action(self)
+        #          .for(Post)
+        #          .within_form('#new_post') {
+        #            fill_in 'post[title]', with: 'My first post'
+        #          }
+        #          .increasing{ |resource_class| resource_class.count }.by(1)
+        #      }
+        #    end
+        #
+        def implement_create_action(spec)
+          ImplementCreateActionMatcher.new(spec)
+        end
+
+        class ImplementCreateActionMatcher
+          include RSpec::Matchers
+
+          def initialize(spec)
+            @spec = spec
+          end
+
+          def id(id)
+            @id = id
+            self
+          end
+
+          def increasing(&block)
+            @block = block
+            self
+          end
+
+          def by(expected_increase)
+            @expected_increase = expected_increase
+            self
+          end
+          
+          # Resource class that will be created
+          def for(resource_class)
+            @resource_class = resource_class
+            self
+          end
+
+          # Specifies the form css id to fill to create the resource.
+          def within_form(id, &block)
+            @form_id = id
+            @form_block = block
+            self
+          end
+
+          def matches?(base_path)
+            @base_path = base_path
+            @new_path = "#{@base_path}/new"
+
+            @spec.visit(@new_path)
+
+            @before_count = @block.call(@resource_class)
+            @spec.within(@form_id) do
+              @form_block.call
+              @spec.find('input[name="commit"]').click
+            end
+            @after_count = @block.call(@resource_class)
+
+            has_correct_status_code && has_correct_current_path && has_increased_resource_count
+          end
+
+          def created_resource
+            @created_resource ||= @resource_class.first
+          end
+
+          def expected_path
+            @expected_path ||= "#{@base_path}/#{created_resource.to_param}"
+          end
+
+          def has_correct_status_code
+            if @spec.status_code == 200
+              true
+            else
+              @error = "Wrong status code [#{@spec.status_code}] instead of [200]"
+              false
+            end
+          end
+
+          def has_increased_resource_count
+            if (@before_count + @after_count) == @expected_increase
+              true
+            else
+              @error = "Did not increase by expected [#{@expected_increase}] but by [#{@before_count + @after_count}]"
+              false
+            end
+          end
+
+          def has_correct_current_path
+            if @spec.current_path == expected_path
+              true
+            else
+              @error = "Wrong current path [#{@spec.current_path}] instead of [#{expected_path}]"
+              false
+            end
+          end
+
+          def failure_message
+            "Should expose create action on #{@new_path}. Error: #{@error}"
+          end
+
+          def failure_message_when_negated
+            "Should not expose create action on #{@new_path}. Error: #{@error}"
+          end
+
+          alias negative_failure_message failure_message_when_negated
+
+          def description
+            "expose create action on #{@new_path}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rails/add_ons/shoulda/matchers/implement_delete_action_matcher.rb

@@ -0,0 +1,111 @@
+module Rails
+  module AddOns
+    module Shoulda
+      module Matchers
+        # Example:
+        #
+        #     RSpec.describe '/posts', type: :feature do
+        #       let(:resource_class) { Post }
+        #       let(:resource)       { create(:post) }
+        #     
+        #       it { 
+        #        expect(subject).to implement_delete_action(self)
+        #          .for(resource)
+        #          .reducing{ resource_class.count }.by(1)
+        #       }
+        #     end
+        #
+        def implement_delete_action(spec)
+          ImplementDeleteActionMatcher.new(spec)
+        end
+
+        class ImplementDeleteActionMatcher
+          include RSpec::Matchers
+
+          def initialize(spec)
+            @spec = spec
+          end
+
+          # Resource that will be deleted
+          def for(resource)
+            @resource = resource
+            self
+          end
+
+          def id
+            @resource.to_param
+          end
+
+          def reducing(&block)
+            @block = block
+            self
+          end
+
+          def by(expected_reduction)
+            @expected_reduction = expected_reduction
+            self
+          end
+
+          def matches?(base_path)
+            @base_path = base_path
+            @expected_path = @base_path
+            @show_path = "#{@base_path}/#{id}"
+
+            @spec.visit(@show_path)
+
+            @before_delete_count = @block.call
+            @spec.click_link(delete_link_text)
+            @after_delete_count = @block.call
+
+            has_correct_status_code && has_correct_current_path && has_reduced_resource_count
+          end
+
+          def delete_link_text
+            @delete_link_text ||= I18n.t('resources_controller.base.show_actions.delete')
+          end
+
+          def has_correct_status_code
+            if @spec.status_code == 200
+              true
+            else
+              @error = "Wrong status code [#{@spec.status_code}] instead of [200]"
+              false
+            end
+          end
+
+          def has_reduced_resource_count
+            if (@before_delete_count - @after_delete_count) == @expected_reduction
+              true
+            else
+              @error = "Did not reduce by expected [#{@expected_reduction}] but by [#{@before_delete_count - @after_delete_count}]"
+              false
+            end
+          end
+
+          def has_correct_current_path
+            if @spec.current_path == @expected_path
+              true
+            else
+              @error = "Wrong current path [#{@spec.current_path}] instead of [#{@expected_path}]"
+              false
+            end
+          end
+
+          def failure_message
+            "Should expose delete action on #{@base_path} [#{delete_link_text}], clicking on #{delete_link_text}. Error: #{@error}"
+          end
+
+          def failure_message_when_negated
+            "Should not expose delete action on #{@base_path} [#{delete_link_text}], clicking on #{delete_link_text}. Error: #{@error}"
+          end
+
+          alias negative_failure_message failure_message_when_negated
+
+          def description
+            "expose delete action on #{@base_path} [#{delete_link_text}]"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rails/add_ons/shoulda/matchers/implement_index_action_matcher.rb

@@ -0,0 +1,65 @@
+module Rails
+  module AddOns
+    module Shoulda
+      module Matchers
+        # Example:
+        #
+        #    RSpec.describe '/posts', type: :feature do
+        #      before(:each) { create_list(:post, 3) }
+        #
+        #      it { expect(subject).to implement_index_action(self) }
+        #    end
+        #
+        def implement_index_action(spec)
+          ImplementIndexActionMatcher.new(spec)
+        end
+
+        class ImplementIndexActionMatcher
+          include RSpec::Matchers
+
+          def initialize(spec)
+            @spec = spec
+          end
+
+          def matches?(base_path)
+            @base_path = base_path
+            @spec.visit(@base_path)
+            has_correct_status_code && has_correct_current_path
+          end
+
+          def has_correct_status_code
+            if @spec.status_code == 200
+              true
+            else
+              @error = "Wrong status code [#{@spec.status_code}] instead of [200]"
+              false
+            end
+          end
+
+          def has_correct_current_path
+            if @spec.current_path == @base_path
+              true
+            else
+              @error = "Wrong current path [#{@spec.current_path}] instead of [#{@base_path}]"
+              false
+            end
+          end
+
+          def failure_message
+            "Should expose index action on #{@base_path}. Error: #{@error}"
+          end
+
+          def failure_message_when_negated
+            "Should not expose index action on #{@base_path}. Error: #{@error}"
+          end
+
+          alias negative_failure_message failure_message_when_negated
+
+          def description
+            "expose index action on #{@base_path}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rails/add_ons/shoulda/matchers/implement_show_action_matcher.rb

@@ -0,0 +1,78 @@
+module Rails
+  module AddOns
+    module Shoulda
+      module Matchers
+        # Example:
+        #
+        #    RSpec.describe '/posts', type: :feature do
+        #      let(:resource)       { create(:post) }
+        #     
+        #       it { expect(subject).to implement_show_action(self).for(resource) }
+        #    end
+        #
+        def implement_show_action(spec)
+          ImplementShowActionMatcher.new(spec)
+        end
+
+        class ImplementShowActionMatcher
+          include RSpec::Matchers
+
+          def initialize(spec)
+            @spec = spec
+          end
+
+          # Resource that will be updated
+          def for(resource)
+            @resource = resource
+            self
+          end
+
+          def id
+            @resource.to_param
+          end
+
+          def matches?(base_path)
+            @base_path     = base_path
+            @expected_path = "#{@base_path}/#{id}"
+
+            @spec.visit(@expected_path)
+            
+            has_correct_status_code && has_correct_current_path
+          end
+
+          def has_correct_status_code
+            if @spec.status_code == 200
+              true
+            else
+              @error = "Wrong status code [#{@spec.status_code}] instead of [200]"
+              false
+            end
+          end
+
+          def has_correct_current_path
+            if @spec.current_path == @expected_path
+              true
+            else
+              @error = "Wrong current path [#{@spec.current_path}] instead of [#{@expected_path}]"
+              false
+            end
+          end
+
+          def failure_message
+            "Should expose show action on #{@base_path}. Error: #{@error}"
+          end
+
+          def failure_message_when_negated
+            "Should not expose show action on #{@base_path}. Error: #{@error}"
+          end
+
+          alias negative_failure_message failure_message_when_negated
+
+          def description
+            "expose show action on #{@base_path}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rails/add_ons/shoulda/matchers/implement_update_action_matcher.rb

@@ -0,0 +1,141 @@
+module Rails
+  module AddOns
+    module Shoulda
+      module Matchers
+        # Example:
+        #
+        #    RSpec.describe '/posts', type: :feature do
+        #      let(:post) { create(:post) }
+        #      it {
+        #        expect(subject).to implement_update_action(self)
+        #          .for(post)
+        #          .within_form('.edit_post') {
+        #            fill_in 'post[title]', with: 'New title'
+        #            fill_in 'post[body]',  with: 'New body'
+        #          }
+        #          .updating{ |resource| resource.attributes }
+        #          .from(post.attributes)
+        #          .to({ 'title' => 'New title', 'body' => 'New body' })
+        #      }
+        #    end
+        #
+        def implement_update_action(spec)
+          ImplementUpdateActionMatcher.new(spec)
+        end
+
+        class ImplementUpdateActionMatcher
+          include RSpec::Matchers
+
+          def initialize(spec)
+            @spec = spec
+          end
+
+          # Resource that will be updated
+          def for(resource)
+            @resource = resource
+            self
+          end
+
+          def from(attributes)
+            @expected_before_attributes = attributes
+            self
+          end
+
+          def to(attributes)
+            @expected_after_attributes = attributes
+            self
+          end
+
+          # Specifies the form css id to fill to create the resource.
+          def within_form(id, &block)
+            @form_id = id
+            @form_block = block
+            self
+          end
+
+          def updating(&block)
+            @block = block
+            self
+          end
+
+          def id
+            @resource.to_param
+          end
+
+          def matches?(base_path)
+            @base_path = base_path
+            @show_path = "#{@base_path}/#{id}"
+            @edit_path = "#{@base_path}/#{id}/edit"
+
+            @expected_path = @show_path
+
+            @spec.visit(@edit_path)
+
+            return unless has_correct_attributes_before if @expected_before_attributes.present?
+
+            @spec.within(@form_id) do
+              @form_block.call
+              @spec.find('input[name="commit"]').click
+            end
+                        
+            @resource.reload
+
+            has_correct_status_code && has_correct_current_path && has_correct_attributes_after
+          end
+
+          def has_correct_status_code
+            if @spec.status_code == 200
+              true
+            else
+              @error = "Wrong status code [#{@spec.status_code}] instead of [200]"
+              false
+            end
+          end
+
+          def has_correct_current_path
+            if @spec.current_path == @expected_path
+              true
+            else
+              @error = "Wrong current path [#{@spec.current_path}] instead of [#{@expected_path}]"
+              false
+            end
+          end
+
+          def has_correct_attributes_before
+            sliced_resource_attributes = @resource.attributes.with_indifferent_access.slice(*@expected_before_attributes.keys)
+            if @expected_before_attributes == sliced_resource_attributes
+              true
+            else
+              @error = "Attributes before update [#{sliced_resource_attributes}] did not match expected attributes [#{@expected_before_attributes}]"
+              false
+            end
+          end
+
+          def has_correct_attributes_after
+            sliced_resource_attributes = @resource.attributes.with_indifferent_access.slice(*@expected_after_attributes.keys)
+            if @expected_after_attributes == sliced_resource_attributes
+              true
+            else
+              @error = "Attributes after update [#{sliced_resource_attributes}] did not match expected attributes [#{@expected_after_attributes}]"
+              false
+            end
+          end
+
+          def failure_message
+            "Should expose update action on #{@edit_path}. Error: #{@error}"
+          end
+
+          def failure_message_when_negated
+            "Should not expose update action on #{@edit_path}. Error: #{@error}"
+          end
+
+          alias negative_failure_message failure_message_when_negated
+
+          def description
+            "expose update action on #{@edit_path}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rails/add_ons/shoulda/matchers.rb

@@ -0,0 +1,22 @@
+require 'rails/add_ons/shoulda/matchers/implement_create_action_matcher'
+require 'rails/add_ons/shoulda/matchers/implement_show_action_matcher'
+require 'rails/add_ons/shoulda/matchers/implement_update_action_matcher'
+require 'rails/add_ons/shoulda/matchers/implement_delete_action_matcher'
+require 'rails/add_ons/shoulda/matchers/implement_index_action_matcher'
+
+module Rails
+  module AddOns
+    module Shoulda
+      # Adding the matchers to rspec:
+      #
+      #     # spec/rails_helper or supoprt/rails-add_ons.rb
+      #     require 'rails/add_ons/shoulda/matchers'
+      #     
+      #     RSpec.configure do |config|
+      #       config.include Rails::AddOns::Shoulda::Matchers, type: :feature
+      #     end
+      module Matchers
+      end
+    end
+  end
+end

data/lib/rails/add_ons/version.rb

@@ -1,5 +1,5 @@
 module Rails
   module AddOns
-    VERSION = '2.0.2'.freeze
+    VERSION = '2.1.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-add_ons
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-23 00:00:00.000000000 Z
+date: 2018-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -190,6 +190,7 @@ files:
 - app/components/component/collection_table.rb
 - app/components/component/resource_table.rb
 - app/concerns/api_controller_concerns/exception_handling.rb
+- app/concerns/component/collection_table/awesome_nested_set_concern.rb
 - app/concerns/controller/query_conditions.rb
 - app/concerns/resources_controller/kaminari.rb
 - app/concerns/resources_controller/location_history.rb
@@ -220,6 +221,10 @@ files:
 - app/services/rails/add_ons/service/result/base.rb
 - app/views/component/_collection_table.haml
 - app/views/component/_resource_table.haml
+- app/views/component/table/body_cells/_association.haml
+- app/views/component/table/body_cells/_awesome_nested_set.haml
+- app/views/component/table/body_cells/_default.haml
+- app/views/component/table/body_cells/_timestamp.haml
 - app/views/frontend/_after_body.haml
 - app/views/frontend/_after_head.haml
 - app/views/frontend/_before_body.haml
@@ -260,6 +265,12 @@ files:
 - lib/rails-add_ons.rb
 - lib/rails/add_ons.rb
 - lib/rails/add_ons/engine.rb
+- lib/rails/add_ons/shoulda/matchers.rb
+- lib/rails/add_ons/shoulda/matchers/implement_create_action_matcher.rb
+- lib/rails/add_ons/shoulda/matchers/implement_delete_action_matcher.rb
+- lib/rails/add_ons/shoulda/matchers/implement_index_action_matcher.rb
+- lib/rails/add_ons/shoulda/matchers/implement_show_action_matcher.rb
+- lib/rails/add_ons/shoulda/matchers/implement_update_action_matcher.rb
 - lib/rails/add_ons/version.rb
 - lib/tasks/rails/add_ons_tasks.rake
 homepage: