expire_me 0.0.3 → 0.0.4

data/expire_me.gemspec

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

data/lib/expire_me/expire.rb

@@ -8,10 +8,14 @@ module ExpireMe
       
       seconds = 0 # Reset for each request.
       
-      if options.empty?
-        self.send :in, descriptor
+      if descriptor.is_a? Array
+        descriptor = descriptor.first # Ruby 1.9.x makes this an array. I do not know why.
+      end
+      
+      if !descriptor.is_a? Hash
+        self.send :in, safe_value(descriptor)
       else
-        self.send descriptor, options        
+        self.send descriptor.keys.first, descriptor.values.first
       end
     end
     
@@ -22,6 +26,20 @@ module ExpireMe
         :adapter => adapter
       })
     end
+    
+    protected
+    
+    def safe_value(v)
+      if v.is_a? Array
+        begin
+          v = v.first.to_i
+        rescue Exception => e
+          throw "[ExpireMe] You must submit your expiration time in seconds or ruby date."
+        end
+      end
+      
+      v
+    end
   
     private
     

data/lib/expire_me/version.rb

@@ -8,7 +8,7 @@ module ExpireMe
 
     MAJOR     = 0
     MINOR     = 0
-    TINY      = 3
+    TINY      = 4
     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.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70132556005580 !ruby/object:Gem::Requirement
+  requirement: &70140117428580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -25,10 +25,10 @@ dependencies:
         version: '4'
   type: :runtime
   prerelease: false
-  version_requirements: *70132556005580
+  version_requirements: *70140117428580
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70132556004180 !ruby/object:Gem::Requirement
+  requirement: &70140117427160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -36,7 +36,7 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70132556004180
+  version_requirements: *70140117427160
 description: control varnish expiration
 email:
 - me@colinyoung.com