rails_com 1.2.1 → 1.2.2

data/lib/mina/git2.rb

@@ -0,0 +1,59 @@
+require 'mina/default'
+
+set :branch, 'master'
+set :remove_git_dir, true
+set :remote, 'origin'
+set :git_not_pushed_message, -> { "Your branch #{fetch(:branch)} needs to be pushed to #{fetch(:remote)} before deploying" }
+
+namespace :git do
+  desc 'Clones the Git repository to the current path.'
+  task :clone do
+    ensure!(:repository)
+    ensure!(:deploy_to)
+    if set?(:commit)
+      comment %{Using git commit \\"#{fetch(:commit)}\\"}
+      command %{git clone "#{fetch(:repository)}" . --recursive}
+      command %{git checkout -b current_release "#{fetch(:commit)}" --force}
+    else
+      command %{
+        if [ ! -d "#{fetch(:deploy_to)}/scm" ]; then
+          echo "-----> Cloning the Git repository"
+          #{echo_cmd %[git clone --recurse-submodules --separate-git-dir #{fetch(:deploy_to)}/scm #{fetch(:repository)} #{fetch(:deploy_to)}/repo]}
+        else
+          echo "-----> Fetching new git commits"
+          #{echo_cmd %[(cd #{fetch(:deploy_to)}/repo && git pull --force #{fetch(:repository)} #{fetch(:branch)}:#{fetch(:branch)})]}
+        fi &&
+        echo "-----> Using git branch '#{fetch(:branch)}'" &&
+        #{echo_cmd %[echo 'gitdir: #{fetch(:deploy_to)}/scm' >> .git]}
+        #{echo_cmd %[git checkout --force]}
+        #{echo_cmd %[git submodule deinit -all]}
+        #{echo_cmd %[git submodule update --init]}
+      }, quiet: true
+    end
+    comment %{Using this git commit}
+    command %{git rev-parse HEAD > .mina_git_revision}
+    command %{git --no-pager log --format="%aN (%h):%n> %s" -n 1}
+    if fetch(:remove_git_dir)
+      command %{rm -rf .git}
+    end
+  end
+
+  desc 'Prints out current revision'
+  task :revision do
+    ensure!(:deploy_to)
+    command %{cat #{fetch(:current_path)}/.mina_git_revision}
+  end
+
+  desc 'Ensures local repository is pushed to remote'
+  task :ensure_pushed do
+    run :local do
+      comment %{Ensuring everything is pushed to git}
+      command %{
+        if [ $(git log #{fetch(:remote)}/#{fetch(:branch)}..#{fetch(:branch)} | wc -l) -ne 0 ]; then
+          echo "! #{fetch(:git_not_pushed_message)}"
+          exit 1
+        fi
+      }
+    end
+  end
+end

data/lib/rails_com.rb

@@ -1,27 +1,37 @@
 require 'rails_com/version'
+require 'rails_com/engine'
 require 'rails_com/config'
 
-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/non_digest_assets'
+# Meta for Rails
+require 'rails_com/meta/routes'
+require 'rails_com/meta/models'
+require 'rails_com/meta/controllers'
 
-require 'rails_com/helpers/uid_helper'
-require 'rails_com/helpers/jobber'
+# Rails Helper
+require 'rails_com/helpers/model_helper'
+require 'rails_com/helpers/controller_helper'
 
+# Ruby core extension
 require 'rails_com/core_ext/hash'
 require 'rails_com/core_ext/nil'
 require 'rails_com/core_ext/array'
+require 'rails_com/core_ext/date'
+require 'rails_com/core_ext/numeric'
+require 'rails_com/core_ext/string'
 
+# Rails extension
 require 'rails_com/rails_ext/template_renderer'
 require 'rails_com/rails_ext/scaffold_generator'
+require 'rails_com/rails_ext/named_base'
 require 'rails_com/rails_ext/activestorage_attached'
 require 'rails_com/rails_ext/persistence_sneakily'
 require 'rails_com/rails_ext/translation_helper'
+require 'rails_com/rails_ext/video_response'
+require 'rails_com/rails_ext/attachment_transfer'
+require 'rails_com/sprockets/non_digest_assets'
 
-require 'utils/time_helper'
-
-require 'rails_com/engine'
-
+# Utils
+require 'rails_com/utils/time_helper'
+require 'rails_com/utils/num_helper'
+require 'rails_com/utils/uid_helper'
+require 'rails_com/utils/jobber'

data/lib/rails_com/config.rb

@@ -1,11 +1,13 @@
+require 'active_support/configurable'
+
 module RailsCom
   include ActiveSupport::Configurable
-  config_accessor :access_denied_method, :default_admin_emails
 
   configure do |config|
     config.ignore_controllers = [
       'rails/welcome'
     ]
+    config.app_class = 'ApplicationController'
   end
 
 end

data/lib/rails_com/core_ext/array.rb

@@ -1,42 +1,48 @@
 class Array
 
-  # arr = [1, 2, 3]
-  # arr.rjust! 5, nil
-  # => [1, 2, 3, nil, nil]
+  # fill an array with the given elements right;
+  #   arr = [1, 2, 3]
+  #   arr.rjust! 5, nil
+  #   # => [1, 2, 3, nil, nil]
   def rjust!(n, x)
     return self if n < length
     insert(0, *Array.new([0, n-length].max, x))
   end
 
-  # arr = [1, 2, 3]
-  # arr.ljust! 5, nil
-  # => [nil, nil, 1, 2, 3]
+  ##
+  #   arr = [1, 2, 3]
+  #   arr.ljust! 5, nil
+  #   # => [nil, nil, 1, 2, 3]
   def ljust!(n, x)
     return self if n < length
     fill(x, length...n)
   end
 
-  # arr = [1, 2, 3]
-  # arr.mjust!(5, nil)
-  # => [1, 2, nil, nil, 3]
+  ##
+  #   arr = [1, 2, 3]
+  #   arr.mjust!(5, nil)
+  #   # => [1, 2, nil, nil, 3]
   def mjust!(n, x)
     return self if n < length
     insert (length / 2.0).ceil, *Array.new(n - length, x)
   end
 
-  # raw_data = [
-  #   { a: 1 },
-  #   { a: 2 },
-  #   { b: 2 }
-  # ]
-  # raw_data.to_combined_hash
-  # => { a: [1, 2], b: 2 }
+  ##
+  # combine the same key hash like array
+  #   raw_data = [
+  #     { a: 1 },
+  #     { a: 2 },
+  #     { b: 2 }
+  #   ]
+  #   raw_data.to_combined_hash
+  #   #=> { a: [1, 2], b: 2 }
   def to_combined_hash
     self.reduce({}) do |memo, index|
       memo.merge(index) { |_, value, default| [value, default] }
     end
   end
 
+  #
   # raw_data = [
   #   [:a, 1],
   #   [:a, 2],
@@ -44,11 +50,23 @@ class Array
   # ]
   # raw_data.to_combined_h
   # => { a: [1, 2], b: 2 }
-  # todo nested array bug
+  # #todo nested array bug
   def to_combined_h
     hash = {}
     self.each { |x, y| hash[x] = hash[x] ? Array(hash[x]) << y : y  }
     hash
   end
 
+  # 2D array to csv file
+  #   data = [
+  #     [1, 2],
+  #     [3, 4]
+  #   ]
+  #   data.to_csv_file
+  def to_csv_file(file = 'export.csv')
+    CSV.open(file, 'w') do |csv|
+      self.each { |ar| csv << ar }
+    end
+  end
+
 end

data/lib/rails_com/core_ext/date.rb

@@ -0,0 +1,24 @@
+class Date
+
+  # '2018-01-01'.to_date.after(2.month) => '2018-02-31'
+  # '2018-01-31'.to_date.after(1.month) => '2018-03-02'
+  def after(other)
+    if ActiveSupport::Duration === other
+      if other.parts.keys == [:months]
+        date = self + other
+        if date.day == self.day
+          r = date - 1.day
+        else
+          r = date + (self.day - date.day - 1).days
+        end
+
+        r
+      else
+        self + other
+      end
+    else
+      self + other
+    end
+  end
+
+end

data/lib/rails_com/core_ext/numeric.rb

@@ -0,0 +1,11 @@
+class Numeric
+
+  def half_round
+    (self * 2).round / 2.0
+  end
+
+  def half_floor
+    (self * 2).floor / 2.0
+  end
+
+end

data/lib/rails_com/core_ext/string.rb

@@ -0,0 +1,15 @@
+class String
+
+  def integer?
+    Integer(self).is_a?(Integer)
+  rescue ArgumentError, TypeError
+    false
+  end
+
+  def numeric?
+    Float(self).is_a?(Numeric)
+  rescue ArgumentError, TypeError
+    false
+  end
+
+end

data/lib/rails_com/engine.rb

@@ -1,17 +1,29 @@
-module RailsCom
-  class Engine < ::Rails::Engine
+class RailsCom::Engine < ::Rails::Engine
 
-    initializer 'rails_com.assets.precompile' do |app|
-      app.config.assets.precompile += ['rails_com_manifest.js']
-    end
+  config.generators do |g|
+    g.stylesheets false
+    g.javasricpts false
+    g.javascript_engine false
+    g.helper false
+    g.jbuilder false
+    g.templates.unshift File.expand_path('lib/templates', root)
+  end
+
+  initializer 'rails_com.assets.precompile' do |app|
+    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_generator_templates' do |app|
+    app.config.paths['lib/templates'].unshift 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
+  initializer 'rails_com.add_assets_templates' do |app|
+    app.config.assets.paths.push(*Dir[File.expand_path('lib/nondigest_assets/*', root)])
+  end
 
+  initializer 'rails_com.add_activestorage' do |app|
+    ActiveStorage::DiskController.include VideoResponse
+    ActiveStorage::Attachment.include AttachmentTransfer
   end
+
 end

data/lib/rails_com/{controller_helper.rb → helpers/controller_helper.rb}

@@ -1,25 +1,5 @@
 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
-
   def set_locale
     if params[:locale]
       session[:locale] = params[:locale]

data/lib/rails_com/{model_helper.rb → helpers/model_helper.rb}

@@ -1,15 +1,15 @@
 module RailsCom::ModelHelper
 
-  def to_factory_girl
+  def to_factory_bot
     require 'rails/generators'
-    require 'generators/factory_girl/model/model_generator'
+    require 'generators/factory_bot/model/model_generator'
 
     args = [
       self.name.underscore
     ]
     cols = columns.map { |col| "#{col.name}:#{col.type}" }
 
-    generator = FactoryGirl::Generators::ModelGenerator.new(args + cols, destination_root: Rails.root)
+    generator = FactoryBot::Generators::ModelGenerator.new(args + cols, destination_root: Rails.root)
     generator.invoke_all
   end
 

data/lib/rails_com/{models.rb → meta/models.rb}

@@ -10,6 +10,7 @@ module RailsCom::Models
         nil
       end
     end
+
     models.compact
   end
 

data/lib/rails_com/{routes.rb → meta/routes.rb}

@@ -14,6 +14,15 @@ module RailsCom::Routes
     _controllers - RailsCom.config.ignore_controllers
   end
 
+  def modules
+    controllers.map do |i|
+      x = i.split('/')
+      if x.size >= 2
+        x[0..-2].join('/')
+      end
+    end.compact.uniq
+  end
+
   def routes_wrapper
     return @routes_wrapper if @routes_wrapper.present?
 

data/lib/rails_com/rails_ext/activestorage_attached.rb

@@ -1,11 +1,10 @@
 module ActiveStorage
   class Attached
 
-    def url_sync(url, filename = 'tmp_file_' + self.record.id.to_s)
-      tmp_path = File.expand_path 'tmp/storage_migrate'
-      file_path = File.join tmp_path, filename.to_s
+    def url_sync(url)
+      filename = File.basename URI(url).path
 
-      File.open(file_path, 'w+') do |file|
+      Tempfile.open do |file|
         file.binmode
         HTTParty.get(url, stream_body: true) do |fragment|
           file.write fragment
@@ -14,8 +13,8 @@ module ActiveStorage
         file.rewind
         self.attach io: file, filename: filename
       end
-    end
 
+    end
 
     class One
 
@@ -29,4 +28,5 @@ module ActiveStorage
 
     end
   end
+
 end

data/lib/rails_com/rails_ext/attachment_transfer.rb

@@ -0,0 +1,40 @@
+require 'active_storage/downloading'
+module AttachmentTransfer
+  include ActiveStorage::Downloading
+
+  def copy
+    raise 'Only Support mirror service' unless service.is_a?(ActiveStorage::Service::MirrorService)
+    download_blob_to_tempfile do |io|
+      checksum = blob.send(:compute_checksum_in_chunks, io)
+      service.mirrors.map do |service|
+        service.upload key, io.tap(&:rewind), checksum: checksum
+      end
+    end
+  end
+
+  def transfer_faststart
+    attach = self.record.send(self.name)
+    r = nil
+    download_blob_to_tempfile do |input|
+      Tempfile.open([ 'ActiveStorage', self.filename.extension_with_delimiter ], Dir.tmpdir) do |file|
+        file.binmode
+        argv = [ffmpeg_path, '-i', input.path, '-codec', 'copy', '-movflags', 'faststart', '-f', 'mp4', '-y', file.path]
+        system(*argv)
+        file.rewind
+        r = attach.attach io: file, filename: self.filename.to_s, content_type: 'video/mp4'
+      end
+    end
+    self.purge
+
+    if attach.is_a?(ActiveStorage::Attached::One)
+      r
+    else
+      r.first
+    end
+  end
+
+  def ffmpeg_path
+    ActiveStorage.paths[:ffmpeg] || 'ffmpeg'
+  end
+
+end