sanji 1.0.0.pre.4 → 1.0.0.pre.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 761e0db85939270258d83509f3433ffd23959bdf
-  data.tar.gz: 3c1ab6ef2147753a103e87cf86adf046800cbd49
+  metadata.gz: 14ba224e7a05f550d0248df7e734d610d5d548a9
+  data.tar.gz: 742c4417b7e9c7a66802cf4e535790610b96f0d9
 SHA512:
-  metadata.gz: 1ba36ccb450ac2cbcf3fa0b8589d312d8e20fc9a94f65da245bfcb4b46021d497cdba42f2ede35edb0362bccd94d5115f8e74fe32d06d5091a559d6d05945471
-  data.tar.gz: 8d16ba20c6e8b22008c55c98ae79f7c5444f55817f5bc1d38e1327ccdca50e69e1fa3b1e2db2c55b9e504b779c2d15aebcdf5c307b3e2ec50844063e431e06ae
+  metadata.gz: fd1c2ff58dd300468c0efc2bca26c3d925d9300c7697a03723c9f80a8f5b2755c5ae4d33c85c5f0e388edb311aa972bfbabdb3fbda0444f1fd9c52689dec4c14
+  data.tar.gz: 6337c58ae4fc096b5d7092a10dcffd084bb012f5b6abd55c09ae7bb41bfae5febaf0ba3481751726c1ae0bd8ae91e24470c68fdbcaeac63aec96ff7f92cb9a28

data/README.md

@@ -1,10 +1,10 @@
 # sanji
 
