rails_com 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 32b4755a8bebb55e2b76cf7706a5db5847faf3d3
-  data.tar.gz: 353c60cc06071bb72a88ef9c146d2d3ec85369ed
+SHA256:
+  metadata.gz: 91a9e381fa905dd733cdabed0016d6f6826b468e3d9a2d1af8eece1323d88d81
+  data.tar.gz: 95625b665362ccfea08fb4f9317a521e741adc0f765d0bef2996477aef0cc34c
 SHA512:
-  metadata.gz: '0384054fc7e6a81ad573089fe6a4b1357dee92dd60325dc5ca0375fe20b024fd64e08d513394c9036968fcea65f047e0bb2b55929af22abb6503b3e508c69728'
-  data.tar.gz: b92de35c6e6a552de2140bc4c6812b8098b733f61eb2dfef8df5f1a454a8b92e1dfcda849eb053c1dc68d447432755c79b75e3f3b2d23b63cce21c7330a2fa07
+  metadata.gz: 0ce5ae23bc46a4f2d667db8d8b21ee86b4fa8670a322074857d1cee11b0a6afd7c3e8c8cce0325cc15a6b65742c25dec7b486a48bb964e971df62f9d3b21734c
+  data.tar.gz: a6f1f3e942c26a68ad460f387146fe58304895fa8c46ac76c9f9053fcbf270ca4cd7288bb0cb5a6d4839275099e18ad1282fe517cfea796e34f52e508cb257c9

data/README.md

@@ -1,9 +1,6 @@
 # RailsCom
 Short description and motivation.
 
-## Usage
-How to use my plugin.
-
 ## Installation
 Add this line to your application's Gemfile:
 
@@ -20,6 +17,17 @@ Or install it yourself as:
 ```bash
 $ gem install rails_com
 ```
+## Usage
+How to use my plugin.
+
+
+### View: add link
+```erb
+<%= link_to locales_path, class: 'item', remote: true, id: 'locales_show' do %>
+  <i class="translate icon"></i>
+<% end %>
+```
+
 
 ## Contributing
 Contribution directions go here.

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

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

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

@@ -0,0 +1,32 @@
+function timeForLocalized(){
+  $('time[data-localized!="true"]').each(function(){
+    this.textContent = moment.utc(this.textContent).local().format('YYYY-MM-DD HH:mm:ss');
+    this.dataset['localized'] = 'true'
+  })
+}
+
+function clickCallback(e) {
+  if (e.target.tagName !== 'A') {
+    return;
+  }
+  (new Date).getTimezoneOffset();
+}
+
+//document.addEventListener('click', clickCallback, false);
+
+document.addEventListener('DOMContentLoaded', function() {
+  timeForLocalized()
+});
+
+document.addEventListener('turbolinks:load', function() {
+  timeForLocalized()
+});
+
+document.addEventListener('turbolinks:request-start', function(event) {
+  var xhr = event.data.xhr;
+  var offset = (new Date).getTimezoneOffset();
+  xhr.setRequestHeader('Utc-Offset', offset);
+});
+
+
+

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

@@ -0,0 +1,53 @@
+function fetch_xhr_script(url, params){
+  var default_params = {
+    credentials: 'include',
+    headers: {
+      'Accept': 'application/javascript',
+      'X-CSRF-Token': document.head.querySelector("[name=csrf-token]").content
+    }
+  };
+
+  fetch(url, params).then(function(response) {
+    return response.text()
+  }).then(function(text) {
+    var script = document.createElement('script');
+    script.text = text;
+    document.head.appendChild(script).parentNode.removeChild(script);
+  }).catch(function(ex) {
+    console.log('parsing failed', ex)
+  })
+}
+
+function listenCheckedIds(name) {
+  var checked = 'input[name="' + name + '"]:checked';
+  var unchecked = 'input[name="' + name + '"][checked!="checked"]';
+
+  window.add_ids = [];
+  window.remove_ids = [];
+  $(checked).change(function(){
+    if(this.checked){
+      var index = window.remove_ids.indexOf(this.value);
+      window.remove_ids.splice(index, 1);
+    } else {
+      window.remove_ids.push(this.value)
+    }
+  });
+  $(unchecked).change(function(){
+    if(this.checked){
+      window.add_ids.push(this.value)
+    } else {
+      var index = window.add_ids.indexOf(this.value);
+      window.add_ids.splice(index, 1);
+    }
+  });
+}
+
+function getAddIds(){
+  add_str = window.add_ids.join(',');
+  return add_str;
+}
+
+function getRemoveIds(){
+  remove_str = window.remove_ids.join(',');
+  return remove_str
+}

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

@@ -0,0 +1,3 @@
+$('.message .close').on('click', function() {
+  $(this).closest('.message').fadeOut();
+});

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

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

data/app/controllers/common_controller.rb

@@ -0,0 +1,18 @@
+class CommonController < ApplicationController
+
+  def locales
+    respond_to do |format|
+      format.html
+      format.js
+    end
+  end
+
+  def not_found
+    params.permit!
+    RailsCom.not_found_logger.info "#{params[:path]}.#{params[:format]}"
+
+    head :not_found
+  end
+
+
+end

data/app/controllers/concerns/the_common_api.rb

@@ -5,9 +5,10 @@ module TheCommonApi
     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
+    # rescue_from 'StandardError' do |exp|
+    #   render json: { error: exp.message, backtrace: exp.backtrace }, status: 500
+    # end
+    after_action :wrap_body
   end
 
   def process_errors(model)
@@ -17,4 +18,15 @@ module TheCommonApi
     }, status: 500
   end
 
+  def wrap_body
+    if self.response.media_type == 'application/json'
+      begin
+        body = JSON.parse self.response.body
+      rescue JSON::ParserError
+        body = {}
+      end
+      self.response.body = { data: body }.to_json
+    end
+  end
+
 end

data/app/helpers/rails_com/active_helper.rb

@@ -9,6 +9,17 @@ module RailsCom::ActiveHelper
     end
   end
 
+  # active_asserts('active': true, expected: false)
+  def active_asserts(join: true, **options)
+    keys = options.select { |_, v| v }.keys
+
+    if join
+      keys.join(' ')
+    else
+      keys.last.to_s
+    end
+  end
+
   # 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']
@@ -49,20 +60,20 @@ module RailsCom::ActiveHelper
   def filter_params(options = {})
     except = options.delete(:except)
     only = options.delete(:only)
-    query = request.GET.dup
+    query = ActionController::Parameters.new(request.GET)
 
-    if only.present?
-      query.slice!(*only)
+    if only
+      query = query.permit(only)
     else
       excepts = []
-      if except.is_a? Array
+      if except.is_a?(Array)
         excepts += except
-      else
+      elsif except.present?
         excepts << except
       end
       excepts += ['commit', 'utf8', 'page']
 
-      query.except!(*excepts)
+      query = query.permit!.except(*excepts)
     end
 
     query.merge!(options)

data/app/helpers/rails_com_helper.rb

@@ -1,23 +1,26 @@
 module RailsComHelper
 
-  def js_load(filename = nil, root: Rails.root, **options)
+  def js_load(filename = nil, root: nil, **options)
     filename ||= "controllers/#{controller_path}/#{action_name}"
+    root ||= @_rendered_from || Rails.root
     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 css_load(filename = nil, root: Rails.root, **options)
+  def css_load(filename = nil, root: nil, **options)
     filename ||= "controllers/#{controller_path}/#{action_name}"
+    root ||= @_rendered_from || Rails.root
     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)
+  def js_ready(filename = nil, root: nil, **options)
     filename ||= "controllers/#{controller_path}/#{action_name}.ready"
+    root ||= @_rendered_from || Rails.root
     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

data/app/models/state_machine.rb

@@ -9,13 +9,14 @@ module StateMachine
 
     options.each do |k, v|
       states = k.to_s.pluralize
-      states = self.class.send(states).keys
+      states = self.class.send(states)
 
-      i = states.find_index self.send(k)
-      n = states[i+1]
+      i = states[self.send(k)]
+      n = states.key(i+1)
 
       if n == v.to_s
-        update!(k => states[v])
+        assign_attributes(k => v)
+        save!
       else
         errors.add k, 'Next state is wrong'
         raise ActiveRecord::Rollback, 'Next state is wrong'

data/app/views/shared/_alert.html.erb

@@ -5,8 +5,4 @@
   </div>
 <% end %>
 
-<script>
-  $('.message .close').on('click', function() {
-    $(this).closest('.message').fadeOut();
-  });
-</script>
+

data/app/views/shared/_error_messages.html.erb

@@ -8,10 +8,4 @@
       <% end %>
     </ul>
   </div>
-<% end %>
-
-<script>
-  $('.message .close').on('click', function() {
-    $(this).closest('.message').fadeOut();
-  });
-</script>
+<% end %>

data/app/views/shared/_locales.html.erb

@@ -0,0 +1,8 @@
+<div class="ui simple dropdown item">
+  <i class="translate icon"></i>
+  <%= I18n.locale %>
+  <div class="menu">
+    <%= link_to 'EN', { locale: 'en' }, class: 'item' %>
+    <%= link_to 'CN', { locale: 'zh' }, class: 'item' %>
+  </div>
+</div>

data/config/initializers/time_format.rb

@@ -0,0 +1 @@
+Time::DATE_FORMATS[:admin] = '%Y-%m-%d %H:%M:%S'

data/config/locales/en.yml

@@ -15,9 +15,11 @@ en:
           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"
-      select:
-        prompt: "Please select"
-      submit:
-        create: 'Create %{model}'
-        update: 'Update %{model}'
-        submit: 'Save %{model}'
+    select:
+      prompt: "Please select"
+    submit:
+      create: 'Creates %{model}'
+      update: 'Updates %{model}'
+      submit: 'Saves %{model}'
+      q:
+        submit: 'Search'

data/config/routes.rb

@@ -1,5 +1,12 @@
 Rails.application.routes.draw do
   
   resources :the_guards
+  controller :common do
+    get :locales
+  end
 
 end
+
+Rails.application.routes.append do
+  match '*path' => 'common#not_found', via: :all
+end