anadea-spark 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b82af6245f67dc75d86df9c2f193c04306e4cb92
-  data.tar.gz: 8a1cbe9a9d832dfcbe1de9ba8553da88b2c5d610
+  metadata.gz: 5152f8299a5da09137355aa4b6d6f9787cce496a
+  data.tar.gz: 258ac48e778aab7e06776084329b18566f30bdd9
 SHA512:
-  metadata.gz: a731cd4e1f20d594ea069f00caefef30ddb588ff0b05b64b934323b95ff52d8e7693624ce9620debeed247763d810227a1029696a2d1b5bc8a2030e6ca831a8c
-  data.tar.gz: 34cb2b0125f725e8d7416e97f68c1ce8f297a3a13d1773abeecd767b8f3a8b98f711e1da6fd3e6cbc7da24611919a96292332fec121b5189c33c748788181b90
+  metadata.gz: 6dfe24b9f4798511027a19c295ae8b7e8941d93873121881550d57c34266357f4bac2acc06d81a61e9214564a904c01501421a043278203af6c04c464cbd3a48
+  data.tar.gz: 306d3974368dd2eabc592cf75f90e855f8977dd08fbdf3fd35d3a35f868400a1b73f8b3fb952e63803ba28e3cf1fa26f8a2eed95ef931ce3559b93aa3a1bfdf3

data/lib/spark/app_builder.rb

@@ -197,7 +197,7 @@ module Spark
 
     def configure_time_formats
       remove_file "config/locales/en.yml"
-      template "config/locales_en.yml.erb", "config/locales/en.yml"
+      template "config/locales/en/formats.yml.erb", "config/locales/en/formats.yml"
     end
 
     def configure_simple_form
@@ -226,6 +226,15 @@ module Spark
       inject_into_class 'config/application.rb', 'Application', config
     end
 
+    def configure_locales_load_from_folders
+      config = <<-RUBY
+    config.i18n.load_path += Dir[Rails.root.join('config', 'locales', '**', '*.{rb,yml}')]
+      RUBY
+
+      gsub_file 'config/application.rb', /config\.i18n\.load_path.+/, config
+      uncomment_lines 'config/application.rb', /config\.i18n\.load_path/
+    end
+
     def generate_rspec
       generate 'rspec:install'
     end
@@ -240,8 +249,8 @@ module Spark
 
     def setup_stylesheets
       remove_file 'app/assets/stylesheets/application.css'
-      copy_file 'assets/application.css.scss',
-        'app/assets/stylesheets/application.css.scss'
+      copy_file 'assets/application.scss',
+        'app/assets/stylesheets/application.scss'
     end
 
     def setup_javascripts

data/lib/spark/generators/app_generator.rb

@@ -1,3 +1,4 @@
+require 'ostruct'
 require 'rails/generators'
 require 'rails/generators/rails/app/app_generator'
 
@@ -114,6 +115,7 @@ module Spark
       build :configure_simple_form
       build :disable_xml_params
       build :fix_i18n_deprecation_warning
+      build :configure_locales_load_from_folders
       build :setup_default_rake_task
       build :setup_foreman
     end
@@ -184,6 +186,30 @@ module Spark
 
     protected
 
+    def db_host
+      db_info.host
+    end
+
+    def db_port
+      db_info.port
+    end
+
+    def db_username
+      db_info.user
+    end
+
+    def db_password
+      db_info.password
+    end
+
+    def db_info
+      if ENV.key?("GENERATED_DATABASE_URL")
+        URI.parse(ENV["GENERATED_DATABASE_URL"])
+      else
+        OpenStruct.new
+      end
+    end
+
     def get_builder_class
       Spark::AppBuilder
     end

data/lib/spark/version.rb

@@ -1,5 +1,5 @@
 module Spark
   RAILS_VERSION = "4.2.1"
   RUBY_VERSION = IO.read("#{File.dirname(__FILE__)}/../../.ruby-version").strip
-  VERSION = "0.3.2"
+  VERSION = "0.4.0"
 end

data/spec/features/new_project_spec.rb

@@ -80,7 +80,7 @@ RSpec.feature 'Build a new project with default configuration' do
   scenario "generated en.yml is evaluated" do
     run_generator
 
-    locales_en_file = IO.read("#{project_path}/config/locales/en.yml")
+    locales_en_file = IO.read("#{project_path}/config/locales/en/formats.yml")
 
     expect(locales_en_file).to match(/with_weekday/)
   end

data/templates/config/postgresql_database.yml.erb

@@ -2,7 +2,10 @@ development: &default
   adapter: postgresql
   database: <%= app_name %>_development
   encoding: utf8
-  host: localhost
+  host: <%= db_host %>
+  <%= "port: #{db_port}" if db_port %>
+  <%= "username: #{db_username}" if db_username %>
+  <%= "password: #{db_password}" if db_password %>
   min_messages: warning
   pool: 2
   timeout: 5000

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: anadea-spark
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - anadea
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-04 00:00:00.000000000 Z
+date: 2015-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -113,15 +113,15 @@ files:
 - templates/Gemfile.erb
 - templates/Procfile
 - templates/README.md.erb
-- templates/assets/application.css.scss
 - templates/assets/application.js
+- templates/assets/application.scss
 - templates/bin/setup.erb
 - templates/config/application.yml.sample
 - templates/config/initializers/disable_xml_params.rb
 - templates/config/initializers/errors.rb
 - templates/config/initializers/exception_notification.rb.erb
 - templates/config/initializers/json_encoding.rb
-- templates/config/locales_en.yml.erb
+- templates/config/locales/en/formats.yml.erb
 - templates/config/newrelic.yml.erb
 - templates/config/postgresql_database.yml.erb
 - templates/config/rails_secrets.yml