stationed 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd0eef67b43417e7fd36f910d756d88eb01be768
-  data.tar.gz: 86a8f6cce7c8084573de3c9228b592bed0b1ef83
+  metadata.gz: 733060c6d3cd4844ae711d77c2dd16da04120350
+  data.tar.gz: 0fca0d5e034005561d405c615d95c5eef12f998e
 SHA512:
-  metadata.gz: 64faf83906f6206d63eda4c13e8232b8492dfcbcc4cd503bd911d01de0456503737d1ff2bc4fd84e6bb62401adbcb6efe40c0c21527b653a47e91816401440dd
-  data.tar.gz: a87de8d7e9358cf86f7ffb9df76cf244b737edff1eb6d43ebf01bb525928186053d3da024ecc058a962f00973b0d2c55d2d5c5aebbe473d59ea41903cca5b069
+  metadata.gz: 58fba6b9f02dddbf43f2a416a274f5e858beb8803ada47d7486e509ca27d5de6534691c987e1d604372fb736c5d1a15febe821ba1be743dfcca000f4796aa0f5
+  data.tar.gz: cf84b738ea05008af6a972f6cd3ab1a6af97b0d4b941dc7c6b338b6c4db90f4d3e216f7a7e00208b91ea46f2fb145b0565d5453d06881b96f882d54c28865805

data/HISTORY.md

@@ -1,5 +1,9 @@
 # HISTORY
 
+## Unreleased
+
+* Include default form element and error styles
+
 ## 0.4.0
 
 * Improve default layout and actually remove Erb layout file

data/lib/stationed/generators/app_generator.rb

@@ -17,7 +17,7 @@ module Stationed
       prepend Plugins::FactoryGirl
       prepend Plugins::DatabaseCleaner
       prepend Plugins::Capybara
-      prepend Plugins::CapybaraWebkit
+      prepend Plugins::Poltergeist
       prepend Plugins::Pundit
       prepend Plugins::Yard
       prepend Plugins::Foreman

data/lib/stationed/generators/plugins/poltergeist.rb

@@ -0,0 +1,21 @@
+module Stationed
+  module Generators
+    module Plugins
+      module Poltergeist
+        def self.prepended(base)
+          base.class_option :poltergeist,
+            type: :boolean,
+            default: true,
+            desc: 'Include Poltergeist for headless browser testing'
+        end
+
+        def finish_template
+          return super unless options[:capybara] && options[:poltergeist]
+          gem 'poltergeist', group: :test
+          copy_file 'poltergeist.rb', 'spec/support/poltergeist.rb'
+          super
+        end
+      end
+    end
+  end
+end

data/lib/stationed/generators/plugins/stationed.rb

@@ -1,3 +1,5 @@
+require 'stationed/version'
+
 module Stationed
   module Generators
     module Plugins
@@ -11,7 +13,7 @@ module Stationed
 
         def finish_template
           return super unless options[:stationed]
-          gem 'stationed', path: '~/code/stationed'
+          gem 'stationed', ::Stationed::VERSION
           super
         end
       end

data/lib/stationed/generators/plugins/styles.rb

@@ -15,9 +15,11 @@ module Stationed
           gem 'neat'
           gem 'bitters'
           remove_file 'app/assets/stylesheets/application.css'
-          copy_file 'application.scss', 'app/assets/stylesheets/application.scss'
-          copy_file 'layout.scss', 'app/assets/stylesheets/_layout.scss'
-          copy_file 'normalize.css', 'vendor/assets/stylesheets/normalize.css'
+          copy_file 'application.scss',            'app/assets/stylesheets/application.scss'
+          copy_file 'layout.scss',                 'app/assets/stylesheets/_layout.scss'
+          copy_file '_input_wrapper_default.scss', 'app/assets/stylesheets/modules/_input_wrapper_default.scss'
+          copy_file '_error_notification.scss',    'app/assets/stylesheets/modules/_error_notification.scss'
+          copy_file 'normalize.css',               'vendor/assets/stylesheets/normalize.css'
           super
         end
 
@@ -25,8 +27,8 @@ module Stationed
           super
           return unless options[:styles]
           run 'bitters install'
-          FileUtils.mv 'bitters', 'app/assets/stylesheets/bitters'
-          gsub_file 'app/assets/stylesheets/bitters/_bitters.scss', %r{// @import}, '@import'
+          FileUtils.mv 'base', 'app/assets/stylesheets/base'
+          gsub_file 'app/assets/stylesheets/base/_base.scss', %r{// @import}, '@import'
         end
       end
     end

data/lib/stationed/generators/templates/_error_notification.scss

@@ -0,0 +1,3 @@
+.error-notification {
+  color: darken($error-color, 60);
+}

data/lib/stationed/generators/templates/_input_wrapper_default.scss

@@ -0,0 +1,68 @@
+.input {
+  @include row;
+  margin-bottom: $base-line-height / 2;
+
+  abbr[title=required] {
+    border: none;
+    color: darken($error-color, 60);
+  }
+
+  label {
+    font-weight: normal;
+
+    &.required:after {
+      content: "";
+    }
+
+    abbr {
+      display: inline;
+    }
+  }
+
+  .hint {
+    color: $medium-gray;
+  }
+
+  &.field-with-errors {
+    label {
+      font-weight: bold;
+      color: darken($error-color, 60);
+    }
+
+    textarea,
+    #{$all-text-inputs},
+    select[multiple=multiple] {
+      border-color: darken($error-color, 60);
+      border-bottom-left-radius: 0;
+      border-bottom-right-radius: 0;
+    }
+  }
+
+  .error {
+    @include flash($error-color);
+    border: 1px solid darken($error-color, 60);
+    border-top: 0;
+    padding: ($base-line-height / 4);
+    margin: 0 0 ($base-line-height / 2);
+    border-bottom-left-radius: $form-border-radius;
+    border-bottom-right-radius: $form-border-radius;
+  }
+
+  .input-label {
+    @include span-columns(3);
+  }
+
+  .input-field {
+    @include span-columns(9);
+  }
+
+  textarea,
+  #{$all-text-inputs},
+  select {
+    margin: 0;
+  }
+
+  &.datetime select {
+    display: inline;
+  }
+}

data/lib/stationed/generators/templates/application.scss

@@ -3,4 +3,4 @@
 @import 'bitters/bitters';
 @import 'neat';
 @import 'layout';
-// @import 'modules/*';
+@import 'modules/*';

data/lib/stationed/generators/templates/database_cleaner.rb

@@ -4,7 +4,7 @@ RSpec.configure do |config|
     DatabaseCleaner.clean_with(:truncation)
   end
 
-  config.before(:each) do
+  config.before(:each) do |example|
     if example.metadata[:js]
       DatabaseCleaner.strategy = :truncation
     else

data/lib/stationed/generators/templates/paginating_decorator.rb

@@ -3,5 +3,5 @@
 # {ApplicationDecorator}.
 class PaginatingDecorator < Draper::CollectionDecorator
   delegate :current_page, :total_pages, :limit_value, :total_count,
-           :offset_value, :last_page?
+           :offset_value, :last_page?, :model_name
 end

data/lib/stationed/generators/templates/poltergeist.rb

@@ -0,0 +1,2 @@
+require 'capybara/poltergeist'
+Capybara.javascript_driver = :poltergeist

data/lib/stationed/generators/templates/rubocop.rake

@@ -1,5 +1,5 @@
 begin
   require 'rubocop/rake_task'
-  Rubocop::RakeTask.new
+  RuboCop::RakeTask.new
 rescue LoadError
 end

data/lib/stationed/version.rb

@@ -1,3 +1,3 @@
 module Stationed
-  VERSION = '0.4.0'.freeze
+  VERSION = '0.5.0'.freeze
 end

data/lib/templates/haml/scaffold/_form.html.haml

@@ -1,6 +1,6 @@
 = form_for(@<%= singular_table_name %>) do |f|
   = f.error_notification
-  = f.base_errors
+  = f.full_error :base
 
   .form-inputs
 <%- attributes.each do |attribute| -%>
@@ -8,4 +8,4 @@
 <%- end -%>
 
   .form-actions
-    = f.submit_or_cancel
+    = f.button :submit

data/lib/templates/rails/scaffold_controller/controller.rb

@@ -8,7 +8,7 @@ class <%= controller_class_name %>Controller < ApplicationController
   before_action :set_<%= singular_table_name %>, only: %i[show edit update destroy]
 
   def index
-    @<%= plural_table_name %> = policy_scope(<%= orm_class.all(class_name) %>).decorate
+    @<%= plural_table_name %> = policy_scope(<%= orm_class.all(class_name) %>).page(params[:page]).decorate
     respond_with @<%= plural_table_name %>
   end
 

data/lib/templates/rspec/scaffold/controller_spec.rb

@@ -1,7 +1,5 @@
-require 'spec_helper'
-
 <% module_namespacing do -%>
-describe <%= controller_class_name %>Controller do
+RSpec.describe <%= controller_class_name %>Controller, type: :controller do
   subject { response }
 
 <% unless options[:singleton] -%>
@@ -10,8 +8,9 @@ describe <%= controller_class_name %>Controller do
 
     before do
       allow(<%= class_name %>).to receive(:all).and_return(<%= table_name %>)
-      <%= class_name %>Policy.any_instance.stub(:index?).and_return(true)
+      allow_any_instance_of(<%= class_name %>Policy).to receive(:index?).and_return(true)
       allow(Array).to receive(:policy_class).and_return(<%= class_name %>Policy)
+      allow(<%= table_name %>).to receive(:page).and_return(<%= table_name %>)
       allow(<%= table_name %>).to receive(:decorate).and_return(<%= table_name %>)
     end
 
@@ -38,7 +37,7 @@ describe <%= controller_class_name %>Controller do
 
     before do
       allow(<%= class_name %>).to receive(:find).with(<%= file_name %>.to_param).and_return(<%= file_name %>)
-      <%= class_name %>Policy.any_instance.stub(:show?).and_return(true)
+      allow_any_instance_of(<%= class_name %>Policy).to receive(:show?).and_return(true)
     end
 
     describe 'response' do
@@ -63,7 +62,7 @@ describe <%= controller_class_name %>Controller do
 
     before do
       allow(<%= class_name %>).to receive(:new).and_return(<%= file_name %>)
-      <%= class_name %>Policy.any_instance.stub(:new?).and_return(true)
+      allow_any_instance_of(<%= class_name %>Policy).to receive(:new?).and_return(true)
     end
 
     describe 'response' do
@@ -88,7 +87,7 @@ describe <%= controller_class_name %>Controller do
 
     before do
       allow(<%= class_name %>).to receive(:find).with(<%= file_name %>.to_param).and_return(<%= file_name %>)
-      <%= class_name %>Policy.any_instance.stub(:edit?).and_return(true)
+      allow_any_instance_of(<%= class_name %>Policy).to receive(:edit?).and_return(true)
     end
 
     describe 'response' do
@@ -110,7 +109,7 @@ describe <%= controller_class_name %>Controller do
 
   describe 'POST create' do
     before do
-      <%= class_name %>Policy.any_instance.stub(:create?).and_return(true)
+      allow_any_instance_of(<%= class_name %>Policy).to receive(:create?).and_return(true)
     end
 
     describe 'with valid params' do
@@ -158,26 +157,28 @@ describe <%= controller_class_name %>Controller do
 
     before do
       allow(<%= class_name %>).to receive(:find).with(<%= file_name %>.to_param).and_return(<%= file_name %>)
-      <%= class_name %>Policy.any_instance.stub(:update?).and_return(true)
+      allow_any_instance_of(<%= class_name %>Policy).to receive(:update?).and_return(true)
     end
 
     describe 'with valid params' do
+      let(:attributes) { attributes_for(:<%= file_name %>) }
+
       before do
         allow(<%= file_name %>).to receive(:update).and_return(true)
       end
 
       it 'updates the requested <%= ns_file_name %>' do
-        expect(<%= file_name %>).to receive(:update).with(attributes_for(:<%= file_name %>).stringify_keys)
-        put :update, id: <%= file_name %>.to_param, <%= ns_file_name %>: attributes_for(:<%= file_name %>)
+        expect(<%= file_name %>).to receive(:update).with(attributes.stringify_keys)
+        put :update, id: <%= file_name %>.to_param, <%= ns_file_name %>: attributes
       end
 
       it 'assigns the requested <%= ns_file_name %> as @<%= ns_file_name %>' do
-        put :update, id: <%= file_name %>.to_param, <%= ns_file_name %>: attributes_for(:<%= file_name %>)
+        put :update, id: <%= file_name %>.to_param, <%= ns_file_name %>: attributes
         expect(assigns(:<%= ns_file_name %>)).to eq(<%= file_name %>)
       end
 
       it 'redirects to the <%= ns_file_name %>' do
-        put :update, id: <%= file_name %>.to_param, <%= ns_file_name %>: attributes_for(:<%= file_name %>)
+        put :update, id: <%= file_name %>.to_param, <%= ns_file_name %>: attributes
         expect(response).to redirect_to(<%= file_name %>)
       end
     end
@@ -207,7 +208,7 @@ describe <%= controller_class_name %>Controller do
       allow(<%= class_name %>).to receive(:find).with(<%= file_name %>.to_param).and_return(<%= file_name %>)
       allow(<%= file_name %>).to receive(:destroy).and_return(true)
       allow(<%= file_name %>).to receive(:persisted?).and_return(false)
-      <%= class_name %>Policy.any_instance.stub(:destroy?).and_return(true)
+      allow(<%= class_name %>Policy).to receive(:destroy?).and_return(true)
     end
 
     it 'destroys the requested <%= ns_file_name %>' do

data/lib/templates/rspec/scaffold/edit_spec.rb

@@ -1,7 +1,5 @@
-require 'spec_helper'
-
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
-describe "<%= ns_table_name %>/edit" do
+RSpec.describe "<%= ns_table_name %>/edit", type: :view do
   let(:<%= ns_file_name %>) { build_stubbed :<%= ns_file_name %> }
 
   before do

data/lib/templates/rspec/scaffold/index_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe "<%= ns_table_name %>/index" do
+RSpec.describe "<%= ns_table_name %>/index", type: :view do
   let(:<%= table_name %>) { build_stubbed_list :<%= ns_file_name %>, 3 }
 
   before do

data/lib/templates/rspec/scaffold/new_spec.rb

@@ -1,7 +1,5 @@
-require 'spec_helper'
-
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
-describe "<%= ns_table_name %>/new" do
+RSpec.describe "<%= ns_table_name %>/new", type: :view do
   let(:<%= ns_file_name %>) { build :<%= ns_file_name %> }
 
   before do

data/lib/templates/rspec/scaffold/routing_spec.rb

@@ -1,7 +1,5 @@
-require 'spec_helper'
-
 <% module_namespacing do -%>
-describe <%= controller_class_name %>Controller do
+RSpec.describe <%= controller_class_name %>Controller, type: :view do
   describe 'routing' do
 <% unless options[:singleton] -%>
     it { expect(get: '/<%= ns_table_name %>').to route_to('<%= ns_table_name %>#index') }

data/lib/templates/rspec/scaffold/show_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe "<%= ns_table_name %>/show" do
+RSpec.describe "<%= ns_table_name %>/show", type: :view do
   let(:<%= ns_file_name %>) { build_stubbed :<%= ns_file_name %> }
 
   before do