barebones 0.1.3.1 → 0.1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c13d5de5763f292128c4fab1e88af3c9a7b609e8
-  data.tar.gz: ed5f1e08e9f82c445648177f1acb74a4de2042a1
+  metadata.gz: a988c36235dab45a627cc23debab190cc764bed2
+  data.tar.gz: c5af15d12f523821efd1e3de6d0667a2ce5e0b68
 SHA512:
-  metadata.gz: 251672ca48b0c8c8f2240f8d7f39be02ee79e10874800be74791a621ee386f60df64bea29a0949c8a9ab83cb502693d1072b8f9d2b0fa1f448e00c6676fa2200
-  data.tar.gz: be4810ec3be2def39d9e2f23916d384d34b2a50b0b76bf9e06b5e772100b3a456d725e75fbec194ae2fece65e24299570c3b485e7c53b4b05efa48edf17a78ff
+  metadata.gz: 5634b9a32c3124dd5daf89e5ab1f7bd48694fd7ba1f4e9188590f0e3e695cf576e37d85eace995cfacd8cd327dbe650d46ac4dde659050e410f444741a4aa300
+  data.tar.gz: 874f53019d2958fca3630a5a051d02f331842265cb6f5de56ee80fa18a0efe3d99ac8e6656b1fc73cb8285e1f6e274e7b41b964a053304d1a30fb9a0ebcdbbd9

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2015 Danny Yu
+Copyright (c) 2015-2016 Danny Yu
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -5,8 +5,7 @@ Barebones is my personal base Rails application. After developing a
 couple of Rails applications, I thought that there were some common
 gems and patterns that would be nice to have out of the box.
 
-Installation
----
+#Installation
 Install the gem:  
 
     gem install barebones
@@ -15,72 +14,67 @@ Then run:
 
     barebones [AppName]
 
-#### Flags
+## Flags
 If you don't like using any of the below gems or configurations for whatever reason, you can skip them:
 * --skip-api
-* --skip-sorcery
-* --skip-minitest
 * --skip-resque
+* --skip-minitest
+* --skip-factory-girl
 * --skip-carrierwave
 
 For example:
 
-    barebones [AppName] --skip-api --skip-sorcery
+    barebones [AppName] --skip-api --skip-minitest
 
-Gemfile
----
+#Gemfile
 Barebones' [Gemfile](templates/Gemfile.erb) includes various preconfigured gems such as:
-####File Uploading
+##File Uploading
 * [Carrierwave](https://github.com/carrierwaveuploader/carrierwave) for file uploading
 * [Fog](https://github.com/fog/fog) for AWS/Google cloud storage
 * [MiniMagick](https://github.com/minimagick/minimagick) for image cropping/resizing and all that good stuff
 
-####Background Processing
+##Background Processing
 * [Resque](https://github.com/resque/resque) for background workers
 * [Resque-Scheduler](https://github.com/resque/resque-scheduler) for queueing workers in the future
 
-####Database
+##Database
 * [Postgres](https://rubygems.org/gems/pg/versions/0.18.3)
 
-####Dev/Testing
+##Dev/Testing
 * [Byebug](https://github.com/deivid-rodriguez/byebug) for debugging
 * [Pry Byebug](https://github.com/deivid-rodriguez/pry-byebug) for debugging background jobs
 * [Web Console](https://github.com/rails/web-console) for debugging views
 * [Quiet Assets](https://github.com/evrone/quiet_assets) for muting the Rails asset pipeline log
 * [Awesome Print](https://github.com/michaeldv/awesome_print) for pretty printing command line objects
 
-####Testing
+##Testing
 * [Minitest](https://github.com/blowmage/minitest-rails) for TDD/BDD
 * [Minitest Reporters](https://github.com/kern/minitest-reporters) for customizable Minitest output formats
+* [Minitest Around](https://github.com/splattael/minitest-around) for database setup/teardown
+* [Mocha](https://github.com/freerange/mocha) for mocking and stubbing
+* [Database Cleaner](https://github.com/DatabaseCleaner/database_cleaner) to ensure a clean state during tests
 
-####Authentication
-* [Sorcery](https://github.com/NoamB/sorcery) for user authentication
-
-####API
+##API
 * [Jbuilder](https://github.com/rails/jbuilder) for building JSON structures
 * [oj](https://github.com/ohler55/oj) for faster JSON parsing (and a faster Jbuilder)
 * [oj_mimic_json](https://github.com/ohler55/oj_mimic_json)
 * [MultiJSON](https://github.com/intridea/multi_json)
 
-Design Patterns
----
+##Design Patterns
 * Services (Pre-made folder)
 * [Custom Decorator Class](templates/barebones_decorator.rb.erb) (A custom subclass of SimpleDelegator)
 
-API
----
-* [Routes](templates/Gemfile.erb) with API subdomain and version namespacing
+##API
+* [Routes](templates/routes.rb.erb) with API subdomain and version namespacing
 * [ApiConstraints](templates/api_constraints.rb.erb) for API version control
 * [Configurations/Ping endpoint](templates/configs_controller.rb) to test that the API works :)
 
-Dependencies
----
-Barebones requires the latest version of Ruby (2.2.3), Rails (4.2.3), and
+#Dependencies
+Barebones requires the latest version of Ruby (2.3.0), Rails (4.2.5), and
 PostgreSQL (9.4) on your local machine.
  
-License
----
-Barebones is copyright © 2015 Danny Yu.  
+#License
+Barebones is copyright © 2015-2016 Danny Yu.  
 It is free software, and may be redistributed under the terms specified in the [LICENSE] file.
 
 [LICENSE]: LICENSE

data/barebones.gemspec

@@ -3,11 +3,11 @@ require "date"
 
 Gem::Specification.new do |s|
   s.name        = "barebones"
-  s.version     = "0.1.3.1"
+  s.version     = "0.1.4.0"
   s.date        = Date.today.to_s
   s.licenses    = ['MIT']
   s.summary     = "Rails template generator"
-  s.description = "Personal Rails template generator for Danny Yu"
+  s.description = "A personal Rails template generator."
   s.authors     = ["Danny Yu"]
   s.files       = `git ls-files -z`.split("\x0")
   s.executables = ["barebones"]

data/lib/barebones/builders/app_builder.rb

@@ -26,20 +26,7 @@ module Barebones
     end
 
     def config
-      empty_directory "config"
-
-      inside "config" do
-        customize_routes
-        template "application.rb"
-        customize_application_rb
-
-        template "environment.rb"
-
-        directory "environments"
-        directory "initializers"
-        directory "locales"
-      end
-
+      super
     end
 
     def database_yml
@@ -51,16 +38,17 @@ module Barebones
       create_file ".ruby-version", "#{Barebones::RUBY_VERSION}"
     end
 
-    def customize_application_rb
-      inject_into_file "application.rb", 
-        after: "config.active_record.raise_in_transactional_callbacks = true\n" do
+    def setup_autoload_paths
+      application_class_end_line = "#{spaces(2)}end\nend"
+      inject_into_file "config/application.rb", 
+        before: application_class_end_line do
           "\n#{spaces(4)}# Autoload 'lib' folder\n"\
-          "#{spaces(4)}config.autoload_paths << Rails.root.join('lib')\n"
+          "#{spaces(4)}config.autoload_paths += Dir[\"\#{config.root}/lib/**/\"]\n"
       end
     end
 
     def customize_routes
-      template "routes.rb", "config/routes.rb"
+      template "routes.rb.erb", "config/routes.rb", force: true
     end
 
     def setup_oj
@@ -93,7 +81,7 @@ module Barebones
     end
 
     def customize_secrets
-      template "secrets.yml.erb", "config/secrets.yml"
+      template "secrets.yml.erb", "config/secrets.yml", force: true
     end
 
     def raise_on_delivery_errors
@@ -108,21 +96,62 @@ module Barebones
       run "cp #{environment_path}/development.rb #{environment_path}/staging.rb"
     end
 
+    def configure_factory_girl
+      application_class_end_line = "#{spaces(2)}end\nend"
+      inject_into_file "config/application.rb", 
+        before: application_class_end_line do
+          "\n#{spaces(4)}# Generate Factories instead of Fixtures\n"\
+          "#{spaces(4)}config.generators do |g|\n"\
+          "#{spaces(6)}g.factory_girl true\n"\
+          "#{spaces(4)}end\n"
+      end
+
+      class_end_line = "end\n"
+      inject_into_file "test/test_helper.rb",
+        after: class_end_line do
+          "# Minitest does not provide a way to include or "\
+          "extend a module into every test class\n"\
+          "# without re-opening the test case class\n"\
+          "module Minitest\n"\
+          "#{spaces(2)}class Test\n"\
+          "#{spaces(4)}include FactoryGirl::Syntax::Methods\n"\
+          "#{spaces(2)}end\n"\
+          "end\n"
+      end
+    end
+
     def configure_minitest
-      autoload_paths_line = "config.autoload_paths << Rails.root.join('lib')\n"
+      class_end_line = "#{spaces(2)}end\nend"
       inject_into_file "config/application.rb", 
-        after: autoload_paths_line do
+        before: class_end_line do
           "\n#{spaces(4)}# Auto generate test files\n"\
           "#{spaces(4)}config.generators do |g|\n"\
-          "#{spaces(6)}g.test_framework :minitest, spec: false, fixture: false\n"\
+          "#{spaces(6)}g.test_framework :minitest, spec: true, fixture: false\n"\
           "#{spaces(4)}end\n"
       end
+
+      last_require = "require 'rails/test_help'\n"
+      inject_into_file "test/test_helper.rb",
+        after: last_require do
+          "require 'minitest/reporters'\n"\
+          "require 'minitest/spec'\n"\
+          "require 'mocha/mini_test'\n"\
+          "# Require all support helpers\n"\
+          "Dir[Rails.root.join('test/support/**/*.rb')].each { |f| require f }\n"\
+          "\n"\
+          "Minitest::Reporters.use!(\n"\
+          "#{spaces(2)}Minitest::Reporters::DefaultReporter.new,\n"\
+          "#{spaces(2)}ENV,\n"\
+          "#{spaces(2)}Minitest.backtrace_filter\n"\
+          ")\n"
+      end
+        
     end    
 
     def configure_active_job
-      autoload_paths_line = "config.autoload_paths << Rails.root.join('lib')\n"
+      application_class_end_line = "#{spaces(2)}end\nend"
       inject_into_file "config/application.rb", 
-        after: autoload_paths_line do
+        before: application_class_end_line do
           "\n#{spaces(4)}# Set ActiveJob to use Resque\n"\
           "#{spaces(4)}config.active_job.queue_adapter = :resque\n"
       end

data/lib/barebones/generators/app_generator.rb

@@ -12,18 +12,20 @@ module Barebones
     class_option :skip_resque, type: :boolean, default: false,
       desc: "Skip using Resque. Default is false."
 
-    class_option :skip_sorcery, type: :boolean, default: false,
-      desc: "Skip using Sorcery for user authentication. Default is false."
-
     class_option :skip_minitest, type: :boolean, default: false,
       desc: "Skip using Minitest. Default is false."
 
+    class_option :skip_factory_girl, type: :boolean, default: false,
+      desc: "Skip using Factory Girl. Default is false."
+
     class_option :skip_carrierwave, type: :boolean, default: false,
       desc: "Skip using Carrierwave. Default is false."
 
     def customizations
       say "Invoking customizations..."
       invoke :setup_ruby
+      invoke :configure_app
+      invoke :setup_routes
       invoke :setup_api
       invoke :setup_secrets
       invoke :setup_environments
@@ -36,10 +38,19 @@ module Barebones
       build :set_ruby_version
     end
 
+    def setup_routes
+      say "Setting up custom routes..."
+      build :customize_routes
+    end
+
+    def configure_app
+      say "Configuring application..."
+      build :setup_autoload_paths
+    end
+
     def setup_api
       unless options[:skip_api]
         say "Setting up an API..."
-        build :customize_routes
         build :setup_oj
         build :create_api_constraints
         build :create_api_v1_defaults
@@ -73,11 +84,18 @@ module Barebones
 
     def setup_gems
       invoke :setup_minitest
-      #invoke :setup_sorcery
+      invoke :setup_factory_girl
       invoke :setup_resque
       invoke :setup_carrierwave
     end
 
+    def setup_factory_girl
+      unless options[:skip_factory_girl]
+        say "Setting up FactoryGirl gem..."
+        build :configure_factory_girl
+      end
+    end
+
     def setup_minitest
       unless options[:skip_minitest]
         say "Setting up Minitest gem..."
@@ -104,33 +122,11 @@ module Barebones
     end
 
     def outro
-      invoke :minitest_setup_reminder
-      invoke :resque_web_reminder
       say "\e[34mSweet, we're done!\e[0m"
     end
 
-    def minitest_setup_reminder
-      unless options[:skip_minitest]
-        say "==========================================\n"\
-          "Remember to run `rails g minitest:install` \n"\
-          "and to set up Minitest-Reporters!\n"\
-          "==========================================\n"
-      end
-    end
-
-    def resque_web_reminder
-      unless options[:skip_resque]
-        say "==============================================\n"\
-          "If you'd like to have the resque-web dashboard, \n"\
-          "you should add the following to your routes: \n"\
-          "`require 'resque/scheduler/server'`\n"\
-          "`mount Resque::Server.new, :at => '/resque'`\n"\
-          "==============================================\n"
-      end
-    end
-
     protected
-
+    
     # Supply Thor with template root path
     def self.source_root
       File.expand_path("../../../templates", File.dirname(__FILE__))

data/lib/barebones/version.rb

@@ -1,4 +1,4 @@
 module Barebones
-  RAILS_VERSION = "~> 4.2.4"
-  RUBY_VERSION = "2.2.3"
+  RAILS_VERSION = "~> 4.2.5"
+  RUBY_VERSION = "2.3.0"
 end

data/templates/Gemfile.erb

@@ -20,6 +20,12 @@ group :development, :test do
 <% unless options[:skip_minitest] %>
   gem "minitest-rails"
   gem "minitest-reporters"
+  gem "minitest-around"
+  gem "mocha"
+  gem "database_cleaner"
+<% end %>
+<% unless options[:skip_factory_girl] %>
+  gem "factory_girl_rails", "~> 4.0"
 <% end %>
 end
 
@@ -37,12 +43,7 @@ gem "resque-scheduler"
 <% end %>
 
 # Database
-gem "pg", "~> 0.18.2"
-
-<% unless options[:skip_sorcery] %>
-# Authentication
-gem "sorcery"
-<% end %>
+gem "pg", "~> 0.18.4"
 
 # Faster JSON Parsing
 gem "oj"

data/templates/api_defaults_concern.rb

@@ -7,20 +7,20 @@ module ApiDefaults
  API_DEFAULT_FAIL_PATH = "defaults/fail"
 
  # Statuses
- SUCCESS_STATUS = "success"
- FAIL_STATUS = "fail"
+ SUCCESS = 200
+ INTERNAL_SERVER_ERROR = 500
 
   included do
     layout 'api/v1/application'
 
     def render_api_success(path=ApiDefaults::API_DEFAULT_SUCCESS_PATH)
-      @status = ApiDefaults::SUCCESS_STATUS
-      return render template: "#{API_VIEW_PATH}/#{path}"
+      @status = ApiDefaults::SUCCESS
+      return render template: "#{API_VIEW_PATH}/#{path}", status: ApiDefaults::SUCCESS
     end
 
     def render_api_fail(path=ApiDefaults::API_DEFAULT_FAIL_PATH)
-      @status = ApiDefaults::FAIL_STATUS
-      return render template: "#{API_VIEW_PATH}/#{path}"
+      @status = ApiDefaults::INTERNAL_SERVER_ERROR
+      return render template: "#{API_VIEW_PATH}/#{path}", status: ApiDefaults::INTERNAL_SERVER_ERROR
     end
   end
 

data/templates/barebones_gitignore

@@ -16,5 +16,8 @@
 /public/system
 /public/uploads
 
+# Ignore byebug files
+.byebug_history
+
 # Redis stores
 dump.rdb

data/templates/{routes.rb → routes.rb.erb}

@@ -13,5 +13,9 @@ Rails.application.routes.draw do
       end
     end
   end
-
+  <% unless options[:skip_resque] %>
+  # Resque Dashboard
+  require 'resque/scheduler/server'
+  mount Resque::Server.new, :at => '/resque'
+  <% end %>
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: barebones
 version: !ruby/object:Gem::Version
-  version: 0.1.3.1
+  version: 0.1.4.0
 platform: ruby
 authors:
 - Danny Yu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-26 00:00:00.000000000 Z
+date: 2016-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,15 +16,15 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.4
+        version: 4.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.4
-description: Personal Rails template generator for Danny Yu
+        version: 4.2.5
+description: A personal Rails template generator.
 email: 
 executables:
 - barebones
@@ -57,7 +57,7 @@ files:
 - templates/redis.rb
 - templates/resque.rake
 - templates/resque.rb
-- templates/routes.rb
+- templates/routes.rb.erb
 - templates/secrets.yml.erb
 - templates/test_job.rb
 homepage: https://github.com/dannyyu92/barebones
@@ -80,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Rails template generator