chr 0.4.14 → 0.4.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e17c570888d2652d32bce1a7735271077be4209
-  data.tar.gz: a751e96a3132dd42d96990fb32b2380f84039477
+  metadata.gz: 912f73cb64614f05ec42f14e83f2503933b7d820
+  data.tar.gz: ea5738b31d01552bac7d3ca9b11fd1bc3d7371e5
 SHA512:
-  metadata.gz: bd8018b063db8d922b99215764de74064919f0f68a9473d72df5edae7be18378b2f4ae641e195da163460669a587774689bd285b8a875587bac6d2306f1d4d3d
-  data.tar.gz: c05d08fdd10382d47fa18c3396d5dcc38437e03ebc23a8814d772b0ad26653e3a57f9476a95f8fc56394535fd907e54635d0ca60a18dd4e011de3077a6d8838f
+  metadata.gz: d002f6906c5e8ce5ff85b556b2599aa59b73ffedbabd0910d482c050526ebb506624963078856f9052e4ac5210021daa2035c6bb0fc237192dd5d578d3322889
+  data.tar.gz: e2747d714fb650826e626f38016916fe5925d93df0459032d4c29032d819ac742624e285635170595c4e521dc10f56593fbbe27d5c67294d3561c1e6856a5e36

data/lib/chr/app_builder.rb

@@ -135,11 +135,6 @@ module Chr
     end
 
 
-    def setup_asset_sync
-      copy_file 'asset_sync.rb', 'config/initializers/asset_sync.rb'
-    end
-
-
     def setup_staging_environment
       staging_file = 'config/environments/staging.rb'
       copy_file 'staging.rb', staging_file
@@ -282,7 +277,10 @@ module Chr
 
 
     def setup_character_views
-      copy_file 'character_admin_layout.html.erb', 'app/views/layouts/admin.html.erb'
+      template 'character_admin_layout.html.erb.erb',
+        'app/views/layouts/admin.html.erb',
+        force: true
+
       copy_file 'character_admin_index.html.erb',  'app/views/admin/index.html.erb'
     end
 

data/lib/chr/generators/app_generator.rb

@@ -80,7 +80,6 @@ module Chr
       build :enable_rack_canonical_host
       build :enable_rack_deflater
       build :setup_asset_host
-      build :setup_asset_sync
     end
 
 

data/lib/chr/version.rb

@@ -1,5 +1,5 @@
 module Chr
   RAILS_VERSION = "~> 4.2.4"
   RUBY_VERSION  = IO.read("#{File.dirname(__FILE__)}/../../.ruby-version").strip
-  VERSION       = "0.4.14"
+  VERSION       = "0.4.15"
 end

data/templates/Gemfile.erb

@@ -10,17 +10,18 @@ gem 'puma'
 gem 'recipient_interceptor'
 gem 'rack-canonical-host'
 gem 'meta-tags'
-gem 'asset_sync'
 gem 'awesome_print'
 gem 'bson_ext'
 gem 'mongoid', '~> 5.0.0'
+gem 'fog'
+gem 'fog-aws'
+gem 'carrierwave-mongoid'
 # This `autoinc` branch supports mongoid 5.0, required by Loft
 gem 'mongoid-autoinc', github: 'suweller/mongoid-autoinc'
 gem 'mongosteen'
 gem 'chr'
 gem 'ants'
 gem 'loft'
-gem 'carrierwave-mongoid'
 
 group :development do
   gem 'spring'

data/templates/carrierwave.rb

@@ -1,23 +1,24 @@
 CarrierWave.configure do |config|
+  config.cache_dir = "#{Rails.root}/public/uploads/tmp"
 
   # DEVELOPMENT
-  config.storage   = :file
-  config.cache_dir = "#{Rails.root}/public/uploads/tmp"
+  if Rails.env.development?
+    config.storage = :file
+  end
 
+  # TEST
   if Rails.env.test?
-    # TEST
     config.cache_dir = "#{Rails.root}/public/uploads/tmp/test"
     config.enable_processing = false
 
+  # PRODUCTION & STAGING
   elsif Rails.env.production? || Rails.env.staging?
-    # PRODUCTION & STAGING
-    config.storage         = :fog
-    config.fog_directory   = ENV.fetch('FOG_DIRECTORY')
+    config.storage = :fog
+    config.fog_directory = ENV.fetch('FOG_DIRECTORY')
     config.fog_credentials = {
       provider: 'AWS',
-      aws_access_key_id:     ENV.fetch('AWS_ACCESS_KEY_ID'),
+      aws_access_key_id: ENV.fetch('AWS_ACCESS_KEY_ID'),
       aws_secret_access_key: ENV.fetch('AWS_SECRET_ACCESS_KEY'),
     }
   end
-
-end
+end

data/templates/character_admin_index.html.erb

@@ -1,2 +1,2 @@
 <%= javascript_include_tag :admin %>
-<%= link_to 'Sign Out', destroy_admin_session_path, method: :delete, style: 'display:none;', class: 'menu-logout' %>
+<%= link_to "Sign Out", destroy_admin_session_path, method: :delete, style: "display:none;", class: "menu-logout" %>

data/templates/character_admin_layout.html.erb.erb

@@ -8,13 +8,13 @@
   <meta name="apple-mobile-web-app-capable" content="yes">
   <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
 
-  <%%= display_meta_tags site: '<%= app_name %>', title: 'CMS' %>
+  <%%= display_meta_tags site: "<%= app_name %>", title: "CMS" %>
 
   <%%= csrf_meta_tags %>
-  <%%= stylesheet_link_tag :admin, media: 'all' %>
+  <%%= stylesheet_link_tag :admin, media: "all" %>
 </head>
 
-<body class='<%= body_class %>'>
+<body class="<%%= body_class %>">
   <%%= yield %>
 </body>
 

data/templates/dev.rake

@@ -5,7 +5,7 @@ if Rails.env.development? || Rails.env.test?
     desc "Seed data for development environment"
     task prime: "db:setup" do
       include FactoryGirl::Syntax::Methods
-
+      Mongoid.purge!
       Admin.create!(name: 'Admin', email: 'user@example.com', password: 'password')
     end
   end

data/templates/devise_overrides_passwords_edit.html.erb

@@ -1,4 +1,4 @@
-<% set_meta_tags title: 'CMS — Change Password' %>
+<% set_meta_tags title: "Change Password" %>
 
 <div class='signin-modal'>
   <h2>Change password</h2>
@@ -26,6 +26,6 @@
     <%= devise_error_messages! %>
 
     <%= f.submit "Change password", tabindex: 3 %>
-    <%= link_to 'Sign In', new_session_path(resource_name) %>
+    <%= link_to "Sign In", new_session_path(resource_name) %>
   <% end %>
 </div>

data/templates/devise_overrides_passwords_new.html.erb

@@ -1,4 +1,4 @@
-<% set_meta_tags title: 'CMS — Reset Password' %>
+<% set_meta_tags title: "Reset Password" %>
 
 <div class='signin-modal'>
   <h2>Forgot your password?</h2>
@@ -14,6 +14,6 @@
     <%= devise_error_messages! %>
 
     <%= f.submit "Reset password", tabindex: 2 %>
-    <%= link_to 'Sign In', new_session_path(resource_name) %>
+    <%= link_to "Sign In", new_session_path(resource_name) %>
   <% end %>
 </div>

data/templates/devise_overrides_sessions_new.html.erb

@@ -1,4 +1,4 @@
-<% set_meta_tags title: 'CMS — Sing in' %>
+<% set_meta_tags title: "Sing in" %>
 
 <div class='signin-modal'>
   <h2>Sign in</h2>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chr
 version: !ruby/object:Gem::Version
-  version: 0.4.14
+  version: 0.4.15
 platform: ruby
 authors:
 - Alexander Kravets
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-04 00:00:00.000000000 Z
+date: 2015-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -336,7 +336,6 @@ files:
 - templates/application.yml
 - templates/application_gitignore
 - templates/application_layout.html.erb.erb
-- templates/asset_sync.rb
 - templates/bin_setup.erb
 - templates/body_class_helper.rb
 - templates/bundler_audit.rake

data/templates/asset_sync.rb

@@ -1,28 +0,0 @@
-AssetSync.configure do |config|
-  config.fog_provider          = 'AWS'
-  config.aws_access_key_id     = ENV['AWS_ACCESS_KEY_ID']
-  config.aws_secret_access_key = ENV['AWS_SECRET_ACCESS_KEY']
-  config.fog_directory         = ENV['FOG_DIRECTORY']
-  # To use AWS reduced redundancy storage.
-  # config.aws_reduced_redundancy = true
-
-  # Invalidate a file on a cdn after uploading files
-  # config.cdn_distribution_id = "12345"
-  # config.invalidate = ['file1.js']
-
-  # Increase upload performance by configuring your region
-  # config.fog_region = 'eu-west-1'
-  #
-  # Don't delete files from the store
-  # config.existing_remote_files = "keep"
-  #
-  # Automatically replace files with their equivalent gzip compressed version
-  # config.gzip_compression = true
-  #
-  # Use the Rails generated 'manifest.yml' file to produce the list of files to
-  # upload instead of searching the assets directory.
-  # config.manifest = true
-  #
-  # Fail silently. Useful for environments such as Heroku
-  # config.fail_silently = true
-end