rocket_cms 0.25.1 → 0.25.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f857caa9b097cb30962cabade54f1dfba733a73f94cbd77e3658a5cd282ca719
-  data.tar.gz: 1774de5c3b590febd0e2828bf7441a3193941e37f1b4571891890b8a13eb780d
+  metadata.gz: 7c3c972dce8c12cffb6124593a02cfe2205d84a949fd954b4ba19f5dac2b6608
+  data.tar.gz: 767caf3f26c4805a805f385b8accb9e64d9ce3fe2b3abdf8388f11c4d181dcea
 SHA512:
-  metadata.gz: 848e9a4f759aad59c3eae2d247da275cae14c7216f9f651d67386c890a8b350fadc851c7ded99ee96e93747dda53b57851cbb6813a1bd32c9d6e12f7edd560f6
-  data.tar.gz: 185fe4f1c840908ca1bd00f1879d5140407ec896c69fd90d5d568b769077094a3d217d74808ee354c8ad5cb66898a945dd8efbf311f0db451072be2567d8de53
+  metadata.gz: 45fecf2fe340e7b4404b9afb90ffc7ed2ec8e308c536c749c09834d069f7a85ceab6bdf8d72ced7a7dc75004cf5773146654ca773aa75eacde4996843712b4b9
+  data.tar.gz: 37e7515c77173323da11a56eedb78d3e4e91cebea2cca72dd87556b1379fe1af703314b35a7c40c4577c236f6a2b18de5ab4d578462d74312b790d1dd2e6584d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rocket_cms (0.25.1)
+    rocket_cms (0.25.3)
       addressable
       coffee-rails
       jquery-rails

data/README.md

@@ -155,6 +155,10 @@ gem 'rails_admin_mongoid_localize_field'
 
 designed to be used together with our ansible app setup script.
 
+### Alternative capistrano task (can be used with non-configured app)
+
+   bundle exec rocket_cms capify PmiGames pg.pmi.ru
+
 ### Documentation
 
 It's basically Rails Admin + some of our common models and controllers, capistrano config, etc.

data/bin/rocket_cms

@@ -0,0 +1,59 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+require 'thor'
+
+module RocketCMS
+  class Capify < Thor::Group
+    include Thor::Actions
+
+    no_commands do
+      def load_env
+        return if defined?(Rails)
+        require File.expand_path("../../../config/environment", __FILE__)
+      end
+    end
+
+    class_option :mongoid, default: false
+
+    argument :app_name, type: :string
+    argument :domain, type: :string
+    argument :port, type: :string, optional: true
+
+    source_root File.expand_path('../../lib/generators/rocket_cms/templates', __FILE__)
+
+    #def app_name
+      #Rails.application.class.name.split("::")[0]
+    #end
+
+    def deploy_to
+      "/data/#{app_name.downcase}/app"
+    end
+    def tmp_path
+      "/data/#{app_name.downcase}/tmp_dump"
+    end
+
+    desc "Generate Capistrano config"
+    def capify
+      if options[:mongoid]
+        def RocketCMS.mongoid?
+          true
+        end
+      else
+        def RocketCMS.mongoid?
+          true
+        end
+      end
+      copy_file "Capfile", "Capfile"
+      unless port.nil?
+        template "unicorn.erb", "config/unicorn/production.rb"
+      end
+      template "deploy.erb", "config/deploy.rb"
+      template "production.erb", "config/deploy/production.rb"
+      template "dl.erb", "lib/tasks/dl.thor"
+      puts "all ok"
+    end
+  end
+end
+
+RocketCMS::Capify.start

data/lib/generators/rocket_cms/templates/webpack/analytics.es6

@@ -1,21 +1,25 @@
 var old_url = window.location.href;
+var first = true;
 
 document.addEventListener("turbolinks:load", function() {
   //console.log("analytics load");
-
-  if (window[metrika]) {
+  if (first) {
+    first = false;
+    return;
+  }
+  if (window.metrika && window[metrika] && window[metrika].hit) {
     window[metrika].hit(window.location.href, document.title, old_url)
   }
   old_url = window.location.href
 
   if (window.gtag) {
     gtag('event', 'page_view');
-    //  gtag('event', 'page_view', { 'send_to': 'YOUR_ID_HERE' });
+    //gtag('event', 'page_view', { 'send_to': 'YOUR_ID_HERE' });
   }
 });
 
 export default function(name) {
-  if (window[metrika] && window[metrika].reachGoal) {
+  if (window.metrika && window[metrika] && window[metrika].reachGoal) {
     window[metrika].reachGoal(name);
   } else {
     if (window.console) {

data/lib/rocket_cms.rb

@@ -105,3 +105,4 @@ if defined?(RailsAdmin) && !RocketCMS.light?
   require 'rocket_cms/nested_set'
 end
 
+Thor::Util.load_thorfile(File.expand_path("../tasks/rocket.thor", __FILE__).to_s)

data/lib/rocket_cms/version.rb

@@ -1,3 +1,3 @@
 module RocketCMS
-  VERSION = "0.25.1"
+  VERSION = "0.25.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rocket_cms
 version: !ruby/object:Gem::Version
-  version: 0.25.1
+  version: 0.25.3
 platform: ruby
 authors:
 - glebtv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-27 00:00:00.000000000 Z
+date: 2018-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -187,7 +187,8 @@ dependencies:
 description: RocketCMS
 email:
 - glebtv@gmail.com
-executables: []
+executables:
+- rocket_cms
 extensions: []
 extra_rdoc_files: []
 files:
@@ -252,6 +253,7 @@ files:
 - app/views/shared/_meta.slim
 - app/views/shared/_obj.slim
 - app/views/shared/_og.slim
+- bin/rocket_cms
 - config/locales/en.rocket_admin.yml
 - config/locales/en.rs.yml
 - config/locales/ru.cancan.yml