brightcontent-core 2.1.5 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d35bf6ba253fbd2ddf7fe207a0fe4a1fbecfbf61
-  data.tar.gz: ec5cfee1eb6b6f149d590f3db1a571b785d1d950
+  metadata.gz: ca3785050aa8c2db2a8007bb9a8a648b0f6cb13b
+  data.tar.gz: e8e2b8ffa1d5f558461b91b095b442bb6f9d860c
 SHA512:
-  metadata.gz: 3949d392a27a5b32cbaad04de8a127a833293a4b5dd834cdba69fea8ee7e10e0ecab9ebf5471348f82dd77291aea6b5e8147e813c57c4833437a16905c4861e3
-  data.tar.gz: 9fad89c2d9884156e629cac2f359e7570b09858901ba4e5df01a232aa3ecb05f7271fefd6c03e5bcfdcdabe9b4e4143babca296c3cb512f24b08b3050c7a87d7
+  metadata.gz: e29b0764abbb6d0032b59b0884a1555964db4fb686745febb4ffff0319c8b9afc1612f976dd939988f25f8ac2cbdb96b3ef7f74195135519cc3c2f9e4abd3614
+  data.tar.gz: 4537fa305e9fde2652e29e51ea08e0a4e2e2816d6c74e17fb5d5e9f6984cc1920952cdd7231589ddc8080eb59f5eaa61719b9989716c3aa508949ecebe98b4e9

data/Gemfile

@@ -1,17 +1,3 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
-# Declare your gem's dependencies in brightcontent.gemspec.
-# Bundler will treat runtime dependencies like base dependencies, and
-# development dependencies will be added by default to the :development group.
 gemspec
-
-# jquery-rails is used by the dummy application
-# gem "jquery-rails"
-
-# Declare any dependencies that are still in development here instead of in
-# your gemspec. These might include edge Rails or gems from your path or
-# Git. Remember to move these dependencies to your gemspec before releasing
-# your gem to rubygems.org.
-
-# To use debugger
-# gem 'debugger'

data/app/controllers/brightcontent/sessions_controller.rb

@@ -1,3 +1,5 @@
+require_dependency "brightcontent/application_controller"
+
 module Brightcontent
   class SessionsController < ApplicationController
     skip_before_filter :authorize

data/app/helpers/brightcontent/base_helper.rb

@@ -4,8 +4,8 @@ module Brightcontent
       ViewLookup::ListField.new(self, item: item, field: field).call
     end
 
-    def render_filter_field(form, field)
-      ViewLookup::FilterField.new(self, field: field, form: form).call
+    def render_filter_field(form, field, options)
+      ViewLookup::FilterField.new(self, field: field, form: form, options: options).call
     end
 
     def render_form_field(form, field)
@@ -17,5 +17,19 @@ module Brightcontent
     rescue ActionView::MissingTemplate
       nil
     end
+
+    # Returns filter field definitions as a nested array.
+    #
+    #  [:foo, { bar: { as: :select }, qux: { as: :string } }]
+    #
+    # Becomes:
+    #
+    #  [[:foo], [:bar, { as: :select }], [:qux, { as: :string }]]
+    #
+    def normalized_filter_fields
+      filter_fields.flat_map do |field|
+        field.is_a?(Hash) ? field.to_a : [[field]]
+      end
+    end
   end
 end

data/app/views/brightcontent/base/_list_filters.html.erb

@@ -1,10 +1,8 @@
 <% if filter_fields.present? %>
   <div class="panel-body">
     <%= search_form_for ransack_search, class: "form-inline" do |form| %>
-      <% filter_fields.each do |field| %>
-        <div class="form-group">
-          <%= render_filter_field form, field %>
-        </div>
+      <% normalized_filter_fields.each do |field, options| %>
+        <%= render_filter_field form, field, options %>
       <% end %>
       <%= form.submit class: "btn btn-default btn-sm" %>
     <% end %>

data/brightcontent-core.gemspec

