amee 4.3.0 → 4.3.1

data/CHANGELOG.txt

@@ -1,5 +1,11 @@
 = Changelog
 
+== 4.3.1
+* Bugfix to make caching Rails 3 compatible
+
+== 4.3.0
+* Numerous fixes for compatibility with Ruby 1.9.2 and Rails 3.1
+
 == 4.2.0 (also 3.2.0/3.2.1 for Rails 2)
 * Add algorithm details to ItemDefinitions
 * Bugfix when using AMEE::Rails.connection from locations other than Rails.root

data/VERSION

@@ -1 +1 @@
-4.3.0
+4.3.1

data/amee.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "amee"
-  s.version = "4.3.0"
+  s.version = "4.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James Smith", "James Hetherington", "Andrew Hill", "Andrew Berkeley"]
-  s.date = "2011-12-23"
+  s.date = "2012-01-04"
   s.email = "james@floppy.org.uk"
   s.executables = ["ameesh"]
   s.extra_rdoc_files = [

data/lib/amee/connection.rb

@@ -298,9 +298,8 @@ module AMEE
     def cache_key(path)
       # We have to make sure cache keys don't get too long for the filesystem,
       # so we cut them off if they're too long and add a digest for uniqueness.
-      newpath = path.gsub(/[^0-9a-z\/]/i, '')
-      newpath = (newpath.length < 255) ? newpath : newpath.first(192)+Digest::MD5.hexdigest(newpath)
-      (@server+newpath)
+      newpath = @server + path.gsub(/[^0-9a-z\/]/i, '').gsub(/\//i, '_')
+      newpath = (newpath.length < 255) ? newpath : newpath.first(218)+Digest::MD5.hexdigest(newpath)
     end
 
     public

data/spec/cache_spec.rb

@@ -76,10 +76,25 @@ describe AMEE::Connection do
       i = c.item :label => 'biodiesel'
     end
     
-    it "removes special characters from cache keys" do
+    it "removes special characters from cache keys, include slashes" do
       setup_connection
-      @connection.send(:cache_key, "/%cache/$4/%20test").should eql 'server.example.com/cache/4/20test'
+      @connection.send(:cache_key, "/%cache/$4/%20test").should eql 'server.example.com_cache_4_20test'
     end
+    
+    it "trims cache keys to correct length for filenames, allowing for lock extension" do
+      setup_connection
+      step = '/123456789'
+      test_str = step
+      # test lots of string lengths
+      while (test_str.length < 300)
+        key = @connection.send(:cache_key, test_str)
+        key.starts_with?(@connection.server).should be_true
+        key.length.should <= 250
+        # next
+        test_str += step
+      end
+    end
+
 
     describe 'and automatic invalidation' do
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: amee
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 49
   prerelease: 
   segments: 
   - 4
   - 3
-  - 0
-  version: 4.3.0
+  - 1
+  version: 4.3.1
 platform: ruby
 authors: 
 - James Smith
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-23 00:00:00 Z
+date: 2012-01-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement