rails_com 1.1.0 → 1.2.0

data/lib/rails_com/controller_helper.rb

@@ -20,6 +20,31 @@ module RailsCom::ControllerHelper
     end
   end
 
+  def set_locale
+    if params[:locale]
+      session[:locale] = params[:locale]
+    end
+
+    I18n.locale = session[:locale] || I18n.default_locale
+  end
+
+  def detect_filter(filter)
+    callback = self.__callbacks[:process_action].find { |i| i.filter == filter.to_sym }
+    return false unless callback
+
+    _if = callback.instance_variable_get(:@if).map do |c|
+      c.call(self)
+    end
+
+    _unless = callback.instance_variable_get(:@unless).map do |c|
+      !c.call(self)
+    end
+
+    !(_if + _unless).uniq.include?(false)
+  end
+
 end
 
-ActionController::Base.include RailsCom::ControllerHelper
+ActiveSupport.on_load :action_controller_base do
+  include RailsCom::ControllerHelper
+end

data/lib/rails_com/controllers.rb

@@ -0,0 +1,8 @@
+module RailsCom::Controllers
+  extend self
+
+  def controller controller_path
+    (controller_path + '_controller').classify.constantize
+  end
+
+end

data/lib/rails_com/core_ext/nil.rb

@@ -1,7 +1,7 @@
 class NilClass
 
   def to_d
-    to_s.to_d
+    BigDecimal(0)
   end
 
 end

data/lib/rails_com/helpers/uid_helper.rb

@@ -13,15 +13,35 @@ module UidHelper
     str
   end
 
-  def nsec_uuid(prefix = '')
+  def nsec_uuid(prefix = '', suffix = rand_string)
     time = Time.now
     str = time.to_i.to_s + time.nsec.to_s
-    uuid str.to_i, prefix, rand_string
+    uuid str.to_i, prefix, suffix
   end
 
-  def sec_uuid(prefix = '')
+  def sec_uuid(prefix = '', suffix = rand_string(2))
     time = Time.now
-    uuid time.to_i, prefix, rand_string(2)
+    uuid time.to_i, prefix, suffix
+  end
+
+  def decode_uuid(uuid, prefix: true)
+    if prefix
+      str_arr = uuid.split('-')
+      str = str_arr[1..-1].join
+    else
+      str_arr = uuid.split('-')
+      str = str_arr.join
+    end
+
+    if str.size >= 12
+      str = str[0..11]
+      str.to_i(36).to_s
+    elsif str.size >= 6 && str.size < 12
+      str = str[0..5]
+      str.to_i(36).to_s
+    else
+      raise 'Can not parse the format string!'
+    end
   end
 
   def rand_string(len = 4)

data/lib/rails_com/rails_ext/scaffold_generator.rb

@@ -0,0 +1,14 @@
+require 'rails/generators/erb/scaffold/scaffold_generator'
+
+class Erb::Generators::ScaffoldGenerator
+  source_root File.expand_path('../../../templates/erb/scaffold', __FILE__)
+
+  undef available_views
+  private
+  def available_views
+    ['index', 'edit', 'show', 'new', '_form', '_search_form']
+  end
+
+end
+
+

data/lib/rails_com/rails_ext/template_renderer.rb

@@ -0,0 +1,22 @@
+module RailsExt
+  module TemplateRenderer
+    
+    # record where the view rendered from, main project or which engine
+    # used by view helper methods: js_load, css_load, js_ready
+    def render_template(template, layout_name = nil, locals = nil)
+      path = template.identifier
+
+      result = path.match /(?<=\/)[a-zA-Z0-9_-]+(?=\/app\/views)/
+      result = result.to_s.split('-').first.to_s + '/engine'
+
+      engine = result.classify.safe_constantize
+
+      @view.instance_variable_set(:@_rendered_from,  engine.root) if engine
+
+      super
+    end
+
+  end
+end
+
+ActionView::TemplateRenderer.prepend RailsExt::TemplateRenderer

data/lib/rails_com/routes.rb

@@ -1,21 +1,25 @@
 module RailsCom::Routes
   extend self
 
+  def verbs(controller, action)
+    routes_wrapper.select { |i| i[:controller] == controller.to_s && i[:action] == action.to_s }.map { |i| i[:verb] }.uniq
+  end
+
+  def actions(controller)
+    routes_wrapper.select { |i| i[:controller] == controller.to_s }.map { |i| i[:action] }.uniq
+  end
+
   def routes_wrapper
-    ary = []
+    return @routes_wrapper if @routes_wrapper.present?
 
+    @routes_wrapper = []
     routes.each do |route|
-      ary << detail(route)
+      @routes_wrapper << detail(route)
     end
 
-    ary
-  end
-
-  def actions(controller)
-    routes_wrapper.select { |i| i[:controller] == controller.to_s }.map { |i| i[:action] }.uniq
+    @routes_wrapper
   end
 
-  private
   def detail(route)
     wrap = ActionDispatch::Routing::RouteWrapper.new(route)
     info = route.defaults

data/lib/rails_com/sprockets/non_digest_assets.rb

@@ -8,24 +8,6 @@ module NonDigestAssets
     environment.paths.find_all { |i| i.include? 'nondigest_assets' }.each do |src|
       r_src = src.to_s + '/.'
       FileUtils.cp_r r_src, self.dir, verbose: true
-
-      if Sprockets.config[:sync].to_s == 'qiniu'
-        f_src = src.to_s + '/**/*'
-        path_src = Pathname.new src
-        Dir.glob(f_src).select { |f| File.file?(f) }.each do |file|
-          key = Pathname.new(file).relative_path_from(path_src)
-          QiniuHelper.upload file, 'assets/' + key.to_s
-        end
-      end
-    end
-  end
-
-  def remove(filename)
-    super
-
-    if Sprockets.config[:sync].to_s == 'qiniu'
-      QiniuHelper.delete 'assets/' + filename.to_s
-      logger.info "--> Removed from Qiniu: #{ filename }"
     end
   end
 

data/lib/rails_com/version.rb

@@ -1,3 +1,3 @@
 module RailsCom
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

data/lib/rails_com.rb

@@ -2,15 +2,24 @@ require 'rails_com/version'
 
 require 'rails_com/routes'
 require 'rails_com/models'
+require 'rails_com/controllers'
 require 'rails_com/model_helper'
 require 'rails_com/controller_helper'
-require 'rails_com/sprockets'
+require 'rails_com/sprockets/non_digest_assets'
 
 require 'rails_com/helpers/uid_helper'
 require 'rails_com/helpers/jobber'
-require 'rails_com/helpers/qiniu_helper'
 
 require 'rails_com/core_ext/hash'
 require 'rails_com/core_ext/nil'
 
+require 'rails_com/rails_ext/template_renderer'
+require 'rails_com/rails_ext/scaffold_generator'
+
 require 'rails_com/engine'
+
+module RailsCom
+  mattr_accessor :not_found_logger
+
+  self.not_found_logger = ActiveSupport::Logger.new('log/not_found.log')
+end

data/lib/templates/erb/scaffold/_form.html.erb.tt

@@ -0,0 +1,12 @@
+<%%= form_with model: @<%= model_resource_name %>, local: true do |f| %>
+  <%%= render 'shared/error_messages', target: @<%= singular_table_name %> %>
+<% attributes.each do |attribute| -%>
+<% if attribute.password_digest? -%>
+  <%%= f.password_field :password %>
+  <%%= f.password_field :password_confirmation %>
+<% else -%>
+  <%%= f.<%= attribute.field_type %> :<%= attribute.column_name %> %>
+<% end -%>
+<% end -%>
+  <%%= f.submit %>
+<%% end %>

data/lib/templates/erb/scaffold/_search_form.html.erb.tt

@@ -0,0 +1,7 @@
+<%%= search_form_with css: { wrapper_all: 'inline field', wrapper_input: 'field', wrapper_submit: 'field', submit: 'ui green button'} do |f| %>
+  <div class="fields">
+    <%%= f.submit 'Search' %>
+  </div>
+<%% end %>
+
+

data/lib/templates/erb/scaffold/edit.html.erb.tt

@@ -0,0 +1,14 @@
+<div>
+
+  <div class="ui segment breadcrumb">
+    <%%= link_to 'Back', <%= index_helper %>_path, class: 'section' %>
+    <div class="divider"> / </div>
+    <div class="active section">Edit</div>
+  </div>
+
+  <div class="ui segment">
+    <%%= render 'form' %>
+  </div>
+
+</div>
+

data/lib/templates/erb/scaffold/index.html.erb.tt

@@ -0,0 +1,43 @@
+<div>
+
+  <div class="ui top attached menu borderless">
+    <div class="header item"><%= plural_table_name.titleize %></div>
+  </div>
+
+  <div class="ui segment bottom attached">
+    <%%= render 'search_form' %>
+  </div>
+
+  <div class="ui segment top attached">
+    <%%= link_to 'New <%= singular_table_name.titleize %>', new_<%= singular_table_name %>_path, class: 'ui teal button' %>
+  </div>
+
+  <table class="ui bottom attached table">
+    <thead>
+    <tr>
+    <% attributes.reject(&:password_digest?).each do |attribute| -%>
+      <th><%= attribute.human_name %></th>
+    <% end -%>
+    </tr>
+    </thead>
+
+    <tbody>
+    <%% @<%= plural_table_name %>.each do |<%= singular_table_name %>| %>
+      <tr>
+<% attributes.reject(&:password_digest?).each do |attribute| -%>
+        <td><%%= <%= singular_table_name %>.<%= attribute.name %> %></td>
+<% end -%>
+        <td>
+          <%%= link_to 'Show', <%= singular_table_name %>_path(<%= singular_table_name %>), class: 'ui blue label' %>
+          <%%= link_to 'Edit', edit_<%= singular_table_name %>_path(<%= singular_table_name %>), class: 'ui pink label' %>
+          <%%= link_to 'Destroy', <%= singular_table_name %>_path(<%= singular_table_name %>), method: :delete, data: { confirm: 'Are you sure?' }, class: 'ui red label' %>
+        </td>
+      </tr>
+    <%% end %>
+    </tbody>
+  </table>
+
+  <%%= paginate @<%= plural_table_name %> %>
+</div>
+
+

data/lib/templates/erb/scaffold/new.html.erb.tt

@@ -0,0 +1,13 @@
+<div>
+
+  <div class="ui segment breadcrumb">
+    <%%= link_to 'Back', <%= index_helper %>_path, class: 'section' %>
+    <div class="divider"> / </div>
+    <div class="active section">Add</div>
+  </div>
+
+  <div class="ui segment">
+    <%%= render 'form' %>
+  </div>
+
+</div>

data/lib/templates/erb/scaffold/show.html.erb.tt

@@ -0,0 +1,7 @@
+<% attributes.reject(&:password_digest?).each do |attribute| -%>
+<p>
+  <strong><%= attribute.human_name %>:</strong>
+  <%%= @<%= singular_table_name %>.<%= attribute.name %> %>
+</p>
+
+<% end -%>

data/lib/templates/rails/scaffold_controller/controller.rb.tt

@@ -0,0 +1,53 @@
+<% if namespaced? -%>
+require_dependency '<%= namespaced_path %>/application_controller'
+<% end -%>
+class <%= controller_class_name %>Controller < <%= controller_class_path.map(&:camelize).join('::') %>::BaseController
+  before_action :set_<%= singular_table_name %>, only: [:show, :edit, :update, :destroy]
+
+  def index
+    @<%= plural_table_name %> = <%= orm_class %>.page(params[:page])
+  end
+
+  def new
+    @<%= singular_table_name %> = <%= orm_class.build(class_name) %>
+  end
+
+  def create
+    @<%= singular_table_name %> = <%= orm_class.build(class_name, "#{singular_table_name}_params") %>
+
+    if @<%= orm_instance.save %>
+      redirect_to <%= index_helper %>_url, notice: <%= "'#{human_name} was successfully created.'" %>
+    else
+      render :new
+    end
+  end
+
+  def show
+  end
+
+  def edit
+  end
+
+  def update
+    if @<%= orm_instance.update("#{singular_table_name}_params") %>
+      redirect_to <%= index_helper %>_url, notice: <%= "'#{human_name} was successfully updated.'" %>
+    else
+      render :edit
+    end
+  end
+
+  def destroy
+    @<%= orm_instance.destroy %>
+    redirect_to <%= index_helper %>_url, notice: <%= "'#{human_name} was successfully destroyed.'" %>
+  end
+
+  private
+  def set_<%= singular_table_name %>
+    @<%= singular_table_name %> = <%= orm_class.find(class_name, "params[:id]") %>
+  end
+
+  def <%= "#{singular_table_name}_params" %>
+    params.fetch(:<%= singular_table_name %>, {}).permit(<%= attributes_names.map { |name| ":#{name}" }.join(', ') %>)
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_com
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - qinmingyuan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-05 00:00:00.000000000 Z
+date: 2018-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -38,7 +38,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Description of RailsCom.
+description: Rails Engine with many common utils
 email:
 - mingyuan0715@foxmail.com
 executables: []
@@ -51,7 +51,11 @@ files:
 - app/assets/config/rails_com_manifest.js
 - app/assets/images/verification.jpg
 - app/assets/javascripts/rails_com/application.js
+- app/assets/javascripts/rails_com/common.js
+- app/assets/javascripts/rails_com/fetch_xhr_script.js
+- app/assets/javascripts/rails_com/footer.js
 - app/assets/stylesheets/rails_com/application.css
+- app/controllers/common_controller.rb
 - app/controllers/concerns/the_common_api.rb
 - app/controllers/the_guards_controller.rb
 - app/helpers/rails_com/active_helper.rb
@@ -67,44 +71,49 @@ files:
 - app/views/layouts/rails_com/application.html.erb
 - app/views/shared/_alert.html.erb
 - app/views/shared/_error_messages.html.erb
+- app/views/shared/_locales.html.erb
 - app/views/the_guards/index.html.erb
+- config/initializers/time_format.rb
 - config/locales/en.yml
 - config/locales/zh.yml
 - config/routes.rb
 - lib/assets/javascripts/input-attachment.js
-- lib/assets/stylesheets/semantic.css
+- lib/assets/javascripts/semantic.js
 - lib/generators/doc_model_generator.rb
 - lib/generators/doc_models_generator.rb
 - lib/generators/templates/model.erb
+- lib/mina/puma.rb
+- lib/mina/sidekiq.rb
 - lib/nondigest_assets/fonts/themes/default/assets/fonts/icons.eot
 - lib/nondigest_assets/fonts/themes/default/assets/fonts/icons.otf
 - lib/nondigest_assets/fonts/themes/default/assets/fonts/icons.svg
 - lib/nondigest_assets/fonts/themes/default/assets/fonts/icons.ttf
 - lib/nondigest_assets/fonts/themes/default/assets/fonts/icons.woff
 - lib/nondigest_assets/fonts/themes/default/assets/fonts/icons.woff2
-- lib/nondigest_assets/images/themes/default/assets/images/flags.png
+- lib/nondigest_assets/fonts/themes/default/assets/images/flags.png
 - lib/rails_com.rb
 - lib/rails_com/controller_helper.rb
+- lib/rails_com/controllers.rb
 - lib/rails_com/core_ext/hash.rb
 - lib/rails_com/core_ext/nil.rb
 - lib/rails_com/engine.rb
 - lib/rails_com/helpers/jobber.rb
-- lib/rails_com/helpers/qiniu_helper.rb
 - lib/rails_com/helpers/uid_helper.rb
 - lib/rails_com/model_helper.rb
 - lib/rails_com/models.rb
+- lib/rails_com/rails_ext/scaffold_generator.rb
+- lib/rails_com/rails_ext/template_renderer.rb
 - lib/rails_com/routes.rb
-- lib/rails_com/sprockets.rb
 - lib/rails_com/sprockets/non_digest_assets.rb
-- lib/rails_com/sprockets/qiniu_exporter.rb
 - lib/rails_com/version.rb
 - lib/tasks/rails_com_tasks.rake
-- lib/templates/erb/scaffold/_form.html.erb
-- lib/templates/erb/scaffold/edit.html.erb
-- lib/templates/erb/scaffold/index.html.erb
-- lib/templates/erb/scaffold/new.html.erb
-- lib/templates/erb/scaffold/show.html.erb
-- lib/templates/rails/scaffold_controller/controller.rb
+- lib/templates/erb/scaffold/_form.html.erb.tt
+- lib/templates/erb/scaffold/_search_form.html.erb.tt
+- lib/templates/erb/scaffold/edit.html.erb.tt
+- lib/templates/erb/scaffold/index.html.erb.tt
+- lib/templates/erb/scaffold/new.html.erb.tt
+- lib/templates/erb/scaffold/show.html.erb.tt
+- lib/templates/rails/scaffold_controller/controller.rb.tt
 homepage: https://github.com/qinmingyuan/rails_com
 licenses:
 - MIT
@@ -125,8 +134,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
-summary: Summary of RailsCom.
+summary: Rails Engine with many common utils
 test_files: []