metanol 0.0.6 → 0.0.8

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NWI2M2YyMTUyNjNlYWI1MzJlZTQ0YWRjODhiMWNkYjY2ZGNhOGZlMQ==
-  data.tar.gz: !binary |-
-    NzVmYmRhYTU5N2U3MGU5MjI3MTAwMDg0MmNhMjZmOTBkZWVmMTI4YQ==
+SHA1:
+  metadata.gz: 192b22e268ed2c08e3b83a989deba1c79035530b
+  data.tar.gz: 779557ee8a0cc78ac1ccabca931e741cc1a833ef
 SHA512:
-  metadata.gz: !binary |-
-    ZGM4N2RiM2I0MTU5OWIxNDdkYzFmMzMyNzZhZjY2Zjc1NDgyYjY0OTQ4YjJm
-    NDVkM2NhMzM4N2Q2NGVhMzBmNzg0ODA4ZWJlNDk4NjVlMWQzNGI1OTg1NWI4
-    YTY2Y2E2YmE5NzZiNGI0ZTRiYzQ2Y2U4Y2JiZjM2NjAwOWMwMTQ=
-  data.tar.gz: !binary |-
-    YTI3NWU5YjdjZWQ0ZmU5OTFkZTFiZjE0NWY0MTI1MzFjN2IwODkwOGUyMTA2
-    MmQxMmM3NDgyMDg2NzBiMzhjZGZlZjQ5OWVhMTIwMzQyM2Y2NjY0ZDFlMTc3
-    NWRhOWQyZDZhNzEyNzM3ZTY4MGJmY2EwNTlhYmEzZDYyYTc3ZDA=
+  metadata.gz: b5a924dcf8196ae2a6d12c860b7aa792b547d54b38618688ad4ed215bb0854a7116534b21c14acef8fed6f4692c166fcb094dc5b512cef1bdfac2e2a00828c4c
+  data.tar.gz: 67cc4bab0f137f8dc6d99be1dedafbbd58fba91e8e64171ec09a0fe3caf341e287a6f95e0ef9339a81acca8188c44718123a5979c39c1e0a32caa664eb450162

data/.rspec

@@ -0,0 +1 @@
+--color

data/lib/metanol/engine_controller.rb

@@ -6,75 +6,84 @@ module Metanol
   module EngineController
     extend ActiveSupport::Concern
 
+    included do
+      before_filter :clear_metanols
+    end
+
     module ClassMethods
-      def metanol_options
-        @@metanol_options ||= {}
+      def common_metanols
+        @@common_metanols ||= {}
       end
 
       SUPPORT_GROUPS.keys.each do |method|
         method_name = "#{method == :main ? '' : "#{method}_"}meta"
         define_method method_name do |*args|
-          add_meta_tag(method, *args)
+          add_meta_tag(common_metanols, method, *args)
         end
 
         get_method_name = "get_#{method_name}"
         define_method get_method_name do |name|
-          get_meta_by_type(method, name)
+          get_meta_tag(common_metanols, method, name)
         end
       end
 
       private
 
-      def add_meta_tag(type, *args)
+      def add_meta_tag(repo, type, *args)
         if args[0].is_a? Hash
           filters = args[1..-1]
           args[0].each do |name, value|
-            add_meta_by_type type, name, value, filters
+            add_meta_by_type repo, type, name, value, filters
           end
         else
           name = args[0].to_sym
           value = args[1]
           filters = args[2..-1]
-          add_meta_by_type type, name, value, filters
+          add_meta_by_type repo, type, name, value, filters
         end
       end
 
-      def add_meta_by_type(type, name, value, filters=[])
+      def add_meta_by_type(repo, type, name, value, filters=[])
         meta_class = SUPPORT_GROUPS[type]
         key = get_meta_key(type, name)
-        if metanol_options.key? key
-          metanol_options[key].value = value
-          metanol_options[key].filters = filters
-        else
-          metanol_options[key] = meta_class.new(name, value, filters)
+        unless repo.key? key
+          repo[key] = meta_class.new(name, value, filters)
+          return
         end
+        repo[key].value = value
+        repo[key].filters = filters
       end
 
-      def get_meta_by_type(type, name)
+      def get_meta_tag(repo, type, name)
         key = get_meta_key(type, name)
-        metanol_options.key?(key) ? metanol_options[key].value : nil
+        repo.key?(key) ? repo[key].value : nil
       end
 
       def get_meta_key(type, name)
         "#{type}:#{name}"
       end