+![sanji](http://icons.iconarchive.com/icons/crountch/one-piece-character/256/Sanji-icon.png)
+
 Customized Rails application generator.
 Inspired by [suspenders](https://github.com/thoughtbot/suspenders) and [rails_apps_composer](https://github.com/RailsApps/rails_apps_composer) gems.
 
-![sanji](http://icons.iconarchive.com/icons/crountch/one-piece-character/256/Sanji-icon.png)
-
 ## Installation
 
 ```
@@ -22,18 +22,18 @@ sanji app_name
 ```ruby
 class Sanji::Locals::MyRecipe < Sanji::Recipe
 
-  def prompt
+  def confirm
     # return a string (boolean question) to make this recipe optional
   end
-  
+
   def after_create
     # execute after app is created
   end
-  
+
   def after_bundle
     # execute after bundle
   end
-  
+
   def after_everything
     # execute after "after_bundle"
   end
@@ -52,13 +52,13 @@ end
   ```ruby
   cookbook: cookbook_name
   recipes: /path/to/recipes
-  
+
   cookbooks:
     cookbook_name:
     - recipe_name
     - other_recipe_name
     - another_recipe
-    
+
     my_cookbook:
     - my_recipe
   ```

data/lib/sanji/recipe.rb

@@ -8,7 +8,7 @@ class Sanji::Recipe
   end
 
   def run_after_create
-    @disabled = a.no?(self.prompt) if self.prompt.present?
+    @disabled = a.no?(self.confirm) if self.confirm.present?
     return if @disabled
 
     a.log_start :after_create
@@ -41,7 +41,7 @@ class Sanji::Recipe
   def after_everything
   end
 
-  def prompt
+  def confirm
   end
 
 end

data/lib/sanji/recipes/admin_namespace.rb

@@ -0,0 +1,54 @@
+class Sanji::Recipes::AdminNamespace < Sanji::Recipe
+
+  def confirm
+    'Create admin namespace for controllers?'
+  end
+
+  def after_bundle
+    a.generate 'controller', 'admin/base'
+
+    # Delete base folder created by generate
+    a.inside 'app/views/admin' do
+      a.run 'rm -R base'
+    end
+
+    self.add_route
+  end
+
+  def after_everything
+    if a.yes? 'Create admin layout?'
+      self.create_layout
+
+      a.insert_into_file 'app/controllers/admin/base_controller.rb',
+        :after => /ApplicationController\n/ do
+          a.text { |t| t.indent.puts "layout 'admin'" }
+        end
+    end
+  end
+
+
+  protected
+
+  def add_route
+    route =
+      a.text do |t|
+        t.puts 'namespace :admin do'
+        t.indent.puts 'end'
+      end
+
+    a.route route
+  end
+
+  def create_layout
+    a.inside 'app/views/layouts' do
+      a.run 'cp application.html.haml admin.html.haml'
+    end
+
+    a.insert_into_file(
+      'app/views/layouts/admin.html.haml',
+      '.admin',
+      :after => '%body'
+    )
+  end
+
+end

data/lib/sanji/recipes/draper.rb

@@ -1,6 +1,6 @@
 class Sanji::Recipes::Draper < Sanji::Recipe
 
-  def prompt
+  def confirm
     'Do you want to use Draper?'
   end
 

data/lib/sanji/recipes/paloma.rb

@@ -1,6 +1,8 @@
 class Sanji::Recipes::Paloma < Sanji::Recipe
 
   def after_create
+    a.add_gem 'paloma'
+
     a.insert_into_file 'app/assets/javascripts/application.js',
       "//= require paloma\n",
       :after => "//= require jquery_ujs\n"

data/lib/sanji/recipes/postgresql.rb

@@ -7,6 +7,13 @@ class Sanji::Recipes::Postgresql < Sanji::Recipe
     self.create_database_yml
   end
 
+  def after_bundle
+    if a.yes?('Drop and create database?')
+      a.rake 'db:drop'
+      a.rake 'db:create'
+    end
+  end
+
 
   protected
 

data/lib/sanji/recipes/public_module.rb

@@ -0,0 +1,67 @@
+class Sanji::Recipes::PublicModule < Sanji::Recipe
+
+  def after_bundle
+    self.create_public_module if self.create_public_module?
+    self.create_home if self.create_home?
+  end
+
+
+  protected
+
+  def create_public_module?
+    if @create_public_module.nil?
+      @create_public_module = a.yes? 'Create public module for controllers?'
+    end
+
+    @create_public_module
+  end
+
+  def create_public_module
+    a.generate 'controller', 'public/base'
+
+    # Remove base folder create by generate.
+    a.inside 'app/views/public' do
+      a.run 'rm -R base'
+    end
+  end
+
+  def create_home?
+    a.yes? 'Create public home controller?'
+  end
+
+  def create_home
+    if self.create_public_module?
+      self.create_home_inside_module
+    else
+      self.create_home_outside_module
+    end
+  end
+
+  def create_home_inside_module
+    a.generate 'controller', 'public/home', 'index'
+
+    a.gsub_file 'app/controllers/public/home_controller.rb',
+      /ApplicationController/,
+      'Public::BaseController'
+
+    a.route "root :to => 'public/home#index'"
+
+    # Change public namespace created by generate to module.
+    a.gsub_file 'config/routes.rb',
+      /namespace :public/,
+      'scope :module => :public'
+
+    # Remove route created by 'public/home index'
+    a.gsub_file 'config/routes.rb', /get 'home\/index'/, ''
+  end
+
+  def create_home_outside_module
+    a.generate 'controller', 'home', 'index'
+
+    # Remove route created by 'home index'
+    a.gsub_file 'config/routes.rb', /get 'home\/index'/, ''
+
+    a.route "root :to => 'home#index'"
+  end
+
+end

data/lib/sanji/recipes/readme.rb

@@ -0,0 +1,8 @@
+class Sanji::Recipes::Readme < Sanji::Recipe
+
+  def after_create
+    a.run 'rm README.rdoc'
+    a.template 'README.md.erb', 'README.md'
+  end
+
+end

data/lib/sanji.yml

@@ -12,3 +12,6 @@ cookbooks:
   - _reform
   - _frontend
   - _simple_gems
+  - _public_module
+  - _admin_namespace
+  - _readme

data/templates/README.md.erb

@@ -0,0 +1,33 @@
+# <%= app_name.titleize %>
+
+## Servers
+
+*none*
+
+## Environment
+
+- Ruby <%= RUBY_VERSION %>
+- Rails <%= Rails.version %>
+- PostgreSQL
+
+## Development Setup
+
+1. `bundle install`.
+2. `rake db:create; rake db:migrate; rake db:seed`.
+
+## Run
+
+1. `bundle exec rails s`
+
+## Tests
+
+*none*
+
+## Depolyment
+
+*none*
+
+## Developer Notes
+
+*none*
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sanji
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.4
+  version: 1.0.0.pre.5
 platform: ruby
 authors:
 - Karl Paragua
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-09 00:00:00.000000000 Z
+date: 2015-12-10 00:00:00.000000000 Z
 dependencies: []
 description: rails application generator
 email: kb.paragua@gmail.com
@@ -27,9 +27,9 @@ files:
 - lib/sanji/config.rb
 - lib/sanji/options.rb
 - lib/sanji/recipe.rb
+- lib/sanji/recipes/admin_namespace.rb
 - lib/sanji/recipes/annotate.rb
 - lib/sanji/recipes/cleanup.rb
-- lib/sanji/recipes/controllers.rb
 - lib/sanji/recipes/devise.rb
 - lib/sanji/recipes/draper.rb
 - lib/sanji/recipes/figaro.rb
@@ -37,11 +37,14 @@ files:
 - lib/sanji/recipes/haml.rb
 - lib/sanji/recipes/paloma.rb
 - lib/sanji/recipes/postgresql.rb
+- lib/sanji/recipes/public_module.rb
+- lib/sanji/recipes/readme.rb
 - lib/sanji/recipes/reform.rb
 - lib/sanji/recipes/seedbank.rb
 - lib/sanji/recipes/setup.rb
 - lib/sanji/recipes/simple_gems.rb
 - lib/sanji/utilities/text.rb
+- templates/README.md.erb
 - templates/base_form.rb
 - templates/database.yml.erb
 - templates/public_home_controller.rb

data/lib/sanji/recipes/controllers.rb

@@ -1,80 +0,0 @@
-class Sanji::Recipes::Controllers < Sanji::Recipe
-
-  def after_bundle
-    self.setup_public
-
-    self.setup_admin if self.has_admin?
-    self.setup_private if self.has_private?
-  end
-
-  protected
-
-  def has_admin?
-    a.yes? 'Create admin namespace?'
-  end
-
-  def has_private?
-    a.yes? 'Create private module for logged-in non-admin users?'
-  end
-
-  def has_homepage?
-    a.yes? 'Create controller for public home page?'
-  end
-
-  def setup_admin
-    a.generate 'controller', 'admin/base'
-
-    a.inside 'app/views/admin' do
-      a.run 'rm -R base'
-    end
-
-    route =
-      a.text do |t|
-        t.indent.puts 'namespace :admin do'
-        t.indent.puts 'end'
-      end
-
-    a.route route
-  end
-
-  def setup_private
-    a.generate 'controller', 'private/base'
-
-    a.inside 'app/views/private' do
-      a.run 'rm -R base'
-    end
-
-    route =
-      a.text do |t|
-        t.indent.puts 'scope :module => :private do'
-        t.indent.puts 'end'
-      end
-
-    a.route route
-  end
-
-  def setup_public
-    a.generate 'controller', 'public/base'
-
-    a.inside 'app/views/public' do
-      a.run 'rm -R base'
-    end
-
-    if self.has_homepage?
-      a.copy_file 'public_home_controller.rb',
-        'app/controller/public/home_controller.rb'
-
-      a.template 'public_home_index.haml.erb', 'app/views/public/home/index.haml'
-
-      a.route "root :to => 'public/home#index'"
-
-      # Change public namespace to module only.
-      a.gsub_file 'config/routes.rb',
-        /namespace :public/,
-        'scope :module => :public'
-    else
-      a.route "scope :module => :public do\n  end"
-    end
-  end
-
-end