enjoy_cms 0.4.0.beta3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a5d6147bb0eb040d5049c6ec15332854109a4bb
-  data.tar.gz: ac05ab418b17b705a7541eb7b8ca7e2819445495
+  metadata.gz: 867a2e90a3a9e259ceadaf99ab42df4469481c3b
+  data.tar.gz: 441c4459be10d3e19416f8865f6a3db7db6c1bf0
 SHA512:
-  metadata.gz: 1122136245369984ddb261ea6d1d3092eda5a8dab2d07367b2c1bf5f89767c35c173e7aaa66d1b85215563129f0bc6a1a650073316d9b2151bf26c764e579a6b
-  data.tar.gz: f0405c8bc242b332325098247b6c88fd5df0ed3fea92c0afaf70b8997106afd73a4f8df1121e5a29776e4a20cb60838356dba3b822e6df3680507fb2a9f8e6ee
+  metadata.gz: b59526d7d43ff89a2dea28e56ffc08cc5d6744a79e23b54ed5d9e575e273fc9e9c2d4172fdf475075e1565edee2274ecb44f2abb59770a9aaff6954ce484cb9a
+  data.tar.gz: bf4872c75876973ac21328ed9fa194d718bc454c26670f4a01d0b8a5953ce578abc94db608472994abff3a6aaf3bd7589fa61f8f312cff3d0f5c55693c9cabdf

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    enjoy_cms (0.4.0.beta3)
+    enjoy_cms (0.4.0)
       ckeditor
       coffee-rails
       devise

data/app/controllers/concerns/enjoy/errors.rb

@@ -1,7 +1,7 @@
 module Enjoy::Errors
   extend ActiveSupport::Concern
   included do
-    if Rails.env.production? || Rails.env.staging?
+    if Rails.env.production? || Rails.env.staging? || (respond_to?(:enjoy_check_errors) and enjoy_check_errors)
       rescue_from Exception, with: :render_500
       rescue_from ActionController::RoutingError, with: :render_404
       rescue_from ActionController::UnknownController, with: :render_404

data/app/models/concerns/enjoy/hash_field.rb

@@ -1,4 +1,4 @@
-if Enjoy.mongoid?
+if false #Enjoy.mongoid?
   module Enjoy::HashField
     extend ActiveSupport::Concern
 
@@ -12,8 +12,8 @@ if Enjoy.mongoid?
         meth_hsh = "#{name}_hash"
         meth_json = "#{name}_json"
         if opts[:localize]
-          meth_str_t = "#{name}_str_translations"
-          meth_hsh_t = "#{name}_hash_translations"
+          meth_str_t = "#{meth_str}_translations"
+          meth_hsh_t = "#{meth_hsh}_translations"
           class_eval <<-EVAL
             def #{meth_str_t}=(val)
               return self.#{meth_hsh_t} = {} if val.blank?
@@ -38,6 +38,9 @@ if Enjoy.mongoid?
             def #{meth}
               self.#{meth_hsh}
             end
+            def #{meth}=(val)
+              self.#{meth_str} = val
+            end
             def #{meth_json}
               self.#{meth_hsh}.to_json if self.#{meth_hsh}
             end
@@ -47,9 +50,6 @@ if Enjoy.mongoid?
                 _has_errors = false
                 I18n.available_locales.each do |l|
                   I18n.with_locale(l) do
-                    puts self.#{meth_hsh_t}[l]
-                    puts self.#{meth_str}
-                    puts "_"
                     if self.#{meth_hsh_t}[l].nil? and !self[:#{meth_str_t}][l].blank?
                       _has_errors ||= true
                       _meth = "#{meth_hsh_t}_\#{l}".to_s
@@ -69,9 +69,16 @@ if Enjoy.mongoid?
           class_eval <<-EVAL
             def #{meth_str}=(val)
               return self.#{meth_hsh} = {} if val.blank?
-              begin
-                self.#{meth_hsh} = JSON.parse(val)
-              rescue
+              if val.is_a?(String)
+                begin
+                  begin
+                    self[:#{meth_str}] = JSON.parse(val)
+                  rescue
+                    self[:#{meth_str}] = YAML.load(val)
+                  end
+                rescue
+                end
+              elsif val.is_a?(Hash)
                 self[:#{meth_str}] = val
               end
             end
@@ -81,6 +88,9 @@ if Enjoy.mongoid?
             def #{meth}
               self.#{meth_hsh}
             end
+            def #{meth}=(val)
+              self.#{meth_str} = val
+            end
             def #{meth_json}
               self.#{meth_hsh}.to_json if self.#{meth_hsh}
             end

data/app/views/enjoy/errors/error_403.html.slim

@@ -1 +1 @@
-= render 'errors/base', code: 403, text: t('enjoy.errors.access_denied')
+= render 'enjoy/errors/base', code: 403, text: t('enjoy.errors.access_denied')

data/app/views/enjoy/errors/error_404.html.slim

@@ -1 +1 @@
-= render 'errors/base', code: 404, text: t('enjoy.errors.not_found')
+= render 'enjoy/errors/base', code: 404, text: t('enjoy.errors.not_found')

data/app/views/enjoy/errors/error_500.html.slim

@@ -1 +1 @@
-= render 'errors/base', code: 500, text: t('enjoy.errors.internal_error')
+= render 'enjoy/errors/base', code: 500, text: t('enjoy.errors.internal_error')

data/app/views/layouts/application.html.slim

@@ -14,9 +14,9 @@ html lang="ru"
     /[if lt IE 9]
       = javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.2/html5shiv.min.js", async: async
     css:
-      #{Settings.custom_css(default: '', kind: :css)}    
+      #{Settings.custom_css(default: '', kind: :css, title: "Дополнительный CSS")}    
     javascript:
-      #{Settings.custom_js(default: '', kind: :js)}
+      #{Settings.custom_js(default: '', kind: :js, title: "Дополнительный JS")}
       
   body
     #root

data/lib/enjoy/version.rb

@@ -1,3 +1,3 @@
 module Enjoy
-  VERSION = "0.4.0.beta3"
+  VERSION = "0.4.0"
 end

data/lib/enjoy_cms.rb

@@ -20,7 +20,7 @@ require 'filename_to_slug'
 require 'rails_admin'
 require 'enjoy/rails_admin_ext/config'
 
-require 'enjoy/rails_admin_ext/enjoy_hash'
+# require 'enjoy/rails_admin_ext/enjoy_hash'
 require 'enjoy/rails_admin_ext/enjoy_html'
 require 'enjoy/rails_admin_ext/enjoy_slugs'
 require 'enjoy/rails_admin_ext/group_patch'

data/lib/generators/enjoy/cms/layout_generator.rb

@@ -8,7 +8,7 @@ module Enjoy::Cms
 
     desc 'Enjoy CMS Layout generator'
     def layout
-      template('app/views/layouts/application.html.slim', 'app/views/layouts/application.html.slim')
+      template('../app/views/layouts/application.html.slim', 'app/views/layouts/application.html.slim')
     end
   end
 end

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

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'rails', '4.2.4' #'~> 5.0.0.beta3'
+gem 'rails', '4.2.6' #'~> 5.0.0.beta3'
 #{if mongoid then "gem 'mongoid'" else "gem 'pg'" end}
 
 gem 'sass'

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

@@ -29,6 +29,7 @@ class Ability
   end
 
   def admin_ui(user)
+    can :manage, :all
     can :manage, User
     can :user_abilities, User
 
@@ -36,6 +37,8 @@ class Ability
   end
 
   def manager_ui(user)
+    can :read, :all
+    can :show, :all
     cannot [:edit, :destroy, :new, :create], User
     can :edit, User, _id: user._id
     cannot :user_abilities, :all

data/template.rb

@@ -14,7 +14,7 @@ remove_file 'Gemfile'
 create_file 'Gemfile' do <<-TEXT
 source 'https://rubygems.org'
 
-gem 'rails', '4.2.6' #'~> 5.0.0.rc1'
+gem 'rails', '4.2.6'
 #{if mongoid then "gem 'mongoid'" else "gem 'pg'" end}
 
 gem 'sass'
@@ -29,8 +29,7 @@ gem 'rails_admin_multiple_file_upload'
 #gem 'rails_admin_comments', github: "enjoycreative/rails_admin_comments" #path: '/home/ack/www/rails_admin/rails_admin_comments'
 
 
-##{if mongoid then "gem 'enjoy_cms_mongoid'" else "gem 'enjoy_cms_activerecord'" end}, path: '/home/ack/www/enjoy/enjoy_cms' #'~> 0.4.0.beta1'
-#{if mongoid then "gem 'enjoy_cms_mongoid'" else "gem 'enjoy_cms_activerecord'" end}, github: "enjoycreative/enjoy_cms" #'~> 0.4.0.beta1'
+#{if mongoid then "gem 'enjoy_cms_mongoid'" else "gem 'enjoy_cms_activerecord'" end}, '~> 0.4.0'
 
 gem 'devise'
 
@@ -159,11 +158,16 @@ create_file 'config/navigation.rb' do <<-TEXT
 TEXT
 end
 
+remove_file 'README.md'
 create_file 'README.md', "## #{app_name}\nProject generated by EnjoyCMS\nORM: #{if mongoid then 'Mongoid' else 'ActiveRecord' end}\n\n"
 
-create_file '.ruby-version', "2.3.1\n"
+RVM_RUBY_VERSION = "2.3.1"
+create_file '.ruby-version', "#{RVM_RUBY_VERSION}\n"
 create_file '.ruby-gemset', "#{app_name}\n"
 
+# run "rvm use #{RVM_RUBY_VERSION} && rvm gemset create #{app_name}"
+# run "rvm use #{RVM_RUBY_VERSION}@#{app_name} && gem install bundler"
+# run "rvm gemset list"
 run 'bundle install --without production'
 
 if mongoid
@@ -325,13 +329,13 @@ inject_into_file 'app/models/user.rb', before: /^end/ do <<-TEXT
   def self.generate_first_admin_user
     if User.all.count == 0
       _email_pass = 'admin@#{app_name.dasherize.downcase}.ru'
-      if User.create(roles: ["admin"], email: _email_pass, password: _email_pass, password_confirmation: _email_pass)
+      if User.new(roles: ["admin"], email: _email_pass, password: _email_pass, password_confirmation: _email_pass).save
         puts "User with email and password '\#{_email_pass}' was created!"
       else
-        puts 'error'
+        puts 'Creating User error'
       end
     else
-      puts 'error'
+      puts 'Users are here already'
     end
   end
 
@@ -406,6 +410,8 @@ TEXT
 end
 end
 
+# run 'rails r User.generate_first_admin_user'
+
 if mongoid
   generate "ckeditor:install", "--orm=mongoid", "--backend=paperclip"
 else
@@ -467,7 +473,7 @@ end
 # end
 
 
-generate "enjoy:rack"
+generate "enjoy:cms:rack"
 
 
 remove_file 'app/assets/stylesheets/application.css'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enjoy_cms
 version: !ruby/object:Gem::Version
-  version: 0.4.0.beta3
+  version: 0.4.0
 platform: ruby
 authors:
 - Alexander Kiseliev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-04 00:00:00.000000000 Z
+date: 2016-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -383,9 +383,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1