seory 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 679ed7e93f25e0539660873f3b4ad92d89327082
-  data.tar.gz: 514f420b0f775555ee3d736120aa7c4a898e1bd1
+  metadata.gz: 89f54528e92f65e0f2bde744dd32012ecc49ab11
+  data.tar.gz: b80835f02bfd2753c398454b408de843b0bf4f0b
 SHA512:
-  metadata.gz: 66e97190536b1dd87c7b3396a9d3c93e23da823530965565e399266d2a9f8680c358f1b00ec7ed19a8da1687902d2403ac4ef46c96e5119fb50f563368a2b19e
-  data.tar.gz: 50eb55d2c9df67fd68c8c2fb0e6b6271a96b32cda1dedac10a09fd6e0e6f3e61704594f3e46b125f1076640786d5f9225088e7af5190fac436caa9034dca4ac1
+  metadata.gz: 0f2eef6b3801bdafbac1a991cdcbacd20c3ca65efeee290550e9bbebfdbda980f90eea6a1becf7445eb92fd490e299de9f2e35b79015e11017a2945d1dd5ee35
+  data.tar.gz: 43b63992a32409aaa0d5005a460df1e9398d3b9a3c8ad58fd557270faef98aaa9e99d24b255c46f0189cf418c50edecaf3ca57ac5215bfbe8ace41ff955a8366

data/README.md

@@ -21,64 +21,65 @@ Or install it yourself as:
 
 ## Usage
 
-Specify SEO content as ruby code.  For example, `config/initializers/seory.rb`
+Specify SEO content as ruby code.  For example, `config/seory/*.rb`
 
 ```ruby
-# Specify SEO content based on `controller#action` rule
-match *%w[products#popular products#new_release] do
-  title            'Great products | My Great Site[MGS]'
-  meta_description 'A lot of great products'
+# config/seory/products.rb
+Seory.seo_content 'products' do
+  # Specify SEO content based on `controller#action` rule
+  match *%w[products#popular products#new_release] do
+    title            'Great products | My Great Site[MGS]'
+    meta_description 'A lot of great products'
 
-  meta_keywords    %w[Software Internet Service].join(',')
+    meta_keywords    %w[Software Internet Service].join(',')
 
-  h1               'Most popular products'
-end
-
-# Can contain dynamic content based on controller using assigned ivar
-match slug('brands#show') do
-  title { assigns(:brand).name }
-end
+    h1               'Most popular products'
+  end
 
-# Match with request fullpath
-match path('/products/special-product') do
-  title 'Special Product Detail'
-end
+  # Can contain dynamic content based on controller using assigned ivar
+  match slug('products#show') do
+    assign_reader :product
 
-# Custom lookup rule with controller
-match(->(controller) { controller.params[:page].to_i == 1 }) do
-  meta_keywords do
-    search = assigns(:search_object)
+    title { product.name }
+  end
 
-    # do something
+  # Match with request fullpath
+  match path('/products/special-product') do
+    title 'Special Product Detail'
   end
-end
 
-# Use custom word part
-match slug('products#index') do
-  misc(:page_name) { "#{controller.params[:page].to_i} page | Good products") }
+  # Custom lookup rule with controller
+  match(->(controller) { controller.params[:page].to_i == 1 }) do
+    meta_keywords do
+      search = assigns(:search_object)
 
-  title :page_name
-  h1    :page_name
+      # do something
+    end
+  end
 
-  meta_description { "Page for #{page_name}" }
-}
+  # Use custom word part
+  match slug('products#index') do
+    misc(:page_name) { "#{controller.params[:page].to_i} page | Good products") }
 
-default do
-  title 'My Great Service'
-  h1    { I18n.t("#{controller_name}.h1", scope: 'label.misc_pages' }
-end
-```
+    title :page_name
+    h1    :page_name
 
-Then we can use seory in your application.[TODO]
-```ruby
-module ApplicationHelper
+    meta_description { "Page for #{misc(:page_name)}" }
+  }
+  end
+end
 
-  # provides seory() method,
-  # which returns Seory::Runtime object with configured
-  include Seory::Helper
+# config/seory/default.rb
+Seory.seo_content 'default' do
+  default do
+    title 'My Great Service'
+    h1    { I18n.t("#{controller_name}.h1", scope: 'label.misc_pages' }
+  end
 end
 ```
 
+Then we can use seory in your application.
+
 ```haml
 %html
   %head

data/lib/seory/rails_helper.rb

@@ -1,7 +1,7 @@
 module Seory
   module RailsHelper
     def seory(repository = Seory.default_repository)
-      repository.lookup(controller)
+      repository.lookup(self)
     end
   end
 end

data/lib/seory/repository.rb

@@ -24,10 +24,10 @@ module Seory
       clear_page_order_pre_calculation!
     end
 
-    def lookup(controller)
-      page = pre_orderd_pages.detect {|pg| pg.match?(controller) } || default
+    def lookup(view_context)
+      page = pre_orderd_pages.detect {|pg| pg.match?(view_context.controller) } || default
 
-      Seory::Runtime.new(page, controller, default).tap do |runtime|
+      Seory::Runtime.new(page, view_context, default).tap do |runtime|
         runtime.extend helper if helper
       end
     end

data/lib/seory/runtime.rb

@@ -2,26 +2,31 @@ require 'seory'
 
 module Seory
   class Runtime
+    delegate :controller,  to: '@view_context'
     delegate :action_name, to: :controller
 
-    attr_reader :page_contents, :controller
+    attr_reader :page_contents
 
-    def initialize(page_contents, controller, fallback = nil)
+    def initialize(page_contents, view_context, fallback = nil)
       @page_contents = page_contents
-      @controller    = controller
+      @view_context  = view_context
       @fallback      = fallback
 
       extend build_assign_accessor_module(@page_contents.assign_name_accessors)
     end
 
     def assigns(name)
-      @controller.view_assigns[name.to_s]
+      controller.view_assigns[name.to_s]
     end
 
     def misc(name)
       calculate_content_for(name)
     end
 
+    def helper
+      @view_context
+    end
+
     Seory::CONTENTS.each do |name|
       define_method(name) { misc(name) }
     end

data/lib/seory/version.rb

@@ -1,3 +1,3 @@
 module Seory
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/spec/seory/dsl_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'seory/dsl'
 
 describe Seory::Dsl do
-  subject(:seory) { seory_class.lookup(controller) }
+  subject(:seory) { seory_class.lookup(Seory::ViewContextDouble.new(controller)) }
 
   context 'with traditional syntax' do
     let(:seory_class) { Object.new.extend(Seory::Dsl) }

data/spec/seory/rails_helper_spec.rb

@@ -6,6 +6,8 @@ describe Seory::RailsHelper do
     Seory.seo_content 'products' do
       match slug('products#index') do
         title 'Product index'
+
+        og_image_url { helper.image_url('top-logo.png') }
       end
 
       default do
@@ -27,22 +29,26 @@ describe Seory::RailsHelper do
   end
 
   context 'GET /products' do
-    let(:context) do
-      Seory::ViewContextDouble.new(controller_double('products#index'))
+    let(:context) { view_context_double('products#index') }
+
+    before do
+      allow(context).to receive(:image_url) {|img| "http://example.com/assets/#{img}?12345" }
     end
 
     specify do
       expect(context.seory.title).to eq 'Product index'
     end
+
+    specify do
+      expect(context.seory.og_image_url).to eq 'http://example.com/assets/top-logo.png?12345'
+    end
   end
 
   context 'GET /products/a-computer/reviews' do
     let(:context) do
-      controller = controller_double('products/reviews#index') do
+      view_context_double('products/reviews#index') do
         @product = OpenStruct.new(name: 'a-computer')
       end
-
-      Seory::ViewContextDouble.new(controller)
     end
 
     specify do

data/spec/seory/repository_spec.rb

@@ -18,7 +18,7 @@ describe Seory::Repository do
   end
 
   def title_for(*args)
-    repository.lookup(controller_double(*args)).title
+    repository.lookup(view_context_double(*args)).title
   end
 
   def page_group(name, title = name)
@@ -95,7 +95,7 @@ describe Seory::Repository do
         expect {
           repository << describe_page_group('duplicate default') { default { title 'duplicate default' } }
 
-          repository.lookup(controller_double('hi#index'))
+          repository.lookup(view_context_double('hi#index'))
         }.to raise_error(Seory::DuplicateDefault)
       end
     end

data/spec/seory/runtime_spec.rb

@@ -4,7 +4,8 @@ require 'seory/page'
 
 describe Seory::Runtime do
   let(:seory) do
-    Seory::Runtime.new(page_contents, controller)
+    view_context = double('context', controller: controller)
+    Seory::Runtime.new(page_contents, view_context)
   end
 
   let(:controller) { double('controller') }
@@ -88,4 +89,14 @@ describe Seory::Runtime do
       expect(seory.h1).to eq 'A title'
     end
   end
+
+  context 'Can call view_context methods' do
+    before do
+      page_contents.define(:title) { "#{helper.number_with_delimiter(10_000)} items" }
+
+      expect(seory.helper).to receive(:number_with_delimiter).with(10_000) { '10,000' }
+    end
+
+    specify { expect(seory.title).to eq '10,000 items' }
+  end
 end

data/spec/support/testing_dsl.rb

@@ -3,5 +3,9 @@ module Seory
     def controller_double(*args, &block)
       Seory::ControllerDouble.new(*args, &block)
     end
+
+    def view_context_double(*args, &block)
+      Seory::ViewContextDouble.new(controller_double(*args, &block))
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seory
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - moro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-20 00:00:00.000000000 Z
+date: 2014-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport