showcase 0.2.0.beta.3 → 0.2.0.beta.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d6a631420d19d2a548cdf36d56577c48ae24930
-  data.tar.gz: bd24f9fc93109defc060e10b88d2dc2c57980a6a
+  metadata.gz: a552e964feb8dee0c01780000c3b5fcff2dd69e4
+  data.tar.gz: 33e71c49318a0edb2874caa823a6d2bbd04b9373
 SHA512:
-  metadata.gz: df878541e87c19106087fa2f1a8eb7610fca82637b6e7ed13e056a98284fafbb55ec428e9922c0b16d9e9404b8e95a8c543595f0ba9a179472376b76a6a3a4dc
-  data.tar.gz: 2075e6deb475f90d8f4f215478e2b027af35def0f9abb5fc10a4e2f26d068a78957457009a3f4d7877331517a9cdf5a121064d37270c75455b9119a5d4fad82c
+  metadata.gz: 911610134d24f4f00bd3315a634e5bec6b4a304e0a56035d7f1adf5e4cc0cc1075b24c9f3cd3cf75377975e619e1f53f2625aeb483839b2a15487b9d9009b662
+  data.tar.gz: 508533360df64c06a1de58e999abe82de44ada2c45207f27b015a37fae37507ecb45a33e52899a7c79549e72086697bce0953b4f92f21ae19563cc728ce7b665

data/.gitignore

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

data/.travis.yml

@@ -5,8 +5,8 @@ rvm:
   - "2.0.0"
 
 gemfile:
-  - "gemfiles/activerecord3.gemfile"
-  - "gemfiles/activerecord4.gemfile"
+  - "gemfiles/rails_32.gemfile"
+  - "gemfiles/rails_4.gemfile"
 
 script: "bundle exec rake spec"
 

data/Appraisals

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

data/gemfiles/{activerecord4.gemfile → rails_32.gemfile}

@@ -3,6 +3,6 @@
 source "https://rubygems.org"
 
 gem "appraisal"
-gem "activerecord", "4.0.0"
+gem "rails", "3.2.14"
 
 gemspec :path=>"../"

data/gemfiles/{activerecord3.gemfile → rails_4.gemfile}

@@ -3,6 +3,6 @@
 source "https://rubygems.org"
 
 gem "appraisal"
-gem "activerecord", "3.2.14"
+gem "rails", "4.0.0"
 
 gemspec :path=>"../"

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

@@ -31,7 +31,7 @@ module Showcase
       private
 
       def first_nonblank(values)
-        Array(values).map(&:presence).compact.first
+        Array(values).find(&:presence)
       end
 
       def seo_meta_tags(*args)

data/lib/showcase/presenter.rb

@@ -1,11 +1,13 @@
 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
 
@@ -47,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,23 +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
-            method_module = Module.new do
-              define_method(method_name, &block)
-            end
-            include(method_module)
-            true
-          end
-        end
+      included do
+        extend Helpers::ModuleMethodBuilder
       end
-
     end
   end
 end

data/lib/showcase/traits/link_to.rb

@@ -10,15 +10,15 @@ 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
 
             html_options = HtmlOptions.new(config.html_options)

data/lib/showcase/traits/seo.rb

@@ -9,9 +9,16 @@ 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)

data/lib/showcase/traits/share.rb

@@ -45,9 +45,11 @@ module Showcase
               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[key] }
+                  [ param, values.find(&:presence) ]
                 end
               ]
+
               c.url "#{settings[:url]}?#{params.to_query}"
               c.label settings[:label]
               c.html_options = html_options.reverse_merge(target: '_blank')

data/lib/showcase/version.rb

@@ -1,4 +1,4 @@
 module Showcase
-  VERSION = "0.2.0.beta.3"
+  VERSION = "0.2.0.beta.4"
 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/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
@@ -19,7 +19,7 @@ module Showcase::Traits
         klass = Class.new do
           include Base
 
-          define_method? :foo do
+          define_module_method :foo do
             true
           end
 
@@ -46,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
@@ -57,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/seo_spec.rb

@@ -12,25 +12,38 @@ 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'
-          c.title_suffix = ' - qux'
         end
       end
     }
 
-    describe '#seo' do
-      let(:options) { { title_suffix: ' - qux' } }
+    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,6 +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
@@ -29,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",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: showcase
 version: !ruby/object:Gem::Version
-  version: 0.2.0.beta.3
+  version: 0.2.0.beta.4
 platform: ruby
 authors:
 - Stefano Verna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-30 00:00:00.000000000 Z
+date: 2013-11-08 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: []
@@ -95,15 +95,16 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- gemfiles/activerecord3.gemfile
-- gemfiles/activerecord4.gemfile
+- 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
-