tuning 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2905dec322526dd21c3aeb41a722d1590fb9c4ba
-  data.tar.gz: 04a821c58f34e36bb6dc3180c12310dff1b56c21
+  metadata.gz: 571eaac46fc919759e989e83b338d22237a18617
+  data.tar.gz: 229680a76b0acfb87afe35186a8b95eea44c286a
 SHA512:
-  metadata.gz: f5b555d8d40cf9b7e4806a6edf7e7d6e843d6d3e9cee8ee77c5e7b77db9a1e2b85ba377e3204bcffc79daf32631dcf11355f1435f3614d195e2a34440ff594d1
-  data.tar.gz: 39c78175744b75a3fb1700a5afb6ee63b6cedc0db9d4c1db13ada1cce970d71462a4d07f6d55265f719e149ce5a670c5a55b0c5288c6cc44c59fe2930f96c4a0
+  metadata.gz: 49039f3ab79c99fd630ad71bc116883eee558ee53c260230df92b0a4da7f8319bf3fb84175f676c50240edf7cfad9c8529480b7eefd9c7f68029b7519b1d08af
+  data.tar.gz: 26ff64770ec7e75bfc14bda0bb004c1f4761e9c6e9bc602d223866dca64ad3ebf77024d00442fccaefa295138b81bd2c6d097807da3cf798db262759d7a55cd5

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2013 Mattways
+Copyright 2013 Museways
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -1,4 +1,4 @@
-{<img src="https://codeclimate.com/github/mattways/tuning.png" />}[https://codeclimate.com/github/mattways/tuning] {<img src="https://travis-ci.org/mattways/tuning.png?branch=master" alt="Build Status" />}[https://travis-ci.org/mattways/tuning] {<img src="https://gemnasium.com/mattways/tuning.png" alt="Dependency Status" />}[https://gemnasium.com/mattways/tuning]
+{<img src="https://badge.fury.io/rb/tuning.png" alt="Gem Version" />}[http://badge.fury.io/rb/tuning] {<img src="https://codeclimate.com/github/museways/tuning.png" />}[https://codeclimate.com/github/museways/tuning] {<img src="https://travis-ci.org/museways/tuning.png?branch=master" alt="Build Status" />}[https://travis-ci.org/museways/tuning] {<img src="https://gemnasium.com/museways/tuning.png" alt="Dependency Status" />}[https://gemnasium.com/museways/tuning]
 
 = Tuning
 

data/lib/tuning/action_controller/base.rb

@@ -8,10 +8,12 @@ module Tuning
       end
 
       protected
-      
-      def error(exception)
-        logger.error exception.message
-        exception.backtrace.each { |line| logger.error line }
+ 
+      def error(exception=nil)
+        if exception
+          logger.error exception.message
+          exception.backtrace.each { |line| logger.error line }
+        end
         respond_to do |format|
           format.json { head 500 }
           format.any { render file: Rails.root.join('public', '500.html'), status: 500, layout: false }
@@ -24,14 +26,14 @@ module Tuning
           format.any { render file: Rails.root.join('public', '404.html'), status: 404, layout: false }
         end
       end  
-      
+ 
       def unauthorized
         respond_to do |format|
           format.json { head 401 }
           format.any { render file: Rails.root.join('public', '422.html'), status: 401, layout: false }
         end
       end
-      
+ 
       def forbidden
         respond_to do |format|
           format.json { head 403 }

data/lib/tuning/action_view/base.rb

@@ -13,15 +13,15 @@ module Tuning
         @meta_keywords = t('.meta.keywords', options)
         @meta_description = t('.meta.description', options)
       end
-
-      def content_tag_if(condition, name, options=nil, &block)
-        condition ? content_tag(name, options, &block) : capture(&block)
-      end
-
+ 
       def active_trail?(path)
         (path == '/' && request.path == path) or request.path.start_with?(path)
       end
 
+      def content_tag_if(condition, name, options={}, &block)
+        condition ? content_tag(name, options, &block) : capture(&block)
+      end
+
       def submit_tag_with_button(value='Send', options={})
         button_tag({ type: 'submit', name: 'commit' }.update(options)) { content_tag(:span, value) }
       end

data/lib/tuning/version.rb

@@ -1,5 +1,5 @@
 module Tuning
 
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 
 end

data/test/active_trail_test.rb

@@ -0,0 +1,33 @@
+require 'test_helper'
+
+class ActiveTrailTest < ActionView::TestCase
+
+  test "should return true if path is in active trail" do
+    set_path '/some-path/other-path'
+    assert active_trail?('/')
+    assert active_trail?('/some-path')
+  end
+
+  test "should return true if path is the same as active trail" do
+    set_path '/'
+    assert active_trail?('/')
+
+    set_path '/some-path'
+    assert active_trail?('/some-path')
+  end
+
+  test "should return false if path is not in active trail" do
+    set_path '/'
+    assert !active_trail?('/some-path')
+
+    set_path '/some-path'
+    assert !active_trail?('/other-path')
+  end
+
+  private
+
+  def set_path(path)
+    self.request = OpenStruct.new(path: path)
+  end
+
+end

data/test/button_test.rb

@@ -0,0 +1,17 @@
+require 'test_helper'
+
+class ButtonTest < ActionView::TestCase
+ 
+  test "should use button with span inside instead of input" do
+    assert_equal '<button name="commit" type="submit"><span>Send</span></button>', submit_tag
+  end
+
+  test "should use the value as label" do
+    assert_equal '<button name="commit" type="submit"><span>Other</span></button>', submit_tag('Other')
+  end
+
+  test "should accept options as attributes" do
+    assert_equal '<button attribute="value" name="commit" type="submit"><span>Send</span></button>', submit_tag('Send', attribute: 'value')
+  end
+
+end

data/test/content_tag_if_test.rb

@@ -0,0 +1,17 @@
+require 'test_helper'
+
+class ContentTagIfTest < ActionView::TestCase
+
+  test "should show tag if condition is true" do
+    assert_equal '<a>content</a>', content_tag_if(1 == 1, 'a') { 'content' }
+  end
+
+  test "should not show tag if condition if false" do
+    assert_equal 'content', content_tag_if(1 == 2, 'a') { 'content' }
+  end
+
+  test "should accept options as attributes" do
+    assert_equal '<a href="#">content</a>', content_tag_if(1 == 1, 'a', href: '#') { 'content' }
+  end
+
+end

data/test/dummy/app/controllers/status_controller.rb

@@ -0,0 +1,27 @@
+class StatusController < ApplicationController
+
+  def exception_action
+    raise 'error'
+  end
+
+  def error_action
+    error
+  end
+
+  def not_found_action
+    not_found
+  end
+
+  def unauthorized_action
+    unauthorized
+  end
+
+  def forbidden_action
+    forbidden
+  end
+
+  def unprocessable_entity_action
+    unprocessable_entity
+  end
+
+end

data/test/dummy/app/views/layouts/application.html.erb

@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <html>
-<head>
-  <title>Dummy</title>
-  <%= stylesheet_link_tag    "application", media: "all", "data-turbolinks-track" => true %>
-  <%= javascript_include_tag "application", "data-turbolinks-track" => true %>
-  <%= csrf_meta_tags %>
-</head>
-<body>
-
-<%= yield %>
-
-</body>
+  <head>
+    <title><%= @meta_title %></title>
+    <meta name="description" content="<%= @meta_description %>" />
+    <meta name="keywords" content="<%= @meta_keywords %>" />
+    <%= csrf_meta_tags %>
+    <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %>
+    <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
+  </head>
+  <body>
+    <%= yield %>
+  </body>
 </html>

data/test/dummy/app/views/pages/index.html.erb

@@ -0,0 +1 @@
+<% set_meta %>

data/test/dummy/app/views/pages/other.html.erb

@@ -0,0 +1 @@
+<% set_meta name: 'other' %>

data/test/dummy/config/application.rb

@@ -3,7 +3,7 @@ require File.expand_path('../boot', __FILE__)
 require 'rails/all'
 
 Bundler.require(*Rails.groups)
-require "tuning"
+require 'tuning'
 
 module Dummy
   class Application < Rails::Application

data/test/dummy/config/initializers/secret_token.rb

@@ -9,4 +9,5 @@
 
 # Make sure your secret_key_base is kept private
 # if you're sharing your code publicly.
+Dummy::Application.config.secret_token = 'ebf2469bae653bb0ed9bc16c4485757036de73fd148942a3bf9940519149c443a572c3a9ab83386de40a0084743ab2db6a455f0218b553815c53ce04c697c300'
 Dummy::Application.config.secret_key_base = 'ebf2469bae653bb0ed9bc16c4485757036de73fd148942a3bf9940519149c443a572c3a9ab83386de40a0084743ab2db6a455f0218b553815c53ce04c697c300'

data/test/dummy/config/locales/en.yml

@@ -1,23 +1,12 @@
-# Files in the config/locales directory are used for internationalization
-# and are automatically loaded by Rails. If you want to use locales other
-# than English, add the necessary files in this directory.
-#
-# To use the locales, use `I18n.t`:
-#
-#     I18n.t 'hello'
-#
-# In views, this is aliased to just `t`:
-#
-#     <%= t('hello') %>
-#
-# To use a different locale, set it with `I18n.locale`:
-#
-#     I18n.locale = :es
-#
-# This would use the information in config/locales/es.yml.
-#
-# To learn more, please read the Rails Internationalization guide
-# available at http://guides.rubyonrails.org/i18n.html.
-
 en:
-  hello: "Hello world"
+  pages:
+    index:
+      meta:
+        title: 'index title'
+        description: 'index description'
+        keywords: 'index keywords'
+    other:
+      meta:
+        title: 'other %{name}'
+        description: 'other %{name}'
+        keywords: 'other %{name}'

data/test/dummy/config/routes.rb

@@ -1,56 +1,10 @@
 Dummy::Application.routes.draw do
-  # The priority is based upon order of creation: first created -> highest priority.
-  # See how all your routes lay out with "rake routes".
-
-  # You can have the root of your site routed with "root"
-  # root 'welcome#index'
-
-  # Example of regular route:
-  #   get 'products/:id' => 'catalog#view'
-
-  # Example of named route that can be invoked with purchase_url(id: product.id)
-  #   get 'products/:id/purchase' => 'catalog#purchase', as: :purchase
-
-  # Example resource route (maps HTTP verbs to controller actions automatically):
-  #   resources :products
-
-  # Example resource route with options:
-  #   resources :products do
-  #     member do
-  #       get 'short'
-  #       post 'toggle'
-  #     end
-  #
-  #     collection do
-  #       get 'sold'
-  #     end
-  #   end
-
-  # Example resource route with sub-resources:
-  #   resources :products do
-  #     resources :comments, :sales
-  #     resource :seller
-  #   end
-
-  # Example resource route with more complex sub-resources:
-  #   resources :products do
-  #     resources :comments
-  #     resources :sales do
-  #       get 'recent', on: :collection
-  #     end
-  #   end
   
-  # Example resource route with concerns:
-  #   concern :toggleable do
-  #     post 'toggle'
-  #   end
-  #   resources :posts, concerns: :toggleable
-  #   resources :photos, concerns: :toggleable
+  get 'exception' => 'status#exception_action'
+  get 'error' => 'status#error_action'
+  get 'not_found' => 'status#not_found_action'
+  get 'unauthorized' => 'status#unauthorized_action'
+  get 'forbidden' => 'status#forbidden_action'
+  get 'unprocessable_entity' => 'status#unprocessable_entity_action'
 
-  # Example resource route within a namespace:
-  #   namespace :admin do
-  #     # Directs /admin/products/* to Admin::ProductsController
-  #     # (app/controllers/admin/products_controller.rb)
-  #     resources :products
-  #   end
 end