showcase 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bedbd67bc3e6d05ad13f3605a4a2c01f1e384288
-  data.tar.gz: 2b6113d2cd3e94191a183b64ef9d185b5276f6c4
+  metadata.gz: 626e99ee876822033c08da67fa23f579028dec83
+  data.tar.gz: 6cb9d3be74ea269b752ed3e4fe3704fd7cdada5f
 SHA512:
-  metadata.gz: 942132f75d1ffaccb55b5f02d33c54e8cdbc2bf8affeb8e9d808aa55fff92fd6861ce2456406a6e3d854a27737f0b9d7965e9238127691d0feabf4c3aeec5f39
-  data.tar.gz: 1bec04a1151f63a00bda00d897e3c0b7e2e8135ccc1e7d7f0bc8620d79072029272e557ed202b21312006549d46d951b2141b57ee67f1ede77b2d94bdec5de73
+  metadata.gz: a1cfcacd185e4376c897629400c1c322141dad7cc536c7c54d8f153a56b8b6b4e1e805075b97e24ebbe06fe1db5b72a7921489cbde244dfc7fdd64f1481e4f2e
+  data.tar.gz: c5a14c96b7baa1fe72615ce98c17f7dc1fb71136fecaa4ce95e162ff982661ae44ae2c4f9a044c4082b5d9549763a2e24daeb5122d7616ceb6963beb9b5b680e

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# Version 0.2.5
+
+* Smarter HtmlOptions (extracted CSS class logic to HtmlClassAttribute)
+
 # Version 0.2.4
 
 * Added missing ActiveSupport requires

data/lib/showcase/helpers/html_class_attribute.rb

@@ -0,0 +1,23 @@
+module Showcase
+  module Helpers
+    class HtmlClassAttribute
+      def initialize(value = nil)
+        @css_classes = value.to_s.strip.split(/\s+/)
+      end
+
+      def <<(value)
+        value = value.to_s.strip.split(/\s+/)
+        @css_classes += value
+      end
+
+      def to_html_attribute
+        if @css_classes.any?
+          @css_classes.uniq.join(' ')
+        else
+          nil
+        end
+      end
+    end
+  end
+end
+

data/lib/showcase/helpers/html_options.rb

@@ -1,3 +1,5 @@
+require 'showcase/helpers/html_class_attribute'
+
 module Showcase
   module Helpers
     class HtmlOptions
@@ -6,15 +8,19 @@ module Showcase
       end
 
       def add_class!(css_class)
-        @options[:class] ||= ""
-        css_classes = @options[:class].split(/\s+/)
-        css_classes << css_class
-        @options[:class] = css_classes.join(" ")
+        merge_attrs!(class: css_class)
       end
 
       def merge_attrs!(options = {})
-        options = (options || {}).symbolize_keys
-        @options.merge!(options)
+        new_options = (options || {}).symbolize_keys
+
+        if new_options[:class]
+          class_attr = HtmlClassAttribute.new(@options[:class])
+          class_attr << new_options[:class]
+          new_options[:class] = class_attr.to_html_attribute
+        end
+
+        @options.merge!(new_options)
       end
 
       def to_h

data/lib/showcase/helpers/present.rb

@@ -38,7 +38,7 @@ module Showcase
       private
 
       def presenter_class(obj)
-        obj.class.ancestors.each do |k|
+        (obj.class.ancestors - obj.class.included_modules).each do |k|
           klass = "#{k.name}Presenter".safe_constantize
           return klass if klass
         end

data/lib/showcase/version.rb

@@ -1,4 +1,4 @@
 module Showcase
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end
 

data/spec/showcase/helpers/html_class_attribute_spec.rb

