aetherg 0.5.0.beta → 0.5.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 637408317b3ebd124ddc4a72b20801b8dc83c1c7
-  data.tar.gz: f2bbf7875fa01ffb06238e2a63f1811d6177b8fa
+  metadata.gz: 8c14fc0b51212c45fc6b1a9ecd2a63e0c4919e61
+  data.tar.gz: 498aad0e46737bd2ca39a0fb4021d0561f2fc401
 SHA512:
-  metadata.gz: 883541433acae2dd41c6e4c3e5e779c34d47dc37ac7a7d6768d18e38fbc039bec144e1e1da09cefe073ca9aa485b6c623dd9ba5aff9b4f30c1a4ee2e91d40592
-  data.tar.gz: c9f952fde9203efd4456b42012e203a7fbc3d1dcf6b29db618fe43ec3284e1699e9f16710a4c11d0ec7186b758d7ee810cc0e067646fc9cc3f3eb92b57d16558
+  metadata.gz: c10c303c2583f5ffdd591365f6d573286eb4ba16e52281eef27797927b126a75ff5cc118fc63b52224db605bf50d551f980942aec0680658be67b34671670224
+  data.tar.gz: 43d5569efb69129f6c013bf3b6b72ae2e428acfe58ad6ee8a2657bbccc3d3eb4ddb81d83824eeb1af6b3760b07f44e47e594e5220dff2dea3cd0595c29e615c4

data/README.md

@@ -29,4 +29,4 @@ Usage
 
 Copyright
 -----
-Copyright (c) 2016 Allen Chan, Inc. See LISENCE for detail.
+Copyright (c) 2017 Allen Chan, Inc. See LISENCE for detail.

data/VERSION

@@ -1 +1 @@
-0.5.0.beta
+0.5.0.beta2

data/aetherg.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'aetherg'
-  s.version     = '0.5.0.beta'
-  s.date        = '2017-04-20'
+  s.version     = '0.5.0.beta2'
+  s.date        = '2017-04-27'
   s.summary     = "Aetherg (Aether Generator) is a generator of sinatra app."
   s.description = "Aetherg (Aether Generator) is a sinatra based App generator. Light-weight for API service or full-stack Web apps"
   s.authors     = ["Allen Chan"]

data/bin/aetherg

@@ -8,4 +8,5 @@ if ARGV[0] == "--version" || ARGV[0] == "-v"
   exit
 end
 
+puts "Aetherg is generating..."
 Aetherg::Generator.start

data/changchangchang/app/routes/welcome.rb

@@ -0,0 +1,6 @@
+class Changchangchang::Application
+  # root default route
+  get "/" do
+    "Hello World! from Changchangchang."
+  end
+end

data/changchangchang/application.rb

@@ -0,0 +1,36 @@
+require File.expand_path('../boot', __FILE__)
+
+module Changchangchang
+  class Application < Sinatra::Base
+
+    set :root, File.dirname(__FILE__)
+    set :public_dir, File.expand_path('../public', __FILE__)
+    set :raise_errors, true
+    set :app_file, __FILE__
+
+    AUTOLOAD_PATHS = ["#{root}/app/*", "#{root}/lib"]
+
+    def self.require_autoload_paths(paths)
+      paths.each do |path|
+        Dir[File.join(path, "*.rb")].each do |file|
+          require file
+        end
+      end
+    end
+
+    def self.initialize!
+      settings_file = File.expand_path('../config/settings.yml', __FILE__)
+
+      if File.exist? settings_file
+        YAML::load(open(settings_file))[self.environment.to_s]
+      else
+        raise Errno::ENOENT
+      end
+    end
+
+  end
+end
+
+$app_settings ||= Changchangchang::Application.initialize!
+require File.expand_path('../config/initializer', __FILE__)
+Changchangchang::Application.require_autoload_paths(Changchangchang::Application::AUTOLOAD_PATHS)

data/lib/aetherg/aetherg.rb

@@ -35,7 +35,7 @@ module Aetherg
         empty_directory File.join(@app_path, dir)
       end
 
-      %w{app/assets app/assets/images app/assets/javascripts app/assets/stylesheets app/assets/fonts app/views app/views/layouts public}.each do |dir|
+      %w{app/assets app/assets/images app/assets/javascripts app/assets/stylesheets app/views app/views/layouts public}.each do |dir|
         empty_directory File.join(@app_path, dir)
       end unless @no_views
     end
@@ -48,6 +48,8 @@ module Aetherg
     def create_views_layout
       unless @no_views
         copy_file "app/views/layouts/application.erb", File.join(@app_path, "/app/views/layouts/application.erb")
+        copy_file "app/assets/javascripts/application.js", File.join(@app_path, "/app/assets/javascripts/applicatin.js")
+        copy_file "app/assets/stylesheets/application.css", File.join(@app_path, "/app/assets/stylesheets/application.css")
       end
     end
 

data/lib/aetherg/version.rb

@@ -1,4 +1,4 @@
 module Aetherg
-  VERSION = "0.5.0.beta"
-  BUILD   = "2017-04-20"
+  VERSION = "0.5.0.beta2"
+  BUILD   = "2017-04-27"
 end

data/lib/templates/Gemfile

@@ -2,6 +2,9 @@ source "https://ruby.taobao.org"
 # source "https://rubygems.org" # Use rubygems if you're not in China
 
 gem 'sinatra', '~> 2.0.0.rc2', require: 'sinatra/base'
+# sinatra-contrib gem was merged into sinatra in v2.0.0
+# requirement can be changed when you use some/all of them
+gem 'sinatra-contrib', '~> 2.0.0.rc2', require: false
 gem 'rake'
 <%- unless @no_database -%>
 gem 'activerecord'
