potassium 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44f4877e46ff82660a1c6be6f8f4f7afe69c702d
-  data.tar.gz: 5f2202a4a00fb64e25a77bf8dd0bb71f9998273d
+  metadata.gz: 6bd955fe45f9f7ea2929aa14fce95eba22a2d589
+  data.tar.gz: d4190dd0cef9d11f659c82cdd18fff3b94248cbe
 SHA512:
-  metadata.gz: 61fd09c9afd24f864e0a3c95d7c933dbd8ab397ec2d762f261ae769ee41f5a98c5035bfa81aae5532d51fefdac3f1b3e44f521d23427e955b507141ebd5f80ff
-  data.tar.gz: e0d209ec0fade494671b82135476e4056aac23383229a93439183ad9277641011e1d968d1eafae47ab121373e54f109a9767744787888d7f0388ca67d7cf9808
+  metadata.gz: 1897969429841a49c86d009cf9a3b391fb1a33c2166cb5a2ef5605fccdbc4768b79b838d5ee03fafd2f57981be738b96b4d6bc1990aa7f28b7761c40b58be1ae
+  data.tar.gz: ebcb9f52ad8f8cc7bcbebcae08df89c8efd66b8032a9b232ac712ffb0004f696998df3d866db33c60a95ff296dff9ea4ddeb3296179da9f31a6607f18df97b4f

data/CHANGELOG.md

@@ -10,3 +10,17 @@ Bugfixes:
 
 Features:
   - Added a question for choosing application language and integration with devise-i18n.
+
+## 1.2.0
+
+Bugfixes:
+  - Fixed RSpec load with Zeus (by using rails_helper instead on spec_helper in .rspec).
+  - Removed RSpec `--warnings` option.
+
+Features:
+  - Added `aws-sdk` gem (< 2).
+  - Added `activeadmin_addons` when using ActiveAdmin.
+  - Added AngularJS support for ActiveAdmin. 
+
+Chore:
+  - Removed several questions for ActiveAdmin support.

data/lib/potassium/templates/application/assets/.rbenv-vars.example

@@ -3,3 +3,5 @@ DB_USER=root
 DB_PASSWORD=
 DEFAULT_EMAIL_ADDRESS=
 SECRET_KEY_BASE=
+AWS_ACCESS_KEY_ID=
+AWS_SECRET_ACCESS_KEY=

data/lib/potassium/templates/application/assets/active_admin/active_admin.js.coffee

@@ -0,0 +1,4 @@
+#= require active_admin/base
+#= require angular
+#= require admin_app
+#= require_tree ./admin

data/lib/potassium/templates/application/assets/active_admin/init_activeadmin_angular.rb

@@ -0,0 +1,8 @@
+class ActiveAdmin::Views::Pages::Base
+  alias_method :old_add_classes_to_body, :add_classes_to_body
+
+  def add_classes_to_body
+    old_add_classes_to_body
+    @body.set_attribute "ng-app", "ActiveAdmin"
+  end
+end

data/lib/potassium/templates/application/assets/testing/.rspec

@@ -1,5 +1,4 @@
 --color
---require spec_helper
---warnings
+--require rails_helper
 --format=doc
 --format=Nc

data/lib/potassium/templates/application/assets/testing/rails_helper.rb

@@ -1,8 +1,8 @@
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 ENV['RAILS_ENV'] ||= 'test'
-require 'spec_helper'
 require File.expand_path('../../config/environment', __FILE__)
 require 'rspec/rails'
+require 'spec_helper'
 require 'shoulda/matchers'
 # Add additional requires below this line. Rails is not loaded until this point!
 

data/lib/potassium/templates/application/recipes/admin.rb

@@ -1,6 +1,7 @@
 if get(:admin_mode)
   if equals?(:authentication, :devise)
     gather_gem 'activeadmin', github: 'activeadmin'
+    gather_gem 'activeadmin_addons'
 
     after(:gem_install, :wrap_in_action => :admin_install) do
       generate "active_admin:install"

data/lib/potassium/templates/application/recipes/angular_admin.rb

@@ -0,0 +1,23 @@
+if get(:angular_admin)
+
+  after(:admin_install) do
+    copy_file 'assets/active_admin/init_activeadmin_angular.rb', 'config/initializers/init_activeadmin_angular.rb'
+
+    create_file 'app/assets/javascripts/admin_app.js', "angular.module('ActiveAdmin', []);"
+
+    copy_file 'assets/active_admin/active_admin.js.coffee', 'app/assets/javascripts/active_admin.js.coffee', force: true
+
+    empty_directory 'app/assets/javascripts/admin'
+    empty_directory 'app/assets/javascripts/admin/controllers'
+    empty_directory 'app/assets/javascripts/admin/services'
+    empty_directory 'app/assets/javascripts/admin/directives'
+
+    create_file 'app/assets/javascripts/admin/controllers/.keep'
+    create_file 'app/assets/javascripts/admin/services/.keep'
+    create_file 'app/assets/javascripts/admin/directives/.keep'
+
+    inside('.') do
+      run('bower install angular --save')
+    end
+  end
+end

data/lib/potassium/templates/application/recipes/asks/admin.rb

@@ -1,10 +1,8 @@
 if equals?(:authentication, :devise)
   admin_mode = Ask.confirm "Do you want to use ActiveAdmin?"
   if admin_mode
-    admin_mode = Ask.confirm "Do you really want to use ActiveAdmin?"
-    if admin_mode
-      admin_mode = Ask.confirm "Do you really, really want to use ActiveAdmin?"
-    end
+    angular_admin = Ask.confirm "Do you want Angular support for ActiveAdmin?"
+    set(:angular_admin, angular_admin)
   end
 
   set(:admin_mode, admin_mode)

data/lib/potassium/templates/application/recipes/aws_sdk.rb

@@ -0,0 +1 @@
+gather_gem('aws-sdk', '< 2')

data/lib/potassium/templates/application/template.rb

@@ -27,10 +27,12 @@ run_action(:recipe_loading) do
   eval_file "recipes/rbenv.rb"
   eval_file "recipes/bower.rb"
   eval_file "recipes/editorconfig.rb"
+  eval_file "recipes/aws_sdk.rb"
   eval_file "recipes/i18n.rb"
   eval_file "recipes/pry.rb"
   eval_file "recipes/devise.rb"
   eval_file "recipes/admin.rb"
+  eval_file "recipes/angular_admin.rb"
   eval_file "recipes/pundit.rb"
   eval_file "recipes/testing.rb"
   eval_file "recipes/production.rb"

data/lib/potassium/version.rb

@@ -1,3 +1,3 @@
 module Potassium
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: potassium
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - juliogarciag
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-18 00:00:00.000000000 Z
+date: 2015-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -104,6 +104,8 @@ files:
 - lib/potassium/templates/application/assets/.editorconfig
 - lib/potassium/templates/application/assets/.pryrc
 - lib/potassium/templates/application/assets/.rbenv-vars.example
+- lib/potassium/templates/application/assets/active_admin/active_admin.js.coffee
+- lib/potassium/templates/application/assets/active_admin/init_activeadmin_angular.rb
 - lib/potassium/templates/application/assets/active_admin/pundit_page_policy.rb
 - lib/potassium/templates/application/assets/bower.json
 - lib/potassium/templates/application/assets/config/database_mysql.yml
@@ -119,11 +121,13 @@ files:
 - lib/potassium/templates/application/helpers/template-helpers.rb
 - lib/potassium/templates/application/helpers/variable-helpers.rb
 - lib/potassium/templates/application/recipes/admin.rb
+- lib/potassium/templates/application/recipes/angular_admin.rb
 - lib/potassium/templates/application/recipes/asks/admin.rb
 - lib/potassium/templates/application/recipes/asks/database.rb
 - lib/potassium/templates/application/recipes/asks/devise.rb
 - lib/potassium/templates/application/recipes/asks/lang.rb
 - lib/potassium/templates/application/recipes/asks/pundit.rb
+- lib/potassium/templates/application/recipes/aws_sdk.rb
 - lib/potassium/templates/application/recipes/bower.rb
 - lib/potassium/templates/application/recipes/database.rb
 - lib/potassium/templates/application/recipes/devise.rb
@@ -159,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: An application generator from Platanus