-
     end
 
     SUPPORT_GROUPS.keys.each do |method|
       method_name = "#{method == :main ? '' : "#{method}_"}meta"
       define_method method_name do |*args|
-        self.class.send(method_name, *args)
+        self.class.send 'add_meta_tag', action_metanols, method, *args
       end
 
       get_method_name = "get_#{method_name}"
       define_method get_method_name do |name|
-        self.class.send(get_method_name, name)
+        self.class.send 'get_meta_tag', action_metanols, method, name
       end
     end
 
-    def metanol_options
-      self.class.metanol_options
+    def action_metanols
+      @action_metanols ||= {}
+    end
+
+    private
+
+    def clear_metanols
+      @action_metanols = {}
     end
 
   end

data/lib/metanol/helpers.rb

@@ -39,8 +39,9 @@ module Metanol
     private
 
     def metanol_render_tags(type)
-      result = ""
-      self.controller.metanol_options.each_value do |value|
+      result = ''
+      metanols = self.controller.class.common_metanols.merge(self.controller.action_metanols)
+      metanols.each_value do |value|
         next unless value.is_a? type
         result << value.render
       end

data/lib/metanol/version.rb

@@ -1,3 +1,3 @@
 module Metanol
-  VERSION = '0.0.6'
+  VERSION = '0.0.8'
 end

data/spec/controllers/home_controller_spec.rb

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
 describe HomeController do
-  context "render meta tags with some global ones" do
+  context 'render meta tags with some global ones' do
 
-    context "all meta tags" do
+    context 'all meta tags' do
       before { get :index }
 
       it { response.should have_selector("meta[content=\"#{url_for(controller: :home, action: :index, host: 'test.host')}\"]", property: 'og:url') }
@@ -15,6 +15,7 @@ describe HomeController do
       it { response.should have_selector('meta[content="alexa code"]', name: 'alexaVerifyID') }
       it { response.should have_selector('meta[content="google code"]', name: 'google-site-verification') }
       it { response.should have_selector('meta[content="yandex code"]', name: 'yandex-verification') }
+      it { response.body.should =~ /<title>Index Page<\/title>/ }
     end
 
     context "only WebMaster's meta tags" do
@@ -28,5 +29,11 @@ describe HomeController do
       it { response.should have_selector('meta[content="yandex code"]', name: 'yandex-verification') }
     end
 
+    context 'correct title tag' do
+      before { get :index }
+      before { get :get_title }
+      it { response.body.should_not =~ /<title>Index Page<\/title>/ }
+    end
+
   end
 end

data/spec/support/application.rb

@@ -6,8 +6,8 @@ ActiveRecord::Base.configurations = {'test' => {:adapter => 'sqlite3', :database
 ActiveRecord::Base.establish_connection('test')
 
 app = Class.new(Rails::Application)
-app.config.secret_token = "f974ebb750a8e200c85f7a749d589fa2"
-app.config.session_store :cookie_store, :key => "_myapp_session"
+app.config.secret_token = 'f974ebb750a8e200c85f7a749d589fa2'
+app.config.session_store :cookie_store, :key => '_myapp_session'
 app.config.active_support.deprecation = :log
 app.config.eager_load = false
 app.config.root = File.dirname(__FILE__)
@@ -16,7 +16,11 @@ app.initialize!
 
 app.routes.draw do
   resources :tests
-  resources :home
+  resources :home do
+    collection do
+      get :get_title
+    end
+  end
 end
 
 class ApplicationController < ActionController::Base; end
@@ -38,11 +42,18 @@ class HomeController < ParentController
   end
 
   def index
-    og_meta title: "OpenGraph Title", description: "OpenGraph Description"
+    meta :title, 'Index Page'
+    og_meta title: 'OpenGraph Title', description: 'OpenGraph Description'
     render :inline => <<-ERB
       <%= metanol_tags %>
     ERB
   end
+
+  def get_title
+    render :inline => <<-ERB
+      <%= metanol_main_tags %>
+    ERB
+  end
 end
 
 Object.const_set(:ApplicationHelper, Module.new)

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: metanol
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.8
 platform: ruby
 authors:
 - Eugene Kondratyuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-10 00:00:00.000000000 Z
+date: 2014-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.2'
 description: This is a meta tags plugin which helps to manage meta tags in your Rails
@@ -35,6 +35,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -66,17 +67,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: metanol
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A <META> tags engine plugin for Rails 3.2+ applications