mcnamara 0.0.4 → 0.1

data/Change.log

@@ -1,11 +0,0 @@
--- Nov. 25th, 2009
-
-* added some file name functionality to support a request:
-    "Would be nice to be able to name CSS files that cover multiple versions of a specific folder, e.g.:
-        style-msie-lte-6.css (less than or equal to IE 6.0)
-        style-msie-gt-6.css (greater than)
-        style-msie-7-to-8.css OR style-msie-8-to-7.css (reversed)"
-
--- Nov. 24th, 2009
-
-* coded initial version of McNamara

data/LICENSE

@@ -1,19 +0,0 @@
-Copyright (c) 2009 Kristan 'Krispy' Uccello <krispy@soldierofcode.com> - Soldier Of Code
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

data/README

@@ -2,18 +2,21 @@
 
 STILL A WORK IN PROGRESS
 
-After working on Spy vs Spy (http://github.com/kuccello/spy-vs-spy) I wanted to build a system that would allow me to serve up css specific to various browsers if I needed to. How many times have you fixed a css design in one browser only to have it break in another. Then you fix the other and it break the first one! McNamara attempts to solve this issue by allowing you to have css browser/platform overrides that will be served up in place of your default one.
+After working on Spy vs Spy (http://github.com/kuccello/spy-vs-spy) I wanted to build a system that would allow me to
+serve up css specific to various browsers if I needed to. How many times have you fixed a css design in one browser only
+to have it break in another. Then you fix the other and it break the first one! McNamara attempts to solve this issue
+by allowing you to have css browser/platform overrides that will be served up in place of your default one.
 
 Here's how it works:
 
-Say you have a web application that serves up css from the directory "/home/kuccello/myapp/public/css" and you have a css file called "style.css" in that directory. Now, you have a special case for Internet Explorer 6.0 and another case for Safari. What you would do is create another file in your css directory (can even be a sub directory deeply nested!) called "style-msie-6-0.css" and you put your full css into that (that is all the contents of style with the changes needed for internet explorer. As well you would create a file called "style-safari.css" where you would put all of the contents of "style.css" with the changes specific for Safari. Then you put the McNamara middleware upstream of what ever is serving your css and voila! when the browser is Safari the "style-safari.css" is served and when the browser is IE6.0 then the "style-msie-6-0.css" is served and all you need to reference in your html is "style.css"!!
-
-Now there is more, you can also use comment style overrides in your file names too.
-
->> style-msie-lte-6.css (less than or equal to IE 6.0)
->> style-msie-gt-6.css (greater than)
->> style-msie-7-to-8.css OR style-msie-8-to-7.css (reversed)
->> style-msie-6-to-8.css OR style-msie-8-to-6.css TWO VERSION DIFFERENCE
+Say you have a web application that serves up css from the directory "/home/kuccello/myapp/public/css" and you have a
+css file called "style.css" in that directory. Now, you have a special case for Internet Explorer 6.0 and another case
+for Safari. What you would do is create another file in your css directory (can even be a sub directory deeply nested!)
+called "style-msie-6-0.css" and you put your full css into that (that is all the contents of style with the changes needed
+for internet explorer. As well you would create a file called "style-safari.css" where you would put all of the contents
+of "style.css" with the changes specific for Safari. Then you put the McNamara middleware upstream of what ever is serving
+your css and voila! when the browser is Safari the "style-safari.css" is served and when the browser is IE6.0 then the
+"style-msie-6-0.css" is served and all you need to reference in your html is "style.css"!!
 
 = usage:
 
@@ -21,22 +24,17 @@ require 'mcnamara'
 
 use SOC::McNamara, "/usr/local/some_css_dir"
 
+
 All you need to do is have browser overrides for the css you want.
 stylename-<browser lowercase>-<version.major>-<version.minor>-<version.sub>.css
 stylename-<browser lowercase>-<version.major>-<version.minor>.css
-stylename-<browser lowercase>-<version.major>-to-<version.major-1>.css
-stylename-<browser lowercase>-<version.major>-to-<version.major-2>.css
-stylename-<browser lowercase>-<version.major-1>-to-<version.major>.css
-stylename-<browser lowercase>-<version.major-2>-to-<version.major>.css
-stylename-<browser lowercase>-lte-<version.major>.css
-stylename-<browser lowercase>-gte-<version.major>.css
-stylename-<browser lowercase>-gt-<version.major>.css
-stylename-<browser lowercase>-lt-<version.major>.css
 stylename-<browser lowercase>-<version.major>.css
+stylename-<platform lowercase spaces replaced with _>-<mobile>.css
+stylename-<platform lowercase spaces replaced with _>.css
 stylename-<browser lowercase>.css
 
 = notes:
 
-you can have spy-vs-spy upstream of this middleware but it is not a requirement - McNamara will create its own Spy vs Spy instance as needed and put it into the rack env
+you can have spy-vs-spy upstream of this middleware
 
 if you use this middleware then you don't need spy-vs-spy downstream

data/Rakefile

@@ -9,7 +9,7 @@ begin
     s.homepage = "http://github.com/kuccello/Mcnamara"
     s.authors = ['Kristan "Krispy" Uccello']
     s.files = FileList["[A-Z]*", "{lib,test}/**/*"]
-#    s.version = "0.3"
+    s.version = "0.1"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +0,0 @@
-0.0.4

data/lib/mcnamara.rb

@@ -41,80 +41,54 @@ module SoldierOfCode
       @css_dir = css_dir
     end
 
-    def build_possible_overrides(spy_vs_spy)
-
-      possible_overrides = []
-
-      possible_overrides << "-#{spy_vs_spy.browser}-#{spy_vs_spy.version.major}-#{spy_vs_spy.version.minor}-#{spy_vs_spy.version.sub}.css" if spy_vs_spy.version.major && spy_vs_spy.version.minor && spy_vs_spy.version.sub
-
-      possible_overrides << "-#{spy_vs_spy.browser}-#{spy_vs_spy.version.major}-#{spy_vs_spy.version.minor}.css" if spy_vs_spy.version.major && spy_vs_spy.version.minor
-
-      # trickier conditionals
-      possible_overrides << "-#{spy_vs_spy.browser}-#{spy_vs_spy.version.major}-to-#{spy_vs_spy.version.major.to_i-1}.css" if spy_vs_spy.version.major && (spy_vs_spy.version.major.to_i - 1 > 0)
-      possible_overrides << "-#{spy_vs_spy.browser}-#{spy_vs_spy.version.major.to_i-1}-to-#{spy_vs_spy.version.major}.css" if spy_vs_spy.version.major && (spy_vs_spy.version.major.to_i - 1 > 0)
-
-      possible_overrides << "-#{spy_vs_spy.browser}-#{spy_vs_spy.version.major}-to-#{spy_vs_spy.version.major.to_i-2}.css" if spy_vs_spy.version.major && (spy_vs_spy.version.major.to_i - 2 > 0)
-      possible_overrides << "-#{spy_vs_spy.browser}-#{spy_vs_spy.version.major.to_i-2}-to-#{spy_vs_spy.version.major}.css" if spy_vs_spy.version.major && (spy_vs_spy.version.major.to_i - 2 > 0)
-
-      # multi version coverage
-      possible_overrides << "-#{spy_vs_spy.browser}-gte-#{spy_vs_spy.version.major}.css" if spy_vs_spy.version.major
-      possible_overrides << "-#{spy_vs_spy.browser}-lte-#{spy_vs_spy.version.major}.css" if spy_vs_spy.version.major
-      possible_overrides << "-#{spy_vs_spy.browser}-gt-#{spy_vs_spy.version.major}.css" if spy_vs_spy.version.major
-      possible_overrides << "-#{spy_vs_spy.browser}-lt-#{spy_vs_spy.version.major}.css" if spy_vs_spy.version.major
-
-      possible_overrides << "-#{spy_vs_spy.browser}-#{spy_vs_spy.version.major}.css" if spy_vs_spy.version.major
-
-      possible_overrides << "-#{spy_vs_spy.browser}.css"
-
-      return possible_overrides
-
-    end
-
     def call(env)
 
       begin
+      # establish what browser we are dealing with
+      # hey! is spy-vs-spy upstream?
+      spy_vs_spy = env['soldierofcode.spy-vs-spy']
+      unless spy_vs_spy
+        http_user_agent = env['HTTP_USER_AGENT']
+        env['soldierofcode.spy-vs-spy'] = SpyVsSpy.new(http_user_agent)
+        spy_vs_spy = env['soldierofcode.spy-vs-spy']
+      end
 
-        # look for what css we are after
-        request_path = env['REQUEST_PATH']
-        if request_path =~ /\.css$/
-
-          # establish what browser we are dealing with
-          # hey! is spy-vs-spy upstream?
-          spy_vs_spy = env['soldierofcode.spy-vs-spy']
-          unless spy_vs_spy
-            http_user_agent = env['HTTP_USER_AGENT']
-            env['soldierofcode.spy-vs-spy'] = SpyVsSpy.new(http_user_agent)
-            spy_vs_spy = env['soldierofcode.spy-vs-spy']
-          end
+      # look for what css we are after
+      request_path = env['REQUEST_PATH']
+      if request_path =~ /\.css$/
 
-          # need a base directory to scann...
-          # TODO -- ripe for a cache
-          possible_overrides = build_possible_overrides(spy_vs_spy)
+        # need a base directory to scann...
+        # TODO -- ripe for a cache
+        possible_overrides = []
+        possible_overrides << "-#{spy_vs_spy.browser}-#{spy_vs_spy.version.major}-#{spy_vs_spy.version.minor}-#{spy_vs_spy.version.sub}.css" if spy_vs_spy.version.major && spy_vs_spy.version.minor && spy_vs_spy.version.sub
+        possible_overrides << "-#{spy_vs_spy.browser}-#{spy_vs_spy.version.major}-#{spy_vs_spy.version.minor}.css" if spy_vs_spy.version.major && spy_vs_spy.version.minor
+        possible_overrides << "-#{spy_vs_spy.browser}-#{spy_vs_spy.version.major}.css" if spy_vs_spy.version.major
+        
+        possible_overrides << "-#{spy_vs_spy.browser}.css"
 
-          Dir["#{@css_dir}/**/*.css"].each do |css_file|
-            possible_overrides.each do |override|
-              request_path_sub = request_path[1..-1].downcase.sub(/\.css/, override)
+        Dir["#{@css_dir}/**/*.css"].each do |css_file|
+          possible_overrides.each do |override|
+            request_path_sub = request_path[1..-1].downcase.sub(/\.css/, override)
 
-              file_of_intrest = request_path_sub.split("/").last
+            file_of_intrest = request_path_sub.split("/").last
 #            puts "#{__FILE__}:#{__LINE__} #{__method__} #{file_of_intrest.downcase} |||| #{css_file.downcase[1..-1]}"
 
-              if css_file[1..-1].downcase =~ Regexp.new("#{file_of_intrest.downcase}$")
+            if css_file[1..-1].downcase =~ Regexp.new("#{file_of_intrest.downcase}$")
 #              puts "#{__FILE__}:#{__LINE__} #{__method__} I'm IN!!"
-                # this is the file we want to serve
-                css = '/* Oh oo - I droped the bomb */'
-                File.open(css_file, "r") {|f| css = f.read} # file is closed when the block is done. TODO -- cache this
-                return [200, {"Content-Type"=>"text/css"}, css]
-              end
+              # this is the file we want to serve
+              css = 'Oh oo - I droped the bomb'
+              File.open(css_file, "r") {|f| css = f.read}
+              return [200,{"Content-Type"=>"text/css"},css]
             end
           end
-
         end
+      else
+        @app.call(env)
+      end
       rescue => e
         puts "#{__FILE__}:#{__LINE__} #{__method__} #{e} - #{e.backtrace}"
       end
 
-      @app.call(env)      
-
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mcnamara
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: "0.1"
 platform: ruby
 authors: 
 - Kristan "Krispy" Uccello
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-25 00:00:00 -05:00
+date: 2009-11-24 00:00:00 -05:00
 default_executable: 
 dependencies: []