repres-dosser 1.6.2 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d218185b060660cd9d3fa2252219abed7337744b
-  data.tar.gz: d7539dbd223895a28a7dae3a4eed07ce5347e497
+  metadata.gz: 9159343e1431e63c00f2ac01681c6d0ab23d50b0
+  data.tar.gz: 1e626e0a0589151c7cb6757ba466222705e11b40
 SHA512:
-  metadata.gz: f7044bdce2ef47172a1526fa9b862994a40b5d9671bb12532eb5372dbf2b77a4f38497c7bbbc8e96fd508378b8250c8200806d238f31809883e59909f5070005
-  data.tar.gz: 28aa3bd595b210b9c162c9cfdd3b08128cd8e2c7bdb4689a2afa48ac3d8ce387e6a7d309c4be547c3ed5137ed3bb4b8e4c86a33764373db7c5a207f220fd4dcf
+  metadata.gz: fa9104f825e204bfd3feb9cb7a9dbcfe956888297ddfb37b18e40b357f7aa57f4fd8c28338c7522d5780fb2f03326a85ea23f62625601b5e4dae9f1a8e5bc346
+  data.tar.gz: 4de3f38f8f4a6f08d2b2c8816e2f6e7fbb208a2161c52bb86dac853f28b110c09ade565342b3edbeff6acb9b1d9bfd4210027bf40af828ae31597a40c9fe798b

data/lib/generators/repres/dosser/platform/platform_generator.rb

@@ -9,8 +9,6 @@ class Repres::Dosser::PlatformGenerator < Rails::Generators::NamedBase
 
   def produce
 
-    @platform_name  = file_name.downcase
-    @version_number = options['version'].to_i
     bind_options
 
     generate_controller
@@ -19,6 +17,8 @@ class Repres::Dosser::PlatformGenerator < Rails::Generators::NamedBase
   end
 
   def bind_options
+    @platform_name        = file_name.downcase
+    @version_number       = options['version'].to_i
     @platform_module_name = @platform_name.camelize
     @version_module_name  = "V#{@version_number}"
     @version_name         = "v#{@version_number}"
@@ -26,12 +26,13 @@ class Repres::Dosser::PlatformGenerator < Rails::Generators::NamedBase
 
   # controller
   #
-  #   app/controllers/platform/version/presentation_controller.rb
-  #   app/controllers/platform/version/portals_controller.rb
+  #   app/controllers/{platform}/dosser/{version}/presentation_controller.rb
+  #   app/controllers/{platform}/dosser/{version}/portals_controller.rb
   #
   def generate_controller
-    template 'controllers/portals_controller.rb',      "app/controllers/#{@platform_name}/dosser/#{@version_name}/portals_controller.rb"
-    template 'controllers/presentation_controller.rb', "app/controllers/#{@platform_name}/dosser/#{@version_name}/presentation_controller.rb"
+    empty_directory "app/controllers/#{@platform_name}/dosser/#{@version_name}"
+    template 'app/controllers/portals_controller.rb.erb',      "app/controllers/#{@platform_name}/dosser/#{@version_name}/portals_controller.rb"
+    template 'app/controllers/presentation_controller.rb.erb', "app/controllers/#{@platform_name}/dosser/#{@version_name}/presentation_controller.rb"
   end
 
   # route
@@ -39,11 +40,11 @@ class Repres::Dosser::PlatformGenerator < Rails::Generators::NamedBase
   #   config/routes.rb
   #
   def generate_route
-    source  = File.expand_path find_in_source_paths('routes.rb')
+    source  = File.expand_path find_in_source_paths('config/routes.rb.erb')
     content = ERB.new(File.binread(source).strip, nil, '-', "@output_buffer").result instance_eval('binding')
     route content
   end
 
-  private :bind_options,   :generate_controller,  :generate_route
+  private :bind_options, :generate_controller, :generate_route
 
 end

data/lib/generators/repres/dosser/platform/templates/{controllers/presentation_controller.rb → app/controllers/presentation_controller.rb.erb}

@@ -1,4 +1,4 @@
-require 'unidom'
+#require 'unidom'
 
 class <%= @platform_module_name %>::Dosser::<%= @version_module_name %>::PresentationController < ActionController::Base
 
@@ -8,10 +8,10 @@ class <%= @platform_module_name %>::Dosser::<%= @version_module_name %>::Present
 
   layout nil
 
-  before_action :load_unidom
+  #before_action :load_unidom
 
-  def load_unidom
-    initialize_unidom
-  end
+  #def load_unidom
+  #  initialize_unidom
+  #end
 
 end

data/lib/generators/repres/dosser/swagger/swagger_generator.rb

@@ -9,30 +9,25 @@ class Repres::Dosser::SwaggerGenerator < Rails::Generators::NamedBase
 
   def produce
 
-    @platform_name  = file_name.downcase
-    @version_number = options['version'].to_i
+    bind_options
 
     generate 'repres:dosser:platform', "#{@platform_name} --version #{@version_number}"
 
     generate_gemfile
     generate_initializer
     generate_swagger
+    generate_route
 
   end
 
-  def define_platform_namespace(content)
-    content.gsub! /PlatformModuleName/, platform_module_name
-    content.gsub! /VersionModuleName/,  version_module_name
-    content.gsub! /platform_name/,      platform_name
-    content.gsub! /version_name/,       version_name
-    content.gsub! /version_number/,     version_number.to_s
-    content
-  end
-
-  def define_swagger_engine(content)
-    content.gsub! /APPLICATION_NAME/, application_name.upcase
-    content.gsub! /application_name/, application_name
-    define_platform_namespace content
+  def bind_options
+    @platform_name          = file_name.downcase
+    @version_number         = options['version'].to_i
+    @platform_module_name   = @platform_name.camelize
+    @version_module_name    = "V#{@version_number}"
+    @version_name           = "v#{@version_number}"
+    @application_name       = application_name
+    @application_name_const = application_name.upcase
   end
 
   # gemfile
@@ -41,7 +36,6 @@ class Repres::Dosser::SwaggerGenerator < Rails::Generators::NamedBase
   #
   def generate_gemfile
     gem 'swagger_engine'
-    gem 'repres-dosser', ">= #{Repres::Dosser::VERSION}"
   end
 
   # initializer
@@ -49,12 +43,10 @@ class Repres::Dosser::SwaggerGenerator < Rails::Generators::NamedBase
   #   config/initializers/swagger_engine.rb
   #
   def generate_initializer
-    copy_file('config/initializers/swagger_engine.rb') { |content| define_swagger_engine content }
-    file = Rails.root.join('config', 'initializers', 'swagger_engine.rb')
-
-    line = "'PlatformModuleName API version_name': 'lib/swagger/platform_name_api_version_name.json'"
-    line = define_platform_namespace line
+    template 'config/initializers/swagger_engine.rb.erb', 'config/initializers/swagger_engine.rb'
 
+    line = "'#{@platform_module_name} API #{@version_name}': 'lib/swagger/#{@platform_name}_api_#{@version_name}.json'"
+    file = Rails.root.join 'config', 'initializers', 'swagger_engine.rb'
     if :invoke==behavior
       puts "Please make sure the following line is in the file #{file}:\n\n    #{line}\n\n"
     elsif :revoke==behavior
@@ -65,45 +57,22 @@ class Repres::Dosser::SwaggerGenerator < Rails::Generators::NamedBase
 
   # swagger
   #
-  #   lib/swagger/administration_api_v1.json
+  #   lib/swagger/{platform}_api_{version}.json
   #
   def generate_swagger
-    copy_file('lib/swagger/api.json', "lib/swagger/#{platform_name}_api_#{version_name}.json") { |content| define_platform_namespace content }
-  end
-
-  # Administration
-  def platform_module_name
-    @platform_name.camelize
-  end
-
-  # administration
-  def platform_name
-    @platform_name
+    template 'lib/swagger/api.json.erb', "lib/swagger/#{@platform_name}_api_#{@version_name}.json"
   end
 
-  # Administration::V1
-  def platform_version_module_name
-    "#{platform_module_name}::Dosser::#{version_module_name}"
-  end
-
-  # V1
-  def version_module_name
-    "V#{version_number}"
-  end
-
-  # v1
-  def version_name
-    "v#{version_number}"
-  end
-
-  # 1
-  def version_number
-    @version_number
+  # route
+  #
+  #   config/routes.rb
+  #
+  def generate_route
+    source  = File.expand_path find_in_source_paths('config/routes.rb.erb')
+    content = ERB.new(File.binread(source).strip, nil, '-', "@output_buffer").result instance_eval('binding')
+    route content
   end
 
-  private :define_platform_namespace,             :define_swagger_engine,
-    :generate_gemfile,     :generate_initializer, :generate_swagger,
-    :platform_module_name, :platform_name,        :platform_version_module_name,
-    :version_module_name,  :version_name,         :version_number
+  private :generate_gemfile, :generate_initializer, :generate_swagger, :generate_route
 
 end

data/lib/generators/repres/dosser/swagger/templates/config/initializers/swagger_engine.rb.erb

@@ -0,0 +1,10 @@
+SwaggerEngine.configure do |config|
+
+  config.admin_username = ENV['<%= @application_name_const %>_SWAGGER_USERNAME']||'swagger'
+  config.admin_password = ENV['<%= @application_name_const %>_SWAGGER_PASSWORD']||'<%= @application_name %>'
+
+  config.json_files = {
+    '<%= @platform_module_name %> API <%= @version_name %>': 'lib/swagger/<%= @platform_name %>_api_<%= @version_name %>.json'
+  }
+
+end

data/lib/generators/repres/dosser/swagger/templates/config/routes.rb.erb

@@ -0,0 +1 @@
+mount SwaggerEngine::Engine, at: '/api-docs'

data/lib/generators/repres/dosser/swagger/templates/lib/swagger/{api.json → api.json.erb}

@@ -1,13 +1,13 @@
 {
   "swagger": "2.0",
   "info": {
-    "title":       "PlatformModuleName Web API",
-    "description": "PlatformModuleName RESTful Web API version_name",
+    "title":       "<%= @platform_module_name %> Web API",
+    "description": "<%= @platform_module_name %> RESTful Web API <%= @version_name %>",
     "contact":     { "name": "Your Name", "email": "user@company.com" },
-    "version":     "version_number"
+    "version":     "<%= @version_number %>"
   },
   "schemes":  [ "https", "http" ],
-  "basePath": "/platform_name-api/version_name",
+  "basePath": "/<%= @platform_name %>-api/<%= @version_name %>",
   "produces": [ "application/json" ],
   "consumes": [ "application/json" ],
   "paths":    {

data/lib/repres/dosser/version.rb

@@ -1,5 +1,5 @@
 module Repres
   module Dosser
-    VERSION = '1.6.2'.freeze
+    VERSION = '1.6.3'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: repres-dosser
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.6.3
 platform: ruby
 authors:
 - Topbit Du
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-07 00:00:00.000000000 Z
+date: 2016-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -46,13 +46,14 @@ files:
 - config/routes.rb
 - lib/generators/repres/dosser/platform/USAGE
 - lib/generators/repres/dosser/platform/platform_generator.rb
-- lib/generators/repres/dosser/platform/templates/controllers/portals_controller.rb
-- lib/generators/repres/dosser/platform/templates/controllers/presentation_controller.rb
-- lib/generators/repres/dosser/platform/templates/routes.rb
+- lib/generators/repres/dosser/platform/templates/app/controllers/portals_controller.rb.erb
+- lib/generators/repres/dosser/platform/templates/app/controllers/presentation_controller.rb.erb
+- lib/generators/repres/dosser/platform/templates/config/routes.rb.erb
 - lib/generators/repres/dosser/swagger/USAGE
 - lib/generators/repres/dosser/swagger/swagger_generator.rb
-- lib/generators/repres/dosser/swagger/templates/config/initializers/swagger_engine.rb
-- lib/generators/repres/dosser/swagger/templates/lib/swagger/api.json
+- lib/generators/repres/dosser/swagger/templates/config/initializers/swagger_engine.rb.erb
+- lib/generators/repres/dosser/swagger/templates/config/routes.rb.erb
+- lib/generators/repres/dosser/swagger/templates/lib/swagger/api.json.erb
 - lib/repres/dosser.rb
 - lib/repres/dosser/engine.rb
 - lib/repres/dosser/version.rb

data/lib/generators/repres/dosser/swagger/templates/config/initializers/swagger_engine.rb

@@ -1,10 +0,0 @@
-SwaggerEngine.configure do |config|
-
-  config.admin_username = ENV['APPLICATION_NAME_SWAGGER_USERNAME']||'swagger'
-  config.admin_password = ENV['APPLICATION_NAME_SWAGGER_PASSWORD']||'application_name'
-
-  config.json_files = {
-    'PlatformModuleName API version_name': 'lib/swagger/platform_name_api_version_name.json'
-  }
-
-end