sinatra-cigars 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71640998c57a08a4e6c54a9e4032c8dc6e62103e
-  data.tar.gz: b3144c8b738791f72078ad47ab5dbc2cec62b887
+  metadata.gz: 622d3c7880e461be93cca291589cd92da1563ee3
+  data.tar.gz: ca6be4dbc46e8dfea1184435a02e01f819fd1599
 SHA512:
-  metadata.gz: ec46011292f1bc4c02917ee9c343d744de91211aa8d73050e8afa102ba6e24f19bb5e3d291c684229be828cbc1c73661a564e088ac651d1cd45d42cbc29297ac
-  data.tar.gz: ac172e41b8fb44b6eaf62682cf35a07f512de7b988f081ffbbf97956d48062a7a7988fbbb37405bbe4092c4ef72fc26e5e430f47ef95518f4c926b0e2fdb608f
+  metadata.gz: b3039fb0c4366a606763c728a3acf7ff02c38ba892bfa38ba9f1edeea8226ccd1f055a0f3dc40beceac7c829029353c94019ac1a429894664baa0698eb017104
+  data.tar.gz: 278d533a046092dcd77c140f3453b834a2c26afa7a3db7794a39863b3d6eb4804a9a1691e739dfaa1c314faf95482f1feb50681ff1133a0257ba7ef817d1f347

data/Changelog.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.0.13 - 2014-08-03
+
+  * Added `favicon` to helpers
+  * Change Sinatra::Cigars to class
+
 ## 0.0.12 - 2014-05-05
 
   * Change `title` returns always "title" in home

data/Gemfile

@@ -5,5 +5,5 @@ gemspec
 group :test do
   gem 'capybara'
   gem 'rake'
-  gem 'rspec'
+  gem 'rspec', '~> 2'
 end

data/examples/classic.rb

@@ -0,0 +1,8 @@
+$:.unshift 'lib'
+
+require 'sinatra'
+require 'sinatra/cigars'
+
+get '/' do
+  haml "= home? ? 'Hooray!' : 'Oops.'"
+end

data/examples/modular.rb

@@ -0,0 +1,9 @@
+$:.unshift 'lib'
+
+require 'sinatra/cigars'
+
+class App < Sinatra::Cigars
+  get '/' do
+    haml "= home? ? 'Hooray!' : 'Oops.'"
+  end
+end

data/lib/sinatra/cigars/helpers.rb

@@ -1,7 +1,8 @@
 require 'sinatra/base'
+require 'haml'
 
 module Sinatra
-  module Cigars
+  class Cigars < Base
     module Helpers
       def development?
         ENV['RACK_ENV'] == 'development'
@@ -35,6 +36,10 @@ module Sinatra
         render_haml "%script{src: '#{render_tag(src, '.js')}'}"
       end
 
+      def favicon src = nil
+        render_haml "%link{rel: 'shortcut icon', href: '#{render_tag((src ? src : '/favicon'), (src ? '.png' : '.ico'))}'}"
+      end
+
       def title str, prefix = "", suffix = false
         home? ? render_haml("%title= '#{str}'") : render_haml("%title= '#{suffix ? str + prefix : prefix + str}'")
       end
@@ -75,6 +80,8 @@ module Sinatra
         end
       end
     end
+
+    helpers Helpers
   end
 
   helpers Cigars::Helpers

data/lib/sinatra/cigars/version.rb

@@ -1,5 +1,5 @@
 module Sinatra
-  module Cigars
-    VERSION = '0.0.12'
+  class Cigars
+    VERSION = '0.0.13'
   end
 end

data/spec/cigars_spec.rb

@@ -9,7 +9,7 @@ describe Sinatra::Cigars do
 
   context 'Helpers' do
     it 'included automatically' do
-      defined?(Sinatra::Cigars::Helpers).should be_true
+      defined?(Sinatra::Cigars::Helpers).should be_truthy
     end
   end
 end

data/spec/helpers_spec.rb

@@ -8,8 +8,6 @@ describe Sinatra::Cigars::Helpers, type: :feature do
       ENV['RACK_ENV'] = 'development'
 
       mock_app do
-        helpers Sinatra::Cigars::Helpers
-
         get('/development') { development?.to_s }
         get('/test')        { test?.to_s        }
         get('/staging')     { staging?.to_s     }
@@ -230,6 +228,43 @@ describe Sinatra::Cigars::Helpers, type: :feature do
     end
   end
 
+  describe 'favicon' do
+    before do
+      @rev = `git rev-parse --short HEAD`.chomp
+
+      mock_app do
+        helpers Sinatra::Cigars::Helpers
+
+        get('/')     { haml '= favicon' }
+        get('/path') { haml '= favicon :path' }
+      end
+    end
+
+    it do
+      ENV['RACK_ENV'] = 'test'
+      visit '/'
+      body.should == "<link href='/favicon.ico' rel='shortcut icon'>\n"
+    end
+
+    it do
+      ENV['RACK_ENV'] = 'production'
+      visit '/'
+      body.should == "<link href='/favicon.ico?#{@rev}' rel='shortcut icon'>\n"
+    end
+
+    it do
+      ENV['RACK_ENV'] = 'test'
+      visit '/path'
+      body.should == "<link href='/path.png' rel='shortcut icon'>\n"
+    end
+
+    it do
+      ENV['RACK_ENV'] = 'production'
+      visit '/path'
+      body.should == "<link href='/path.png?#{@rev}' rel='shortcut icon'>\n"
+    end
+  end
+
   describe 'livereload' do
     before do
       mock_app do

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-cigars
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Seiichi Yonezawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-05 00:00:00.000000000 Z
+date: 2014-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
 description: ''
@@ -44,13 +44,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".editorconfig"
-- ".gitignore"
-- ".rspec"
+- .editorconfig
+- .gitignore
+- .rspec
 - Changelog.md
 - Gemfile
 - Rakefile
 - Readme.md
+- examples/classic.rb
+- examples/modular.rb
 - lib/sinatra/cigars.rb
 - lib/sinatra/cigars/helpers.rb
 - lib/sinatra/cigars/version.rb
@@ -67,17 +69,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: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: ''