rocket_cms 0.5.19 → 0.5.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1eff66640060afdc6093e4cff72d5e2a917e7c7e
-  data.tar.gz: 4152f73324d2d66d2004a4de9e1de2705ffa8fe1
+  metadata.gz: 441d92e65a93736affc737d6b3553502b501dfe0
+  data.tar.gz: dbd7853c197d8aaf01e89a2037b8d43981acb4d1
 SHA512:
-  metadata.gz: 16852baa7025b862da594a8ecf955d12e2f13251da58de74886f03505ed1cde7d5b91114df38349c7d589728498be5ab76b26baf8f423e560b390c5ed4afcb33
-  data.tar.gz: 2aa4a0644d26a8381c2a0a8f3259df9f6b3242568a42bd2cc14f3a1c2908dabef3542a5beaf7fa41764d1d4113a89c64ef4b9614de7bf236aae7bdbcd8b7c200
+  metadata.gz: 8d393bdcf0c623bdad37bfaf38b5ad3c5a60d5e302e62ce1e11b2e47e7feab1925191ee8819b1a6f50c09f256f9e1bba215686ecd14dfd208c785cb303e0722f
+  data.tar.gz: 8994fc3ee4aa32700a640a80047381bd63999dd88a472827ff168b397a731839d099798937947cd11a324351d831f21fc2b66dba91c31e10103d4dd504ecb344

data/.ruby-version

@@ -1 +1 @@
-2.1.3
+2.1.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rocket_cms (0.5.19)
+    rocket_cms (0.5.20)
       addressable
       coffee-rails
       devise
@@ -10,13 +10,13 @@ PATH
       glebtv-simple_captcha
       jquery-rails
       kaminari
-      rails (~> 4.1.6)
+      rails (~> 4.1.8)
       rails_admin
       rails_admin_nested_set
-      rails_admin_settings (~> 0.9.0.pre.4)
+      rails_admin_settings (~> 0.9.0)
       rails_admin_toggleable
       simple-navigation
-      simple_form
+      simple_form (~> 3.0.2)
       sitemap_generator
       smart_excerpt
       stringex
@@ -102,7 +102,7 @@ GEM
     minitest (5.4.3)
     multi_json (1.10.1)
     nested_form (0.3.2)
-    nokogiri (1.6.4.1)
+    nokogiri (1.6.5)
       mini_portile (~> 0.6.0)
     orm_adapter (0.5.0)
     rack (1.5.2)
@@ -135,27 +135,28 @@ GEM
       remotipart (~> 1.0)
       safe_yaml (~> 1.0)
       sass-rails (~> 4.0)
-    rails_admin_nested_set (0.3.8)
-    rails_admin_settings (0.9.0.pre.6)
+    rails_admin_nested_set (0.3.9)
+    rails_admin_settings (0.9.0)
     rails_admin_toggleable (0.4.1)
     railties (4.1.8)
       actionpack (= 4.1.8)
       activesupport (= 4.1.8)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.3.2)
+    rake (10.4.0)
     remotipart (1.2.1)
     responders (1.1.2)
       railties (>= 3.2, < 4.2)
     safe_yaml (1.0.4)
-    sass (3.4.8)
-    sass-rails (4.0.1)
+    sass (3.2.19)
+    sass-rails (4.0.5)
       railties (>= 4.0.0, < 5.0)
-      sass (>= 3.1.10)
-      sprockets-rails (~> 2.0.0)
+      sass (~> 3.2.2)
+      sprockets (~> 2.8, < 3.0)
+      sprockets-rails (~> 2.0)
     simple-navigation (3.13.0)
       activesupport (>= 2.3.2)
-    simple_form (3.0.2)
+    simple_form (3.0.3)
       actionpack (~> 4.0)
       activemodel (~> 4.0)
     sitemap_generator (5.0.5)
@@ -168,10 +169,10 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.0.1)
+    sprockets-rails (2.2.1)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
-      sprockets (~> 2.8)
+      sprockets (>= 2.8, < 4.0)
     stringex (2.5.2)
     thor (0.19.1)
     thread_safe (0.3.4)

data/app/models/concerns/mappable.rb

@@ -2,9 +2,9 @@ module Mappable
   extend ActiveSupport::Concern
   
   included do
-    include Geocoder::Model::Mongoid
     
     if RocketCMS.mongoid?
+      include Geocoder::Model::Mongoid
       field :coordinates, type: Array
       field :address, type: String
       
@@ -13,9 +13,16 @@ 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
       if geo_address.blank?
@@ -54,6 +61,8 @@ module Mappable
   def has_map?
     (!lat.blank? && !lon.blank?) || !coordinates.nil?
   end
+
+  geocoded_by :geo_address
   
   def to_map
     {

data/lib/rocket_cms/migration.rb

@@ -17,5 +17,13 @@ module RocketCMS
         #t.column :name_translations, 'hstore'
       #end
     end
+
+    def map_fields(t)
+      t.string :address
+      t.string :map_address
+      t.string :map_hint
+      t.float :latitude
+      t.float :longitude
+    end
   end
 end

data/lib/rocket_cms/version.rb

@@ -1,3 +1,3 @@
 module RocketCMS
-  VERSION = "0.5.19"
+  VERSION = "0.5.20"
 end

data/rocket_cms.gemspec

@@ -20,10 +20,10 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   
-  spec.add_dependency 'rails', "~> 4.1.6"
+  spec.add_dependency 'rails', "~> 4.1.8"
 
   spec.add_dependency 'jquery-rails'
-  spec.add_dependency 'simple_form'
+  spec.add_dependency 'simple_form', '~> 3.0.2'
   spec.add_dependency 'glebtv-simple_captcha'
   spec.add_dependency 'coffee-rails'
   spec.add_dependency 'devise'
@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rails_admin_nested_set'
   spec.add_dependency 'rails_admin_toggleable'
   spec.add_dependency 'glebtv-ckeditor'
-  spec.add_dependency 'rails_admin_settings', '~> 0.9.0.pre.4'
+  spec.add_dependency 'rails_admin_settings', '~> 0.9.0'
   spec.add_dependency 'geocoder'
   spec.add_dependency 'simple-navigation'
   spec.add_dependency 'sitemap_generator'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rocket_cms
 version: !ruby/object:Gem::Version
-  version: 0.5.19
+  version: 0.5.20
 platform: ruby
 authors:
 - glebtv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-20 00:00:00.000000000 Z
+date: 2014-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.6
+        version: 4.1.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.6
+        version: 4.1.8
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -70,16 +70,16 @@ dependencies:
   name: simple_form
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.2
 - !ruby/object:Gem::Dependency
   name: glebtv-simple_captcha
   requirement: !ruby/object:Gem::Requirement
@@ -212,14 +212,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0.pre.4
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0.pre.4
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: geocoder
   requirement: !ruby/object:Gem::Requirement
@@ -485,7 +485,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: Please DO NOT use this gem directly, use rocket_cms_mongoid or rocket_cms_activerecord