newrelic-dragonfly 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9bee35d73a1966dd8db2e8984f89b4a62ca3283b
-  data.tar.gz: 98ab249c1f6d4a16d837ca631ea0ac4f6e8cc3fa
+  metadata.gz: d4034dddc94d3027cf42706b8f4331714d02f18f
+  data.tar.gz: 4f8ae40b4b01a61c4993e34b0298f3b854c4126e
 SHA512:
-  metadata.gz: be72ae86d18bf365bb7fe5358ac36626752380c0f761b4cb344cd2a16110976150d207e6c4b3361029d4e342090e72d50c9a74d8e129e78515023c7b36e0032a
-  data.tar.gz: 377aaa90be843b7df40a34b50d22b2d50eefe7988ff2af559a823cf5fceed5707979a67b88170a0a777e712e0d8f6e23b1515b0a9f3a8f0736506065bc35f945
+  metadata.gz: 4a7efd36b1970de415d385a2b64c289a0a2b7acea85478a4526fa20fbdacc16e2865cf50471fe4ebd4b4db3cc1278240beaf53dafd86db7236a898160c89aa46
+  data.tar.gz: 6a0a819d3e40aab17e0e95eaeff634e108a7a959715d32eb5fa8da4681e87247429821d275a5074057eb64c2edb559719dab4fb685f270376495ac80f7ab896d

data/Gemfile

@@ -4,6 +4,7 @@ source 'https://rubygems.org'
 gemspec
 
 group :test do
+  gem 'dragonfly-s3_data_store'
   gem 'pry-debugger'
   gem 'rack-test'
   gem 'rspec'

data/lib/newrelic/dragonfly/instrumentation/instrumentation.rb

@@ -88,7 +88,7 @@ DependencyDetection.defer do
   end
 
   executes do
-    class Dragonfly::DataStorage::S3DataStore
+    class Dragonfly::S3DataStore
       include NewRelic::Agent::MethodTracer
       add_method_tracer :write
       add_method_tracer :read

data/lib/newrelic/dragonfly/version.rb

@@ -1,5 +1,5 @@
 module Newrelic
   module Dragonfly
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/spec/instrumentation_spec.rb

@@ -3,7 +3,12 @@ require 'spec_helper'
 describe Newrelic::Dragonfly do
   include Rack::Test::Methods
 
-  let(:app) { Dragonfly.app(:images).configure_with(:imagemagick) }
+  let(:root_path) { Dir.mktmpdir }
+  after { FileUtils.remove_entry_secure root_path }
+
+  let(:app) { Dragonfly.app(:images) }
+  before { app.use_datastore :file, root_path: root_path }
+
   let(:uid) { app.store fixture('sample.png') }
 
   let(:agent) { NewRelic::Agent.instance }
@@ -21,3 +26,19 @@ describe Newrelic::Dragonfly do
     agent.transaction_sampler.last_sample.to_s.should include 'Dragonfly::ImageMagick::Processors::Encode'
   end
 end
+
+describe Newrelic::Dragonfly, Dragonfly::S3DataStore do
+  include Rack::Test::Methods
+
+  let(:app) { Dragonfly.app(:images) }
+  before { app.use_datastore :s3, bucket_name: 'dragonfly', access_key_id: 'dummy', secret_access_key: 'dummy' }
+
+  let(:uid) { app.store fixture('sample.png') }
+
+  let(:agent) { NewRelic::Agent.instance }
+
+  it 'include s3 instrumentation' do
+    get app.create.fetch(uid).url
+    agent.transaction_sampler.last_sample.to_s.should include 'Dragonfly::S3DataStore'
+  end
+end

data/spec/spec_helper.rb

@@ -6,7 +6,14 @@ Bundler.require :default, :test
 
 RSpec.configure do |config|
   config.before(:suite) do
-    Dragonfly.app(:images).configure_with(:imagemagick)
+    Fog.mock!
+  end
+
+  config.before(:suite) do
+    Dragonfly.logger = Logger.new STDOUT
+    Dragonfly.app(:images).configure do
+      plugin :imagemagick
+    end
   end
 
   config.before(:suite) do
@@ -15,8 +22,9 @@ RSpec.configure do |config|
   end
 
   config.before(:each) do
-    @engine = NewRelic::Agent.instance.stats_engine
-    @engine.clear_stats
+    agent = NewRelic::Agent.instance
+    agent.stats_engine.clear_stats
+    agent.transaction_sampler.reset!
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: newrelic-dragonfly
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - miyucy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-27 00:00:00.000000000 Z
+date: 2014-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler