excalibur 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e73905a05488d0f31f7bee41eef8755cfd72010
-  data.tar.gz: 9d8eb4c51d7996a0faff11fcc93977773b83257e
+  metadata.gz: 1316bfc8127d428511d73ac6076fe7ca6bb271fe
+  data.tar.gz: c6470804f8d7339dc0222c494c8c8afc9f3ef7b4
 SHA512:
-  metadata.gz: 631f7546330c3bbefeafb82e8ccf2cd0cc6b7c89b990c6f5c60bcdcb967ea3f9865adcf320bbb5dc9a13d689ed9a04ebdcaa8a9ace15dfd4c951e9946c65ab3c
-  data.tar.gz: 9d81f8a6b01e62e92dfe7a982696e7193bfb4655785521ff8173b61e4d2245dd4bb506103791266490f4d5517174ca244360e6f6922be4d1c1f4c0eaff3a2f6b
+  metadata.gz: b592599d73cfaf217d3c4b1034b079be3d10d23031515602d66817a71bf0a99bf3d96c10b4cb2b2f8d65cee3705eabdfc5308e650a7daf2e3bd67af81f9e9d85
+  data.tar.gz: b1acb7dfa01d296a25fac74c0c60de880cb066cf275ffd757d531a2fc76a7d5cb9f0742700532c12938f8d9d11c239bdb817a259514c1df9c024df1f09e72882

data/README.md

@@ -116,7 +116,7 @@ meta tags and the title. So without a decorator for an object the view helper
 
 To scaffold a decorator execute:
 
-    rails generate excalibur:install [class name]
+    rails generate excalibur:decorator [class name]
 
 A detailed description on how the decorators work can be found in the newly
 created decorator class. As a side note the ```Excalibur::Decorator``` is a

data/lib/excalibur/version.rb

@@ -1,4 +1,4 @@
 # setting version number for the Excalibur gem
 module Excalibur
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/lib/excalibur/view_helpers.rb

@@ -64,8 +64,14 @@ module Excalibur
     end
 
     def excalibur_decorate_subject(object, options = {})
+      class_name = if object.is_a?(Draper::Decorator)
+                     object.object.class.name
+                   else
+                     object.class.name
+                   end
+
       Object.const_get(
-          "::Excalibur::#{object.class.name}Decorator"
+          "::Excalibur::#{class_name}Decorator"
       ).decorate(object, options)
     end
   end

data/spec/lib/excalibur/view_helper_spec.rb

@@ -4,6 +4,7 @@ require 'action_view/helpers'
 
 class Dummy; end
 class Klass; end
+class OtherDecorator < Draper::Decorator; end
 
 module Excalibur
   class DummyDecorator < Decorator; end
@@ -15,19 +16,32 @@ module Excalibur
     end
 
     describe '#entitle' do
-      let(:obj) { Dummy.new }
+      context 'when dealing with a blank object' do
+        let(:obj) { Dummy.new }
 
-      it 'should try and decorate an object' do
-        expect(DummyDecorator).to receive(:decorate).with(obj, {})
+        it 'should try and decorate an object' do
+          expect(DummyDecorator).to receive(:decorate).with(obj, {})
 
-        helpers.entitle(obj, {})
+          helpers.entitle(obj, {})
+        end
+
+        it 'should set an instance variable' do
+          helpers.entitle(obj, {})
+
+          expect(helpers.instance_variable_get(:@excalibur_subject)).to be_present
+          expect(helpers.instance_variable_get(:@excalibur_subject)).to be_instance_of DummyDecorator
+        end
       end
 
-      it 'should set an instance variable' do
-        helpers.entitle(obj, {})
+      context 'when dealing with a decorated object' do
+        let(:origin) { Dummy.new }
+        let(:obj) { OtherDecorator.decorate(origin) }
+
+        it 'should try and decorate an object' do
+          expect(DummyDecorator).to receive(:decorate).with(origin, {})
 
-        expect(helpers.instance_variable_get(:@excalibur_subject)).to be_present
-        expect(helpers.instance_variable_get(:@excalibur_subject)).to be_instance_of DummyDecorator
+          helpers.entitle(obj, {})
+        end
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: excalibur
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Joost Elfering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-13 00:00:00.000000000 Z
+date: 2014-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails