rocket_cms 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b90cdc30b2a084cb396c127cf4f3d47200b0bfa
-  data.tar.gz: cc892187a3721397de7c1d11665b0dd773a65248
+  metadata.gz: e5353eebe00fca900bbae6b353137de684e512a6
+  data.tar.gz: c34c7fbbcecc3a777f8472e0bd2afa37ce27a224
 SHA512:
-  metadata.gz: 460d06d8f3af815e54eeeabf17edb9126ecc77b2e1958d510131ce9ccd4cadb0188d3b3a7c13847ef426b852db57cd732a0f17b72900499d41c0f7180404dbd5
-  data.tar.gz: 7e3ce3ccb91730b55176c66a8f8bf16195a6f8caa401659fddae8735da95ebc99666ecad0624f7aa8f2e1c81555c236e6973d36309906ecd3ff6eb25142b7a04
+  metadata.gz: af8f6ab7d941bf58a482ddea75b1c7d716e9bee7b719355bffed940d95bd5d0e4a87fe2412beda58744468fb91c54e36b655c2433de968da402fc411c287d13e
+  data.tar.gz: 5b9148db5dcfd0cc23d142b52e05f190c8ec42321a6f67aa1ba8f4b4ba702717fe135ef3cbda203a46f1a307b31cc4104a1a12c1a0569284b6e5ffaddbcbd478

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rocket_cms (0.6.3)
+    rocket_cms (0.6.4)
       addressable
       coffee-rails
       devise
@@ -95,7 +95,7 @@ GEM
     haml (4.0.6)
       tilt
     hike (1.2.3)
-    htmlentities (4.3.2)
+    htmlentities (4.3.3)
     i18n (0.7.0)
     jquery-rails (4.0.2)
       rails-dom-testing (~> 1.0)

data/app/models/concerns/mappable.rb

@@ -13,20 +13,22 @@ module Mappable
       
       field :lat, type: Float
       field :lon, type: Float
-    else
-      def coordinates
-        if latitude.nil? || longitude.nil?
-          nil
-        else
-          [longitude, latitude]
-        end
-      end
     end
     
     geocoded_by :geo_address
     after_validation :do_geocode
   end
 
+  if RocketCMS.active_record?
+    def coordinates
+      if latitude.nil? || longitude.nil?
+        nil
+      else
+        [longitude, latitude]
+      end
+    end
+  end
+
   def do_geocode
     if geo_address.blank?
       if RocketCMS.mongoid?

data/app/views/rails_admin/main/_check_boxes.html.haml

@@ -1,5 +1,5 @@
 - if params[:associations].nil?
-  = form.collection_check_boxes field.method_name, form.object.class.send(field.method_name).values.map { |v| [t("enumerize.#{form.object.class.name.downcase}.#{field.method_name}.#{v}"), v] }, :last, :first, {}, {} { |i| i.label( class: 'checkbox' ) { i.check_box + i.text } }
+  = render 'rails_admin/main/enum_check_boxes', field: field, form: form
 - else  
   :ruby
     related_id = params[:associations] && params[:associations][field.name.to_s]

data/app/views/rails_admin/main/_enum_check_boxes.html.haml

@@ -0,0 +1,2 @@
+- values = form.object.class.send(field.method_name).values.map { |v| [t("enumerize.#{form.object.class.name.downcase}.#{field.method_name}.#{v}", default: t("enumerize.defaults.#{field.method_name}.#{v}")), v] }
+= form.collection_check_boxes field.method_name, values, :last, :first, {}, {} { |i| i.label( class: 'checkbox' ) { i.check_box + i.text } }

data/app/views/rails_admin/main/_enum_radio_buttons.html.haml

@@ -0,0 +1,2 @@
+- values = form.object.class.send(field.method_name).values.map { |v| [t("enumerize.#{form.object.class.name.downcase}.#{field.method_name}.#{v}", default: t("enumerize.defaults.#{field.method_name}.#{v}")), v] }
+= form.collection_radio_buttons field.method_name, values, :last, :first, {}, {} { |i| i.label(class: 'radio') { i.radio_button + i.text } }

data/lib/rocket_cms/admin.rb

@@ -1,23 +1,24 @@
 module RocketCMS
   class << self
-    def map_config
+    def map_config(is_active = true)
       Proc.new {
-        active true
+        active is_active
         label I18n.t('rs.map')
         field :address, :string
         field :map_address, :string
         field :map_hint, :string
         field :coordinates, :string do
           read_only true
+          formatted_value{ bindings[:object].coordinates.to_json }
         end
         field :lat
         field :lon
       }
     end
     
-    def seo_config
+    def seo_config(is_active = false)
       Proc.new {
-        active false
+        active is_active
         label "SEO"
         field :h1, :string
         field :title, :string

data/lib/rocket_cms/version.rb

@@ -1,3 +1,3 @@
 module RocketCMS
-  VERSION = "0.6.3"
+  VERSION = "0.6.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rocket_cms
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - glebtv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-23 00:00:00.000000000 Z
+date: 2014-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -399,6 +399,8 @@ files:
 - 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