@@ -21,12 +24,14 @@ gem 'redis'
 <%- end -%>
 
 <%- unless @no_views -%>
-# with assetpack, using sass, and uglifier
-# assetpack support by compass configure when using scss/sass import
-gem 'sinatra-assetpack', require: 'sinatra/assetpack'
-gem 'compass'
-gem 'sass'
+# Sprockets for assets pipeline
+# sass, coffescript, and compile with uglifier
+gem 'sprockets', '~> 3.7.1'
+gem 'sprockets-helpers'
 gem 'uglifier'
+gem 'sass'
+gem 'coffee-script'
+gem 'execjs'
 <%- end %>
 
 <%- unless @no_views -%>

data/lib/templates/app/assets/javascripts/application.js

@@ -0,0 +1,6 @@
+// This is a manifest file that'll be compiled into application.js, which will include all the files
+// listed below.
+//
+// Any JavaScript/Coffee file within this directory can be referenced here using a relative path.
+//
+//= require_tree .

data/lib/templates/app/assets/stylesheets/application.css

@@ -0,0 +1,9 @@
+/*
+ * This is a manifest file that'll be compiled into application.css, which will include all the files
+ * listed below.
+ *
+ * Any CSS and SCSS file within this directory, can be referenced here using a relative path.
+ *
+ *= require_self
+ *= require style
+ */

data/lib/templates/app/views/layouts/application.erb

@@ -3,14 +3,16 @@
   <head>
     <meta charset="utf-8">
     <meta http-equiv=X-UA-Compatible content="Chrome=1,IE=edge">
+    <meta name="renderer" content="webkit">
     <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no, maximum-scale=1">
     <title></title>
-
+    <link rel="stylesheet" href="<%= stylesheet_path 'application' %>">
     <meta name="keywords" content="">
     <meta name="description" content="">
-    <link rel="canonical" href="<%= $app_settings['url'] %>">
+    <link rel="canonical" href='<%= $app_settings['url'] %>'>
   </head>
   <body>
     <%= yield %>
+    <script src='<%= javascript_path 'application' %>' charset="utf-8"></script>
   </body>
 </html>

data/lib/templates/config/initializers/assets.rb

@@ -1,35 +1,56 @@
 class <%= @name.camelcase %>::Application
+  register Sprockets::Helpers
 
-  register Sinatra::AssetPack
-
-  # configuration with compass
-  set :sass, Compass.sass_engine_options
-  set :sass, { :load_paths => sass[:load_paths] + [ "#{root}/app/assets/stylesheets" ] }
-  set :scss, sass
-
-  # Config assets paths
-  # with sass, uglify support
-  # Also supports coffeescript
-  # assets do
-  #   serve '/js',    from: 'app/assets/javascripts'
-  #   serve '/css',   from: 'app/assets/stylesheets'
-  #   serve '/fonts', from: 'app/assets/fonts'
-  #   serve '/images', from: 'app/assets/images'
-  #
-  #   js :application, [
-  #     '/js/jquery.js',
-  #     '/js/util.js',
-  #     '/js/*.js'
-  #   ]
-  #
-  #   css :application, [
-  #     '/css/application.css'
-  #   ]
-  #
-  #   js_compression :uglify
-  #   css_compression :sass
-  #
-  #   expires 86400*365, :public
-  # end
+  set :sprockets, Sprockets::Environment.new
+  set :assets_prefix, '/assets'
+  set :digest_assets, true
+
+  configure do
+    # append assets paths
+    sprockets.append_path "app/assets/stylesheets"
+    sprockets.append_path "app/assets/javascripts"
+    sprockets.append_path "app/assets/images"
+    # Other assets path, you can add below
+    # sprockets.append_path "app/assets/fonts"
+
+    # compress assets
+    sprockets.js_compressor  = :uglify
+    sprockets.css_compressor = :scss
+
+    # Configure Sprockets::Helpers (if necessary)
+    Sprockets::Helpers.configure do |config|
+      config.environment = sprockets
+      config.prefix      = assets_prefix
+      config.digest      = digest_assets
+      config.public_path = public_folder
+
+      # Force to debug mode in development mode
+      # Debug mode automatically sets
+      # expand = true, digest = false, manifest = false
+      config.debug       = true if development?
+    end
+  end
+
+  helpers do
+  include Sprockets::Helpers
+
+    # Alternative method for telling Sprockets::Helpers which
+    # Sprockets environment to use.
+    # def assets_environment
+    #   settings.sprockets
+    # end
+
+    # Use:
+    # stylesheet_path 'application'
+    # javascript_path 'application'
+    # as style and js path generator
+  end
+
+  # get assets
+  get "/assets/*" do
+    # if you changed assets_prefix, you need change it here
+    env["PATH_INFO"].sub!("/assets", "")
+    settings.sprockets.call(env)
+  end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aetherg
 version: !ruby/object:Gem::Version
-  version: 0.5.0.beta
+  version: 0.5.0.beta2
 platform: ruby
 authors:
 - Allen Chan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-20 00:00:00.000000000 Z
+date: 2017-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -41,6 +41,9 @@ files:
 - VERSION
 - aetherg.gemspec
 - bin/aetherg
+- changchangchang/app/routes/welcome.rb
+- changchangchang/app/views/layouts/application.erb
+- changchangchang/application.rb
 - lib/aetherg.rb
 - lib/aetherg/aetherg.rb
 - lib/aetherg/array.rb
@@ -49,6 +52,8 @@ files:
 - lib/templates/Gemfile
 - lib/templates/README.md
 - lib/templates/Rakefile
+- lib/templates/app/assets/javascripts/application.js
+- lib/templates/app/assets/stylesheets/application.css
 - lib/templates/app/routes/welcome.rb
 - lib/templates/app/views/layouts/application.erb
 - lib/templates/application.rb