expire_me 0.0.1 → 0.0.2

data/expire_me.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   # general infos
   s.name        = "expire_me"
-  s.version     = "0.0.1"
+  s.version     = "0.0.2"
   s.description = "control varnish expiration"
   s.homepage    = "http://github.com/colinyoung/expire_me"
   s.summary     = s.description

data/lib/expire_me/adapter.rb

@@ -18,12 +18,15 @@ end
 
 class Regexp
   def unregex
-    puts "unr: #{self.to_s}"
-    s = self.to_s.gsub('?i-mx:', ''). # Remove initial ruby stuff
+    self.to_s.gsub('?i-mx:', ''). # Remove initial ruby stuff
       gsub(/(\=\)|)\(\[0-9\]\+\)/, '='). # Empties the value subgroup, heavily escaped because we're operating on a regex
       gsub(/[^\d\w\-\=]/, '') # Replaces all nondigits and words
-    puts s
-    s
+  end
+end
+
+class String
+  def interpolate(regex, add)
+    self.sub(self[regex], self[regex, 1] << add.to_s)
   end
 end
 

data/lib/expire_me/adapters/varnish.rb

@@ -8,7 +8,6 @@ module ExpireMe
     def set_expiration(response, seconds)
       super
       
-      puts "Caching page for seconds: #{seconds}"
       replace_caching_header :age => seconds
     end
     
@@ -20,12 +19,12 @@ module ExpireMe
       return if value.nil? or needle.nil?
       
       if header =~ needle
-        self.header.interpolate! needle, value
+        self.header = header.interpolate(needle, value)
       else
         if header.empty?
           self.header = needle.unregex << value.to_s
         else
-          self.header = self.header << header[needle, 1] << value.to_s
+          self.header = header << ", " << needle.unregex << value.to_s
         end
       end
     end

data/lib/expire_me/version.rb

@@ -8,7 +8,7 @@ module ExpireMe
 
     MAJOR     = 0
     MINOR     = 0
-    TINY      = 1
+    TINY      = 2
     SIGNATURE = [MAJOR, MINOR, TINY]
     STRING    = SIGNATURE.join '.'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: expire_me
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70338508618260 !ruby/object:Gem::Requirement
+  requirement: &70358930043400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -25,10 +25,10 @@ dependencies:
         version: '4'
   type: :runtime
   prerelease: false
-  version_requirements: *70338508618260
+  version_requirements: *70358930043400
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70338508617140 !ruby/object:Gem::Requirement
+  requirement: &70358930042320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -36,7 +36,7 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70338508617140
+  version_requirements: *70358930042320
 description: control varnish expiration
 email:
 - me@colinyoung.com