showcase 0.2.0.beta.5 → 0.2.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f9f2fdb7c485fa431bdc844dfa1e90c19df2327
-  data.tar.gz: f82059c06749b78396057a4902ba5ce305d51804
+  metadata.gz: 72574756357dcfeea3882c9cc85310c932bc272d
+  data.tar.gz: 98f5d60b67e5dba3f0d870ae033b9dacc6ffad28
 SHA512:
-  metadata.gz: a870589ee0807ebf648ba0f77032ec9dda5ef459314099c9fc7ec1b61e1f1f1c74ee839ec519fb757875be0fede89f65d2f5ac95f24cb69041aa1ffc9ae81c89
-  data.tar.gz: dfd4c857afb37106f3d6f61562a2a3efe3304a5f29881e6e759cbfc679633299c67f7d470afbc5cae0858d03ca729a51ede348fbac355002da41861a772ef31c
+  metadata.gz: 7b49b695ea0301b22c47239c144ceaf4ccfa7a22c6ec1ab809f7660581792c196953060183064a7a9e2d61a230d2fbd7ceccc3ce9ce2289e617f6457e39d1b86
+  data.tar.gz: dcfd53204bc986fc2389707a130afe5d7395b110f34d30b63cd562375f12140a7f03474f07c2d88a987304da6bc9fac29d81875eec3dcc8e45c25ba624886a2a

data/.gitignore

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

data/.travis.yml

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

data/Gemfile

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

data/README.md

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

data/Rakefile

@@ -1,14 +1 @@
-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
-
+require "bundler/gem_tasks"

data/lib/showcase/helpers/seo_meta_builder.rb

@@ -12,40 +12,26 @@ 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)
-      end
-
-      def iframe_video_url(video_url, options = {})
-        seo_meta_tags('og:video:url', 'twitter:player', video_url) <<
-        seo_meta_tags('og:video:type', 'text/html')
-      end
-
-      def stream_video_url(video_url, options = {})
-        seo_meta_tags('og:video:url', 'twitter:player:stream', video_url) <<
-        seo_meta_tags('og:video:type', 'video/mp4')
-      end
-
-      def site_name(name, options = {})
-        seo_meta_tags('og:site_name', name)
+        seo_meta_tags(:og_image, :twitter_image, image_url)
       end
 
       def canonical_url(url, options = {})
-        seo_meta_tags('og:url', url) <<
+        seo_meta_tags(:og_url, url) <<
         context.tag(:link, rel: "canonical", "href" => url)
       end
 
       private
 
       def first_nonblank(values)
-        Array(values).find(&:presence)
+        Array(values).map(&:presence).compact.first
       end
 
       def seo_meta_tags(*args)
@@ -54,14 +40,8 @@ module Showcase
         return nil unless value.present?
 
         args.map do |name|
-          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)
+          name = name.to_s.sub(/_/, ":")
+          context.tag(:meta, name: name, content: value)
         end.join.html_safe
       end
     end

data/lib/showcase/helpers.rb

@@ -0,0 +1,33 @@
+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
+

data/lib/showcase/presenter.rb

@@ -1,20 +1,17 @@
 require 'delegate'
-require 'showcase/helpers/present'
-require 'showcase/helpers/module_method_builder'
+require 'showcase/helpers'
 require 'active_support/core_ext/array/extract_options'
 require 'active_support/core_ext/hash/keys'
 
 module Showcase
   class Presenter < SimpleDelegator
-    include Helpers::Present
-    extend Helpers::ModuleMethodBuilder
+    include Helpers
 
     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)
@@ -49,15 +46,19 @@ module Showcase
       options.assert_valid_keys(:with, :nil_presenter)
       presenter_klass = options.fetch(:with, nil)
 
-      args.each do |attr|
-        define_module_method attr do
-          send(method,
-               object.send(attr),
-               presenter_klass,
-               view_context,
-               options.slice(:nil_presenter))
+      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
         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::Present
+        ActionView::Base.send :include, Showcase::Helpers
       end
     end
   end

data/lib/showcase/traits/base.rb

@@ -3,9 +3,20 @@ module Showcase
     module Base
       extend ActiveSupport::Concern
 
-      included do
-        extend Helpers::ModuleMethodBuilder
+      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
       end
+
     end
   end
 end

data/lib/showcase/traits/link_to.rb

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

data/lib/showcase/traits/record.rb

@@ -1,59 +1,35 @@
+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
-        record_identifier.dom_id(self)
+        ActionView::RecordIdentifier.dom_id(self)
       end
 
       def dom_class
-        record_identifier.dom_class(self)
+        ActiveModel::Naming.param_key(self)
       end
 
       def box(*args, &block)
         options = args.extract_options!
+        options.symbolize_keys!
+
         tag = args.pop || :div
 
-        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[:class] ||= ""
+        css_classes = options[:class].split(/\s+/) << dom_class
+        options[:class] = css_classes.join(" ")
 
-        html_options = HtmlOptions.new(config_options)
-        html_options.merge_attrs!(options)
-        html_options.add_class!(dom_class)
-        html_options.merge_attrs!(id: dom_id)
+        options[:id] = dom_id
 
-        h.content_tag(tag, html_options.to_h) do
+        h.content_tag(tag, options) 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,27 +9,13 @@ 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_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
-
+          define_method? [name, :seo_tags] do |options = {}|
+            meta = Helpers::ConfigObject.new(self, &block).to_hash
             builder = Helpers::SeoMetaBuilder.new(view_context)
-            parts = %w(
-              title description site_name
-              canonical_url
-              image_url iframe_video_url stream_video_url
-            ).map(&:to_sym)
-
+            parts = %w(title description canonical_url image_url canonical_url).map(&:to_sym)
             parts.map do |tag|
-              builder.send(tag, meta[tag], meta.except(*parts)) if meta[tag]
+              builder.send(tag, meta[tag], options) if meta[tag]
             end.compact.join.html_safe
           end
         end

data/lib/showcase/traits/share.rb

@@ -1,5 +1,4 @@
 require 'showcase/helpers/config_object'
-require 'active_support/core_ext/object/to_query'
 
 module Showcase
   module Traits
@@ -42,17 +41,14 @@ 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|
-                  values = [:"#{social}_#{meta_key}", meta_key].map { |key| meta.send(key) }
-                  [ param, values.find(&:presence) ]
+                  [ param, meta.send(meta_key) ]
                 end
               ]
-
               c.url "#{settings[:url]}?#{params.to_query}"
               c.label settings[:label]
-              c.html_options = html_options.reverse_merge(target: '_blank')
+              c.html_options = { target: :blank }
             end
           end
         end

data/lib/showcase/version.rb

@@ -1,4 +1,4 @@
 module Showcase
-  VERSION = "0.2.0.beta.5"
+  VERSION = "0.2.0.pre"
 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@gmail.com']
+  gem.email         = ['stefano.verna@welaika.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::Present
+  include Showcase::Helpers
 
   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 og:title meta tag' do
-        expect(subject.title('foo')).to have_tag(:meta, with: { property: 'og:title', content: 'foo' })
+      it 'produces a ug:title meta tag' do
+        expect(subject.title('foo')).to have_tag(:meta, with: { name: '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: { property: 'og:title', content: 'foo' })
+          expect(subject.title('foo')).to have_tag(:meta, with: { name: '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: { property: 'og:description', content: 'foo' })
+        expect(subject.description('foo')).to have_tag(:meta, with: { name: '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: { property: 'og:image', content: 'foo' })
+        expect(subject.image_url('foo')).to have_tag(:meta, with: { name: 'og:image', content: 'foo' })
       end
 
       it 'produces a twitter:image meta tag' do
@@ -69,14 +69,14 @@ 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: { property: 'og:image', content: 'foo' })
+          expect(subject.image_url(['', nil, 'foo'])).to have_tag(:meta, with: { name: '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: { property: 'og:url', content: 'foo' })
+        expect(subject.canonical_url('foo')).to have_tag(:meta, with: { name: 'og:url', content: 'foo' })
       end
 
       it 'produces a canonical link tag' do
@@ -85,44 +85,11 @@ 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: { property: 'og:url', content: 'foo' })
+          expect(subject.canonical_url(['', nil, 'foo'])).to have_tag(:meta, with: { name: '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
   end
 end
 

data/spec/traits/base_spec.rb

@@ -2,12 +2,12 @@ require 'spec_helper'
 
 module Showcase::Traits
   describe Base do
-    describe '.define_module_method' do
+    describe '.define_method?' do
 
       it 'defines an instance method' do
         klass = Class.new do
           include Base
-          define_module_method :foo do
+          define_method? :foo do
             true
           end
         end
@@ -15,22 +15,6 @@ 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
@@ -46,7 +30,7 @@ module Showcase::Traits
         it 'joins them in snake case' do
           klass = Class.new do
             include Base
-            define_module_method [:foo, :bar] do
+            define_method? [:foo, :bar] do
               true
             end
           end
@@ -57,7 +41,7 @@ module Showcase::Traits
         it 'ignores blank chunks' do
           klass = Class.new do
             include Base
-            define_module_method ["", :bar] do
+            define_method? ["", :bar] do
               true
             end
           end

data/spec/traits/link_to_spec.rb

@@ -20,13 +20,10 @@ module Showcase::Traits
           c.url = url
           c.label = 'Label'
           c.active = active
-          c.html_options role: 'label'
         end
 
-        link_to :foo do |c|
+        link_to :foo do
           c.url = '#foo'
-          c.active_class = 'current'
-          c.active = active
         end
 
         def url
@@ -46,10 +43,6 @@ 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')
@@ -72,18 +65,12 @@ module Showcase::Traits
           let(:active) { true }
 
           it 'adds an active class to the link' do
-            expect(subject.link('label')).to have_tag(:a, with: { class: 'active' })
+            expect(subject.link).to have_tag(:a, with: { class: 'active' })
           end
 
           context 'with additional classes' do
             it 'it sums them' do
-              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' })
+              expect(subject.link(class: 'extra')).to have_tag(:a, with: { class: 'extra active' })
             end
           end
         end

data/spec/traits/record_spec.rb

@@ -8,10 +8,6 @@ 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) }
@@ -34,11 +30,6 @@ 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,10 +12,6 @@ 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'
@@ -23,27 +19,16 @@ module Showcase::Traits
       end
     }
 
-    describe '.seo' do
-      let(:expected_options) { { title_suffix: ' - qux' } }
-      let(:expected_description) { 'bar' }
-      let(:expected_title) { 'foo' }
-
+    describe '#seo' do
+      let(:options) { double('options') }
       before do
         Showcase::Helpers::SeoMetaBuilder.stub(:new).with(view).and_return(builder)
-        builder.stub(:title).with(expected_title, expected_options).and_return('<title>')
-        builder.stub(:description).with(expected_description, expected_options).and_return('<description>')
+        builder.stub(:title).with('foo', options).and_return('<title>')
+        builder.stub(:description).with('bar', options).and_return('<description>')
       end
 
       it 'defines a seo_tags method that ouputs seo meta tags' do
-        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
+        expect(subject.seo_tags(options)).to eq '<title><description>'
       end
     end
 

data/spec/traits/share_spec.rb

@@ -14,9 +14,7 @@ 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|
@@ -30,7 +28,7 @@ module Showcase::Traits
 
     describe '#social_share' do
       expected_urls = {
-        twitter: "https://twitter.com/intent/tweet?text=twitter+text&url=url",
+        twitter: "https://twitter.com/intent/tweet?text=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",
@@ -41,19 +39,10 @@ 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.beta.5
+  version: 0.2.0.pre
 platform: ruby
 authors:
 - Stefano Verna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-28 00:00:00.000000000 Z
+date: 2013-09-21 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@gmail.com
+- stefano.verna@welaika.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -90,21 +90,16 @@ 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/Appraisals

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

data/gemfiles/rails_32.gemfile

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

data/gemfiles/rails_4.gemfile

@@ -1,8 +0,0 @@
-# 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

@@ -1,22 +0,0 @@
-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

@@ -1,19 +0,0 @@
-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

@@ -1,35 +0,0 @@
-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
-