brightcontent-core 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ff81cd24827adff2301e1c27e43bae64cf99b5c
-  data.tar.gz: 7f28f10f9edb23e1f32a851c1e94b4cbcdb89c63
+  metadata.gz: 1d98fd17e22933bb39e638dd9a3b39b878eef6cc
+  data.tar.gz: bca0e21e04d7d73fc2dd0478332981de55001219
 SHA512:
-  metadata.gz: d1a776c397011e888583f85ddfc12d2e77660b444e835bb10c42eec1ca096347be07a96b368f680f8358f5b9c15c5e079c6e46eccc5916c34e22367b69aafea3
-  data.tar.gz: 875faa02c872d739780d9ff09d14b874fa06a427826cfc4563ca1a4cf2a2f6a125f4dcac561da9d5ca10f6205be8f08099e8d6d915b4feeb36dd5defeb40743e
+  metadata.gz: ebc862b8bde39b48d1988696dc3d044be451fe311571fd8e91d334e8fc169fe706968f8db905a3538dbcd03474fd907b929a811719b96800175d84821c8e9a76
+  data.tar.gz: 353c844ed0587227aaa8d7dbb78f67941c01d49a913c8e7afd728d353c94a19582bcdf80a2e530bfc6d29e00fa62258d48a3f26b22953811d3a84e633436e1af

data/app/views/brightcontent/base/form_fields/_belongs_to.html.erb

@@ -0,0 +1 @@
+<%= form.association field.to_sym %>

data/app/views/brightcontent/base/form_fields/_has_and_belongs_to_many.html.erb

@@ -0,0 +1 @@
+<%= form.association field.to_sym, as: :check_boxes %>

data/app/views/brightcontent/base/form_fields/_has_many.html.erb

@@ -0,0 +1 @@
+<%= form.association field.to_sym, as: :check_boxes %>

data/app/views/brightcontent/base/list_fields/_has_and_belongs_to_many.html.erb

@@ -0,0 +1 @@
+<%= item.send(field).count %>

data/app/views/brightcontent/base/list_fields/_has_many.html.erb

@@ -0,0 +1 @@
+<%= item.send(field).count %>

data/lib/brightcontent/view_lookup/{abstract.rb → base.rb}

@@ -2,7 +2,7 @@ require 'active_support/inflector'
 
 module Brightcontent
   module ViewLookup
-    class Abstract
+    class Base
       attr_reader :options, :view_context
 
       def initialize(view_context, options)
@@ -11,7 +11,7 @@ module Brightcontent
       end
 
       def call
-        render_by_field_name || render_by_type || render_default
+        render_by_field_name || render_by_type || render_by_association_type || render_default
       end
 
       private
@@ -22,7 +22,12 @@ module Brightcontent
 
       def render_by_type
         return unless field_type
-        render("brightcontent/base/#{name.pluralize}/#{field_type}", options)
+        render "brightcontent/base/#{name.pluralize}/#{field_type}", options
+      end
+
+      def render_by_association_type
+        return unless association_type
+        render "brightcontent/base/#{name.pluralize}/#{association_type}", options
       end
 
       def render_default
@@ -30,7 +35,11 @@ module Brightcontent
       end
 
       def field_type
-        raise NotImplementedError
+        resource_class.columns_hash[options[:field].to_s].try :type
+      end
+
+      def association_type
+        association.try :macro
       end
 
       def name
@@ -41,6 +50,14 @@ module Brightcontent
         options[:item].send(options[:field])
       end
 
+      def association
+        resource_class.reflect_on_association options[:field].to_sym
+      end
+
+      def resource_class
+        view_context.send :resource_class
+      end
+
       def render(*args)
         view_context.render_if_exists(*args)
       end

data/lib/brightcontent/view_lookup/filter_field.rb

@@ -1,6 +1,6 @@
 module Brightcontent
   module ViewLookup
-    class FilterField < Abstract
+    class FilterField < Base
       def render_default
         raise "invalid filter field: #{options[:field]}" unless field_name
         [
@@ -9,10 +9,6 @@ module Brightcontent
         ].join(" ").html_safe
       end
 
-      def field_type
-        resource_class.columns_hash[options[:field]].try :type
-      end
-
       private
 
       def field?
@@ -44,14 +40,6 @@ module Brightcontent
       def raw_options
         resource_class.uniq.pluck(field_name)
       end
-
-      def association
-        resource_class.reflect_on_association options[:field].to_sym
-      end
-
-      def resource_class
-        view_context.send :resource_class
-      end
     end
   end
 end

data/lib/brightcontent/view_lookup/form_field.rb

@@ -1,6 +1,6 @@
 module Brightcontent
   module ViewLookup
-    class FormField < Abstract
+    class FormField < Base
       def render_default
         options[:form].input(options[:field].to_sym)
       end

data/lib/brightcontent/view_lookup/list_field.rb

@@ -1,13 +1,9 @@
 module Brightcontent
   module ViewLookup
-    class ListField < Abstract
+    class ListField < Base
       def render_default
         view_context.strip_tags(field_value.to_s).truncate(50)
       end
-
-      def field_type
-        options[:item].column_for_attribute(options[:field]).try(:type)
-      end
     end
   end
 end

data/lib/brightcontent/view_lookup.rb

@@ -1,6 +1,6 @@
 module Brightcontent
   module ViewLookup
-    autoload :Abstract, 'brightcontent/view_lookup/abstract'
+    autoload :Base, 'brightcontent/view_lookup/base'
     autoload :FormField, 'brightcontent/view_lookup/form_field'
     autoload :ListField, 'brightcontent/view_lookup/list_field'
     autoload :FilterField, 'brightcontent/view_lookup/filter_field'

data/lib/generators/brightcontent/templates/initializer.rb

@@ -23,4 +23,8 @@ Brightcontent.setup do |config|
   # It has to implement an authenticate method.
   # config.user_model = "Brightcontent::AdminUser"
 
+  # brightcontent-pages provides a Brightcontent::Page model which is used
+  # by default. If you want to user another model for pages (eg. to avoid
+  # the namespace) you can specify it as a string or class.
+  # config.page_model = "Brightcontent::Page"
 end

data/spec/lib/brightcontent/view_lookup/{abstract_spec.rb → base_spec.rb}

@@ -1,19 +1,20 @@
-require 'brightcontent/view_lookup/abstract'
+require 'brightcontent/view_lookup/base'
 
 module Brightcontent::ViewLookup
-  describe Abstract do
-    class FakeFormField < Abstract
+  describe Base do
+    class FakeFormField < Base
       def field_type
         :string
       end
     end
 
-    let(:view_context) { double(:view_context) }
+    let(:resource_class) { double(:resource_class, reflect_on_association: nil) }
+    let(:view_context) { double(:view_context, resource_class: resource_class) }
     let(:item) { double(:item, name: 'Item name') }
     let(:fake_form_field) { FakeFormField.new(view_context, field: 'name', item: item) }
 
     context 'with specific field partial' do
-      it 'renders the parial' do
+      it 'renders the partial' do
         expect(view_context).to receive(:render_if_exists)
           .with("fake_form_field_name", {field: 'name', item: item}) { "Result" }
         fake_form_field.call
@@ -21,7 +22,7 @@ module Brightcontent::ViewLookup
     end
 
     context 'with specific field type partial' do
-      it 'renders the parial' do
+      it 'renders the partial' do
         expect(view_context).to receive(:render_if_exists).once
         expect(view_context).to receive(:render_if_exists)
           .with("brightcontent/base/fake_form_fields/string", {field: 'name', item: item}) { "Result" }
@@ -29,6 +30,16 @@ module Brightcontent::ViewLookup
       end
     end
 
+    context 'with association type' do
+      it 'renders the partial' do
+        allow(resource_class).to receive(:reflect_on_association).with(:name) { double(macro: "has_one") }
+        expect(view_context).to receive(:render_if_exists).twice
+        expect(view_context).to receive(:render_if_exists)
+          .with("brightcontent/base/fake_form_fields/has_one", {field: 'name', item: item}) { "Result" }
+        fake_form_field.call
+      end
+    end
+
     context 'without partial' do
       it 'renders the default value' do
         expect(view_context).to receive(:render_if_exists).once

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brightcontent-core
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Developers at Brightin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-01 00:00:00.000000000 Z
+date: 2014-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -311,10 +311,15 @@ files:
 - app/views/brightcontent/base/_list_header.html.erb
 - app/views/brightcontent/base/_list_item.html.erb
 - app/views/brightcontent/base/edit.html.erb
+- app/views/brightcontent/base/form_fields/_belongs_to.html.erb
 - app/views/brightcontent/base/form_fields/_file.html.erb
+- app/views/brightcontent/base/form_fields/_has_and_belongs_to_many.html.erb
+- app/views/brightcontent/base/form_fields/_has_many.html.erb
 - app/views/brightcontent/base/index.csv.erb
 - app/views/brightcontent/base/index.html.erb
 - app/views/brightcontent/base/list_fields/_boolean.html.erb
+- app/views/brightcontent/base/list_fields/_has_and_belongs_to_many.html.erb
+- app/views/brightcontent/base/list_fields/_has_many.html.erb
 - app/views/brightcontent/base/new.html.erb
 - app/views/brightcontent/sessions/new.html.erb
 - app/views/layouts/brightcontent/application.html.erb
@@ -341,7 +346,7 @@ files:
 - lib/brightcontent/resources.rb
 - lib/brightcontent/routes_parser.rb
 - lib/brightcontent/view_lookup.rb
-- lib/brightcontent/view_lookup/abstract.rb
+- lib/brightcontent/view_lookup/base.rb
 - lib/brightcontent/view_lookup/filter_field.rb
 - lib/brightcontent/view_lookup/form_field.rb
 - lib/brightcontent/view_lookup/list_field.rb
@@ -411,7 +416,7 @@ files:
 - spec/lib/brightcontent/resource_spec.rb
 - spec/lib/brightcontent/resources_spec.rb
 - spec/lib/brightcontent/routes_parser_spec.rb
-- spec/lib/brightcontent/view_lookup/abstract_spec.rb
+- spec/lib/brightcontent/view_lookup/base_spec.rb
 - spec/spec_helper.rb
 - spec/support/acceptance_helper.rb
 homepage: http://brightin.nl
@@ -499,6 +504,6 @@ test_files:
 - spec/lib/brightcontent/resource_spec.rb
 - spec/lib/brightcontent/resources_spec.rb
 - spec/lib/brightcontent/routes_parser_spec.rb
-- spec/lib/brightcontent/view_lookup/abstract_spec.rb
+- spec/lib/brightcontent/view_lookup/base_spec.rb
 - spec/spec_helper.rb
 - spec/support/acceptance_helper.rb