ack_rocket_cms 0.7.5.2 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec774db647ab685e73a3a63f4c747cdabd10d317
-  data.tar.gz: d1ce5bc5c4bc708298f4ae8cb39733b586f4f32b
+  metadata.gz: 4354b60e460b681afa953b17bd72e19c9cd9f52a
+  data.tar.gz: 0e7f996494d203663c553e9aea89c38522b6c724
 SHA512:
-  metadata.gz: 1f44ad69726b3e48315c87872d1c3a104462ce3cba439b741e2a83e86e1c434dd2fde86821d7cd435480971a0ce46ede0f401bea1836084079835d5bb907f008
-  data.tar.gz: 4355ee4cebe1a84442e3948ded4b834e765a32b2fc85798535647889c6cb537e01854289f118e51793dcf5bcd1087049f0a645dbd5207d98f8c77057f3639415
+  metadata.gz: d46671e2dce97051ca03cbc25cefe10256fbac3aa9799859cd840e24bf0e2c03aa44a1dffb3300cf4231d11e1f7d4666830c1a8c7bea1cd162637e24ecdea31a
+  data.tar.gz: b486fd928f59dd864e8c41e67cf6eb1e2c53eaf995c51dd69613639459f575ea76bfe98aec6eaa9461459438fbf2790c8560023bbb63f7f6ad915e0d4129472c

data/.ruby-version

@@ -1 +1 @@
-2.2.1
+2.2.2

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    ack_rocket_cms (0.7.5.2)
+    ack_rocket_cms (0.7.6)
+      ack_rails_admin_jcrop
       addressable
       ckeditor
       coffee-rails
@@ -29,6 +30,10 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    ack_rails_admin_jcrop (0.0.2)
+      mini_magick
+      rails (>= 3.0.0)
+      rails_admin (>= 0.3.0)
     actionmailer (4.2.1)
       actionpack (= 4.2.1)
       actionview (= 4.2.1)
@@ -79,11 +84,11 @@ GEM
     coffee-rails (4.1.0)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.0)
-    coffee-script (2.3.0)
+    coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.9.1)
-    connection_pool (2.1.3)
+    coffee-script-source (1.9.1.1)
+    connection_pool (2.2.0)
     devise (3.4.1)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
@@ -92,16 +97,15 @@ GEM
       thread_safe (~> 0.1)
       warden (~> 1.2.3)
     erubis (2.7.0)
-    execjs (2.4.0)
+    execjs (2.5.2)
     font-awesome-rails (4.3.0.0)
       railties (>= 3.2, < 5.0)
     geocoder (1.2.8)
     glebtv-simple_captcha (0.6.7)
-    globalid (0.3.3)
+    globalid (0.3.5)
       activesupport (>= 4.1.0)
     haml (4.0.6)
       tilt
-    hike (1.2.3)
     htmlentities (4.3.3)
     i18n (0.7.0)
     jquery-rails (4.0.3)
@@ -114,13 +118,14 @@ GEM
     kaminari (0.16.3)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
-    loofah (2.0.1)
+    loofah (2.0.2)
       nokogiri (>= 1.5.9)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
-    mime-types (2.4.3)
+    mime-types (2.5)
+    mini_magick (4.2.4)
     mini_portile (0.6.2)
-    minitest (5.5.1)
+    minitest (5.6.1)
     mongoid (4.0.2)
       activemodel (~> 4.0)
       moped (~> 2.0.0)
@@ -130,14 +135,13 @@ GEM
       bson (~> 2.2)
       connection_pool (~> 2.0)
       optionable (~> 0.2.0)
-    multi_json (1.11.0)
     nested_form (0.3.2)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
     optionable (0.2.0)
     origin (2.1.1)
     orm_adapter (0.5.0)
-    rack (1.6.0)
+    rack (1.6.1)
     rack-pjax (0.8.0)
       nokogiri (~> 1.5)
       rack (~> 1.1)
@@ -181,7 +185,7 @@ GEM
       mongoid (>= 3.0)
       rails (>= 3.0)
       rails_admin (>= 0.5)
-    rails_admin_nested_set (0.4.1)
+    rails_admin_nested_set (0.4.2)
       rails_admin (~> 0.6.6)
     rails_admin_settings (0.9.1)
     rails_admin_toggleable (0.5.0)
@@ -203,7 +207,7 @@ GEM
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (~> 1.1)
-    simple-navigation (4.0.1)
+    simple-navigation (4.0.3)
       activesupport (>= 2.3.2)
     simple_form (3.1.0)
       actionpack (~> 4.0)