@@ -0,0 +1,83 @@
+require 'spec_helper'
+
+module Showcase
+  module Helpers
+    describe HtmlClassAttribute do
+      let(:attribute) { HtmlClassAttribute.new(string) }
+      let(:string) { nil }
+
+      describe '.to_html_attribute' do
+        subject { attribute.to_html_attribute }
+
+        context 'nil' do
+          let(:string) { nil }
+          it { should be_nil }
+        end
+
+        context 'empty' do
+          let(:string) { '' }
+          it { should be_nil }
+        end
+
+        context 'whitespaces only' do
+          let(:string) { '  ' }
+          it { should be_nil }
+        end
+
+        context 'with trailing spaces' do
+          let(:string) { '  foo  ' }
+          it { should eq 'foo' }
+        end
+
+        context 'with multiple classes' do
+          let(:string) { '  foo bar ' }
+          it { should eq 'foo bar' }
+        end
+      end
+
+      describe '#<<' do
+        before do
+          attribute << addition
+        end
+
+        subject { attribute.to_html_attribute }
+
+        context 'with no existing class attribute' do
+          let(:string) { nil }
+          let(:addition) { '  foo  ' }
+
+          it { should eq 'foo' }
+        end
+
+        context 'with empty class attribute' do
+          let(:string) { '' }
+          let(:addition) { 'foo' }
+
+          it { should eq 'foo' }
+        end
+
+        context 'with existing class attribute' do
+          let(:string) { 'bar' }
+          let(:addition) { 'foo' }
+
+          it { should eq 'bar foo' }
+        end
+
+        context 'with the same css class' do
+          let(:string) { 'foo bar' }
+          let(:addition) { 'foo' }
+
+          it { should eq 'foo bar' }
+        end
+
+        context 'multiple additions' do
+          let(:string) { 'foo bar' }
+          let(:addition) { 'foo qux' }
+
+          it { should eq 'foo bar qux' }
+        end
+      end
+    end
+  end
+end
+

data/spec/showcase/helpers/html_options_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+module Showcase
+  module Helpers
+    describe HtmlOptions do
+      let(:options) { HtmlOptions.new(attributes) }
+      let(:attributes) { {} }
+
+      it 'takes a hash of attributes' do
+        expect(options.to_h).to eq attributes
+      end
+
+      describe '#merge_attrs!' do
+        let(:attributes) { { 'id' => 'bar', 'data-alert' => 'true' } }
+
+        it 'merges attributes with the passed ones' do
+          options.merge_attrs!('data-method' => 'post', 'id' => 'foo')
+          expect(options.to_h).to eq({
+            :'data-alert' => 'true',
+            :'data-method' => 'post',
+            :'id' => 'foo'
+          })
+        end
+
+        context 'css classes' do
+          let(:attributes) { { 'class' => 'foo bar' } }
+
+          it 'merges them appropriately' do
+            options.merge_attrs!('class' => 'foo qux')
+            expect(options.to_h).to eq(class: 'foo bar qux')
+          end
+        end
+      end
+    end
+  end
+end
+

data/spec/showcase/helpers/present_spec.rb

@@ -0,0 +1,53 @@
+require 'spec_helper'
+
+module Showcase
+  module Helpers
+    describe Present do
+      let(:object) { Person.new('Steve Ballmer') }
+      let(:subclass_object) { EnterpriseCustomer.new('Tito Traves') }
+      let(:object_with_no_presenter) { Shop.new }
+      let(:context) { Context.new }
+
+      describe '.present' do
+        it 'instantiates a new presenter, inferring the presenter class' do
+          PersonPresenter.stub(:new).with(object, context).and_return 'Presenter'
+          context.present(object).should == 'Presenter'
+        end
+        context 'with a superclass presenter' do
+          it "instantiates a new presenter, searching presenter class in object ancestors chain" do
+            PersonPresenter.stub(:new).with(subclass_object, context).and_return 'Presenter'
+            context.present(subclass_object).should == 'Presenter'
+          end
+        end
+        context 'with no existing presenter class' do
+          it "raises a PresenterClassNotFound error" do
+            expect {
+              context.present(object_with_no_presenter)
+            }.to raise_error(Showcase::PresenterClassNotFound)
+          end
+        end
+        it 'uses the specified presenter class, when passed' do
+          ProjectPresenter.stub(:new).with(object, context).and_return 'Presenter'
+          context.present(object, ProjectPresenter).should == 'Presenter'
+        end
+        it 'uses the specified context, when passed' do
+          different_context = double
+          context.present(object, ProjectPresenter, different_context).view_context.should == different_context
+        end
+      end
+
+      describe '.present_collection' do
+        it 'returns a presenter for each object in the collection' do
+          collection = [ Person.new('Mark'), Person.new('Luke') ]
+
+          PersonPresenter.stub(:new).with(collection[0], context).and_return 'foo'
+          PersonPresenter.stub(:new).with(collection[1], context).and_return 'bar'
+
+          presented_collection = context.present_collection(collection)
+          presented_collection.should == [ 'foo', 'bar' ]
+        end
+      end
+    end
+  end
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: showcase
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Stefano Verna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-12 00:00:00.000000000 Z
+date: 2014-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -105,6 +105,7 @@ files:
 - lib/showcase/errors.rb
 - lib/showcase/helpers/config_object.rb
 - lib/showcase/helpers/first_nonblank.rb
+- lib/showcase/helpers/html_class_attribute.rb
 - lib/showcase/helpers/html_options.rb
 - lib/showcase/helpers/module_method_builder.rb
 - lib/showcase/helpers/present.rb
@@ -122,7 +123,9 @@ files:
 - spec/fixtures.rb
 - spec/helpers/config_object_spec.rb
 - spec/helpers/seo_meta_builder_spec.rb
-- spec/showcase/helpers_spec.rb
+- spec/showcase/helpers/html_class_attribute_spec.rb
+- spec/showcase/helpers/html_options_spec.rb
+- spec/showcase/helpers/present_spec.rb
 - spec/showcase/presenter_spec.rb
 - spec/showcase/traits/base_spec.rb
 - spec/showcase/traits/link_to_spec.rb
@@ -157,7 +160,9 @@ test_files:
 - spec/fixtures.rb
 - spec/helpers/config_object_spec.rb
 - spec/helpers/seo_meta_builder_spec.rb
-- spec/showcase/helpers_spec.rb
+- spec/showcase/helpers/html_class_attribute_spec.rb
+- spec/showcase/helpers/html_options_spec.rb
+- spec/showcase/helpers/present_spec.rb
 - spec/showcase/presenter_spec.rb
 - spec/showcase/traits/base_spec.rb
 - spec/showcase/traits/link_to_spec.rb

data/spec/showcase/helpers_spec.rb

@@ -1,49 +0,0 @@
-require 'spec_helper'
-
-describe Showcase::Helpers do
-  let(:object) { Person.new('Steve Ballmer') }
-  let(:subclass_object) { EnterpriseCustomer.new('Tito Traves') }
-  let(:object_with_no_presenter) { Shop.new }
-  let(:context) { Context.new }
-
-  describe '.present' do
-    it 'instantiates a new presenter, inferring the presenter class' do
-      PersonPresenter.stub(:new).with(object, context).and_return 'Presenter'
-      context.present(object).should == 'Presenter'
-    end
-    context 'with a superclass presenter' do
-      it "instantiates a new presenter, searching presenter class in object ancestors chain" do
-        PersonPresenter.stub(:new).with(subclass_object, context).and_return 'Presenter'
-        context.present(subclass_object).should == 'Presenter'
-      end
-    end
-    context 'with no existing presenter class' do
-      it "raises a PresenterClassNotFound error" do
-        expect {
-          context.present(object_with_no_presenter)
-        }.to raise_error(Showcase::PresenterClassNotFound)
-      end
-    end
-    it 'uses the specified presenter class, when passed' do
-      ProjectPresenter.stub(:new).with(object, context).and_return 'Presenter'
-      context.present(object, ProjectPresenter).should == 'Presenter'
-    end
-    it 'uses the specified context, when passed' do
-      different_context = double
-      context.present(object, ProjectPresenter, different_context).view_context.should == different_context
-    end
-  end
-
-  describe '.present_collection' do
-    it 'returns a presenter for each object in the collection' do
-      collection = [ Person.new('Mark'), Person.new('Luke') ]
-
-      PersonPresenter.stub(:new).with(collection[0], context).and_return 'foo'
-      PersonPresenter.stub(:new).with(collection[1], context).and_return 'bar'
-
-      presented_collection = context.present_collection(collection)
-      presented_collection.should == [ 'foo', 'bar' ]
-    end
-  end
-end
-