rails_com 1.0.0 → 1.1.0

data/lib/rails_com/controller_helper.rb

@@ -0,0 +1,25 @@
+module RailsCom::ControllerHelper
+
+  def inc_ip_count
+    Rails.cache.write "access/#{request.remote_ip}", ip_count + 1, expires_in: 60.seconds
+  end
+
+  def clear_ip_count
+    Rails.cache.write "access/#{request.remote_ip}", 0, expires_in: 60.seconds
+  end
+
+  def ip_count
+    Rails.cache.read("access/#{request.remote_ip}").to_i
+  end
+
+  def require_recaptcha
+    inc_ip_count
+    if ip_count >= 100
+      session[:back_to] = request.fullpath
+      redirect_to '/the_guards'
+    end
+  end
+
+end
+
+ActionController::Base.include RailsCom::ControllerHelper

data/lib/rails_com/core_ext/hash.rb

@@ -34,4 +34,5 @@ class Hash
       yield(object)
     end
   end
+
 end

data/lib/rails_com/core_ext/nil.rb

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

data/lib/rails_com/engine.rb

@@ -5,5 +5,13 @@ module RailsCom
       app.config.assets.precompile += ['rails_com_manifest.js']
     end
 
+    initializer 'rails_com.add_generator_templates' do |app|
+      app.config.paths['lib/templates'].push File.expand_path('lib/templates', root)
+    end
+
+    initializer 'rails_com.add_assets_templates' do |app|
+      app.config.assets.paths.push *Dir[File.expand_path('lib/nondigest_assets/*', root)]
+    end
+
   end
 end

data/lib/rails_com/helpers/qiniu_helper.rb

@@ -10,20 +10,35 @@ module QiniuHelper
     config['host'] + key.to_s
   end
 
-  def generate_uptoken(key = nil)
+  def generate_uptoken(key = nil, **options)
     put_policy = Qiniu::Auth::PutPolicy.new(config['bucket'], key)
+    options.slice(*Qiniu::Auth::PutPolicy::PARAMS.keys).each do |k, v|
+      put_policy.send(k.to_s + '=', v)
+    end
     @uptoken = Qiniu::Auth.generate_uptoken(put_policy)
   end
 
-  def upload(local_file, key = nil)
+  def upload(local_file, key = nil, **options)
+    code, result, response_headers = upload_verbose(local_file, key, options)
+    result['key']
+  end
+
+  def upload_verbose(local_file, key = nil, **options)
     code, result, response_headers = Qiniu::Storage.upload_with_token_2(
-      generate_uptoken(key),
+      generate_uptoken(key, options),
       local_file,
       key,
       nil,
       bucket: config['bucket']
     )
-    result['key']
+  end
+
+  def delete(key)
+    code, result, response_headers = Qiniu::Storage.delete(
+      config['bucket'],
+      key
+    )
+    code
   end
 
   def list(prefix = '')
@@ -32,53 +47,9 @@ module QiniuHelper
     result['items']
   end
 
-  def bsearch_last
-    ary = (0..9).to_a.reverse
-    search = 'chem_0'
-    begin_index = 0
-    end_index = ary.length - 1
-    result = nil
-
-    while true do
-      if end_index - begin_index > 1
-        index = ((begin_index + end_index) / 2.0).floor
-        end_flag = false
-      else
-        index = end_index
-        end_flag = true
-      end
-
-      search.sub! /\d$/, ary[index].to_s
-      list = self.list(search)
-
-      puts 'index: ' + index.to_s
-      puts 'search: ' + search
-      puts 'count: ' + list.size.to_s
-      puts '-------------'
-
-      if list.blank?
-        begin_index = index
-      elsif list.size >= 1
-        end_index = index
-
-        if end_flag
-          search << '9'
-          begin_index = 0
-          end_index = ary.length - 1
-
-          if list.size == 1
-            break result = list[0]['key']
-          end
-        end
-      end
-    end
-
-    result
-  end
-
-  def last
+  def last(prefix = '')
     ary = (0..9).to_a.reverse
-    search = 'chem_0'
+    search = prefix
     result = nil
 
     while true do

data/lib/rails_com/sprockets/non_digest_assets.rb

@@ -0,0 +1,34 @@
+require 'sprockets/manifest'
+
+module NonDigestAssets
+
+  def compile(*args)
+    super
+
+    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
+
+end
+
+Sprockets::Manifest.send(:prepend, NonDigestAssets)

data/lib/rails_com/sprockets/qiniu_exporter.rb

@@ -0,0 +1,21 @@
+require 'sprockets/exporters/base'
+
+# Writes a an asset file to Qiniu
+class QiniuExporter < Sprockets::Exporters::Base
+
+  def skip?(logger)
+    if Sprockets.config[:sync].to_s == 'qiniu'
+      logger.info "==> To Upload to Qiniu: #{ target }"
+      false
+    else
+      true
+    end
+  end
+
+  def call
+    QiniuHelper.upload target, 'assets/' + asset.digest_path.to_s
+  end
+
+end
+
+Sprockets.register_exporter '*/*', QiniuExporter

data/lib/rails_com/sprockets.rb

@@ -0,0 +1,15 @@
+require 'rails_com/sprockets/non_digest_assets'
+require 'rails_com/sprockets/qiniu_exporter'
+
+
+module Sprockets
+
+  def self.sync
+    config[:sync]
+  end
+
+  def self.sync=(sync)
+    self.config = hash_reassoc(config, :sync) { sync.dup }
+  end
+
+end

data/lib/rails_com/version.rb

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

data/lib/rails_com.rb

@@ -1,14 +1,16 @@
-require 'rails_com/engine'
+require 'rails_com/version'
+
 require 'rails_com/routes'
 require 'rails_com/models'
 require 'rails_com/model_helper'
+require 'rails_com/controller_helper'
+require 'rails_com/sprockets'
 
 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'
 
-module RailsCom
-  # Your code goes here...
-end
+require 'rails_com/engine'

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

@@ -0,0 +1,19 @@
+<%
+  form_model_name = "@#{file_name}"
+  if controller_class_name.include?('::')
+    namespace = controller_class_name.split('::').first.downcase
+    form_model_name = "[:#{namespace},@#{file_name}]"
+  end
+%>
+<%%= simple_form_for(<%= form_model_name %>) do |f| %>
+  <%%= render "/shared/error_messages", target: @<%= file_name %>  %>
+  <% for attribute in attributes -%>
+  <%%= f.<%= attribute.reference? ? :association : :input %> :<%= attribute.name %> %>
+  <% end -%>
+  <div>oososos</div>
+  <div class="form-group">
+    <div class="col-md-10 col-sm-offset-2">
+      <%%= f.submit t("common.save"), class: "btn btn-primary" %> or <%%= link_to t("common.cancel"), <%= index_helper %>_path %>
+    </div>
+  </div>
+<%% end %>

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

@@ -0,0 +1,2 @@
+<%%= render 'form' %>
+

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

@@ -0,0 +1,36 @@
+<%% content_for :sitemap do %>
+  <span class="current"><%%= t("activerecord.models.<%= file_name %>") %></span>
+<%% end %>
+
+<%%= render 'base' %>
+<h1><%%= t("activerecord.models.<%= file_name %>") %></h1>
+
+<div class="toolbar">
+  <a href="<%%= new_<%= singular_table_name %>_path %>" class="btn btn-sm btn-success">新建</a>
+</div>
+
+<div id="<%= plural_table_name %>">
+  <table class="table table-bordered table-striped table-condensed">
+    <tr class="head">
+      <td>编号</td>
+<% attributes.each do |attr| -%>
+      <td><%%= t("activerecord.attributes.<%= file_name %>.<%= attr.name %>") %></td>
+<% end -%>
+      <td>创建时间</td>
+      <td class="opts"></td>
+    </tr>
+    <%% @<%= plural_file_name %>.each do |item| %>
+    <tr class="<%%= cycle("","even") %>">
+      <td><%%= item.id %></td>
+<% attributes.each do |attr| -%>
+      <td><%%= item.<%= attr.name %> %></td>
+<% end -%>
+      <td><%%= l(item.created_at, format: :long) %></td>
+      <td>
+        <%%= link_to "", edit_<%= singular_table_name %>_path(item.id), class: "fa fa-pencil" %>
+        <%%= link_to "", <%= singular_table_name %>_path(item.id), method: :delete, 'data-confirm' => '确定要删除吗?', class: "fa fa-trash" %>
+      </td>
+    </tr>
+    <%% end %>
+  </table>
+</div>

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

@@ -0,0 +1 @@
+<%%= render 'form' %>

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

@@ -0,0 +1,13 @@
+<div class="toolbar">
+  <%%= link_to '修改', edit_<%= singular_table_name %>_path(@<%= file_name %>), class: "btn btn-sm btn-success" %>
+  <%%= link_to '返回', <%= index_helper %>_path, class: "btn btn-sm btn-default" %>
+</div>
+
+<div id="<%= singular_table_name %>">
+  <% for attribute in attributes -%>
+  <p>
+    <b><%= attribute.human_name %>:</b>
+    <%%= @<%= file_name %>.<%= attribute.name %> %>
+  </p>
+  <% end -%>
+</div>

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

@@ -0,0 +1,47 @@
+class <%= controller_class_name %>Controller < <%= controller_class_name.include?('::') == true ? "#{controller_class_name.split('::').first}::" : ''  %>ApplicationController
+  before_action :set_<%= file_name %>, only: [:show, :edit, :update, :destroy]
+
+  def index
+    @<%= plural_file_name %> = <%= file_name.camelize %>.desc('_id')
+    @<%= plural_file_name %> = @<%= plural_file_name %>.paginate(page: params[:page], per_page: 30)
+  end
+
+  def show
+  end
+
+  def new
+    @<%= file_name %> = <%= orm_class.build(file_name.camelize) %>
+  end
+
+  def edit
+  end
+
+  def create
+    @<%= file_name %> = <%= orm_class.build(file_name.camelize, "params[:#{file_name}].permit!") %>
+
+    if @<%= file_name %>.save
+      redirect_to(<%= index_helper %>_path, notice: '<%= human_name %> 创建成功。')
+    else
+      render action: "new"
+    end
+  end
+
+  def update
+    if @<%= file_name %>.update_attributes(params[:<%= file_name %>].permit!)
+      redirect_to(<%= index_helper %>_path, notice: '<%= human_name %> 更新成功。')
+    else
+      render action: "edit"
+    end
+  end
+
+  def destroy
+    @<%= file_name %>.destroy
+    redirect_to(<%= index_helper %>_path, notice: "删除成功。")
+  end
+
+  private
+
+  def set_<%= file_name %>
+    @<%= file_name %> = <%= orm_class.find(file_name.camelize, "params[:id]") %>
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_com
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - qinmingyuan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-10 00:00:00.000000000 Z
+date: 2017-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rucaptcha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Description of RailsCom.
 email:
 - mingyuan0715@foxmail.com
@@ -34,10 +48,12 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
-- app/assets/config/qiniu.js
-- app/assets/config/qiniu1.js
 - app/assets/config/rails_com_manifest.js
+- app/assets/images/verification.jpg
 - app/assets/javascripts/rails_com/application.js
+- app/assets/stylesheets/rails_com/application.css
+- app/controllers/concerns/the_common_api.rb
+- app/controllers/the_guards_controller.rb
 - app/helpers/rails_com/active_helper.rb
 - app/helpers/rails_com_helper.rb
 - app/models/state_machine.rb
@@ -48,16 +64,29 @@ files:
 - app/views/kaminari/_page.html.erb
 - app/views/kaminari/_paginator.html.erb
 - app/views/kaminari/_prev_page.html.erb
+- app/views/layouts/rails_com/application.html.erb
 - app/views/shared/_alert.html.erb
 - app/views/shared/_error_messages.html.erb
+- app/views/the_guards/index.html.erb
 - config/locales/en.yml
 - config/locales/zh.yml
 - config/routes.rb
+- lib/assets/javascripts/input-attachment.js
+- lib/assets/stylesheets/semantic.css
 - lib/generators/doc_model_generator.rb
 - lib/generators/doc_models_generator.rb
 - lib/generators/templates/model.erb
+- 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/rails_com.rb
+- lib/rails_com/controller_helper.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
@@ -65,8 +94,17 @@ files:
 - lib/rails_com/model_helper.rb
 - lib/rails_com/models.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
 homepage: https://github.com/qinmingyuan/rails_com
 licenses:
 - MIT
@@ -87,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Summary of RailsCom.

data/app/assets/config/qiniu.js

@@ -1,23 +0,0 @@
-var uploader = Qiniu.uploader({
-  runtimes: 'html5,html4',
-  browse_button: 'avatar_image_key_button',
-  uptoken_url: '/uptoken',
-  unique_names: true,
-  save_key: false,
-  domain: '<%= Settings.qiniu.public.domain %>',
-  get_new_uptoken: false,
-  container: 'container',
-  max_file_size: '100mb',
-  max_retries: 3,
-  dragdrop: true,
-  drop_element: 'container',
-  chunk_size: '4mb',
-  auto_start: true,
-  init: {
-    'FileUploaded': function(up, file, info) {
-      var res = $.parseJSON(info);
-      $('#avatar_image_key_id').val(res.key);
-    },
-    'Error': function(up, err, errTip) {}
-  }
-});

data/app/assets/config/qiniu1.js

@@ -1,25 +0,0 @@
-var Qiniu1 = new QiniuJsSDK;
-
-var uploader1 = Qiniu1.uploader({
-  runtimes: 'html5,html4',
-  browse_button: 'certificate_image_key_button',
-  uptoken_url: '/private_uptoken',
-  unique_names: true,
-  save_key: false,
-  domain: '<%= Settings.qiniu.private.domain %>',
-  get_new_uptoken: false,
-  container: 'container',
-  max_file_size: '100mb',
-  max_retries: 3,
-  dragdrop: true,
-  drop_element: 'container',
-  chunk_size: '4mb',
-  auto_start: true,
-  init: {
-    'FileUploaded': function(up, file, info) {
-      var res = $.parseJSON(info);
-      $('#certificate_image_key_id').val(res.key);
-    },
-    'Error': function(up, err, errTip) {}
-  }
-});