showcase 0.2.0.pre → 0.2.0.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72574756357dcfeea3882c9cc85310c932bc272d
-  data.tar.gz: 98f5d60b67e5dba3f0d870ae033b9dacc6ffad28
+  metadata.gz: 987858bde075b1173d6c229fd861b25c165ca851
+  data.tar.gz: daf57836d8e3159f20d2b2034368eb49d9e28c5d
 SHA512:
-  metadata.gz: 7b49b695ea0301b22c47239c144ceaf4ccfa7a22c6ec1ab809f7660581792c196953060183064a7a9e2d61a230d2fbd7ceccc3ce9ce2289e617f6457e39d1b86
-  data.tar.gz: dcfd53204bc986fc2389707a130afe5d7395b110f34d30b63cd562375f12140a7f03474f07c2d88a987304da6bc9fac29d81875eec3dcc8e45c25ba624886a2a
+  metadata.gz: 1893aeaf728470b953c32d835cfbff594a835d97f9af45c63cd80ed0d1afa16f867daab34a6c2051552c0c8c19580e75ffcd12f5727b031b622242fccfd39272
+  data.tar.gz: 0a673a3d06105364974135115fe9b3c99de98d9945ce8b3c7a74bee4d2180bb03b03c4cd43fc7235601eacbd48f1d4be7cc6f6c5da661742e3e06de985f54d47

data/.gitignore

@@ -15,3 +15,5 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+gemfiles/*.gemfile.lock
+

data/.travis.yml

@@ -1,6 +1,12 @@
 language: ruby
+
 rvm:
   - "1.9.3"
   - "2.0.0"
-script: "bundle exec rspec spec"
+
+gemfile:
+  - "gemfiles/rails_32.gemfile"
+  - "gemfiles/rails_4.gemfile"
+
+script: "bundle exec rake spec"
 

data/Appraisals

@@ -0,0 +1,8 @@
+appraise "rails-32" do
+  gem "rails", "3.2.14"
+end
+
+appraise "rails-4" do
+  gem "rails", "4.0.0"
+end
+

data/Gemfile

@@ -2,3 +2,6 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in basic_presenter.gemspec
 gemspec
+
+gem "appraisal"
+

data/README.md

@@ -3,36 +3,42 @@
 A simple (< 100 lines of code) but powerful exhibit/presenter implementation.
 It's framework agnostic: works with Rails, Padrino or just Sinatra.
 
-Since version 0.2.0 Showcase is bundled with [a set of "traits"](https://github.com/stefanoverna/showcase#traits)
+Since version 0.2.0 Showcase is bundled with [a set of optional "traits"](https://github.com/stefanoverna/showcase#traits)
 you can pick and choose to augment your presenters with additional sugar
-(available in Rails only).
+(available in Rails 3+ only).
 
-## Why should I use the Exhibit pattern in my Rails app?
+## Why should I use presenters in my Rails app?
 
-See [Avdi's introductory post](http://devblog.avdi.org/2012/06/04/displaycase-gem-now-available/).
+See [Avdi's Exhibits introductory post](http://devblog.avdi.org/2012/06/04/displaycase-gem-now-available/).
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
-    gem 'showcase'
+```ruby
+gem 'showcase'
+```
 
 And then execute:
 
-    $ bundle
+```
+$ bundle
+```
 
 Or install it yourself as:
 
-    $ gem install showcase
+```
+$ gem install showcase
+```
 
 ## Usage
 
-With Rails, you're already set, move on! With Padrino, include `Showcase::Helpers`
+With Rails, you're already set, move on! With Padrino, include `Showcase::Helpers::Present`
 in your app `helpers` block.
 
 ```ruby
 helpers do
-  include Showcase::Helpers
+  include Showcase::Helpers::Present
 end
 ```
 
@@ -82,16 +88,15 @@ end
 
 ### Generators
 
-Showcase comes with a generator to make the Presenter creation process a little
-faster:
+Showcase comes with a generator to create new presenters a little faster:
 
 ```
 rails generate showcase:presenter User
 ```
 
-Will generate `app/presenters/user_presenter.rb`. If your app has a file called
+Will generate `app/presenters/user_presenter.rb`. If your Rails app has the file
 `app/presenters/base_presenter.rb`, the newly created presenter will inherit
-form `BasePresenter` instead of `Shocase::Presenter`.
+from `BasePresenter` instead of `Showcase::Presenter`.
 
 ### Traits
 
@@ -127,7 +132,7 @@ Super useful in acceptance testing to check the presence of a record inside a
 view:
 
 ```erb
-<% present(@project).box do %>
+<% present(@project, class: 'big').box do %>
   <p>Hi there!</p>
 <% end %>
 ```
@@ -135,11 +140,24 @@ view:
 Produces the following:
 
 ```html
-<div class="project" id="project_12">
+<div class="project big" id="project_12">
   <p>Hi there</p>
 </div>
 ```
 
+Additional HTML attributes can be optionally specified within a config block 
+inside the presenter:
+
+```ruby
+class ProjectPresenter < Showcase::Presenter
+  include Showcase::Traits::Record
+
+  box do |c|
+    c.html_options class: 'another-class', role: 'project'
+  end
+end
+```
+
 #### `Showcase::Traits::LinkTo`
 
 Adds a nice DSL to declare links within your presenter.
@@ -149,15 +167,16 @@ class ProjectPresenter < Showcase::Presenter
   include Showcase::Traits::LinkTo
 
   link_to do |c|
-    c.url     h.project_path(self)
-    c.label   name
-    c.active  h.controller_name == 'projects'
+    c.url           h.project_path(self)
+    c.label         name
+    c.active        h.controller_name == 'projects'
+    c.active_class  'current'
+    c.html_options  role: 'label'
   end
 
   link_to :tasks do
     c.url     h.project_tasks_path(self)
     c.label   "Tasks"
-    c.active  h.controller_name == 'tasks'
   end
 end
 ```
@@ -216,7 +235,7 @@ In your views:
 #### `Showcase::Traits::Seo`
 
 Useful to produce SEO meta tags (title, description, Facebook OpenGraph,
-Twitter cards, and canonical URL):
+Twitter cards, and canonical URLs):
 
 ```ruby
 class ProjectPresenter < Showcase::Presenter
@@ -230,6 +249,7 @@ class ProjectPresenter < Showcase::Presenter
   end
 end
 ```
+
 In your views:
 
 ```erb

data/Rakefile

@@ -1 +1,14 @@
-require "bundler/gem_tasks"
+require 'rubygems'
+require 'bundler/setup'
+require 'appraisal'
+
+desc 'Default: run specs'
+task default: :spec
+
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new do |t|
+  t.pattern = "spec/**/*_spec.rb"
+end
+
+Bundler::GemHelper.install_tasks
+

data/gemfiles/rails_32.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "rails", "3.2.14"
+
+gemspec :path=>"../"

data/gemfiles/rails_4.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "rails", "4.0.0"
+
+gemspec :path=>"../"

data/lib/showcase/helpers/html_options.rb

@@ -0,0 +1,22 @@
+class HtmlOptions
+  def initialize(options = {})
+    @options = (options || {}).symbolize_keys
+  end
+
+  def add_class!(css_class)
+    @options[:class] ||= ""
+    css_classes = @options[:class].split(/\s+/)
+    css_classes << css_class
+    @options[:class] = css_classes.join(" ")
+  end
+
+  def merge_attrs!(options = {})
+    options = (options || {}).symbolize_keys
+    @options.merge!(options)
+  end
+
+  def to_h
+    @options.dup
+  end
+end
+

data/lib/showcase/helpers/module_method_builder.rb

@@ -0,0 +1,19 @@
+module Showcase
+  module Helpers
+    module ModuleMethodBuilder
+      def define_module_method(name_chunks, &block)
+        method_name = Array(name_chunks).map(&:to_s).map(&:presence).compact.join("_")
+        if method_defined?(method_name)
+          false
+        else
+          method_module = Module.new do
+            define_method(method_name, &block)
+          end
+          include(method_module)
+          true
+        end
+      end
+    end
+  end
+end
+

data/lib/showcase/helpers/present.rb

@@ -0,0 +1,35 @@
+require 'active_support/concern'
+require 'active_support/inflector'
+require 'active_support/core_ext/hash/keys'
+
+module Showcase
+  module Helpers
+    module Present
+      extend ActiveSupport::Concern
+
+      def presenter_context
+        if respond_to? :view_context
+          view_context
+        else
+          self
+        end
+      end
+
+      def present(obj, klass = nil, context = presenter_context, options = {})
+        options.assert_valid_keys(:nil_presenter)
+
+        if obj || options.fetch(:nil_presenter, false)
+          klass ||= "#{obj.class.name}Presenter".constantize
+          klass.new(obj, context)
+        else
+          nil
+        end
+      end
+
+      def present_collection(obj, klass = nil, context = presenter_context, options = {})
+        obj.map { |o| present(o, klass, context, options) }
+      end
+    end
+  end
+end
+

data/lib/showcase/helpers/seo_meta_builder.rb

@@ -12,26 +12,51 @@ module Showcase
         title += options[:title_suffix] if options[:title_suffix]
 
         context.content_tag(:title, title) <<
-        seo_meta_tags(:og_title, :twitter_title, values)
+        seo_meta_tags('og:title', 'twitter:title', values)
       end
 
       def description(values, options = {})
-        seo_meta_tags(:description, :og_description, :twitter_description, values)
+        seo_meta_tags('description', 'og:description', 'twitter:description', values)
       end
 
       def image_url(image_url, options = {})
-        seo_meta_tags(:og_image, :twitter_image, image_url)
+        seo_meta_tags('og:image', 'twitter:image', image_url)
+      end
+
+      def iframe_video_url(video_url, options = {})
+        seo_meta_tags('og:video:url', video_url) <<
+        seo_meta_tags('og:video:type', 'text/html') <<
+        seo_meta_tags('twitter:player', video_url)
+      end
+
+      def stream_video_url(video_url, options = {})
+        seo_meta_tags('og:video:url', video_url) <<
+        seo_meta_tags('og:video:type', 'video/mp4') <<
+        seo_meta_tags('twitter:player:stream', video_url)
+      end
+
+      def card_type(type, options = {})
+        seo_meta_tags('twitter:card', type)
+      end
+
+      def video_size(size, options = {})
+        seo_meta_tags('twitter:player:width', size.first) <<
+        seo_meta_tags('twitter:player:height', size.last)
+      end
+
+      def site_name(name, options = {})
+        seo_meta_tags('og:site_name', name)
       end
 
       def canonical_url(url, options = {})
-        seo_meta_tags(:og_url, url) <<
+        seo_meta_tags('og:url', 'twitter:url', url) <<
         context.tag(:link, rel: "canonical", "href" => url)
       end
 
       private
 
       def first_nonblank(values)
-        Array(values).map(&:presence).compact.first
+        Array(values).find(&:presence)
       end
 
       def seo_meta_tags(*args)
@@ -40,8 +65,14 @@ module Showcase
         return nil unless value.present?
 
         args.map do |name|
-          name = name.to_s.sub(/_/, ":")
-          context.tag(:meta, name: name, content: value)
+          chunks = name.to_s.split(":")
+          attr_name = if chunks.first == 'og'
+            'property'
+          else
+            'name'
+          end
+          name = chunks.join(':')
+          context.tag(:meta, attr_name => name, content: value)
         end.join.html_safe
       end
     end

data/lib/showcase/presenter.rb

@@ -1,17 +1,20 @@
 require 'delegate'
-require 'showcase/helpers'
+require 'showcase/helpers/present'
+require 'showcase/helpers/module_method_builder'
 require 'active_support/core_ext/array/extract_options'
 require 'active_support/core_ext/hash/keys'
 
 module Showcase
   class Presenter < SimpleDelegator
-    include Helpers
+    include Helpers::Present
+    extend Helpers::ModuleMethodBuilder
 
     attr_reader :view_context
 
     alias_method :object, :__getobj__
     alias_method :h, :view_context
     alias_method :try, :__send__
+    alias_method :__decorator_class__, :class
 
     def initialize(obj, context)
       super(obj)
@@ -46,19 +49,15 @@ module Showcase
       options.assert_valid_keys(:with, :nil_presenter)
       presenter_klass = options.fetch(:with, nil)
 
-      methods_module = Module.new do
-        args.each do |attr|
-          define_method attr do
-            send(method,
-                 object.send(attr),
-                 presenter_klass,
-                 view_context,
-                 options.slice(:nil_presenter))
-          end
+      args.each do |attr|
+        define_module_method attr do
+          send(method,
+               object.send(attr),
+               presenter_klass,
+               view_context,
+               options.slice(:nil_presenter))
         end
       end
-
-      include(methods_module)
     end
   end
 end

data/lib/showcase/railtie.rb

@@ -4,7 +4,7 @@ module Showcase
   class Railtie < Rails::Railtie
     initializer "action_view.initialize_showcase" do
       ActiveSupport.on_load(:action_view) do
-        ActionView::Base.send :include, Showcase::Helpers
+        ActionView::Base.send :include, Showcase::Helpers::Present
       end
     end
   end

data/lib/showcase/traits/base.rb

@@ -3,20 +3,9 @@ module Showcase
     module Base
       extend ActiveSupport::Concern
 
-      module ClassMethods
-        private
-
-        def define_method?(name_chunks, &block)
-          method_name = Array(name_chunks).map(&:to_s).map(&:presence).compact.join("_")
-          if method_defined?(method_name)
-            false
-          else
-            define_method(method_name, &block)
-            true
-          end
-        end
+      included do
+        extend Helpers::ModuleMethodBuilder
       end
-
     end
   end
 end

data/lib/showcase/traits/link_to.rb

@@ -1,4 +1,5 @@
 require 'showcase/helpers/config_object'
+require 'showcase/helpers/html_options'
 
 module Showcase
   module Traits
@@ -9,31 +10,24 @@ module Showcase
 
       module ClassMethods
         def link_to(name = nil, &block)
-
-          define_method? [name, :url] do
+          define_module_method [name, :url] do
             Helpers::ConfigObject.new(self, &block).to_struct.url
           end
 
-          define_method? [name, :link_active?] do
+          define_module_method [name, :link_active?] do
             Helpers::ConfigObject.new(self, &block).to_struct.active
           end
 
-          define_method? [name, :link] do |*args, &link_block|
+          define_module_method [name, :link] do |*args, &link_block|
             config = Helpers::ConfigObject.new(self, &block).to_struct
-            options = args.extract_options!.symbolize_keys
-            options.reverse_merge!(config.html_options) if config.html_options
 
-            if config.active
-              options[:class] ||= ""
-              css_classes = options[:class].split(/\s+/)
-              css_classes << "active"
-              options[:class] = css_classes.join(" ")
-            end
+            html_options = HtmlOptions.new(config.html_options)
+            html_options.merge_attrs!(args.extract_options!)
+            html_options.add_class!(config.active_class || 'active') if config.active
 
             args = Array(config.label) if args.empty? && !link_block
-            h.link_to *args, config.url, options, &link_block
+            h.link_to *args, config.url, html_options.to_h, &link_block
           end
-
         end
       end
     end

data/lib/showcase/traits/record.rb

@@ -1,35 +1,59 @@
-require 'action_view/record_identifier'
-
 module Showcase
   module Traits
 
     module Record
       extend ActiveSupport::Concern
 
+      module ClassMethods
+        def box(&block)
+          @box_config_block = block
+        end
+
+        def __box_config_block__
+          @box_config_block
+        end
+      end
+
       def dom_id
-        ActionView::RecordIdentifier.dom_id(self)
+        record_identifier.dom_id(self)
       end
 
       def dom_class
-        ActiveModel::Naming.param_key(self)
+        record_identifier.dom_class(self)
       end
 
       def box(*args, &block)
         options = args.extract_options!
-        options.symbolize_keys!
-
         tag = args.pop || :div
 
-        options[:class] ||= ""
-        css_classes = options[:class].split(/\s+/) << dom_class
-        options[:class] = css_classes.join(" ")
+        config_block = self.__decorator_class__.__box_config_block__
+        config_options = if config_block
+                           Helpers::ConfigObject.new(self, &config_block).to_struct.html_options
+                         else
+                           {}
+                         end
 
-        options[:id] = dom_id
+        html_options = HtmlOptions.new(config_options)
+        html_options.merge_attrs!(options)
+        html_options.add_class!(dom_class)
+        html_options.merge_attrs!(id: dom_id)
 
-        h.content_tag(tag, options) do
+        h.content_tag(tag, html_options.to_h) do
           h.capture(self, &block)
         end
       end
+
+      private
+
+      def record_identifier
+        if defined?(ActionView::RecordIdentifier)
+          ActionView::RecordIdentifier
+        elsif defined?(ActionController::RecordIdentifier)
+          ActionController::RecordIdentifier
+        else
+          raise 'No RecordIdentifier found!'
+        end
+      end
     end
 
   end

data/lib/showcase/traits/seo.rb

@@ -9,13 +9,27 @@ module Showcase
 
       module ClassMethods
 
+        def default_seo_options(&block)
+          define_module_method :default_seo_options do
+            Helpers::ConfigObject.new(self, &block).to_hash
+          end
+        end
+
         def seo(name = nil, options = {}, &block)
-          define_method? [name, :seo_tags] do |options = {}|
-            meta = Helpers::ConfigObject.new(self, &block).to_hash
+          define_module_method [name, :seo_tags] do |options = {}|
+            meta = respond_to?(:default_seo_options) ? default_seo_options : {}
+            meta.merge!(Helpers::ConfigObject.new(self, &block).to_hash)
+            meta.merge!(options.symbolize_keys) if options
+
             builder = Helpers::SeoMetaBuilder.new(view_context)
-            parts = %w(title description canonical_url image_url canonical_url).map(&:to_sym)
+            parts = %w(
+              title description site_name
+              canonical_url
+              image_url iframe_video_url stream_video_url
+            ).map(&:to_sym)
+
             parts.map do |tag|
-              builder.send(tag, meta[tag], options) if meta[tag]
+              builder.send(tag, meta[tag], meta.except(*parts)) if meta[tag]
             end.compact.join.html_safe
           end
         end

data/lib/showcase/traits/share.rb

@@ -1,4 +1,5 @@
 require 'showcase/helpers/config_object'
+require 'active_support/core_ext/object/to_query'
 
 module Showcase
   module Traits
@@ -41,14 +42,17 @@ module Showcase
 
             link_to link_name do |c|
               meta = Helpers::ConfigObject.new(self, &block).to_struct
+              html_options = meta.html_options || {}
               params = Hash[
                 settings[:params].map do |param, meta_key|
-                  [ param, meta.send(meta_key) ]
+                  values = [:"#{social}_#{meta_key}", meta_key].map { |key| meta.send(key) }
+                  [ param, values.find(&:presence) ]
                 end
               ]
+
               c.url "#{settings[:url]}?#{params.to_query}"
               c.label settings[:label]
-              c.html_options = { target: :blank }
+              c.html_options = html_options.reverse_merge(target: '_blank')
             end
           end
         end

data/lib/showcase/version.rb

@@ -1,4 +1,4 @@
 module Showcase
-  VERSION = "0.2.0.pre"
+  VERSION = "0.2.0.rc.1"
 end
 

data/showcase.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |gem|
   gem.name          = 'showcase'
   gem.version       = Showcase::VERSION
   gem.authors       = ['Stefano Verna']
-  gem.email         = ['stefano.verna@welaika.com']
+  gem.email         = ['stefano.verna@gmail.com']
   gem.description   = %q{A barebone and framework agnostic presenter implementation}
   gem.summary       = %q{A barebone and framework agnostic presenter implementation}
   gem.homepage      = 'https://github.com/welaika/showcase'

data/spec/fixtures.rb

@@ -87,7 +87,7 @@ class NilClassPresenter < Showcase::Presenter
 end
 
 class Context
-  include Showcase::Helpers
+  include Showcase::Helpers::Present
 
   def bold(text)
     "**#{text}**"

data/spec/helpers/seo_meta_builder_spec.rb

@@ -13,8 +13,8 @@ module Showcase::Helpers
         expect(subject.title('foo')).to have_tag(:title, text: 'foo')
       end
 
-      it 'produces a ug:title meta tag' do
-        expect(subject.title('foo')).to have_tag(:meta, with: { name: 'og:title', content: 'foo' })
+      it 'produces a og:title meta tag' do
+        expect(subject.title('foo')).to have_tag(:meta, with: { property: 'og:title', content: 'foo' })
       end
 
       it 'produces a twitter:title meta tag' do
@@ -32,7 +32,7 @@ module Showcase::Helpers
           expect(subject.title('foo', title_suffix: ' - bar')).to have_tag(:title, text: 'foo - bar')
         end
         it 'does not suffix meta tags' do
-          expect(subject.title('foo')).to have_tag(:meta, with: { name: 'og:title', content: 'foo' })
+          expect(subject.title('foo')).to have_tag(:meta, with: { property: 'og:title', content: 'foo' })
           expect(subject.title('foo')).to have_tag(:meta, with: { name: 'twitter:title', content: 'foo' })
         end
       end
@@ -44,7 +44,7 @@ module Showcase::Helpers
       end
 
       it 'produces a og:description meta tag' do
-        expect(subject.description('foo')).to have_tag(:meta, with: { name: 'og:description', content: 'foo' })
+        expect(subject.description('foo')).to have_tag(:meta, with: { property: 'og:description', content: 'foo' })
       end
 
       it 'produces a twitter:description meta tag' do
@@ -60,7 +60,7 @@ module Showcase::Helpers
 
     describe '#image_url' do
       it 'produces a og:image meta tag' do
-        expect(subject.image_url('foo')).to have_tag(:meta, with: { name: 'og:image', content: 'foo' })
+        expect(subject.image_url('foo')).to have_tag(:meta, with: { property: 'og:image', content: 'foo' })
       end
 
       it 'produces a twitter:image meta tag' do
@@ -69,14 +69,18 @@ module Showcase::Helpers
 
       context 'with multiple values' do
         it 'uses the first non-blank' do
-          expect(subject.image_url(['', nil, 'foo'])).to have_tag(:meta, with: { name: 'og:image', content: 'foo' })
+          expect(subject.image_url(['', nil, 'foo'])).to have_tag(:meta, with: { property: 'og:image', content: 'foo' })
         end
       end
     end
 
     describe '#canonical_url' do
       it 'produces a og:url meta tag' do
-        expect(subject.canonical_url('foo')).to have_tag(:meta, with: { name: 'og:url', content: 'foo' })
+        expect(subject.canonical_url('foo')).to have_tag(:meta, with: { property: 'og:url', content: 'foo' })
+      end
+
+      it 'produces a twitter:url meta tag' do
+        expect(subject.canonical_url('foo')).to have_tag(:meta, with: { name: 'twitter:url', content: 'foo' })
       end
 
       it 'produces a canonical link tag' do
@@ -85,11 +89,58 @@ module Showcase::Helpers
 
       context 'with multiple values' do
         it 'uses the first non-blank' do
-          expect(subject.canonical_url(['', nil, 'foo'])).to have_tag(:meta, with: { name: 'og:url', content: 'foo' })
+          expect(subject.canonical_url(['', nil, 'foo'])).to have_tag(:meta, with: { property: 'og:url', content: 'foo' })
         end
       end
     end
 
+    describe '#iframe_video_url' do
+      it 'produces a og:video:url meta tag' do
+        expect(subject.iframe_video_url('foo')).to have_tag(:meta, with: { property: 'og:video:url', content: 'foo' })
+      end
+
+      it 'produces a twitter:player meta tag' do
+        expect(subject.iframe_video_url('foo')).to have_tag(:meta, with: { name: 'twitter:player', content: 'foo' })
+      end
+
+      it 'produces a og:video:type meta tag' do
+        expect(subject.iframe_video_url('foo')).to have_tag(:meta, with: { property: 'og:video:type', content: 'text/html' })
+      end
+    end
+
+    describe '#stream_video_url' do
+      it 'produces a og:video:url meta tag' do
+        expect(subject.stream_video_url('foo')).to have_tag(:meta, with: { property: 'og:video:url', content: 'foo' })
+      end
+
+      it 'produces a twitter:player:stream meta tag' do
+        expect(subject.stream_video_url('foo')).to have_tag(:meta, with: { name: 'twitter:player:stream', content: 'foo' })
+      end
+
+      it 'produces a og:video:type meta tag' do
+        expect(subject.stream_video_url('foo')).to have_tag(:meta, with: { property: 'og:video:type', content: 'video/mp4' })
+      end
+    end
+
+    describe '#site_name' do
+      it 'produces a og:site_name meta tag' do
+        expect(subject.site_name('foo')).to have_tag(:meta, with: { property: 'og:site_name', content: 'foo' })
+      end
+    end
+
+    describe '#card_type' do
+      it 'produces a twitter:card meta tag' do
+        expect(subject.card_type('foo')).to have_tag(:meta, with: { name: 'twitter:card', content: 'foo' })
+      end
+    end
+
+    describe '#video_size' do
+      it 'produces twitter:player meta tags' do
+        result = subject.video_size([10, 20])
+        expect(result).to have_tag(:meta, with: { name: 'twitter:player:width', content: '10' })
+        expect(result).to have_tag(:meta, with: { name: 'twitter:player:height', content: '20' })
+      end
+    end
   end
 end
 

data/spec/traits/base_spec.rb

@@ -2,12 +2,12 @@ require 'spec_helper'
 
 module Showcase::Traits
   describe Base do
-    describe '.define_method?' do
+    describe '.define_module_method' do
 
       it 'defines an instance method' do
         klass = Class.new do
           include Base
-          define_method? :foo do
+          define_module_method :foo do
             true
           end
         end
@@ -15,6 +15,22 @@ module Showcase::Traits
         expect(klass.new.foo).to be_true
       end
 
+      it 'overriding the method allows to call super' do
+        klass = Class.new do
+          include Base
+
+          define_module_method :foo do
+            true
+          end
+
+          def foo
+            super
+          end
+        end
+
+        expect(klass.new.foo).to be_true
+      end
+
       context 'if the method is already present' do
         it 'no-ops ' do
           klass = Class.new do
@@ -30,7 +46,7 @@ module Showcase::Traits
         it 'joins them in snake case' do
           klass = Class.new do
             include Base
-            define_method? [:foo, :bar] do
+            define_module_method [:foo, :bar] do
               true
             end
           end
@@ -41,7 +57,7 @@ module Showcase::Traits
         it 'ignores blank chunks' do
           klass = Class.new do
             include Base
-            define_method? ["", :bar] do
+            define_module_method ["", :bar] do
               true
             end
           end

data/spec/traits/link_to_spec.rb

@@ -20,10 +20,13 @@ module Showcase::Traits
           c.url = url
           c.label = 'Label'
           c.active = active
+          c.html_options role: 'label'
         end
 
-        link_to :foo do
+        link_to :foo do |c|
           c.url = '#foo'
+          c.active_class = 'current'
+          c.active = active
         end
 
         def url
@@ -43,6 +46,10 @@ module Showcase::Traits
           expect(subject.link).to have_tag(:a, text: 'Label')
         end
 
+        it 'with the specified html attributes' do
+          expect(subject.link).to have_tag(:a, with: { role: 'label' })
+        end
+
         context 'with a different label as parameter' do
           it 'uses it' do
             expect(subject.link('Foo')).to have_tag(:a, text: 'Foo')
@@ -65,12 +72,18 @@ module Showcase::Traits
           let(:active) { true }
 
           it 'adds an active class to the link' do
-            expect(subject.link).to have_tag(:a, with: { class: 'active' })
+            expect(subject.link('label')).to have_tag(:a, with: { class: 'active' })
           end
 
           context 'with additional classes' do
             it 'it sums them' do
-              expect(subject.link(class: 'extra')).to have_tag(:a, with: { class: 'extra active' })
+              expect(subject.link('label', class: 'extra')).to have_tag(:a, with: { class: 'extra active' })
+            end
+          end
+
+          context 'if a different CSS class was specified' do
+            it 'adds it to the link' do
+              expect(subject.foo_link('label')).to have_tag(:a, with: { class: 'current' })
             end
           end
         end

data/spec/traits/record_spec.rb

@@ -8,6 +8,10 @@ module Showcase::Traits
     let(:presenter) {
       Class.new(Showcase::Presenter) do
         include Record
+
+        box do |c|
+          c.html_options role: 'actor', class: 'first'
+        end
       end
     }
     subject { presenter.new(record, view) }
@@ -30,6 +34,11 @@ module Showcase::Traits
         expect(result).to have_tag(:div, with: { class: 'model', id: 'model_1' })
       end
 
+      it 'adds attributes specified within box block' do
+        result = subject.box { "foo" }
+        expect(result).to have_tag(:div, with: { role: 'actor', class: 'first' })
+      end
+
       context 'with a specified tag' do
         it 'uses it' do
           result = subject.box(:span) { "foo" }

data/spec/traits/seo_spec.rb

@@ -12,6 +12,10 @@ module Showcase::Traits
       Class.new(Showcase::Presenter) do
         include Seo
 
+        default_seo_options do |c|
+          c.title_suffix = ' - qux'
+        end
+
         seo do |c|
           c.title = 'foo'
           c.description 'bar'
@@ -19,16 +23,27 @@ module Showcase::Traits
       end
     }
 
-    describe '#seo' do
-      let(:options) { double('options') }
+    describe '.seo' do
+      let(:expected_options) { { title_suffix: ' - qux' } }
+      let(:expected_description) { 'bar' }
+      let(:expected_title) { 'foo' }
+
       before do
         Showcase::Helpers::SeoMetaBuilder.stub(:new).with(view).and_return(builder)
-        builder.stub(:title).with('foo', options).and_return('<title>')
-        builder.stub(:description).with('bar', options).and_return('<description>')
+        builder.stub(:title).with(expected_title, expected_options).and_return('<title>')
+        builder.stub(:description).with(expected_description, expected_options).and_return('<description>')
       end
 
       it 'defines a seo_tags method that ouputs seo meta tags' do
-        expect(subject.seo_tags(options)).to eq '<title><description>'
+        expect(subject.seo_tags).to eq '<title><description>'
+      end
+
+      describe '#seo_tags' do
+        let(:expected_title) { 'other' }
+
+        it 'allows to override options' do
+          expect(subject.seo_tags(title: 'other')).to eq '<title><description>'
+        end
       end
     end
 

data/spec/traits/share_spec.rb

@@ -14,7 +14,9 @@ module Showcase::Traits
         share do |c|
           c.url = 'url'
           c.text = 'text'
+          c.twitter_text = 'twitter text'
           c.image_url = 'image'
+          c.html_options = { role: 'share' }
         end
 
         share :foo do |c|
@@ -28,7 +30,7 @@ module Showcase::Traits
 
     describe '#social_share' do
       expected_urls = {
-        twitter: "https://twitter.com/intent/tweet?text=text&url=url",
+        twitter: "https://twitter.com/intent/tweet?text=twitter+text&url=url",
         facebook: "http://www.facebook.com/sharer/sharer.php?u=url",
         gplus: "https://plus.google.com/share?url=url",
         pinterest: "http://www.pinterest.com/pin/create/button/?media=image&title=text&url=url",
@@ -39,10 +41,19 @@ module Showcase::Traits
         it "produces a #{provider} share link" do
           expect(subject.send("#{provider}_share_link")).to have_tag(:a)
         end
+
         it "produces a #{provider} share url" do
           expect(subject.send("#{provider}_share_url")).to eq url
         end
 
+        it "adds a target :blank to the link" do
+          expect(subject.send("#{provider}_share_link")).to have_tag(:a, with: { target: '_blank' })
+        end
+
+        it "merges additional html_options" do
+          expect(subject.send("#{provider}_share_link")).to have_tag(:a, with: { role: 'share' })
+        end
+
         context 'with prefix' do
           it 'prefixes link method' do
             expect(subject).to respond_to "foo_#{provider}_share_link"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: showcase
 version: !ruby/object:Gem::Version
-  version: 0.2.0.pre
+  version: 0.2.0.rc.1
 platform: ruby
 authors:
 - Stefano Verna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-21 00:00:00.000000000 Z
+date: 2013-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -82,7 +82,7 @@ dependencies:
         version: '0'
 description: A barebone and framework agnostic presenter implementation
 email:
-- stefano.verna@welaika.com
+- stefano.verna@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -90,16 +90,21 @@ files:
 - .gitignore
 - .rspec
 - .travis.yml
+- Appraisals
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- gemfiles/rails_32.gemfile
+- gemfiles/rails_4.gemfile
 - lib/generators/showcase/presenter/USAGE
 - lib/generators/showcase/presenter/presenter_generator.rb
 - lib/generators/showcase/presenter/templates/presenter.rb
 - lib/showcase.rb
-- lib/showcase/helpers.rb
 - lib/showcase/helpers/config_object.rb
+- lib/showcase/helpers/html_options.rb
+- lib/showcase/helpers/module_method_builder.rb
+- lib/showcase/helpers/present.rb
 - lib/showcase/helpers/seo_meta_builder.rb
 - lib/showcase/presenter.rb
 - lib/showcase/railtie.rb

data/lib/showcase/helpers.rb

@@ -1,33 +0,0 @@
-require 'active_support/concern'
-require 'active_support/inflector'
-require 'active_support/core_ext/hash/keys'
-
-module Showcase
-  module Helpers
-    extend ActiveSupport::Concern
-
-    def presenter_context
-      if respond_to? :view_context
-        view_context
-      else
-        self
-      end
-    end
-
-    def present(obj, klass = nil, context = presenter_context, options = {})
-      options.assert_valid_keys(:nil_presenter)
-
-      if obj || options.fetch(:nil_presenter, false)
-        klass ||= "#{obj.class.name}Presenter".constantize
-        klass.new(obj, context)
-      else
-        nil
-      end
-    end
-
-    def present_collection(obj, klass = nil, context = presenter_context, options = {})
-      obj.map { |o| present(o, klass, context, options) }
-    end
-  end
-end
-