rocket_cms 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0cab742d92b01742395d5871d47d8398955808e
-  data.tar.gz: bf0d26461c9c8f4dd6c82fde6013b40a7164a170
+  metadata.gz: 66562d5e44dc92ef98efa194f00200855d15bb2c
+  data.tar.gz: 377d160f40e55aaaeeeb1c3f04b887da25324cb5
 SHA512:
-  metadata.gz: 64776df8a1590ad5886bb0cb3e76390d63fb3660cc79cbacd4e89e30bb9415f8359e7f81394b753bfdea24314f6f48b24ba0b6a570497b02371f5edbd954dc8d
-  data.tar.gz: 51184bfa72a582bfa839233efe81feed99e63945173001502d4e4bee8c602be48bd35f29c6bb43fbc18aacaee1ef1d266b81883fb05eb648c55d131d1c23e7f9
+  metadata.gz: 41c2405d207f70dc8490776d1ba824489d5b2b266f92fffcc3495781b8eb51431d8914c67d110ce6699205239c1b1c4edae45c2a579d5725ba35adf25e9a4824
+  data.tar.gz: d0d3814eecc0e0569421304ec473b84091d84b6fd80dad9030c2731d923afa54a7c65543a2aa29228c582a6e6543a114110113523763d199af686e960b4efb63

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rocket_cms (0.5.1)
+    rocket_cms (0.5.2)
       addressable
       coffee-rails
       devise
@@ -64,10 +64,11 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.8.0)
-    devise (3.3.0)
+    devise (3.4.0)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 3.2.6, < 5)
+      responders
       thread_safe (~> 0.1)
       warden (~> 1.2.3)
     erubis (2.7.0)
@@ -88,7 +89,7 @@ GEM
     jquery-rails (3.1.2)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    jquery-ui-rails (4.2.1)
+    jquery-ui-rails (5.0.0)
       railties (>= 3.2.16)
     json (1.8.1)
     kaminari (0.16.1)
@@ -96,7 +97,7 @@ GEM
       activesupport (>= 3.0.0)
     mail (2.6.1)
       mime-types (>= 1.16, < 3)
-    mime-types (2.3)
+    mime-types (2.4.1)
     mini_portile (0.6.0)
     minitest (5.4.2)
     multi_json (1.10.1)
@@ -120,13 +121,13 @@ GEM
       bundler (>= 1.3.0, < 2.0)
       railties (= 4.1.6)
       sprockets-rails (~> 2.0)
-    rails_admin (0.6.3)
+    rails_admin (0.6.5)
       builder (~> 3.1)
       coffee-rails (~> 4.0)
-      font-awesome-rails (>= 3.0)
+      font-awesome-rails (>= 3.0, < 5)
       haml (~> 4.0)
       jquery-rails (~> 3.0)
-      jquery-ui-rails (~> 4.0)
+      jquery-ui-rails (~> 5.0)
       kaminari (~> 0.14)
       nested_form (~> 0.3)
       rack-pjax (~> 0.7)
@@ -144,6 +145,8 @@ GEM
       thor (>= 0.18.1, < 2.0)
     rake (10.3.2)
     remotipart (1.2.1)
+    responders (1.1.1)
+      railties (>= 3.2, < 4.2)
     safe_yaml (1.0.4)
     sass (3.4.5)
     sass-rails (4.0.1)
@@ -173,7 +176,7 @@ GEM
     thor (0.19.1)
     thread_safe (0.3.4)
     tilt (1.4.1)
-    turbolinks (2.3.0)
+    turbolinks (2.4.0)
       coffee-rails
     tzinfo (1.2.2)
       thread_safe (~> 0.1)

data/app/assets/javascripts/rocket_cms/map.js.coffee

@@ -1,5 +1,5 @@
 window.ya_init = ->
-  $('.ymap').each ->
+  $('.ymap').not('.done').addClass('done').each ->
     $m = $(this)
     coord = [$m.data('lat'), $m.data('lon')]
     map = new ymaps.Map($m[0],
@@ -15,7 +15,7 @@ window.ya_init = ->
     map.geoObjects.add obj
 
 $(document).on 'page:change', ->
-  return if $('.ymap').length == 0
+  return if $('.ymap').not('.done').length == 0
   if window.ymaps
     ya_init()
   else

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

@@ -1,8 +1,9 @@
 .rs-news-index
   %h1= t('rs.news')
   - @news.each do |news|
-    .rs-news-date= news.time.strftime('%Y-%m-%d')
-    - unless RocketCMS.configuration.news_image_styles.nil?
-      .rs-news-image= image_tag news.image.url(:full)
-    .rs-news-excerpt = news.excerpt
+    .rs-news-date= l(news.time.to_date)
+    %a.rs-news-title{href: news_path(news)}= 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
   = paginate @news

data/app/views/news/show.html.haml

@@ -1,8 +1,8 @@
 .rs-news-show
   %h1.rs-news-title= @news.name
-  .rs-news-date= @news.time.strftime('%Y-%m-%d')
+  .rs-news-date= l(@news.time.to_date)
   .rs-news-text= @news.excerpt
-  - unless RocketCMS.configuration.news_image_styles.nil?
-    .rs-news-image= image_tag @news.image.url(:full)
+  - if !RocketCMS.configuration.news_image_styles.nil? && @news.image?
+    .rs-news-image= image_tag @news.image.url(:main)
   .rs-news-content
     = render 'shared/obj', obj: @news

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

@@ -1,4 +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}#{image}"}
+  %meta{property: 'og:image', content: "http://#{request.host_with_port}#{image}"}

data/config/locales/ru.models.yml

@@ -43,7 +43,6 @@ ru:
       page: Страница
       contact_message: Сообщение
       news: Новость
-
     attributes:
       user:
         email: E-mail
@@ -57,7 +56,6 @@ ru:
         first_name: Имя
         last_name: Фамилия
         phone: Телефон
-
       page:
         fullpath: URL
         regexp: Подсветка меню
@@ -70,6 +68,12 @@ ru:
         email: Ваш е-мейл
         phone: Ваш телефон
         content: Ваше сообщение
+    errors:
+      models:
+        contact_message:
+          attributes:
+            email:
+              invalid_email_address: Неверный e-mail
   activerecord:
     <<: *mongoid
 

data/lib/rocket_cms.rb

@@ -1,4 +1,4 @@
-unless defined?(RocketCMS) && [:active_record, :mongoid].include?(RocketCMS.orm)
+unless defined?(RocketCMS) && RocketCMS.respond_to?(:orm) && [:active_record, :mongoid].include?(RocketCMS.orm)
   puts "please use rocket_cms_mongoid or rocket_cms_activerecord and not rocket_cms directly"
   exit 1
 end

data/lib/rocket_cms/controllers/contacts.rb

@@ -17,10 +17,13 @@ module RocketCMS
         end
         if @contact_message.send(meth)
           after_create
-          redirect_after_done
+          if request.xhr? && process_ajax
+            ajax_success
+          else
+            redirect_after_done
+          end
         else
-          flash.now[:alert] = @contact_message.errors.full_messages.join("\n")
-          render action: "new"
+          render_error
         end
       end
 
@@ -28,7 +31,20 @@ module RocketCMS
       end
 
       private
-      
+      def render_error
+        if request.xhr? && process_ajax
+          render json: {errors: @contact_message.errors}, status: 422
+        else
+          flash.now[:alert] = @contact_message.errors.full_messages.join("\n")
+          render action: "new", status: 422
+        end
+      end
+      def process_ajax
+        true
+      end
+      def ajax_success
+        render json: {ok: true}
+      end
       def redirect_after_done
         redirect_to :contacts_sent
       end

data/lib/rocket_cms/version.rb

@@ -1,3 +1,3 @@
 module RocketCMS
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

data/release.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/bash
+bundle update
+gt 'release gem'
+rake release
+cd mongoid && bundle update && cd .. && cd activerecord && bundle update && cd .. 
+gt 'gem update'
+cd mongoid && rake release && cd ..
+cd activerecord && rake release && cd ..

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rocket_cms
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - glebtv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-01 00:00:00.000000000 Z
+date: 2014-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -459,6 +459,7 @@ files:
 - lib/rocket_cms/rails_admin_menu.rb
 - lib/rocket_cms/tasks.rb
 - lib/rocket_cms/version.rb
+- release.sh
 - rocket_cms.gemspec
 - template.rb
 homepage: https://github.com/rs-pro/rocket_cms