dragonfly 0.9.11 → 0.9.12

data/History.md

@@ -1,3 +1,13 @@
+0.9.12 (2012-04-08)
+===================
+Features
+-------
+- Allow using a mongo replica set with mongo datastore
+
+Fixes
+-----
+- `define_macro_on_include` was giving a stack error with multiple accessors on same app
+
 0.9.11 (2012-03-12)
 ===================
 Features

data/README.md

@@ -13,7 +13,7 @@ For the lazy Rails user...
 
 ```ruby
 gem 'rack-cache', :require => 'rack/cache'
-gem 'dragonfly', '~>0.9.11'
+gem 'dragonfly', '~>0.9.12'
 ```
 
 **Initializer** (e.g. config/initializers/dragonfly.rb):

data/VERSION

@@ -1 +1 @@
-0.9.11
+0.9.12

data/dragonfly.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "dragonfly"
-  s.version = "0.9.11"
+  s.version = "0.9.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mark Evans"]
-  s.date = "2012-03-12"
+  s.date = "2012-04-08"
   s.description = "Dragonfly is a framework that enables on-the-fly processing for any content type.\n  It is especially suited to image handling. Its uses range from image thumbnails to standard attachments to on-demand text generation."
   s.email = "mark@new-bamboo.co.uk"
   s.extra_rdoc_files = [

data/extra_docs/DataStorage.md

@@ -129,11 +129,15 @@ To configure with the {Dragonfly::DataStorage::MongoDataStore MongoDataStore}:
 It won't normally need configuring, but if you wish to:
 
     app.datastore.configure do |d|
-      c.host = 'http://egg.heads:5000'                # defaults to localhost
-      c.port = '27018'                                # defaults to mongo default (27017)
-      c.database = 'my_database'                      # defaults to 'dragonfly'
-      c.username = 'some_user'                        # only needed if mongo is running in auth mode
-      c.password = 'some_password'                    # only needed if mongo is running in auth mode
+      c.host = 'http://egg.heads:5000'                  # defaults to localhost
+      c.port = '27018'                                  # defaults to mongo default (27017)
+      c.database = 'my_database'                        # defaults to 'dragonfly'
+      c.username = 'some_user'                          # only needed if mongo is running in auth mode
+      c.password = 'some_password'                      # only needed if mongo is running in auth mode
+      c.connection_opts = {:name => 'prod'}             # arg gets passed to Mongo::Connection
+                                                        #  or Mongo::ReplSetConnection initializer - see http://api.mongodb.org/ruby/current
+      
+      c.hosts = ['localhost:30000', 'localhost:30001']  # will use Mongo::ReplSetConnection instead of Mongo::Connection
     end
 
 If you already have a mongo database or connection available, you can skip setting these and set `db` or `connection` instead.

data/extra_docs/Rails3.md

@@ -35,7 +35,7 @@ application.rb:
 Gemfile
 -------
 
-    gem 'dragonfly', '~>0.9.11'
+    gem 'dragonfly', '~>0.9.12'
     gem 'rack-cache', :require => 'rack/cache'
 
 Capistrano

data/lib/dragonfly/app.rb

@@ -141,12 +141,12 @@ module Dragonfly
       app = self
       name = self.name
       (class << mod; self; end).class_eval do
-        alias_method "included_without_dragonfly_#{name}", :included
-        define_method "included_with_dragonfly_#{name}" do |mod|
-          send "included_without_dragonfly_#{name}", mod
+        alias_method "included_without_dragonfly_#{name}_#{macro_name}", :included
+        define_method "included_with_dragonfly_#{name}_#{macro_name}" do |mod|
+          send "included_without_dragonfly_#{name}_#{macro_name}", mod
           app.define_macro(mod, macro_name)
         end
-        alias_method :included, "included_with_dragonfly_#{name}"
+        alias_method :included, "included_with_dragonfly_#{name}_#{macro_name}"
       end
     end
     

data/lib/dragonfly/data_storage/mongo_data_store.rb

@@ -8,6 +8,8 @@ module Dragonfly
       include Serializer
 
       configurable_attr :host
+      configurable_attr :hosts
+      configurable_attr :connection_opts, {}
       configurable_attr :port
       configurable_attr :database, 'dragonfly'
       configurable_attr :username
@@ -21,6 +23,8 @@ module Dragonfly
 
       def initialize(opts={})
         self.host = opts[:host]
+        self.hosts = opts[:hosts]
+        self.connection_opts = opts[:connection_opts] if opts[:connection_opts]
         self.port = opts[:port]
         self.database = opts[:database] if opts[:database]
         self.username = opts[:username]
@@ -60,7 +64,11 @@ module Dragonfly
       end
 
       def connection
-        @connection ||= Mongo::Connection.new(host, port)
+        @connection ||= if hosts
+          Mongo::ReplSetConnection.new(hosts, connection_opts)
+        else
+          Mongo::Connection.new(host, port, connection_opts)
+        end
       end
 
       def db

data/spec/dragonfly/data_storage/mongo_data_store_spec.rb

@@ -16,6 +16,15 @@ describe Dragonfly::DataStorage::MongoDataStore do
 
   it_should_behave_like 'data_store'
 
+  describe "connecting to a replica set" do
+    it "should initiate a replica set connection if hosts is set" do
+      @data_store.hosts = ['1.2.3.4:27017', '1.2.3.4:27017']
+      @data_store.connection_opts = {:name => 'testingset'}
+      Mongo::ReplSetConnection.should_receive(:new).with(['1.2.3.4:27017', '1.2.3.4:27017'], :name => 'testingset')
+      @data_store.connection
+    end
+  end
+  
   describe "authenticating" do
     before(:each) do
       @temp_object = Dragonfly::TempObject.new('Feijão verde')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dragonfly
 version: !ruby/object:Gem::Version
-  version: 0.9.11
+  version: 0.9.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-12 00:00:00.000000000 Z
+date: 2012-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70236021927120 !ruby/object:Gem::Requirement
+  requirement: &70263282010320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70236021927120
+  version_requirements: *70263282010320
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70236021942780 !ruby/object:Gem::Requirement
+  requirement: &70263282008900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70236021942780
+  version_requirements: *70263282008900
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70236021941780 !ruby/object:Gem::Requirement
+  requirement: &70263282007600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.10.0
   type: :development
   prerelease: false
-  version_requirements: *70236021941780
+  version_requirements: *70263282007600
 - !ruby/object:Gem::Dependency
   name: cucumber-rails
-  requirement: &70236021940000 !ruby/object:Gem::Requirement
+  requirement: &70263282005720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.5.2
   type: :development
   prerelease: false
-  version_requirements: *70236021940000
+  version_requirements: *70263282005720
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &70236021938420 !ruby/object:Gem::Requirement
+  requirement: &70263282019880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70236021938420
+  version_requirements: *70263282019880
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70236021937080 !ruby/object:Gem::Requirement
+  requirement: &70263282017980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *70236021937080
+  version_requirements: *70263282017980
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &70236021936400 !ruby/object:Gem::Requirement
+  requirement: &70263282016740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70236021936400
+  version_requirements: *70263282016740
 - !ruby/object:Gem::Dependency
   name: github-markup
-  requirement: &70236021935700 !ruby/object:Gem::Requirement
+  requirement: &70263282015880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70236021935700
+  version_requirements: *70263282015880
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &70236021976980 !ruby/object:Gem::Requirement
+  requirement: &70263282014860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70236021976980
+  version_requirements: *70263282014860
 - !ruby/object:Gem::Dependency
   name: couchrest
-  requirement: &70236021976260 !ruby/object:Gem::Requirement
+  requirement: &70263282013980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70236021976260
+  version_requirements: *70263282013980
 - !ruby/object:Gem::Dependency
   name: rack-cache
-  requirement: &70236021975280 !ruby/object:Gem::Requirement
+  requirement: &70263282012540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70236021975280
+  version_requirements: *70263282012540
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70236021974280 !ruby/object:Gem::Requirement
+  requirement: &70263282027520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +142,10 @@ dependencies:
         version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: *70236021974280
+  version_requirements: *70263282027520
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &70236021973200 !ruby/object:Gem::Requirement
+  requirement: &70263282026180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,10 +153,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70236021973200
+  version_requirements: *70263282026180
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70236021971360 !ruby/object:Gem::Requirement
+  requirement: &70263282025380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -164,10 +164,10 @@ dependencies:
         version: '2.5'
   type: :development
   prerelease: false
-  version_requirements: *70236021971360
+  version_requirements: *70263282025380
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70236021970020 !ruby/object:Gem::Requirement
+  requirement: &70263282024260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70236021970020
+  version_requirements: *70263282024260
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70236021985140 !ruby/object:Gem::Requirement
+  requirement: &70263282023460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70236021985140
+  version_requirements: *70263282023460
 - !ruby/object:Gem::Dependency
   name: bluecloth
-  requirement: &70236021984320 !ruby/object:Gem::Requirement
+  requirement: &70263282022780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,10 +197,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70236021984320
+  version_requirements: *70263282022780
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70236021983000 !ruby/object:Gem::Requirement
+  requirement: &70263282021920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -208,10 +208,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70236021983000
+  version_requirements: *70263282021920
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &70236021981600 !ruby/object:Gem::Requirement
+  requirement: &70263282020720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -219,7 +219,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70236021981600
+  version_requirements: *70263282020720
 description: ! "Dragonfly is a framework that enables on-the-fly processing for any
   content type.\n  It is especially suited to image handling. Its uses range from
   image thumbnails to standard attachments to on-demand text generation."
@@ -416,7 +416,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -783174098517993028
+      hash: 4546368991893979595
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: