rails-add_ons 2.1.1 → 2.2.0

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

@@ -15,6 +15,33 @@ module Rails
         #      }
         #    end
         #
+        # The newly created resource is found by calling @resource_class.last.
+        # If you need to change this you can call #finding_created_resource_with.
+        #
+        # Example:
+        #
+        #     RSpec.describe '/posts', type: :feature do
+        #       it {
+        #         expect(subject).to implement_create_action(self)
+        #           .for(resource_class)
+        #           .within_form('#new_user') {
+        #             # fill the needed form inputs via capybara here
+        #             #
+        #             # Example:
+        #             #
+        #             #     select 'de', from: 'slider[locale]'
+        #             #     fill_in 'slider[name]', with: 'My first slider'
+        #             #     check 'slider[auto_start]'
+        #             #     fill_in 'slider[interval]', with: '3'
+        #             fill_in 'user[email]', with: 'jane.doe@local.domain'
+        #             fill_in 'user[password]', with: 'password'
+        #             fill_in 'user[password_confirmation]', with: 'password'
+        #           }
+        #           .finding_created_resource_with{ Ecm::UserArea::User.order(created_at: :desc).first }
+        #           .increasing{ Ecm::UserArea::User.count }.by(1)
+        #       }
+        #     end
+        #
         def implement_create_action(spec)
           ImplementCreateActionMatcher.new(spec)
         end
@@ -54,6 +81,11 @@ module Rails
             self
           end
 
+          def finding_created_resource_with(&block)
+            @created_resource_finder_block = block
+            self
+          end
+
           def matches?(base_path)
             @base_path = base_path
             @new_path = "#{@base_path}/new"
@@ -67,11 +99,11 @@ module Rails
             end
             @after_count = @block.call(@resource_class)
 
-            has_correct_status_code && has_correct_current_path && has_increased_resource_count
+            has_correct_status_code && has_increased_resource_count && has_correct_current_path
           end
 
           def created_resource
-            @created_resource ||= @resource_class.first
+            @created_resource ||= @created_resource_finder_block.present? ? @created_resource_finder_block.call : @resource_class.last
           end
 
           def expected_path
@@ -88,10 +120,10 @@ module Rails
           end
 
           def has_increased_resource_count
-            if (@before_count + @after_count) == @expected_increase
+            if (@after_count - @before_count) == @expected_increase
               true
             else
-              @error = "Did not increase by expected [#{@expected_increase}] but by [#{@before_count + @after_count}]"
+              @error = "Did not increase by expected [#{@expected_increase}] but by [#{@after_count - @before_count}]"
               false
             end
           end

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

@@ -2,7 +2,7 @@ module Rails
   module AddOns
     module Shoulda
       module Matchers
-        # Example:
+        # Example checking for changed resource attributes:
         #
         #    RSpec.describe '/posts', type: :feature do
         #      let(:post) { create(:post) }
@@ -13,12 +13,29 @@ module Rails
         #            fill_in 'post[title]', with: 'New title'
         #            fill_in 'post[body]',  with: 'New body'
         #          }
-        #          .updating{ |resource| resource.attributes }
+        #          .updating
         #          .from(post.attributes)
         #          .to({ 'title' => 'New title', 'body' => 'New body' })
         #      }
         #    end
         #
+        # Example checking for changed state:
+        #
+        #    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.updated_by }
+        #          .from(nil)
+        #          .to(User.current)
+        #      }
+        #    end
+        #
         def implement_update_action(spec)
           ImplementUpdateActionMatcher.new(spec)
         end
@@ -36,13 +53,13 @@ module Rails
             self
           end
 
-          def from(attributes)
-            @expected_before_attributes = attributes
+          def from(value)
+            @from = value
             self
           end
 
-          def to(attributes)
-            @expected_after_attributes = attributes
+          def to(value)
+            @to = value
             self
           end
 
@@ -54,7 +71,7 @@ module Rails
           end
 
           def updating(&block)
-            @block = block
+            @updating_block = block if block_given?
             self
           end
 
@@ -102,22 +119,48 @@ module Rails
           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
+            expected = @from
+            if @updating_block.present?
+              given = @updating_block.call(@resource)
+
+              if given == expected
+                return true
+              else
+                @error = "Before update state [#{given.inspect}] did not match expected [#{expected.inspect}]"
+                return false
+              end
             else
-              @error = "Attributes before update [#{sliced_resource_attributes}] did not match expected attributes [#{@expected_before_attributes}]"
-              false
+              given = @resource.attributes.with_indifferent_access.slice(*@expected_before_attributes.keys)
+
+              if given == expected
+                true
+              else
+                @error = "Attributes before update [#{given}] did not match expected attributes [#{@expected_before_attributes}]"
+                false
+              end
             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
+            expected = @to
+            if @updating_block.present?
+              given = @updating_block.call(@resource)
+
+              if given == expected
+                return true
+              else
+                @error = "After update state [#{given.inspect}] did not match expected [#{expected.inspect}]"
+                return false
+              end
             else
-              @error = "Attributes after update [#{sliced_resource_attributes}] did not match expected attributes [#{@expected_after_attributes}]"
-              false
+              given = @resource.attributes.with_indifferent_access.slice(*@to.keys)
+              
+              if given == expected
+                true
+              else
+                @error = "Attributes after update [#{given}] did not match expected attributes [#{@expected_before_attributes}]"
+                false
+              end
             end
           end
 

data/lib/rails/add_ons/version.rb

@@ -1,5 +1,5 @@
 module Rails
   module AddOns
-    VERSION = '2.1.1'.freeze
+    VERSION = '2.2.0'.freeze
   end
 end

data/lib/rails/add_ons.rb

@@ -1,7 +1,8 @@
-require "rails/add_ons/engine"
+require 'rails/add_ons/configuration'
+require 'rails/add_ons/engine'
 
 module Rails
   module AddOns
-    # Your code goes here...
+    extend Configuration
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-add_ons
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-26 00:00:00.000000000 Z
+date: 2018-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -176,6 +176,7 @@ files:
 - Rakefile
 - app/assets/config/rails_add_ons_manifest.js
 - app/assets/javascripts/rails/add_ons/application.js
+- app/assets/javascripts/rails/add_ons/application/acts-as-list.js.coffee
 - app/assets/javascripts/rails/add_ons/application/widgets.js.coffee
 - app/assets/javascripts/rails_add_ons.js
 - app/assets/stylesheets/rails/add_ons/application.scss
@@ -190,8 +191,18 @@ 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/acts_as_list_concern.rb
+- app/concerns/component/collection_table/acts_as_published_concern.rb
 - app/concerns/component/collection_table/awesome_nested_set_concern.rb
+- app/concerns/component/collection_table/batch_actions_concern.rb
+- app/concerns/component/collection_table/boolean_concern.rb
+- app/concerns/component/resource_table/boolean_concern.rb
 - app/concerns/controller/query_conditions.rb
+- app/concerns/resources_controller/acts_as_list_concern.rb
+- app/concerns/resources_controller/acts_as_published_concern.rb
+- app/concerns/resources_controller/awesome_nested_set_concern.rb
+- app/concerns/resources_controller/batch_actions_concern.rb
+- app/concerns/resources_controller/friendly_id_concern.rb
 - app/concerns/resources_controller/kaminari.rb
 - app/concerns/resources_controller/location_history.rb
 - app/concerns/resources_controller/pagination.rb
@@ -221,10 +232,15 @@ 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/_acts_as_list.haml
+- app/views/component/table/body_cells/_acts_as_published.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/_batch_actions.haml
+- app/views/component/table/body_cells/_boolean.haml
 - app/views/component/table/body_cells/_default.haml
 - app/views/component/table/body_cells/_timestamp.haml
+- app/views/component/table/header_cells/_batch_actions.haml
 - app/views/frontend/_after_body.haml
 - app/views/frontend/_after_head.haml
 - app/views/frontend/_before_body.haml
@@ -262,8 +278,13 @@ files:
 - config/locales/en.yml
 - config/routes.rb
 - lib/active_model/model.rb
+- lib/generators/rails/add_ons/install_generator.rb
+- lib/generators/rails/add_ons/resources_controller_spec_generator.rb
+- lib/generators/rails/add_ons/templates/initializer.rb
+- lib/generators/rails/add_ons/templates/spec.rb
 - lib/rails-add_ons.rb
 - lib/rails/add_ons.rb
+- lib/rails/add_ons/configuration.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