attachment_magick 0.3.5 → 0.3.6

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. data/Gemfile.lock +2 -2
  2. data/attachment_magick.gemspec +1 -1
  3. data/lib/attachment_magick/dragonfly/init.rb +1 -16
  4. data/lib/attachment_magick/version.rb +1 -1
  5. metadata +12 -12
data/Gemfile.lock CHANGED
@@ -1,8 +1,8 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- attachment_magick (0.3.4)
5
- dragonfly (>= 0.9.10)
4
+ attachment_magick (0.3.5)
5
+ dragonfly (>= 0.9.12)
6
6
  jquery-rails (>= 0.2.7)
7
7
  marcosinger-auto_html (>= 1.3.6)
8
8
  marcosinger-css_parser (>= 1.3.0)
data/attachment_magick.gemspec CHANGED
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
18
18
  s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
19
19
  s.require_paths = ["lib"]
20
20
 
21
- s.add_dependency "dragonfly", ">= 0.9.10"
21
+ s.add_dependency "dragonfly", ">= 0.9.12"
22
22
  s.add_dependency "rack-cache", ">= 1.1"
23
23
  s.add_dependency "jquery-rails", ">= 0.2.7"
24
24
  s.add_dependency "marcosinger-auto_html", ">= 1.3.6"
data/lib/attachment_magick/dragonfly/init.rb CHANGED
@@ -10,21 +10,6 @@ if defined? ActiveRecord::Base
10
10
  end
11
11
 
12
12
  if defined? Mongoid::Document
13
- require 'mongoid'
14
-
15
- mongo_yml_path = Rails.env.test? ? "#{File.expand_path('../../../../test/dummy/config', __FILE__)}" : "config"
16
- yaml_file = YAML.load_file(File.join(mongo_yml_path, 'mongoid.yml'))[Rails.env]
17
- path = File.join(mongo_yml_path, 'mongoid.yml')
18
- yaml_file = YAML.load(ERB.new(File.new(path).read).result)[Rails.env]
19
-
20
- app.datastore = Dragonfly::DataStorage::MongoDataStore.new
21
- app.datastore.configure do |c|
22
- c.host = yaml_file['host'] || yaml_file['uri'] # defaults to localhost
23
- c.port = yaml_file['port'] # defaults to mongo default (27017)
24
- c.database = yaml_file['database'] # defaults to 'dragonfly'
25
- c.username = yaml_file['username'] # only needed if mongo is running in auth mode
26
- c.password = yaml_file['password'] # only needed if mongo is running in auth mode
27
- end
28
-
13
+ app.datastore = Dragonfly::DataStorage::MongoDataStore.new :db => Mongoid.database
29
14
  app.define_macro_on_include(Mongoid::Document, :image_accessor)
30
15
  end
data/lib/attachment_magick/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module AttachmentMagick
2
- VERSION = "0.3.5"
2
+ VERSION = "0.3.6"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: attachment_magick
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.5
4
+ version: 0.3.6
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -15,18 +15,18 @@ date: 2012-07-28 00:00:00.000000000 Z
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency
17
17
  name: dragonfly
18
- requirement: &2161479760 !ruby/object:Gem::Requirement
18
+ requirement: &2157277300 !ruby/object:Gem::Requirement
19
19
  none: false
20
20
  requirements:
21
21
  - - ! '>='
22
22
  - !ruby/object:Gem::Version
23
- version: 0.9.10
23
+ version: 0.9.12
24
24
  type: :runtime
25
25
  prerelease: false
26
- version_requirements: *2161479760
26
+ version_requirements: *2157277300
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: rack-cache
29
- requirement: &2161478640 !ruby/object:Gem::Requirement
29
+ requirement: &2157276180 !ruby/object:Gem::Requirement
30
30
  none: false
31
31
  requirements:
32
32
  - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
34
34
  version: '1.1'
35
35
  type: :runtime
36
36
  prerelease: false
37
- version_requirements: *2161478640
37
+ version_requirements: *2157276180
38
38
  - !ruby/object:Gem::Dependency
39
39
  name: jquery-rails
40
- requirement: &2161477880 !ruby/object:Gem::Requirement
40
+ requirement: &2157275500 !ruby/object:Gem::Requirement
41
41
  none: false
42
42
  requirements:
43
43
  - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
45
45
  version: 0.2.7
46
46
  type: :runtime
47
47
  prerelease: false
48
- version_requirements: *2161477880
48
+ version_requirements: *2157275500
49
49
  - !ruby/object:Gem::Dependency
50
50
  name: marcosinger-auto_html
51
- requirement: &2161477120 !ruby/object:Gem::Requirement
51
+ requirement: &2157274780 !ruby/object:Gem::Requirement
52
52
  none: false
53
53
  requirements:
54
54
  - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
56
56
  version: 1.3.6
57
57
  type: :runtime
58
58
  prerelease: false
59
- version_requirements: *2161477120
59
+ version_requirements: *2157274780
60
60
  - !ruby/object:Gem::Dependency
61
61
  name: marcosinger-css_parser
62
- requirement: &2161475440 !ruby/object:Gem::Requirement
62
+ requirement: &2157273000 !ruby/object:Gem::Requirement
63
63
  none: false
64
64
  requirements:
65
65
  - - ! '>='
@@ -67,7 +67,7 @@ dependencies:
67
67
  version: 1.3.0
68
68
  type: :runtime
69
69
  prerelease: false
70
- version_requirements: *2161475440
70
+ version_requirements: *2157273000
71
71
  description:
72
72
  email:
73
73
  - markaum@gmail.com