@@ -213,12 +217,9 @@ GEM
     smart_excerpt (0.1.5)
       activesupport
       htmlentities
-    sprockets (2.12.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
+    sprockets (3.1.0)
       rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.2.4)
+    sprockets-rails (2.3.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)

data/app/views/blocks/_footer.html.slim

@@ -0,0 +1 @@
+'(c) 2015 etc

data/app/views/contact_mailer/{new_message_email.html.haml → new_message_email.html.slim}

@@ -1,16 +1,15 @@
-
 - excluded_column_names = %w[id c_at u_at created_at updated_at _id _type enabled attachment c_at u_at captcha captcha_key version creator_id creator updater_id updater modifier modifier_id]
 
-%h3 Сообщение из формы связи:
+h3= "Сообщение из формы связи:"
 
-%table
-  %tr
-    %th(style='padding: 2px 3px') Поле
-    %th(style='padding: 2px 3px') Значение
+table
+  tr
+    th(style='padding: 2px 3px') Поле
+    th(style='padding: 2px 3px') Значение
   - fields = (RocketCMS.mongoid? ? ContactMessage.fields.keys : ContactMessage.columns.map(&:name))
   - fields.reject{|c| excluded_column_names.include?(c) }.each do |c|
-    %tr
-      %td(style='padding: 2px 3px')
+    tr
+      td(style='padding: 2px 3px')
         = ContactMessage.human_attribute_name(c)
-      %td(style='padding: 2px 3px')
+      td(style='padding: 2px 3px')
         = @message.send(c.to_sym)

data/app/views/contacts/sent.html.slim

@@ -0,0 +1,4 @@
+#rocket_cms_contact_sent
+  h1 Обратная связь
+  h2 Ваше сообщение отправлено
+  div Если оно требует ответа, мы постараемся ответить в ближайшее время

data/app/views/errors/_base.html.slim

@@ -0,0 +1,3 @@
+#rocket_cms_error{class="error-#{code}"}
+  h1= "Ошибка #{code}"
+  p= "#{text}"

data/app/views/home/index.html.slim

@@ -0,0 +1 @@
+RocketCMS test app

data/app/views/news/{index.html.haml → index.html.slim}

@@ -1,9 +1,9 @@
 .rs-news-index
-  %h1= t('rs.news')
+  h1= t('rs.news')
   - @news.each do |news|
     .rs-news-date= l(news.time.to_date)
-    %a.rs-news-title{href: news_path(news)}= news.name
+    = link_to news.name, news, class: "rs-news-title", title: news.name
     - if !RocketCMS.configuration.news_image_styles.nil? && news.image?
       .rs-news-image= image_tag news.image.url(:thumb)
-    .rs-news-excerpt= news.excerpt
+    .rs-news-excerpt== news.excerpt
   = paginate @news

data/app/views/news/{show.html.haml → show.html.slim}

@@ -1,5 +1,5 @@
 .rs-news-show
-  %h1.rs-news-title= @news.name
+  h1.rs-news-title= @news.name
   .rs-news-date= l(@news.time.to_date)
   .rs-news-text= @news.excerpt
   - if !RocketCMS.configuration.news_image_styles.nil? && @news.image?

data/app/views/search/{index.html.haml → index.html.slim}

@@ -1,17 +1,17 @@
 .rs-search-results
-  %h1 Результаты поиска
+  h1 Результаты поиска
   = form_tag search_path, method: :get, class: 'nav_search' do
     = text_field_tag 'query', params[:query], placeholder: "Поиск"
     = submit_tag 'Найти'
-  %ol
+  ol
     - any = false
     - @results.each do |r|
       - any = true
-      %li
+      li
         .title= link_to (r._highlight.nil? || r._highlight['name'].nil?) ? r.name : r._highlight['name'].join(' ... ').html_safe, url_for(r)
         .text
           = raw (r._highlight.nil? || r._highlight['content'].nil?) ? (r.content.blank? ? '' : SmartExcerpt.truncate(r.content)) : r._highlight['content'].join(' ... ')
-          %span.more= link_to '', url_for(r)
+          span.more= link_to '', url_for(r)
 
   - unless any
     .rs-search-no-results К сожалению, ничего не найдено

data/app/views/shared/{_admin_link.html.haml → _admin_link.html.slim}

@@ -1,3 +1,3 @@
 - if user_signed_in? && respond_to?(:can?) && can?(:access, :rails_admin) && can?(:edit, obj)
-  %div.admin_link
+  .admin_link
     = link_to t('rs.edit'), rails_admin.edit_path(obj.class.model_name.i18n_key.to_s.gsub('/', '~'), obj.id), 'data-no-turbolink' => true

data/app/views/shared/{_messages.html.haml → _messages.html.slim}

@@ -2,6 +2,6 @@
   .flash
     - flash.each do |type, message|
       - next if message.blank?
-      %div{class: "message #{type}"}
-        %a.close_flash ×
+      div{class="message #{type}"}
+        a.close_flash ×
         = simple_format(message.strip)

data/app/views/shared/{_meta.html.haml → _meta.html.slim}

@@ -1,19 +1,19 @@
 - alt_obj ||= nil
 
 - if obj.respond_to?(:keywords) and !obj.keywords.blank?
-  %meta{name: "keywords", content: obj.keywords}/
+  meta{name="keywords" content="#{obj.keywords}"}/
 - else
   - if alt_obj and alt_obj.respond_to?(:keywords) and !alt_obj.keywords.blank?
-    %meta{name: "keywords", content: alt_obj.keywords}/
+    meta{name="keywords" content="#{alt_obj.keywords}"}/
 
 - if obj.respond_to?(:description) and !obj.description.blank?
-  %meta{name: "description", content: obj.description}/
+  meta{name="description" content="#{obj.description}"}/
 - else
   - if alt_obj and alt_obj.respond_to?(:description) and !alt_obj.description.blank?
-    %meta{name: "description", content: alt_obj.description}/
+    meta{name="description" content="#{alt_obj.description}"}/
 
 - if obj.respond_to?(:robots) and !obj.robots.blank?
-  %meta{name: "robots", content: obj.robots}/
+  meta{name="robots" content="#{obj.robots}"}/
 - else
   - if alt_obj and alt_obj.respond_to?(:robots) and !alt_obj.robots.blank?
-    %meta{name: "robots", content: alt_obj.robots}/
+    meta{name="robots" content="#{alt_obj.robots}"}/

data/app/views/shared/_og.html.slim

@@ -0,0 +1,4 @@
+- if defined?(title) && !title.blank?
+  meta{property='og:title' content="#{title}"}
+- if defined?(image) && !image.blank?
+  meta{property='og:image' content="http://#{request.host_with_port}#{image}"}

data/lib/rocket_cms.rb

@@ -27,6 +27,7 @@ require 'kaminari'
 require 'addressable/uri'
 require 'turbolinks'
 require 'simple-navigation'
+require 'ack_rails_admin_jcrop'
 
 require 'rocket_cms/configuration'
 require 'rocket_cms/patch'

data/lib/rocket_cms/admin.rb

@@ -13,6 +13,10 @@ module RocketCMS
         end
         field :lat
         field :lon
+
+        if block_given?
+          yield
+        end
       }
     end
     
@@ -28,6 +32,10 @@ module RocketCMS
 
         field :og_title, :string
         field :og_image
+
+        if block_given?
+          yield
+        end
       }
     end
     
@@ -73,7 +81,11 @@ module RocketCMS
             if type.nil?
               field name
             else
-              field name, type
+              if type.is_a?(Array)
+                field name, type[0], &type[1]
+              else
+                field name, type
+              end
             end
           end
           group :seo, &RocketCMS.seo_config
@@ -84,18 +96,26 @@ module RocketCMS
           max_depth: RocketCMS.configuration.menu_max_depth,
           scopes: []
         })
+
+        if block_given?
+          yield
+        end
       }
     end
     
     def menu_config
       Proc.new {
-          navigation_label 'CMS'
+        navigation_label 'CMS'
 
-          field :enabled, :toggle
-          field :text_slug
-          field :name
-          RocketCMS.apply_patches self
-          RocketCMS.only_patches self, [:show, :list, :edit, :export]
+        field :enabled, :toggle
+        field :text_slug
+        field :name
+        RocketCMS.apply_patches self
+        RocketCMS.only_patches self, [:show, :list, :edit, :export]
+
+        if block_given?
+          yield
+        end
       }
     end
     
@@ -112,6 +132,10 @@ module RocketCMS
 
         RocketCMS.apply_patches self
         RocketCMS.only_patches self, [:show, :list, :edit, :export]
+
+        if block_given?
+          yield
+        end
       }
     end
 
@@ -126,7 +150,9 @@ module RocketCMS
         field :time
         field :name
         unless RocketCMS.configuration.news_image_styles.nil?
-          field :image
+          field :image, :jcrop do
+            jcrop_options :image_jcrop_options
+          end
         end
         field :excerpt
         field :slugs, :enum do
@@ -150,7 +176,11 @@ module RocketCMS
             if type.nil?
               field name
             else
-              field name, type
+              if type.is_a?(Array)
+                field name, type[0], &type[1]
+              else
+                field name, type
+              end
             end
           end
           RocketCMS.apply_patches self
@@ -159,6 +189,10 @@ module RocketCMS
         end
 
         RocketCMS.only_patches self, [:show, :list, :export]
+
+        if block_given?
+          yield
+        end
       }
     end
 
@@ -174,6 +208,10 @@ module RocketCMS
           end
         end
         field :sitemap_priority
+
+        if block_given?
+          yield
+        end
       }
     end
 
@@ -188,17 +226,37 @@ module RocketCMS
           if type.nil?
             field name
           else
-            field name, type
+            if type.is_a?(Array)
+              field name, type[0], &type[1]
+            else
+              field name, type
+            end
           end
         end
+
+        if block_given?
+          yield
+        end
       }
     end
 
     def embedded_image_config(fields = {})
-      RocketCMS.embedded_element_config(
+      jcrop_proc = Proc.new do
+        jcrop_options :image_jcrop_options
+      end
+
+      if block_given?
+        RocketCMS.embedded_element_config(
+          nil,
+          {image: [:jcrop, jcrop_proc]}.merge(fields),
+          yield
+        )
+      else
+        RocketCMS.embedded_element_config(
           nil,
-          {image: nil}.merge(fields)
-      )
+          {image: [:jcrop, jcrop_proc]}.merge(fields)
+        )
+      end
     end
 
     def gallery_config
@@ -220,7 +278,13 @@ module RocketCMS
         end
         field :text_slug
 
-        field :image
+        field :image, :jcrop do
+          jcrop_options :image_jcrop_options
+        end
+
+        if block_given?
+          yield
+        end
       }
     end
 
@@ -232,7 +296,9 @@ module RocketCMS
           field :gallery
         end
         field :name, :string
-        field :image
+        field :image, :jcrop do
+          jcrop_options :image_jcrop_options
+        end
         fields.each_pair do |name, type|
           if type.nil?
             field name
@@ -240,6 +306,10 @@ module RocketCMS
             field name, type
           end
         end
+
+        if block_given?
+          yield
+        end
       }
     end
   end

data/lib/rocket_cms/version.rb

@@ -1,3 +1,3 @@
 module RocketCMS
-  VERSION = "0.7.5.2"
+  VERSION = "0.7.6"
 end

data/rocket_cms.gemspec

@@ -5,8 +5,8 @@ require 'rocket_cms/version'
 Gem::Specification.new do |spec|
   spec.name          = 'ack_rocket_cms'
   spec.version       = RocketCMS::VERSION
-  spec.authors       = ['glebtv', 'Alexander Kiseliev']
-  spec.email         = ['glebtv@gmail.com', "i43ack@gmail.com"]
+  spec.authors       = ['Alexander Kiseliev', 'glebtv']
+  spec.email         = ["i43ack@gmail.com", 'glebtv@gmail.com']
   spec.description   = %q{RocketCMS fork}
   spec.summary       = %q{Please DO NOT use this gem directly, use ack_rocket_cms_mongoid or ack_rocket_cms_activerecord instead!}
   spec.homepage      = 'https://github.com/ack43/rocket_cms'
@@ -45,6 +45,7 @@ Gem::Specification.new do |spec|
 
 
   spec.add_dependency "rails_admin_mongoid_localize_field", "~> 0.1.2"
+  spec.add_dependency "ack_rails_admin_jcrop"
 
   spec.add_dependency 'stringex'
   spec.add_dependency 'thor'

data/template.rb

@@ -141,7 +141,7 @@ end
 
 create_file 'README.md', "## #{app_name}\nProject generated by RocketCMS\nORM: #{if mongoid then 'Mongoid' else 'ActiveRecord' end}\n\n"
 
-create_file '.ruby-version', "2.2.1\n"
+create_file '.ruby-version', "2.2.2\n"
 create_file '.ruby-gemset', "#{app_name}\n"
 
 run 'bundle install --without production'
@@ -216,9 +216,11 @@ inject_into_file 'app/models/user.rb', before: /^end/ do <<-TEXT
 
   AVAILABLE_ROLES.each do |r|
     class_eval <<-EVAL
-      def \#{r}?
-        self.roles.include?("\#{r}")
+      def #{r}?
+        self.roles and self.roles.include?("#{r}")
       end
+
+      scope :#{r.pluralize}, -> { any_in(roles: "#{r}") }
     EVAL
   end
 
@@ -584,6 +586,14 @@ kill $(cat ./tmp/pids/unicorn.pid)
 TEXT
 end
 
+remove_file 'scripts/send_hup.sh'
+create_file 'scripts/send_hup.sh' do <<-TEXT
+#!/bin/sh
+
+kill  -HUP $(cat ./tmp/pids/unicorn.pid)
+TEXT
+end
+
 remove_file 'scripts/start_god_rvm_wrapper.sh'
 create_file 'scripts/start_god_rvm_wrapper.sh' do <<-TEXT
 #!/bin/sh

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: ack_rocket_cms
 version: !ruby/object:Gem::Version
-  version: 0.7.5.2
+  version: 0.7.6
 platform: ruby
 authors:
-- glebtv
 - Alexander Kiseliev
+- glebtv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-06 00:00:00.000000000 Z
+date: 2015-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -325,6 +325,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.2
+- !ruby/object:Gem::Dependency
+  name: ack_rails_admin_jcrop
+  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'
 - !ruby/object:Gem::Dependency
   name: stringex
   requirement: !ruby/object:Gem::Requirement
@@ -369,8 +383,8 @@ dependencies:
         version: '0'
 description: RocketCMS fork
 email:
-- glebtv@gmail.com
 - i43ack@gmail.com
+- glebtv@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -419,31 +433,31 @@ files:
 - app/models/menu.rb
 - app/models/news.rb
 - app/models/page.rb
-- app/views/blocks/_footer.html.haml
-- app/views/contact_mailer/new_message_email.html.haml
-- app/views/contacts/index.html.haml
-- app/views/contacts/new.html.haml
-- app/views/contacts/sent.html.haml
-- app/views/errors/_base.html.haml
-- app/views/errors/error_403.html.haml
-- app/views/errors/error_404.html.haml
-- app/views/errors/error_500.html.haml
-- app/views/home/index.html.haml
+- app/views/blocks/_footer.html.slim
+- app/views/contact_mailer/new_message_email.html.slim
+- app/views/contacts/index.html.slim
+- app/views/contacts/new.html.slim
+- app/views/contacts/sent.html.slim
+- app/views/errors/_base.html.slim
+- app/views/errors/error_403.html.slim
+- app/views/errors/error_404.html.slim
+- app/views/errors/error_500.html.slim
+- app/views/home/index.html.slim
 - app/views/layouts/application.html.haml
 - app/views/layouts/application.html.slim
-- app/views/news/index.html.haml
-- app/views/news/show.html.haml
-- app/views/pages/show.html.haml
-- app/views/rails_admin/main/_check_boxes.html.haml
-- app/views/rails_admin/main/_enum_check_boxes.html.haml
-- app/views/rails_admin/main/_enum_radio_buttons.html.haml
-- app/views/rails_admin/main/_form_raw.html.haml
-- app/views/search/index.html.haml
-- app/views/shared/_admin_link.html.haml
-- app/views/shared/_messages.html.haml
-- app/views/shared/_meta.html.haml
-- app/views/shared/_obj.html.haml
-- app/views/shared/_og.html.haml
+- app/views/news/index.html.slim
+- app/views/news/show.html.slim
+- app/views/pages/show.html.slim
+- app/views/rails_admin/main/_check_boxes.html.slim
+- app/views/rails_admin/main/_enum_check_boxes.html.slim
+- app/views/rails_admin/main/_enum_radio_buttons.html.slim
+- app/views/rails_admin/main/_form_raw.html.slim
+- app/views/search/index.html.slim
+- app/views/shared/_admin_link.html.slim
+- app/views/shared/_messages.html.slim
+- app/views/shared/_meta.html.slim
+- app/views/shared/_obj.html.slim
+- app/views/shared/_og.html.slim
 - config/locales/en.rocket_admin.yml
 - config/locales/en.rs.yml
 - config/locales/ru.cancan.yml

data/app/views/blocks/_footer.html.haml

@@ -1 +0,0 @@
-(c) 2015 etc

data/app/views/contacts/sent.html.haml

@@ -1,4 +0,0 @@
-#rocket_cms_contact_sent
-  %h1 Обратная связь
-  %h2 Ваше сообщение отправлено
-  %div Если оно требует ответа, мы постараемся ответить в ближайшее время

data/app/views/errors/_base.html.haml

@@ -1,3 +0,0 @@
-#rocket_cms_error{class: "error-#{code}"}
-  %h1 Ошибка #{code}
-  %p #{text}

data/app/views/home/index.html.haml

@@ -1 +0,0 @@
-RocketCMS test app

data/app/views/shared/_og.html.haml

@@ -1,4 +0,0 @@
-- if defined?(title) && !title.blank?
-  %meta{property: 'og:title', content: title}
-- if defined?(image) && !image.blank?
-  %meta{property: 'og:image', content: "http://#{request.host_with_port}#{image}"}