rails_admin_content_builder 1.0.4 → 1.0.5

data/app/controllers/rails_admin_content_builder/content_builder_controller.rb

@@ -1,15 +1,13 @@
 module RailsAdminContentBuilder
+  # This class
   class ContentBuilderController < ::ApplicationController
     def search_content
-      @content_builder = RailsAdminContentBuilder::ContentBuilder.order('date_publish desc')
-                                                                 .limit(10)
-                                                                 .search(params[:term])
+      content_builder = RailsAdminContentBuilder::ContentBuilder
+      @content_builder = content_builder.order('date_publish desc')
+                                        .limit(10)
+                                        .search(params[:term])
       if @content_builder
-        render json: @content_builder.to_json(:include => {
-                                                :content_builder_category => {
-                                                  :only => [:name, :slug]
-                                                }
-                                              })
+        render json: @content_builder.to_json(include: {content_builder_category: {only: [:name, :slug]}})
       else
         render json: @content_builder.errors
       end
@@ -19,7 +17,7 @@ module RailsAdminContentBuilder
       @content_builder = ContentBuilder.find(params[:id])
       @image = @content_builder.content_builder_images
                                .create(image: params[:content_builder_image])
-      if @image
+      if @image.valid?
         render json: find_image(@image.id)
       else
         render json: @image.errors

data/app/helpers/rails_admin_content_builder/content_builder_helpers.rb

@@ -7,26 +7,32 @@
 #     end
 #   end
 module RailsAdminContentBuilder
+  # This is a Module
   module ContentBuilderHelpers
     # Return content Object
     #
     #   @content = content_created
     def content_created
-      RailsAdminContentBuilder::ContentBuilder
+      set_content_builder
     end
 
     # Return all contents created
     #
     #   @content = all_contents_created
     def all_contents_created
-      RailsAdminContentBuilder::ContentBuilder.where(status: true)
+      set_content_builder.where(status: true)
     end
 
     # Return specific contents created by slug
     #
     #   @content = find_content_created_by_slug('slug')
     def find_content_created_by_slug(slug)
-      RailsAdminContentBuilder::ContentBuilder.where(status: true, slug: slug).first
+      set_content_builder.where(status: true, slug: slug).first
+    end
+
+    # Return object RailsAdminContentBuilder::ContentBuilder
+    def set_content_builder
+      RailsAdminContentBuilder::ContentBuilder
     end
   end
 end

data/app/models/rails_admin_content_builder/content_builder.rb

@@ -7,9 +7,11 @@ module RailsAdminContentBuilder
 
     friendly_id :title, use: :slugged
 
-    validates :title, :date_publish, :content_builder_category, :written_by, presence: true
+    validates :title, :date_publish, :content_builder_category,
+              :written_by, presence: true
 
-    has_many :content_builder_images, inverse_of: :content_builder, dependent: :destroy
+    has_many :content_builder_images, inverse_of: :content_builder,
+                                      dependent: :destroy
     belongs_to :content_builder_category, inverse_of: :content_builders
 
     search_scope :search do
@@ -19,9 +21,23 @@ module RailsAdminContentBuilder
     def content_sanitized
       white_list_sanitizer = Rails::Html::WhiteListSanitizer.new
       white_list_sanitizer.sanitize(
-        self.content,
-        tags: %w(div b i a u p img figure figcaption a iframe footer aside section blockquote ul ol li h1 h2 h3 h4 h5 h6),
-        attributes: %w(src class alt href allowfullscreen frameborder height width)).try(:html_safe)
+        content,
+        tags: tags_hash,
+        attributes: attributes_hash
+      ).try(:html_safe)
+    end
+
+    def tags_hash
+      %w(
+        div b i a u p img figure figcaption a iframe footer aside
+        section blockquote ul ol li h1 h2 h3 h4 h5 h6
+      )
+    end
+
+    def attributes_hash
+      %w(
+        src class alt href allowfullscreen frameborder height width
+      )
     end
   end
 end

data/app/views/rails_admin/main/content_builder.html.erb

@@ -75,11 +75,11 @@
 
 <%= simple_form_for rails_admin.content_builder_url(@abstract_model.to_param, id: @object.id), html: { class: 'cb-form' }, remote: false do |f| %>
   <div class="cb-controls">
-    <%= f.button :submit, t('admin.actions.content_builder.button.save'), name: 'save', class: 'btn btn-block btn-primary' %>
+    <%= f.button :submit, t('admin.actions.content_builder.button.save'), name: 'save', class: 'btn btn-block btn-primary btn-right' %>
     <% if @object.status %>
-      <%= f.button :submit, t('admin.actions.content_builder.button.unpublish'), name: 'unpublish', class: 'btn btn-block btn-danger' %>
+      <%= f.button :submit, t('admin.actions.content_builder.button.unpublish'), name: 'unpublish', class: 'btn btn-block btn-danger btn-left' %>
     <% else %>
-      <%= f.button :submit, t('admin.actions.content_builder.button.publish'), name: 'publish', class: 'btn btn-block btn-success' %>
+      <%= f.button :submit, t('admin.actions.content_builder.button.publish'), name: 'publish', class: 'btn btn-block btn-success btn-left' %>
     <% end %>
   </div>
 

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "rails_admin_content_builder"
+require 'bundler/setup'
+require 'rails_admin_content_builder'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +10,5 @@ require "rails_admin_content_builder"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start

data/config/initializers/assets.rb

@@ -1,13 +1,13 @@
-Rails.application.config.assets.precompile += %w( cb-loading.svg )
-Rails.application.config.assets.precompile += %w( cb-snippet-text.jpg )
-Rails.application.config.assets.precompile += %w( cb-snippet-image-text.jpg )
-Rails.application.config.assets.precompile += %w( cb-snippet-text-image.jpg )
-Rails.application.config.assets.precompile += %w( cb-snippet-quote.jpg )
-Rails.application.config.assets.precompile += %w( cb-snippet-quote-text.jpg )
-Rails.application.config.assets.precompile += %w( cb-snippet-text-quote.jpg )
-Rails.application.config.assets.precompile += %w( cb-snippet-image.jpg )
-Rails.application.config.assets.precompile += %w( cb-snippet-video.jpg )
-Rails.application.config.assets.precompile += %w( cb-image-default.jpg )
-Rails.application.config.assets.precompile += %w( cb-video-default.jpg )
-Rails.application.config.assets.precompile += %w( cb-snippet-relational-text.jpg )
-Rails.application.config.assets.precompile += %w( cb-snippet-text-relational.jpg )
+Rails.application.config.assets.precompile += %w(cb-loading.svg)
+Rails.application.config.assets.precompile += %w(cb-snippet-text.jpg)
+Rails.application.config.assets.precompile += %w(cb-snippet-image-text.jpg)
+Rails.application.config.assets.precompile += %w(cb-snippet-text-image.jpg)
+Rails.application.config.assets.precompile += %w(cb-snippet-quote.jpg)
+Rails.application.config.assets.precompile += %w(cb-snippet-quote-text.jpg)
+Rails.application.config.assets.precompile += %w(cb-snippet-text-quote.jpg)
+Rails.application.config.assets.precompile += %w(cb-snippet-image.jpg)
+Rails.application.config.assets.precompile += %w(cb-snippet-video.jpg)
+Rails.application.config.assets.precompile += %w(cb-image-default.jpg)
+Rails.application.config.assets.precompile += %w(cb-video-default.jpg)
+Rails.application.config.assets.precompile += %w(cb-snippet-relational-text.jpg)
+Rails.application.config.assets.precompile += %w(cb-snippet-text-relational.jpg)

data/config/locales/content_builder.en.yml

@@ -11,6 +11,10 @@ en:
         written_by: "Writter By"
         news_source: "News source"
         summary: "Summary"
+        url: "Paste YouTube url"
+        invalid_url: "Invalid url"
+        image_description: 'Image description'
+        search_content: 'Search Content'
         button:
           save: "Save"
           publish: "Publish"

data/config/locales/content_builder.pt-BR.yml

