enjoy_cms 0.4.0.5 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7a875f96cd3f0979334375b90a822d6da795fd8
-  data.tar.gz: 61b29499b40cb6da3fb76d986071437d6ef3820a
+  metadata.gz: b010f4cca2319b6ea7f28d5b2393e6cbf131c1ed
+  data.tar.gz: c25e445db3a8511d32cfb5de8405c300c10e24cd
 SHA512:
-  metadata.gz: 691effa0962a688b062e4234d99c34d6f1628421c86d5faebbbd9c900d069357488f36a911e9e9758e44ff44f859a39b8c0724797d78ce9f6e640e2158987ca3
-  data.tar.gz: ee13c9219748151350df6bc8c0d46062a8d7f5497a9fc97978096f17371b22c9315a0dfb8ac9380ecbc0af980f852b50bff45f436180af10e1c736b3e37d5e25
+  metadata.gz: e1a8db45181f8a61a22c3854e08e4e5e331c079d718b591492fb9754bda904f0a1b34ce44e506afeb7837b1fb67187c9e302bad5a9157a904f136c9938662f85
+  data.tar.gz: 51afe156adc0b74a96b700f1a65b07dde3d82a5856ea284c3777f081b3ee88df0cd5e11f051dd8a57290c43440d3cd649836e07e1242b4efb45fd54c7ad350a3

data/README.md

@@ -1,139 +1,5 @@
 # EnjoyCMS
 
-#### Inspired by [RocketCMS](https://github.com/rs-pro/rocket_cms)
-
-# DEVELOPMENT VERSION
-
-Rails + RailsAdmin + Mongoid/PostgreSQL CMS
-
-Very opinionated and tuned for my needs.
-
-**Before 1.0 API and class names should be considered unstable and can change at any time!**
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-    gem 'enjoy_cms_mongoid'
-
-or:
-
-    gem 'enjoy_cms_activerecord'
-
-*Only PostgreSQL is tested or supported for AR(from root repo). Others will probably work, but untested.*
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install enjoy_cms
-
-For activerecord, generate migrations and run them
-
-    rails g rails_admin_settings:migration
-    rails g enjoy_cms:migration
-    rake db:migrate
-
-## Usage
-
-### Using app generator
-
-Make sure you have rails 4.2 installed
-
-    rails -v
-
-If not, uninstall rails and install again
-
-    gem uninstall rails
-    gem install enjoy_cms
-
-Then, for mongoid:
-
-    rails new my_app -T -O -m https://raw.githubusercontent.com/enjoycreative/enjoy_cms/master/template.rb
-
-for ActiveRecord:
+# NO LONGER MAINTAINED. SEE [HancockCMS](https://github.com/red-rocks/hancock_cms)
 
-    rails new my_app -T --database=postgresql -m https://raw.githubusercontent.com/enjoycreative/enjoy_cms/master/template.rb
-
-generator creates a new RVM gemset, so after cd'ing to app dir, you should run `bundle install` again if you use rvm.
-
-### Localization
-
-All models included in the gem support localization via either [hstore_translate](https://github.com/Leadformance/hstore_translate) or built-in Mongoid localize: true option.
-
-You can get a nice admin UI for editing locales by adding [rails_admin_hstore_translate](https://github.com/glebtv/rails_admin_hstore_translate) or [rails_admin_mongoid_localize_field](https://github.com/sudosu/rails_admin_mongoid_localize_field)
-
-Add to: ```app/models/page.rb```
-
-```ruby
-class Page < Enjoy::Page
-
-  def regexp_prefix
-    "(?:\/ru|\/en)?"
-  end
-end
-```
-
-<!-- Wrap your routes with locale scope:
-
-```ruby
-scope "(:locale)", locale: /en|ru/ do
-  get 'contacts' => 'contacts#new', as: :contacts
-  post 'contacts' => 'contacts#create', as: :create_contacts
-end
-``` -->
-
-Add to application_controller.rb:
-
-```ruby
-class ApplicationController < ActionController::Base
-  include Enjoy::Controller
-  include Enjoy::Localizeable
-end
-```
-
-Enable localization in EnjoyCMS:
-
-```ruby
-Enjoy.configure do |enjoy|
-  enjoy.news_image_styles = {small: '107x126#'}
-  enjoy.contacts_captcha = true
-  enjoy.contacts_message_required = true
-  ...
-  enjoy.localize = true
-end
-```
-
-Add ```rails_admin_hstore_translate``` or ```hstore_translate``` gem if using PostgreSQL:
-
-```ruby
-gem 'rails_admin_hstore_translate'
-```
-
-or
-
-```ruby
-gem 'hstore_translate'
-```
-
-Add ```rails_admin_mongoid_localize_field``` gem if using MongoDB:
-
-```ruby
-gem 'rails_admin_mongoid_localize_field'
-```
-
-### Documentation
-
-It's basically Mongoid + Rails Admin + some of my common models and controllers, etc.
-
-See their documentation for more info
-
-## Contributing
-
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+#### Inspired by [RocketCMS](https://github.com/rs-pro/rocket_cms)

data/app/helpers/enjoy/powered_helper.rb

@@ -1,12 +1,33 @@
 module Enjoy::PoweredHelper
-  def render_enjoy_powered_block
-    content_tag :div, class: 'enjoy-powered' do
+
+  # TODO CMS site block
+  # def render_enjoy_powered_by_block
+  #   content_tag :div, class: 'enjoy-powered' do
+  #     ret = []
+  #     ret << content_tag(:span, class: 'powered') do
+  #       "Сайт работает на "
+  #     end
+  #     _attrs = {
+  #       class: "powered_by",
+  #       target: "_blank",
+  #       title: "Enjoy CMS",
+  #       data: {
+  #         "enjoy-goto-disabled": true
+  #       }
+  #     }
+  #     ret << link_to("Enjoy CMS", "http://cms.enjoycreate.ru", _attrs)
+  #     ret.join.html_safe
+  #   end
+  # end
+
+  def render_enjoy_created_by_block
+    content_tag :div, class: 'enjoy-created-by' do
       ret = []
-      ret << content_tag(:span, class: 'powered') do
+      ret << content_tag(:span, class: 'created-by') do
         "Сайт разработан"
       end
       _attrs = {
-        class: "powered_by",
+        class: "created_by",
         target: "_blank",
         title: "Enjoy Creative studio",
         data: {
@@ -17,4 +38,5 @@ module Enjoy::PoweredHelper
       ret.join.html_safe
     end
   end
+
 end

data/enjoy_cms.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |spec|
   spec.name          = 'enjoy_cms'
   spec.version       = Enjoy::VERSION
   spec.authors       = ['Alexander Kiseliev']
-  spec.email         = ["dev@enjoycreate.ru"]
+  spec.email         = ["i43ack@gmail.com"]
   spec.description   = %q{EnjoyCMS }
   spec.summary       = %q{Please DO NOT use this gem directly, use enjoy_cms_mongoid or enjoy_cms_activerecord instead!}
   spec.homepage      = 'https://github.com/enjoycreative/enjoy_cms'

data/lib/enjoy/rails_admin_ext/patches/enjoy_cms_group.rb

@@ -6,12 +6,26 @@ module Enjoy::RailsAdminGroupPatch
 
       if fields.is_a?(Array)
         fields.each do |_group|
-          config.group (_group[:name] || :default) do
-            active (_group[:active] || false)
-            label _group[:label] if _group[:label].present?
-            help _group[:help] if _group[:help].present?
-            weight _group[:weight] if _group[:weight].present?
-            (_group[:fields] || {}).each_pair do |name, type|
+          _name_default = :default
+          _name = _group.delete(:name) || _name_default
+          _active_default = (_name == :default ? true : false)
+          _fields_default = {}
+          _group_fields = (_group.delete(:fields) || _fields_default)
+
+          config.group _name do
+            _group.each_pair do |name, val|
+
+              # TODO: find more logical sulution
+              begin
+                begin
+                  send name, val
+                rescue
+                  send name
+                end
+              end
+            end
+
+            _group_fields.each_pair do |name, type|
               if type.blank?
                 field name
               else
@@ -22,6 +36,8 @@ module Enjoy::RailsAdminGroupPatch
                 end
               end
             end
+
+
           end
         end
 

data/lib/enjoy/version.rb

@@ -1,3 +1,3 @@
 module Enjoy
-  VERSION = "0.4.0.5"
+  VERSION = "0.4.1"
 end

data/lib/generators/enjoy/cms/templates/ability.erb

@@ -16,6 +16,7 @@ class Ability
       can :read, :all
       can :history, :all
       can :export, :all
+      can :toggle, :all
 
       can :comments, :all         #RailsAdminComments::Comments
       can :model_comments, :all   #RailsAdminComments::ModelComments

data/template.rb

@@ -360,7 +360,7 @@ inject_into_file 'app/models/user.rb', before: /^end/ do <<-TEXT
       field :roles do
         pretty_value do
           render_object = (bindings[:controller] || bindings[:view])
-          render_object.content_tag(:p, bindings[:object].roles.join(", "))
+          render_object.content_tag(:p, bindings[:object].roles.join(", ")) if render_object
         end
       end
     end
@@ -371,14 +371,14 @@ inject_into_file 'app/models/user.rb', before: /^end/ do <<-TEXT
         field :email, :string do
           visible do
             render_object = (bindings[:controller] || bindings[:view])
-            render_object.current_user.admin? or (render_object.current_user.manager? and render_object.current_user == bindings[:object])
+            render_object and (render_object.current_user.admin? or (render_object.current_user.manager? and render_object.current_user == bindings[:object]))
           end
         end
         field :name, :string
         field :login, :string do
           visible do
             render_object = (bindings[:controller] || bindings[:view])
-            render_object.current_user.admin?
+            render_object and render_object.current_user.admin?
           end
         end
       end
@@ -396,7 +396,7 @@ inject_into_file 'app/models/user.rb', before: /^end/ do <<-TEXT
 
           visible do
             render_object = (bindings[:controller] || bindings[:view])
-            render_object.current_user.admin?
+            render_object and render_object.current_user.admin?
           end
         end
       end
@@ -406,13 +406,13 @@ inject_into_file 'app/models/user.rb', before: /^end/ do <<-TEXT
         field :password do
           visible do
             render_object = (bindings[:controller] || bindings[:view])
-            render_object.current_user.admin? or render_object.current_user == bindings[:object]
+            render_object and (render_object.current_user.admin? or render_object.current_user == bindings[:object])
           end
         end
         field :password_confirmation do
           visible do
             render_object = (bindings[:controller] || bindings[:view])
-            render_object.current_user.admin? or render_object.current_user == bindings[:object]
+            render_object and (render_object.current_user.admin? or render_object.current_user == bindings[:object])
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enjoy_cms
 version: !ruby/object:Gem::Version
-  version: 0.4.0.5
+  version: 0.4.1
 platform: ruby
 authors:
 - Alexander Kiseliev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-02 00:00:00.000000000 Z
+date: 2016-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -208,7 +208,7 @@ dependencies:
         version: '0'
 description: 'EnjoyCMS '
 email:
-- dev@enjoycreate.ru
+- i43ack@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []