redis_template_resolver 0.2.0 → 0.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b7e1d74c2a0de4bce0900b3e48ea86aea6ac0ca5
+  data.tar.gz: f3b0f2309e27627534fb4d6df1e28520276c2e95
+SHA512:
+  metadata.gz: 1a49d2eaa670d68a9f25d811de002bd4551cfa9fbfcfb5ac5417172983918c45884fe6d2696fba66bd6eb1ad2a71c100e670a821dc0df501a6c2ea400019cd55
+  data.tar.gz: 979f9d9c51be0c821558f8ae3b409687a227e375e368f7ada19639e2edb241a1e4106e4f0e03ef1863f8243c64573f2016edef9edf7ca40597808f585c906d72

data/CHANGELOG

@@ -1,3 +1,7 @@
+v0.3.0
+  - Replace HTTParty with Curb. Will require libcurl + header files to be 
+    installed
+
 v0.2.0
   - Ruby 2.0 compatibility
 

data/lib/redis_template_resolver.rb

@@ -148,18 +148,20 @@ class RedisTemplateResolver < ActionView::Resolver
 
     Rails.logger.info "Fetching remote template from #{layout_url.inspect}"
 
-    response = HTTParty.get( layout_url, :timeout => self.http_timeout )
-    response_body = response.body
+    response = Curl.get( layout_url ) do |curl| 
+                 curl.timeout = self.http_timeout
+               end
+    response_body = response.body_str
 
-    Rails.logger.info "Got remote template response code #{response.code} with body #{response_body.inspect}"
+    Rails.logger.info "Got remote template response code #{response.response_code} with body #{response_body.inspect}"
 
-    return nil if response.code == 404
+    return nil if response.response_code == 404
     
     response_body = postprocess_template( response_body ) if respond_to?( :postprocess_template, true )
 
     return response_body
     
-  rescue Timeout::Error, SocketError, Errno::ECONNREFUSED, TemplateRejectedError => e
+  rescue SocketError, Curl::Err::TimeoutError, Errno::ECONNREFUSED, TemplateRejectedError => e
     Rails.logger.error e.message
     return nil
   end

data/redis_template_resolver.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "redis_template_resolver"
-  s.version = "0.2.0"
+  s.version = "0.3.0"
   s.homepage = "https://github.com/psd/redis_template_resolver"
   s.summary = "A template resolver for rails that retrieves templates via http and caches them in redis"
 
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
 
   s.add_runtime_dependency( "redis", "> 3.0.0" )
-  s.add_runtime_dependency( "httparty", "> 0.8.0" )
+  s.add_runtime_dependency( "curb", "> 0.8.0" )
   s.add_runtime_dependency( "rails", "~> 3.2.6" )
   s.add_runtime_dependency( "activesupport", ">3.2.0" )
 

data/spec/lib/redis_template_resolver_spec.rb

@@ -12,11 +12,11 @@ describe ExampleClass do
   let( :dummy_remote_template_with_html_escaped_tags ) { "dummy template {{flash}} {{body}} {{head}} {{headline}} {{title}}" }
 
   let( :fake_httparty_response ) do
-    OpenStruct.new( :code => 200, :body => dummy_remote_template )
+    OpenStruct.new( :response_code => 200, :body_str => dummy_remote_template )
   end
 
   let( :fake_httparty_response_with_html_escaped_tags ) do
-    OpenStruct.new( :code => 200, :body => dummy_remote_template_with_html_escaped_tags )
+    OpenStruct.new( :response_code => 200, :body_str => dummy_remote_template_with_html_escaped_tags )
   end
 
   let( :redis_connector ) do
@@ -47,7 +47,7 @@ describe ExampleClass do
       end
 
       it 'should continue processing if the guard function returns true' do
-        HTTParty.stub!( :get => fake_httparty_response )
+        Curl.stub( :get => fake_httparty_response )
         ExampleClass.any_instance.stub( :resolver_guard ).and_return( true )
         result = subject.find_templates( "redis:template", "layouts", "", {} )
         result.first.source.should == dummy_remote_template
@@ -74,7 +74,7 @@ describe ExampleClass do
         context "if the template in the local cache is too old" do
           before( :each ) do
             Timecop.travel( described_class.local_cache_ttl.seconds.ago ) do
-              HTTParty.stub!( :get ).and_return( fake_httparty_response )
+              Curl.stub( :get ).and_return( fake_httparty_response )
               subject.find_templates( name, prefix, partial, details )
             end
           end
@@ -89,7 +89,7 @@ describe ExampleClass do
           before( :each ) do
             target_time = described_class.local_cache_ttl - 2
             Timecop.travel( target_time.seconds.ago ) do
-              HTTParty.stub!( :get => fake_httparty_response )
+              Curl.stub( :get => fake_httparty_response )
               subject.find_templates( name, prefix, partial, details )
             end
           end
@@ -109,7 +109,7 @@ describe ExampleClass do
 
         context "if a template could be found in the redis cache" do
           before( :each ) do
-            redis_connector.stub!( :get ).and_return( dummy_remote_template )
+            redis_connector.stub( :get ).and_return( dummy_remote_template )
           end
 
           it "should store the template in the local cache for 60 seconds" do
@@ -126,7 +126,7 @@ describe ExampleClass do
           end
 
           it "should not fall back to http" do
-            HTTParty.should_not_receive( :get )
+            Curl.should_not_receive( :get )
             subject.find_templates( name, prefix, partial, details )
           end
 
@@ -134,12 +134,12 @@ describe ExampleClass do
 
         context "if no template could be found in the redis cache" do
           before( :each ) do
-            redis_connector.stub!( :get )
+            redis_connector.stub( :get )
           end
 
           context "if the template could be retrieved via HTTP" do
             before( :each ) do
-              HTTParty.stub!( :get => fake_httparty_response )
+              Curl.stub( :get => fake_httparty_response )
             end
 
             it "should store the template in redis" do
@@ -164,7 +164,7 @@ describe ExampleClass do
 
           context "if the template could not be retrieved via HTTP" do
             before( :each ) do
-              HTTParty.stub!( :get ).and_raise( Timeout::Error )
+              Curl.stub( :get ).and_raise( Curl::Err::TimeoutError )
             end
 
             it "should use the default template" do

data/spec/spec_helper.rb

@@ -3,7 +3,7 @@ require 'redis'
 require 'rails'
 require 'action_view'
 require 'active_support/core_ext/numeric/time'
-require 'httparty'
+require 'curb'
 require 'timecop'
 require 'ostruct'
 

metadata

@@ -1,130 +1,115 @@
 --- !ruby/object:Gem::Specification
 name: redis_template_resolver
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - ProSiebenSat.1 Ditital, Central Systems Architecture
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-26 00:00:00.000000000 Z
+date: 2013-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  type: :runtime
   name: redis
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>'
+    - - '>'
       - !ruby/object:Gem::Version
         version: 3.0.0
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>'
+    - - '>'
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  type: :runtime
-  name: httparty
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  name: curb
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>'
+    - - '>'
       - !ruby/object:Gem::Version
         version: 0.8.0
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>'
+    - - '>'
       - !ruby/object:Gem::Version
         version: 0.8.0
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  type: :runtime
   name: rails
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.6
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.6
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  type: :runtime
   name: activesupport
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>'
+    - - '>'
       - !ruby/object:Gem::Version
         version: 3.2.0
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>'
+    - - '>'
       - !ruby/object:Gem::Version
         version: 3.2.0
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  type: :development
   name: rspec
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>'
+    - - '>'
       - !ruby/object:Gem::Version
         version: 2.10.0
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>'
+    - - '>'
       - !ruby/object:Gem::Version
         version: 2.10.0
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  type: :development
   name: simplecov
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  type: :development
   name: timecop
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: ! "    A template resolver for rails 3.2. It retrieves templates via
-  HTTP \n    and stores them in a redis instance, as well as in local caches. \n"
+description: "    A template resolver for rails 3.2. It retrieves templates via HTTP
+  \n    and stores them in a redis instance, as well as in local caches. \n"
 email:
 - sven.riedel@prosiebensat1digital.de
 executables: []
@@ -140,27 +125,26 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/psd/redis_template_resolver
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A template resolver for rails that retrieves templates via http and caches
   them in redis
 test_files: []