@@ -11,6 +11,10 @@ pt-BR:
         written_by: "Autor"
         news_source: "Fonte"
         summary: "Resumo"
+        url: "Cole a url do YouTube"
+        invalid_url: "Ops! Você não informou uma url válida"
+        image_description: 'Divulgação'
+        search_content: 'Buscar notícias'
         button:
           save: "Salvar"
           publish: "Publicar"

data/config/routes.rb

@@ -1,9 +1,9 @@
 Rails.application.routes.draw do
-  get_path_url = 'admin/rails_admin_content_builder~content_builder/:id/search_content'
-  get_path_method = 'rails_admin_content_builder/content_builder#search_content'
-  get get_path_url => get_path_method
+  get_url = 'admin/rails_admin_content_builder~content_builder/search_content'
+  get_method = 'rails_admin_content_builder/content_builder#search_content'
+  get get_url => get_method
 
-  put_path_url = 'admin/rails_admin_content_builder~content_builder/:id/create_images'
-  put_path_method = 'rails_admin_content_builder/content_builder#create_images'
-  put put_path_url => put_path_method
+  put_url = 'admin/rails_admin_content_builder~content_builder/:id/create_images'
+  put_method = 'rails_admin_content_builder/content_builder#create_images'
+  put put_url => put_method
 end

data/lib/generators/rails_admin_content_builder_generator.rb

@@ -4,29 +4,37 @@ class RailsAdminContentBuilderGenerator < Rails::Generators::Base
   include Rails::Generators::Migration
 
   def self.source_root
-    @source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'templates/'))
+    @source_root ||= File.expand_path(
+      File.join(File.dirname(__FILE__), 'templates/')
+    )
   end
 
   def self.next_migration_number(*)
-    unless @migration
-      @migration = Time.now.utc.strftime("%Y%m%d%H%M%S").to_i
-    else
+    if @migration
       @migration += 1
+    else
+      @migration = Time.now.utc.strftime('%Y%m%d%H%M%S').to_i
     end
     @migration.to_s
   end
 
   def create_uploader_content_builder_image_model
-    template "content_builder_image_uploader.rb", "app/uploaders/content_builder_image_uploader.rb"
+    template 'content_builder_image_uploader.rb',
+             'app/uploaders/content_builder_image_uploader.rb'
   end
 
   def create_rails_admin_config_in_initializer
-    template "rails_admin_content_builder.rb", "config/initializers/rails_admin_content_builder.rb"
+    template 'rails_admin_content_builder.rb',
+             'config/initializers/rails_admin_content_builder.rb'
   end
 
   def create_migrations
-    migration_template "create_content_builder_category_migration.rb", File.join('db/migrate', "create_content_builder_categories.rb")
-    migration_template "create_content_builder_migration.rb", File.join('db/migrate', "create_content_builders.rb")
-    migration_template "create_content_builder_image_migration.rb", File.join('db/migrate', "create_content_builder_images.rb")
+    path = 'db/migrate'
+    migration_template 'create_content_builder_category_migration.rb',
+                       File.join(path, 'create_content_builder_categories.rb')
+    migration_template 'create_content_builder_migration.rb',
+                       File.join(path, 'create_content_builders.rb')
+    migration_template 'create_content_builder_image_migration.rb',
+                       File.join(path, 'create_content_builder_images.rb')
   end
 end

data/lib/generators/templates/content_builder_image_uploader.rb

@@ -1,5 +1,4 @@
 # encoding: utf-8
-
 class ContentBuilderImageUploader < CarrierWave::Uploader::Base
   # Include RMagick or MiniMagick support:
   # include CarrierWave::RMagick
@@ -15,14 +14,6 @@ class ContentBuilderImageUploader < CarrierWave::Uploader::Base
     "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
   end
 
-  # Provide a default URL as a default if there hasn't been a file uploaded:
-  # def default_url
-  #   # For Rails 3.1+ asset pipeline compatibility:
-  #   # ActionController::Base.helpers.asset_path("fallback/" + [version_name, "default.png"].compact.join('_'))
-  #
-  #   "/images/fallback/" + [version_name, "default.png"].compact.join('_')
-  # end
-
   # Process files as they are uploaded:
   # process :scale => [200, 300]
   #
@@ -32,11 +23,11 @@ class ContentBuilderImageUploader < CarrierWave::Uploader::Base
 
   # Create different versions of your uploaded files:
   version :left_or_right do
-    process :resize_to_fit => [450, 450]
+    process resize_to_fit: [450, 450]
   end
 
   version :center do
-    process :resize_to_fit => [900, 900]
+    process resize_to_fit: [900, 900]
   end
 
   # Add a white list of extensions which are allowed to be uploaded.
@@ -46,9 +37,8 @@ class ContentBuilderImageUploader < CarrierWave::Uploader::Base
   end
 
   # Override the filename of the uploaded files:
-  # Avoid using model.id or version_name here, see uploader/store.rb for details.
+  # Avoid using model.id or version_name here, see uploader/store.rb for detail
   # def filename
   #   "something.jpg" if original_filename
   # end
-
 end

data/lib/rails_admin_content_builder.rb

@@ -1,4 +1,4 @@
-require "rails_admin_content_builder/engine"
+require 'rails_admin_content_builder/engine'
 
 module RailsAdminContentBuilder
 end
@@ -23,7 +23,7 @@ module RailsAdmin
         end
 
         register_instance_option :controller do
-          Proc.new do
+          proc do
             @object = @abstract_model.model.find(params[:id])
             @response = {}
 
@@ -46,7 +46,7 @@ module RailsAdmin
               end
             end
 
-            render :action => @action.template_name
+            render action: @action.template_name
           end
         end
       end

data/lib/rails_admin_content_builder/engine.rb

@@ -18,7 +18,7 @@ module RailsAdminContentBuilder
 
     config.generators do |g|
       g.test_framework :rspec
-      g.fixture_replacement :factory_girl, :dir => 'spec/factories'
+      g.fixture_replacement :factory_girl, dir: 'spec/factories'
       g.assets false
       g.helper false
     end

data/lib/rails_admin_content_builder/version.rb

@@ -1,3 +1,3 @@
 module RailsAdminContentBuilder
-  VERSION = "1.0.4"
+  VERSION = '1.0.5'.freeze
 end

data/rails_admin_content_builder.gemspec

@@ -1,42 +1,44 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "rails_admin_content_builder/version"
+require 'rails_admin_content_builder/version'
 
 Gem::Specification.new do |spec|
-  spec.name         = "rails_admin_content_builder"
+  spec.name         = 'rails_admin_content_builder'
   spec.version      = RailsAdminContentBuilder::VERSION
-  spec.authors      = ["Luiz Picolo", "Gabriel Medina"]
-  spec.email        = ["luizpicolo@gmail.com", "gmedina.santos@gmail.com"]
+  spec.authors      = ['Luiz Picolo', 'Gabriel Medina']
+  spec.email        = ['luizpicolo@gmail.com', 'gmedina.santos@gmail.com']
 
-  spec.summary      = "Easy way for create contents using rails_admin"
-  spec.description  = "Easy way for create contents using rails_admin"
-  spec.homepage     = "http://github.com/luizpicolo/rails_admin_content_builder"
-  spec.license      = "MIT"
+  spec.summary      = 'Easy way for create contents using rails_admin'
+  spec.description  = 'Easy way for create contents using rails_admin'
+  spec.homepage     = 'http://github.com/luizpicolo/rails_admin_content_builder'
+  spec.license      = 'MIT'
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "exe"
+  spec.files = `git ls-files -z`.split("\x0").reject { |f|
+    f.match(%r{^(test|spec|features)/})
+  }
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-  spec.test_files = Dir["spec/**/*"]
+  spec.require_paths = ['lib']
+  spec.test_files = Dir['spec/**/*']
 
-  spec.add_development_dependency "bundler", "~> 1.11"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rails", [">= 4.0", "< 5"]
-  spec.add_development_dependency "rspec-rails", "~> 3.0"
-  spec.add_development_dependency "rails_admin", "~> 0.8.1"
+  spec.add_development_dependency 'bundler', '~> 1.11'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rails', ['>= 4.0', '< 5']
+  spec.add_development_dependency 'rspec-rails', '~> 3.0'
+  spec.add_development_dependency 'rails_admin', '~> 0.8.1'
   spec.add_development_dependency 'capybara', '~> 2.7', '>= 2.7.0'
   spec.add_development_dependency 'launchy', '~> 2.4', '>= 2.4.3'
-  spec.add_development_dependency "shoulda-matchers", "~> 3.1"
+  spec.add_development_dependency 'shoulda-matchers', '~> 3.1'
   spec.add_development_dependency 'selenium-webdriver', '~> 2.53', '>= 2.53.4'
   spec.add_development_dependency 'factory_girl_rails', '~> 4.7', '>= 4.7.0'
   spec.add_development_dependency 'faker', '~> 1.6', '>= 1.6.3'
 
-  spec.add_runtime_dependency "carrierwave", "~> 0.11.0"
+  spec.add_runtime_dependency 'carrierwave', '~> 0.11.0'
   spec.add_runtime_dependency 'medium-editor-rails', '~> 2.1', '>= 2.1.0'
   spec.add_runtime_dependency 'mini_magick', '~> 4.5', '>= 4.5.1'
   spec.add_runtime_dependency 'friendly_id', '~> 5.1', '>= 5.1.0'
-  spec.add_runtime_dependency "simple_form", "~> 3.2"
+  spec.add_runtime_dependency 'simple_form', '~> 3.2'
   spec.add_runtime_dependency 'search_cop', '~> 1.0', '>= 1.0.6'
   spec.add_runtime_dependency 'rails-html-sanitizer', '~> 1.0', '>= 1.0.0'
 end

data/spec/controllers/rails_admin_content_builder/content_builder_controller_spec.rb

@@ -1,19 +1,55 @@
 require 'spec_helper'
 require 'json'
 
-describe RailsAdminContentBuilder::ContentBuilderController, type: :controller do
+content_builder_controller = RailsAdminContentBuilder::ContentBuilderController
+
+describe content_builder_controller, type: :controller do
   describe 'PUT #create_images' do
-    it "Should return valid JSON" do
+    it 'returns valid JSON' do
       content_builder = FactoryGirl.create :content_builder
       put :create_images, id: content_builder.id,
-          content_builder_image: Rack::Test::UploadedFile.new(File.join('spec', 'fixtures', 'assets', 'example.jpg'))
+                          content_builder_image: Rack::Test::UploadedFile.new(
+                            File.join(
+                              'spec', 'fixtures', 'assets', 'example.jpg'
+                            )
+                          )
 
       json = JSON.parse(response.body)
-      path = '/uploads/rails_admin_content_builder/content_builder_image/image/1/'
+      path = '/uploads/rails_admin_content_builder'
+      path << '/content_builder_image/image/1/'
 
       expect(response.status).to eq 200
       expect(json['image']['url']).to eq path + 'example.jpg'
-      expect(json['image']['left_or_right']['url']).to eq path + 'left_or_right_example.jpg'
+      expect(
+        json['image']['left_or_right']['url']
+      ).to eq path + 'left_or_right_example.jpg'
+    end
+
+    it 'returns error' do
+      content_builder = FactoryGirl.create :content_builder
+      put :create_images, id: content_builder.id, content_builder_image: nil
+
+      json = JSON.parse(response.body)
+
+      expect(response.status).to eq 200
+      expect(json['image']).to include("can't be blank")
+    end
+  end
+
+  describe 'GET #search_content' do
+    it 'returns valid JSON' do
+      5.times do |i|
+        content_builder = FactoryGirl.create :content_builder, title: "content #{i}"
+      end
+      5.times do |i|
+        content_builder = FactoryGirl.create :content_builder, title: "title #{i}"
+      end
+      get :search_content, term: "content"
+
+      json = JSON.parse(response.body)
+
+      expect(response.status).to eq 200
+      expect(json.size).to eq 5
     end
   end
 end