sinatra-cigars 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03d11be340dfdfbe9429027eea09427b33711f01
-  data.tar.gz: 021164f4f2572bfe50b5166ac75a1f907e45701d
+  metadata.gz: 71640998c57a08a4e6c54a9e4032c8dc6e62103e
+  data.tar.gz: b3144c8b738791f72078ad47ab5dbc2cec62b887
 SHA512:
-  metadata.gz: 41e957e136f11cb0728cc34952721402623beac66471f3eb192b31222b2f4d6b006fd65e40f8c79f870b8f49c064aad91d3f4ba1ce0dc8909a24477fc2e6aaec
-  data.tar.gz: ddb0eb003efbf93085b9ad522f5da784c92f77b17f4c7f29415e891fecec0077ff31f839bf555fee920e917b3c68300064c47d2e42e3d2f0093fdd1c37caa468
+  metadata.gz: ec46011292f1bc4c02917ee9c343d744de91211aa8d73050e8afa102ba6e24f19bb5e3d291c684229be828cbc1c73661a564e088ac651d1cd45d42cbc29297ac
+  data.tar.gz: ac172e41b8fb44b6eaf62682cf35a07f512de7b988f081ffbbf97956d48062a7a7988fbbb37405bbe4092c4ef72fc26e5e430f47ef95518f4c926b0e2fdb608f

data/Changelog.md

@@ -1,6 +1,10 @@
 # Changelog
 
-## 0.0.11 - 2014-05-03
+## 0.0.12 - 2014-05-05
+
+  * Change `title` returns always "title" in home
+
+## 0.0.11 - 2014-05-04
 
   * Added helpers (`home?`, `meta`, `title`)
   * Added haml to dependencies

data/lib/sinatra/cigars/helpers.rb

@@ -28,15 +28,15 @@ module Sinatra
       end
 
       def css href = '/style'
-        render_haml "%link{rel: 'stylesheet', href: '#{href}.css'}"
+        render_haml "%link{rel: 'stylesheet', href: '#{render_tag(href, '.css')}'}"
       end
 
       def js src
-        render_haml "%script{src: '#{src}.js'}"
+        render_haml "%script{src: '#{render_tag(src, '.js')}'}"
       end
 
       def title str, prefix = "", suffix = false
-        render_haml "%title= '#{suffix ? str + prefix : prefix + str}'"
+        home? ? render_haml("%title= '#{str}'") : render_haml("%title= '#{suffix ? str + prefix : prefix + str}'")
       end
 
       def livereload
@@ -56,6 +56,12 @@ module Sinatra
         Haml::Engine.new(code).render
       end
 
+      def render_tag code, ext
+        code = "/#{code}" unless code.is_a? String
+        code = code + ext unless code.end_with? ext
+        production? ? code + '?' + `git rev-parse --short HEAD`.chomp : code
+      end
+
       def meta_hash hash
         a = hash.first
         render_haml "%meta{name: '#{a.first}', content: '#{a.last}'}"

data/lib/sinatra/cigars/version.rb

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

data/spec/helpers_spec.rb

@@ -145,28 +145,71 @@ describe Sinatra::Cigars::Helpers, type: :feature do
 
   describe 'css' do
     before do
+      @rev = `git rev-parse --short HEAD`.chomp
+
       mock_app do
         helpers Sinatra::Cigars::Helpers
 
-        get('/') { haml '= css' }
-
-        get('/custom') { haml '= css :custom' }
+        get('/')       { haml '= css' }
+        get('/symbol') { haml '= css :symbol' }
+        get('/string') { haml '= css "string"' }
+        get('/ext')    { haml '= css "/ext.css"' }
       end
     end
 
     it do
+      ENV['RACK_ENV'] = 'test'
       visit '/'
       body.should == "<link href='/style.css' rel='stylesheet'>\n"
     end
 
     it do
-      visit '/custom'
-      body.should == "<link href='custom.css' rel='stylesheet'>\n"
+      ENV['RACK_ENV'] = 'production'
+      visit '/'
+      body.should == "<link href='/style.css?#{@rev}' rel='stylesheet'>\n"
+    end
+
+    it do
+      ENV['RACK_ENV'] = 'test'
+      visit '/symbol'
+      body.should == "<link href='/symbol.css' rel='stylesheet'>\n"
+    end
+
+    it do
+      ENV['RACK_ENV'] = 'production'
+      visit '/symbol'
+      body.should == "<link href='/symbol.css?#{@rev}' rel='stylesheet'>\n"
+    end
+
+    it do
+      ENV['RACK_ENV'] = 'test'
+      visit '/string'
+      body.should == "<link href='string.css' rel='stylesheet'>\n"
+    end
+
+    it do
+      ENV['RACK_ENV'] = 'production'
+      visit '/string'
+      body.should == "<link href='string.css?#{@rev}' rel='stylesheet'>\n"
+    end
+
+    it do
+      ENV['RACK_ENV'] = 'test'
+      visit '/ext'
+      body.should == "<link href='/ext.css' rel='stylesheet'>\n"
+    end
+
+    it do
+      ENV['RACK_ENV'] = 'production'
+      visit '/ext'
+      body.should == "<link href='/ext.css?#{@rev}' rel='stylesheet'>\n"
     end
   end
 
   describe 'js' do
     before do
+      @rev = `git rev-parse --short HEAD`.chomp
+
       mock_app do
         helpers Sinatra::Cigars::Helpers
 
@@ -175,9 +218,16 @@ describe Sinatra::Cigars::Helpers, type: :feature do
     end
 
     it do
+      ENV['RACK_ENV'] = 'test'
       visit '/'
       body.should == "<script src='/script.js'></script>\n"
     end
+
+    it do
+      ENV['RACK_ENV'] = 'production'
+      visit '/'
+      body.should == "<script src='/script.js?#{@rev}'></script>\n"
+    end
   end
 
   describe 'livereload' do
@@ -304,25 +354,29 @@ describe Sinatra::Cigars::Helpers, type: :feature do
       mock_app do
         helpers Sinatra::Cigars::Helpers
 
-        get('/')       { haml '= title "title"' }
-        get('/prefix') { haml '= title "title", "prefix - "' }
-        get('/suffix') { haml '= title "title", " - suffix", true' }
+        helpers do
+          def haml_title
+            haml <<-EOF.gsub /^ {12}/, ''
+            = title 'title'
+            = title 'title', 'prefix - '
+            = title 'title', ' - suffix', true
+            EOF
+          end
+        end
+
+        get('/')     { haml_title }
+        get('/page') { haml_title }
       end
     end
 
-    it do
+    it 'returns always "title" at home' do
       visit '/'
-      body.should == "<title>title</title>\n"
-    end
-
-    it do
-      visit '/prefix'
-      body.should == "<title>prefix - title</title>\n"
+      body.should == "<title>title</title>\n<title>title</title>\n<title>title</title>\n"
     end
 
     it do
-      visit '/suffix'
-      body.should == "<title>title - suffix</title>\n"
+      visit '/page'
+      body.should == "<title>title</title>\n<title>prefix - title</title>\n<title>title - suffix</title>\n"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-cigars
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Seiichi Yonezawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-04 00:00:00.000000000 Z
+date: 2014-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra