ordinary_cms 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de5c0a8f213c36b4fbd052230581ce452c434c78
-  data.tar.gz: ecf6071c5f1d2a4edae3afd9d2edc7377ec894f2
+  metadata.gz: 79eb461dc4d6ae9cd9eae761a10753de26bb7090
+  data.tar.gz: 597744d3c2aa79015464f99f3a8b919ea0be1989
 SHA512:
-  metadata.gz: 4ead1963c7b4a75401af42f6f345f3ac3553bfa14e530b94fe36217e0e09dc3ee3c3da26f97329aa355d7a1e40b13327dd3248f53d199330afc8240bc82a5583
-  data.tar.gz: 4e910f9a2f4039b42e617c2ba0fef678cd7ff7581502d45ebdc285414380a811484a7b786d71dabd3657d5330fd4a3a1dafd6a563931deb6aaf88224dd06fb44
+  metadata.gz: 51ec231450da7476db24d82df3538b8dbd95812a0d797bf5f05f8c844817a95358fb8d96d173e84ea11f8b451f7a2e6fc597107067997981fbd6dcabd813ab14
+  data.tar.gz: 4897d93bc44e2d1ee61dfbeec6cf61efcd46564c24e24d265b457446f6337de97f908b8ed5328e85cf7b878be27910e0f932d89d0743d4e71875a7c1e702d3bf

data/app/admin/ordinary_cms/page.rb

@@ -1,6 +1,6 @@
 ActiveAdmin.register OrdinaryCms::Page do
 
-  permit_params :name, seo_attributes: [ :id, :title, :description, :keywords ],
+  permit_params :name, :factory_id, seo_attributes: [ :id, :title, :description, :keywords ],
                 sections_attributes: [:id, :name, :text, :_destroy]
 
   member_action :set_as_root, method: :patch do

data/app/controllers/ordinary_cms/mercury/images_controller.rb

@@ -0,0 +1,25 @@
+module OrdinaryCms
+  module Mercury
+    class ImagesController < MercuryController
+
+      respond_to :json
+
+      # POST /images.json
+      def create
+
+        @image = Mercury::Image.new(params.require(:image).permit(:image))
+
+        @image.save
+        respond_with @image
+      end
+
+      # DELETE /images/1.json
+      def destroy
+        @image = Mercury::Image.find(params[:id])
+        @image.destroy
+        respond_with @image
+      end
+
+    end
+  end
+end

data/app/controllers/ordinary_cms/pages_controller.rb

@@ -8,7 +8,7 @@ module OrdinaryCms
     before_action ActiveAdmin.application.authentication_method, only: :update
 
     def show
-      smart_render(@page.name)
+      smart_render(@page.slug)
     end
 
     def update

data/app/models/ordinary_cms/factories/page.rb

@@ -6,11 +6,14 @@ module OrdinaryCms
       field :name
 
       embeds_many :sections, class_name: 'OrdinaryCms::Factories::Section'
+      has_many :pages, class_name: 'OrdinaryCms::Page'
+
       validates :name, presence: true, uniqueness: true
 
       def build(params = {})
         page = OrdinaryCms::Page.new params
         sections.each {|s| page.sections << s.build}
+        page.factory = self
         page
       end
     end

data/app/models/ordinary_cms/mercury/image.rb

@@ -0,0 +1,23 @@
+module OrdinaryCms
+  module Mercury
+    class Image
+      include Mongoid::Document
+      include Mongoid::Paperclip
+
+      has_mongoid_attached_file :image
+
+
+      validates_presence_of :image
+      validates_attachment_content_type :image, content_type: %w(image/jpg image/jpeg image/png)
+
+      delegate :url, :to => :image
+
+      def serializable_hash(options = nil)
+        options ||= {}
+        options[:methods] ||= []
+        options[:methods] << :url
+        super(options)
+      end
+    end
+  end
+end

data/config/locales/ru.yml

@@ -4,11 +4,18 @@ ru:
 
   mongoid: &mongoid
     models:
+      admin_user:
+        one:   Администратор
+        few:   Администратора
+        many:  Администраторов
+        other: Администраторы
+
       ordinary_cms/page:
         one:   Страница
         few:   Страницы
         many:  Страниц
         other: Страницы
+
       ordinary_cms/section:
         one:   Раздел
         few:   Раздела
@@ -21,4 +28,8 @@ ru:
       ordinary_cms/section:
         name: Имя
         alias: Псевдоним
-        content: Контент
+        content: Контент
+
+
+  activerecord:
+    <<: *mongoid

data/config/routes.rb

@@ -2,5 +2,9 @@ OrdinaryCms::Engine.routes.draw do
 
   resources :pages, only: [:show, :update]
 
+  namespace :mercury do
+    resources :images
+  end
+
   root 'root#show'
 end

data/lib/ordinary_cms/version.rb

@@ -1,3 +1,3 @@
 module OrdinaryCms
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ordinary_cms
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - max-konin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-21 00:00:00.000000000 Z
+date: 2014-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -88,7 +88,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - MIT-LICENSE
-- README.rdoc
 - Rakefile
 - app/admin/ordinary_cms/page.rb
 - app/assets/javascripts/mercury.js
@@ -96,12 +95,14 @@ files:
 - app/assets/stylesheets/ordinary_cms/application.css
 - app/controllers/ordinary_cms/application_controller.rb
 - app/controllers/ordinary_cms/concerns/smart_pages_render.rb
+- app/controllers/ordinary_cms/mercury/images_controller.rb
 - app/controllers/ordinary_cms/pages_controller.rb
 - app/controllers/ordinary_cms/root_controller.rb
 - app/helpers/ordinary_cms/application_helper.rb
 - app/helpers/ordinary_cms/pages_helper.rb
 - app/models/ordinary_cms/factories/page.rb
 - app/models/ordinary_cms/factories/section.rb
+- app/models/ordinary_cms/mercury/image.rb
 - app/models/ordinary_cms/page.rb
 - app/models/ordinary_cms/section.rb
 - app/views/layouts/ordinary_cms/application.html.erb

data/README.rdoc

@@ -1,3 +0,0 @@
-= OrdinaryCms
-
-This project rocks and uses MIT-LICENSE.