rails_com 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9884f6394c3e3e9d704e28b52b564eab818287d3
-  data.tar.gz: c0b5eb3790e0a67868a44715f2e9c36760ce33c7
+  metadata.gz: 32b4755a8bebb55e2b76cf7706a5db5847faf3d3
+  data.tar.gz: 353c60cc06071bb72a88ef9c146d2d3ec85369ed
 SHA512:
-  metadata.gz: b45dd59723a7532cb40a8001928de34edd568d4d94b0e953012da16d4026ed89671eb6a07a4180366e98b77b101abd0ac427e751780fc81a3b79b385a57f7ce7
-  data.tar.gz: f58cc13c5ac95755231adc26f9c867e6a3dd24bf291ac4db390eaf52caa1178b3b0e620508b90b051e2c552bef02f75a875a9df44b2a8ebff9b92c40ab50fa00
+  metadata.gz: '0384054fc7e6a81ad573089fe6a4b1357dee92dd60325dc5ca0375fe20b024fd64e08d513394c9036968fcea65f047e0bb2b55929af22abb6503b3e508c69728'
+  data.tar.gz: b92de35c6e6a552de2140bc4c6812b8098b733f61eb2dfef8df5f1a454a8b92e1dfcda849eb053c1dc68d447432755c79b75e3f3b2d23b63cce21c7330a2fa07

data/app/assets/config/rails_com_manifest.js

@@ -1,3 +1,4 @@
-//# link rails_com/application.css
+//= link rails_com/application.css
 //= link rails_com/application.js
-//= link_tree ../javascripts/controllers .js
+
+//= link_tree ../images

data/app/assets/javascripts/rails_com/application.js

@@ -0,0 +1,3 @@
+//= require rails-ujs
+//= require turbolinks
+//= require_self

data/app/assets/stylesheets/rails_com/application.css

@@ -0,0 +1,4 @@
+/*
+*= require semantic
+*= require_self
+*/

data/app/controllers/concerns/the_common_api.rb

@@ -0,0 +1,20 @@
+module TheCommonApi
+  extend ActiveSupport::Concern
+
+  included do
+    rescue_from 'ActiveRecord::RecordNotFound' do |exp|
+      render json: { error: exp.message, backtrace: exp.backtarce }, status: :not_found
+    end
+    rescue_from 'StandardError' do |exp|
+      render json: { error: exp.message, backtrace: exp.backtrace }, status: 500
+    end
+  end
+
+  def process_errors(model)
+    render json: {
+      errors: model.errors.as_json(full_messages: true),
+      full_messages: model.errors.full_messages.join(',')
+    }, status: 500
+  end
+
+end

data/app/controllers/the_guards_controller.rb

@@ -0,0 +1,18 @@
+class TheGuardsController < ApplicationController
+  layout 'rails_com/application'
+  skip_before_action :require_recaptcha, raise: false
+
+  def index
+
+  end
+
+  def create
+    if verify_rucaptcha?
+      clear_ip_count
+      redirect_to session[:back_to] || root_url
+    else
+      redirect_to '/the_guards', alert: 'Invalid captcha code.'
+    end
+  end
+
+end

data/app/helpers/rails_com/active_helper.rb

@@ -9,53 +9,34 @@ module RailsCom::ActiveHelper
     end
   end
 
-  def active_helper(controller: [], path: [], active_class: 'item active', item_class: 'item')
-    if path.present?
-      return active_class if path.include?(request.path)
-    end
-
-    if controller.present?
-      controller.include?(controller_name) ? active_class : item_class
-    else
-      item_class
-    end
-  end
-
-  def active_action(active_class: 'item active', item_class: 'item', **options)
-    ok = false
-    options.each do |key, value|
-      if controller_name == key.to_s
-        ok = true if value.include?(action_name)
+  # path: active_helper paths: '/work/employees' or active_helper paths: ['/work/employees']
+  # controller: active_helper controllers: 'xxx'  or active_helper controllers: ['xxx1', 'admin/xxx2']
+  # action: active_helper 'work/employee': ['index', 'show']
+  # params: active_params state: 'xxx'
+  # active_helper controller: 'users', action: 'show', id: 371
+  def active_helper(paths: [], controllers: [], active_class: 'item active', item_class: 'item', **options)
+    check_parameters = options.delete(:check_parameters)
+
+    if paths.present?
+      Array(paths).each do |path|
+        return active_class if current_page?(path, check_parameters: check_parameters)
       end
     end
 
-    if ok
-      active_class
-    else
-      item_class
+    if controllers.present?
+      return active_class if (Array(controllers) & [controller_name, controller_path]).size > 0
     end
-  end
 
-  # active_page controller: 'users', action: 'show', id: 371
-  def active_page(options)
-    active_class = options.delete(:active_class) || 'item active'
-    item_class = options.delete(:item_class) || 'item'
+    return active_class if options.present? && current_page?(options)
 
-    options.select { |_, v| v.blank? }.each do |k, v|
-      if params[k].to_s == v.to_s
-        return active_class
-      else
-        return item_class
-      end
+    options.select { |k, _| [controller_name, controller_path].include?(k.to_s) }.each do |_, value|
+      return active_class if value.include?(action_name)
     end
 
-    current_page?(options) ? active_class : item_class
+    item_class
   end
 
-  def active_params(options)
-    active_class = options.delete(:active_class) || 'item active'
-    item_class = options.delete(:item_class) || 'item'
-
+  def active_params(active_class: 'item active', item_class: 'item', **options)
     options.select { |_, v| v.present? }.each do |k, v|
       if params[k].to_s == v.to_s
         return active_class

data/app/helpers/rails_com_helper.rb

@@ -8,6 +8,22 @@ module RailsComHelper
     end
   end
 
+  def css_load(filename = nil, root: Rails.root, **options)
+    filename ||= "controllers/#{controller_path}/#{action_name}"
+    path = root + 'app/assets/stylesheets' + filename.to_s
+    if File.exist?(path.to_s + '.css')
+      stylesheet_link_tag filename, options
+    end
+  end
+
+  def js_ready(filename = nil, root: Rails.root, **options)
+    filename ||= "controllers/#{controller_path}/#{action_name}.ready"
+    path = root + 'app/assets/javascripts' + filename.to_s
+    if File.exist?(path.to_s + '.js') || File.exist?(path.to_s + '.js.erb')
+      javascript_include_tag filename, options
+    end
+  end
+
   def simple_format_hash(hash_text, options = {})
     wrapper_tag = options.fetch(:wrapper_tag, :p)
 

data/app/models/state_machine.rb

@@ -17,7 +17,7 @@ module StateMachine
       if n == v.to_s
         update!(k => states[v])
       else
-        errors.add :state, 'Next state is wrong'
+        errors.add k, 'Next state is wrong'
         raise ActiveRecord::Rollback, 'Next state is wrong'
       end
     end

data/app/views/kaminari/_paginator.html.erb

@@ -1,5 +1,5 @@
 <%= paginator.render do %>
-  <nav class="ui pagination menu">
+  <nav class="<%= @options[:class] || 'ui pagination menu' %>">
     <%= first_page_tag unless current_page.first? %>
     <%= prev_page_tag unless current_page.first? %>
     <% each_page do |page| %>

data/app/views/layouts/rails_com/application.html.erb

@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+  <title></title>
+  <%= stylesheet_link_tag 'rails_com/application', media: 'all', 'data-turbolinks-track': true %>
+  <%= javascript_include_tag 'rails_com/application', 'data-turbolinks-track': true %>
+  <%= csrf_meta_tags %>
+</head>
+
+<body>
+
+  <%= yield %>
+
+</body>
+
+</html>

data/app/views/the_guards/index.html.erb

@@ -0,0 +1,18 @@
+<div class="ui basic segment">
+  <%= image_tag 'verification.jpg', class: 'ui centered image' %>
+  <h3 class="ui green center aligned header">
+    您的请求过于频繁，喝口茶休息一下吧
+  </h3>
+  <h4 class="ui center aligned header">
+    如果希望继续访问，请输入验证码
+
+  </h4>
+  <div class="ui center aligned basic segment">
+    <%= form_tag do %>
+      <%= rucaptcha_input_tag(class: 'form-control', placeholder: 'Input Captcha') %>
+    <% end %>
+    <%= rucaptcha_image_tag(alt: 'Captcha') %>
+  </div>
+
+
+</div>

data/config/locales/en.yml

@@ -14,4 +14,10 @@ en:
           one: "Displaying <b>1</b> %{entry_name}"
           other: "Displaying <b>all %{count}</b> %{entry_name}"
       more_pages:
-        display_entries: "Displaying %{entry_name} <b>%{first}&nbsp;-&nbsp;%{last}</b> of <b>%{total}</b> in total"
+        display_entries: "Displaying %{entry_name} <b>%{first}&nbsp;-&nbsp;%{last}</b> of <b>%{total}</b> in total"
+      select:
+        prompt: "Please select"
+      submit:
+        create: 'Create %{model}'
+        update: 'Update %{model}'
+        submit: 'Save %{model}'

data/config/routes.rb

@@ -1,2 +1,5 @@
 Rails.application.routes.draw do
+  
+  resources :the_guards
+
 end