newrelic-dragonfly 0.0.1 → 0.0.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    Mzk2ODE1ZjQ3NWNlZTI0Y2Y2MjdkZWExZmUxOTg1NzYzN2JkMmYyMw==
-  data.tar.gz: !binary |-
-    MDEwZDYyNDYzZjExZWVkYWM0YjBiOTA1NjRhZjM3ODQzZGQ1NDU1NA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    MWQ5M2ZmMmY2NzRlNTExNzk3Y2IwZGVjYWJlMTBkMWQxNmJkZjFiMTgwYzkz
-    YjJiOTU5ODNjOWZmMGFiNjI4N2E4NjJiMGQ3MDgzNTUzNTU1MjM1OWJhMmY4
-    NTFlZTgyNGRmNjBmYThmODI1NDMzODZmZmZlN2Q0MGYxNTVlZDc=
-  data.tar.gz: !binary |-
-    Y2M2M2QxZWEzNWUyMjJkOGIwMDIxMDQ0YjJlMjRiZDBhNDg0MTBlN2VjNjAx
-    YWE5NDM2ZWQxODA4MTMzMWJlMzkxOWI3ZDAwNmJjNTUyZmVhNzBjODhmNTg3
-    N2M1YTQzMDNlNWE4NzQwYWM5OTcwOGE2YTU1YTRmZjE3ZTk1ZGY=
+SHA1:
+  metadata.gz: 9bee35d73a1966dd8db2e8984f89b4a62ca3283b
+  data.tar.gz: 98ab249c1f6d4a16d837ca631ea0ac4f6e8cc3fa
+SHA512:
+  metadata.gz: be72ae86d18bf365bb7fe5358ac36626752380c0f761b4cb344cd2a16110976150d207e6c4b3361029d4e342090e72d50c9a74d8e129e78515023c7b36e0032a
+  data.tar.gz: 377aaa90be843b7df40a34b50d22b2d50eefe7988ff2af559a823cf5fceed5707979a67b88170a0a777e712e0d8f6e23b1515b0a9f3a8f0736506065bc35f945

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

@@ -31,10 +31,9 @@ DependencyDetection.defer do
     [
      Dragonfly::Job::Fetch,
      Dragonfly::Job::Process,
-     Dragonfly::Job::Encode,
      Dragonfly::Job::Generate,
      Dragonfly::Job::FetchFile,
-     Dragonfly::Job::FetchUrl
+     Dragonfly::Job::FetchUrl,
     ].each do |klass|
       klass.class_eval do
         add_method_tracer :apply
@@ -43,92 +42,45 @@ DependencyDetection.defer do
   end
 
   executes do
-    class Dragonfly::Analyser
-      include NewRelic::Agent::MethodTracer
-      add_method_tracer :analyse
-    end
-    class Dragonfly::Encoder
-      include NewRelic::Agent::MethodTracer
-      add_method_tracer :encode
-    end
-    class Dragonfly::Generator
-      include NewRelic::Agent::MethodTracer
-      add_method_tracer :generate
-    end
-    class Dragonfly::Processor
-      include NewRelic::Agent::MethodTracer
-      add_method_tracer :process
-    end
-    module Dragonfly::Shell
-      include NewRelic::Agent::MethodTracer
-      add_method_tracer :run
+    [
+     Dragonfly::ImageMagick::Analysers::ImageProperties,
+     Dragonfly::ImageMagick::Generators::Convert,
+     Dragonfly::ImageMagick::Generators::Plain,
+     Dragonfly::ImageMagick::Generators::Plasma,
+     Dragonfly::ImageMagick::Generators::Text,
+     Dragonfly::ImageMagick::Processors::Convert,
+     Dragonfly::ImageMagick::Processors::Encode,
+     Dragonfly::ImageMagick::Processors::Thumb,
+    ].each do |klass|
+      klass.class_eval do
+        include NewRelic::Agent::MethodTracer
+        add_method_tracer :call
+      end
     end
   end
 
   executes do
-    class Dragonfly::ImageMagick::Analyser
-      include NewRelic::Agent::MethodTracer
-      add_method_tracer :width
-      add_method_tracer :height
-      add_method_tracer :aspect_ratio
-      add_method_tracer :portrait?
-      add_method_tracer :portrait
-      add_method_tracer :landscape?
-      add_method_tracer :landscape
-      add_method_tracer :depth
-      add_method_tracer :number_of_colours
-      add_method_tracer :number_of_colors
-      add_method_tracer :format
-      add_method_tracer :image?
-    end
-    class Dragonfly::ImageMagick::Encoder
-      include NewRelic::Agent::MethodTracer
-      add_method_tracer :encode
-    end
-    class Dragonfly::ImageMagick::Generator
+    class Dragonfly::Shell
       include NewRelic::Agent::MethodTracer
-      add_method_tracer :plain
-      add_method_tracer :plasma
-      add_method_tracer :text
-    end
-    class Dragonfly::ImageMagick::Processor
-      include NewRelic::Agent::MethodTracer
-      add_method_tracer :resize
-      add_method_tracer :auto_orient
-      add_method_tracer :crop
-      add_method_tracer :flip
-      add_method_tracer :flop
-      add_method_tracer :greyscale
-      add_method_tracer :grayscale
-      add_method_tracer :resize_and_crop
-      add_method_tracer :rotate
-      add_method_tracer :strip
-      add_method_tracer :thumb
-      add_method_tracer :convert
-    end
-    module Dragonfly::ImageMagick::Utils
-      include NewRelic::Agent::MethodTracer
-      add_method_tracer :convert
-      add_method_tracer :identify
-      add_method_tracer :raw_identify
+      add_method_tracer :run
     end
   end
 
   executes do
     class Dragonfly::DataStorage::FileDataStore
       include NewRelic::Agent::MethodTracer
-      add_method_tracer :store
-      add_method_tracer :retrieve
+      add_method_tracer :write
+      add_method_tracer :read
       add_method_tracer :destroy
     end
   end
 end
 
 DependencyDetection.defer do
-  @name = :dragonfly_s3datastore
+  @name = :dragonfly_s3_data_store
 
   depends_on do
-    defined?(::Fog) and not NewRelic::Control.instance['disable_dragonfly_s3datastore']
+    defined?(::Dragonfly::S3DataStore) and not NewRelic::Control.instance['disable_dragonfly_s3_data_store']
   end
 
   executes do
@@ -138,8 +90,8 @@ DependencyDetection.defer do
   executes do
     class Dragonfly::DataStorage::S3DataStore
       include NewRelic::Agent::MethodTracer
-      add_method_tracer :store
-      add_method_tracer :retrieve
+      add_method_tracer :write
+      add_method_tracer :read
       add_method_tracer :destroy
     end
   end

data/lib/newrelic/dragonfly/version.rb

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

data/spec/instrumentation_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Newrelic::Dragonfly do
   include Rack::Test::Methods
 
-  let(:app) { Dragonfly[:images].configure_with(:imagemagick) }
+  let(:app) { Dragonfly.app(:images).configure_with(:imagemagick) }
   let(:uid) { app.store fixture('sample.png') }
 
   let(:agent) { NewRelic::Agent.instance }
@@ -17,6 +17,7 @@ describe Newrelic::Dragonfly do
     get app.create.fetch(uid).process(:thumb, '32x32').encode(:jpg).url
     agent.transaction_sampler.last_sample.to_s.should include 'Dragonfly::Job::Fetch'
     agent.transaction_sampler.last_sample.to_s.should include 'Dragonfly::Job::Process'
-    agent.transaction_sampler.last_sample.to_s.should include 'Dragonfly::Job::Encode'
+    agent.transaction_sampler.last_sample.to_s.should include 'Dragonfly::ImageMagick::Processors::Thumb'
+    agent.transaction_sampler.last_sample.to_s.should include 'Dragonfly::ImageMagick::Processors::Encode'
   end
 end

data/spec/spec_helper.rb

@@ -6,7 +6,7 @@ Bundler.require :default, :test
 
 RSpec.configure do |config|
   config.before(:suite) do
-    Dragonfly[:images].configure_with(:imagemagick)
+    Dragonfly.app(:images).configure_with(:imagemagick)
   end
 
   config.before(:suite) do

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: newrelic-dragonfly
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - miyucy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-01 00:00:00.000000000 Z
+date: 2014-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: newrelic_rpm
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: dragonfly
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: newrelic instrument for dragonfly
@@ -73,7 +73,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -96,17 +96,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: newrelic instrument for dragonfly