@@ -15,18 +15,18 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- spec/*`.split("\n")
   s.require_paths = ["lib"]
 
-  s.add_dependency "rails", ">= 4.0.0"
+  s.add_dependency "rails", ">= 4.2.0"
   s.add_dependency "bcrypt"
   s.add_dependency "bootstrap-sass", ">= 3.1"
   s.add_dependency "bootstrap-wysihtml5-rails", ">= 0.3.2"
+  s.add_dependency "inherited_resources", ">= 1.6.0"
   s.add_dependency "coffee-rails"
-  s.add_dependency "inherited_resources", "~> 1.4.1"
   s.add_dependency "jquery-rails"
   s.add_dependency "sass-rails", ">= 4.0.2"
   s.add_dependency "simple_form"
   s.add_dependency "will_paginate"
   s.add_dependency "will_paginate-bootstrap"
-  s.add_dependency "ransack", "~> 1.1"
+  s.add_dependency "ransack", ">= 1.1"
 
   s.add_development_dependency "rake"
   s.add_development_dependency "sqlite3"

data/lib/brightcontent/core.rb

@@ -1,3 +1,8 @@
+# Make SimpleForm helpers available in Ransack's search form:
+# https://github.com/activerecord-hackery/ransack#using-simpleform
+#
+ENV['RANSACK_FORM_BUILDER'] ||= '::SimpleForm::FormBuilder'
+
 require "coffee_script"
 require "bootstrap-sass"
 require "bootstrap-wysihtml5-rails"

data/lib/brightcontent/view_lookup/base.rb

@@ -7,7 +7,7 @@ module Brightcontent
 
       def initialize(view_context, options)
         @view_context = view_context
-        @options = options
+        @options = options.symbolize_keys
       end
 
       def call

data/lib/brightcontent/view_lookup/filter_field.rb

@@ -2,42 +2,110 @@ module Brightcontent
   module ViewLookup
     class FilterField < Base
       def render_default
-        raise "invalid filter field: #{options[:field]}" unless field_name
-        [
-          options[:form].label(:"#{field_name}_eq", options[:field].humanize),
-          options[:form].select(:"#{field_name}_eq", select_options, {include_blank: true}, class: "form-control input-sm")
-        ].join(" ").html_safe
+        options[:form].input(input_name, input_options.merge(collection: collection))
       end
 
       private
 
-      def field?
+      def controller
+        view_context.controller
+      end
+
+      def column?
         resource_class.column_names.include? options[:field].to_s
       end
 
+      def scope?
+        resource_class.ransackable_scopes.include?(options[:field].to_sym)
+      end
+
       def belongs_to_association?
         association.try :belongs_to?
       end
 
       def field_name
-        if field?
-          options[:field]
-        elsif belongs_to_association?
+        if belongs_to_association?
           association.foreign_key
+        else
+          options[:field]
+        end
+      end
+
+      def input_name
+        if predicate
+          "#{field_name}_#{predicate}"
+        else
+          field_name.to_s
         end
       end
 
-      def select_options
-        if field?
-          field_type == :boolean ? raw_options : raw_options.sort
+      def filter_options
+        options[:options] || {}
+      end
+
+      def predicate
+        filter_options.fetch(:predicate) { default_predicate }
+      end
+
+      def default_predicate
+        if scope?
+          false
+        elsif as_string?
+          "cont"
+        else
+          "eq"
+        end
+      end
+
+      def input_options
+        default_input_options.merge(filter_options.except(:predicate))
+      end
+
+      def collection
+        collection = filter_options[:collection]
+
+        if collection.respond_to?(:call)
+          collection.call
+        elsif collection.is_a?(Symbol) && controller.respond_to?(collection, true)
+          controller.send(collection)
+        elsif collection
+          collection
+        elsif as_collection?
+          default_collection
+        end
+      end
+
+      def as_collection?
+        %i(select radio_buttons check_boxes).include?(input_options[:as].to_sym)
+      end
+
+      def as_string?
+        %i(string search).include?(input_options[:as].to_sym)
+      end
+
+      def default_input_options
+        {
+          label:         options[:field].to_s.humanize,
+          input_html:    { class: "form-control input-sm" },
+          required:      false,
+          as:            default_type,
+          include_blank: true
+        }
+      end
+
+      def default_type
+        (column? || belongs_to_association?) ? :select : :string
+      end
+
+      def default_collection
+        if column?
+          field_type == :boolean ? raw_collection : raw_collection.sort
         elsif belongs_to_association?
-          association.klass.where(association.association_primary_key => raw_options).map do |record|
-            [record, record[association.association_primary_key]]
-          end
+          association.klass.where(association.association_primary_key => raw_collection)
         end
       end
 
-      def raw_options
+      def raw_collection
         resource_class.uniq.pluck(field_name)
       end
     end

data/spec/dummy/app/controllers/brightcontent/blogs_controller.rb

@@ -1,3 +1,3 @@
 class Brightcontent::BlogsController < Brightcontent::BaseController
-  filter_fields %w[featured author]
+  filter_fields :featured, :author, name: { as: :string }, name_or_comments_text: { label: "Find" }, exclude_inactive: { as: :boolean }
 end

data/spec/dummy/app/models/author.rb

@@ -1,7 +1,3 @@
 class Author < ActiveRecord::Base
   has_many :blogs
-
-  def to_s
-    name
-  end
 end

data/spec/dummy/app/models/blog.rb

@@ -1,5 +1,11 @@
 class Blog < ActiveRecord::Base
   belongs_to :author
   has_many :comments
+
   scope :featured, ->{ where(:featured => true) }
+  scope :exclude_inactive, ->{ where(active: true) }
+
+  def self.ransackable_scopes(auth = nil)
+    [:exclude_inactive]
+  end
 end

data/spec/dummy/config/application.rb

@@ -47,6 +47,7 @@ module Dummy
     config.assets.enabled = true
 
     # config.i18n.enforce_available_locales = true
+    config.active_record.raise_in_transactional_callbacks = true
 
     # Version of your assets, change this if you want to expire all your assets
     config.assets.version = '1.0'

data/spec/dummy/config/environments/production.rb

@@ -9,7 +9,7 @@ Dummy::Application.configure do
   config.action_controller.perform_caching = true
 
   # Disable Rails's static asset server (Apache or nginx will already do this)
-  config.serve_static_assets = false
+  config.serve_static_files = false
 
   # Compress JavaScripts and CSS
   config.assets.compress = true

data/spec/dummy/config/environments/test.rb

@@ -10,7 +10,7 @@ Dummy::Application.configure do
   config.cache_classes = true
 
   # Configure static asset server for tests with Cache-Control for performance
-  config.serve_static_assets = true
+  config.serve_static_files = true
   config.static_cache_control = "public, max-age=3600"
 
   # Show full error reports and disable caching

data/spec/dummy/db/migrate/20150219130156_add_active_to_blogs.rb

@@ -0,0 +1,5 @@
+class AddActiveToBlogs < ActiveRecord::Migration
+  def change
+    add_column :blogs, :active, :boolean, default: true
+  end
+end

data/spec/factories.rb

@@ -29,4 +29,9 @@ FactoryGirl.define do
       end
     end
   end
+
+  factory :comment do
+    text "Comment text"
+    blog
+  end
 end

data/spec/features/resources_index_spec.rb

@@ -41,6 +41,31 @@ feature "Resources index" do
     page_should_have_n_rows 9
   end
 
+  scenario "Filter by name" do
+    given_2_blog_items_with_different_names
+    visit_blogs_page
+    fill_in "Name", with: "oo"
+    click_button "Search"
+    page_should_have_n_rows 1
+  end
+
+  scenario "Filter by name or comments text" do
+    given_3_blog_items_and_a_comment
+    visit_blogs_page
+    fill_in "Find", with: "oo"
+    click_button "Search"
+    page_should_have_n_rows 2
+  end
+
+  scenario "Filter by exclude_inactive scope" do
+    given_an_active_and_inactive_blog
+    visit_blogs_page
+    page_should_have_n_rows 2
+    check "Exclude inactive"
+    click_button "Search"
+    page_should_have_n_rows 1
+  end
+
   def visit_blogs_page
     click_link "Blogs"
   end
@@ -71,4 +96,20 @@ feature "Resources index" do
   def given_10_per_page
     Brightcontent::BlogsController.class_eval { per_page 10 }
   end
+
+  def given_2_blog_items_with_different_names
+    create :blog, name: "Foo"
+    create :blog, name: "Bar"
+  end
+
+  def given_3_blog_items_and_a_comment
+    create :blog, name: "Foo"
+    create :blog, name: "Bar"
+    create :comment, text: "Doodles"
+  end
+
+  def given_an_active_and_inactive_blog
+    create :blog, name: "Foo", active: false
+    create :blog, name: "Bar", active: true
+  end
 end

data/spec/lib/brightcontent/model_extensions_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 module Brightcontent
   describe ModelExtensions do
-    let(:columns) {  ["id", "name", "body", "created_at", "updated_at", "featured", "author_id"] }
+    let(:columns) {  ["id", "name", "body", "created_at", "updated_at", "featured", "author_id", "active"] }
     subject(:blog) { Blog }
     its(:brightcontent_columns) { should eq columns }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brightcontent-core
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.2.0
 platform: ruby
 authors:
 - Developers at Brightin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-18 00:00:00.000000000 Z
+date: 2015-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: bcrypt
   requirement: !ruby/object:Gem::Requirement
@@ -67,33 +67,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.3.2
 - !ruby/object:Gem::Dependency
-  name: coffee-rails
+  name: inherited_resources
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
-  name: inherited_resources
+  name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -168,14 +168,14 @@ dependencies:
   name: ransack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
@@ -396,6 +396,7 @@ files:
 - spec/dummy/db/migrate/20130720211920_create_comments.rb
 - spec/dummy/db/migrate/20140512085432_add_author_id_to_blogs.rb
 - spec/dummy/db/migrate/20140512090832_create_authors.rb
+- spec/dummy/db/migrate/20150219130156_add_active_to_blogs.rb
 - spec/dummy/lib/assets/.gitkeep
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
@@ -438,7 +439,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Brightcontent core
@@ -484,6 +485,7 @@ test_files:
 - spec/dummy/db/migrate/20130720211920_create_comments.rb
 - spec/dummy/db/migrate/20140512085432_add_author_id_to_blogs.rb
 - spec/dummy/db/migrate/20140512090832_create_authors.rb
+- spec/dummy/db/migrate/20150219130156_add_active_to_blogs.rb
 - spec/dummy/lib/assets/.gitkeep
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html