nivo 0.0.2 → 0.0.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. data/app/models/nivo/slide.rb +10 -3
  2. data/config/nivo_config.yml +3 -3
  3. data/lib/nivo/version.rb +1 -1
  4. data/public/stylesheets/{default.css → nivo-default.css} +0 -0
  5. metadata +13 -13
data/app/models/nivo/slide.rb CHANGED
@@ -4,22 +4,29 @@ module Nivo
4
4
 
5
5
  attr_accessible :caption, :url, :active, :lft, :rgt, :image
6
6
 
7
- has_attached_file :image, :styles => Nivo::Config.file['paperclip_options'].symbolize_keys
7
+ OPTIONS = Nivo::Config.file['paperclip_options'].symbolize_keys
8
+ has_attached_file :image, OPTIONS
9
+
8
10
 
9
11
  ##
10
12
  # Save the image dimensions only when a new photo is uploaded
11
13
  #
12
- after_post_process :save_image_dimensions
14
+ # after_post_process :save_image_dimensions
15
+ #
13
16
  def save_image_dimensions
14
- geo = Paperclip::Geometry.from_file(image.queued_for_write[:slide])
17
+ geo = Paperclip::Geometry.from_file(image.url(:slide))
15
18
  self.width = geo.width
16
19
  self.height = geo.height
20
+ self.save
17
21
  end
18
22
 
19
23
  ##
20
24
  # html options for the slide image_tag
21
25
  #
22
26
  def image_options
27
+ if height.blank?
28
+ save_image_dimensions
29
+ end
23
30
  image_options = {
24
31
  :height => height,
25
32
  :width => width,
data/config/nivo_config.yml CHANGED
@@ -1,11 +1,11 @@
1
1
  ---
2
2
  paperclip_options:
3
- style:
3
+ styles:
4
4
  slide: '950x184#'
5
5
  thumb: '200x200>'
6
6
  ## example paperclip S3 storage solution
7
- # storage: !ruby/symbol s3
8
- # s3_credentials: "#{Rails.root.to_s}/config/s3.yml"
7
+ # storage: "s3"
8
+ # s3_credentials: "config/s3.yml"
9
9
  # path: "site_name/:attachment/:id/:style.:extension"
10
10
  # bucket: 'bucket_name'
11
11
 
data/lib/nivo/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Nivo
2
- VERSION = "0.0.2"
2
+ VERSION = "0.0.3"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: nivo
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.2
4
+ version: 0.0.3
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2011-09-18 00:00:00.000000000Z
12
+ date: 2011-09-19 00:00:00.000000000Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: shoulda
16
- requirement: &2153071000 !ruby/object:Gem::Requirement
16
+ requirement: &2151840980 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '0'
22
22
  type: :development
23
23
  prerelease: false
24
- version_requirements: *2153071000
24
+ version_requirements: *2151840980
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: jquery-rails
27
- requirement: &2153069800 !ruby/object:Gem::Requirement
27
+ requirement: &2151836440 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '0'
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *2153069800
35
+ version_requirements: *2151836440
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: paperclip
38
- requirement: &2153068760 !ruby/object:Gem::Requirement
38
+ requirement: &2151835100 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '0'
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *2153068760
46
+ version_requirements: *2151835100
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: haml
49
- requirement: &2153028840 !ruby/object:Gem::Requirement
49
+ requirement: &2151832940 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
54
54
  version: '0'
55
55
  type: :runtime
56
56
  prerelease: false
57
- version_requirements: *2153028840
57
+ version_requirements: *2151832940
58
58
  description: Easily add nivo slider and slide management to dust
59
59
  email:
60
60
  - axcess1@me.com
@@ -117,7 +117,7 @@ files:
117
117
  - public/javascripts/nivo-slider.js
118
118
  - public/stylesheets/.DS_Store
119
119
  - public/stylesheets/.gitkeep
120
- - public/stylesheets/default.css
120
+ - public/stylesheets/nivo-default.css
121
121
  - public/stylesheets/nivo-slider.css
122
122
  - test/.DS_Store
123
123
  - test/helper.rb
@@ -136,7 +136,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
136
136
  version: '0'
137
137
  segments:
138
138
  - 0
139
- hash: -1856366192010729382
139
+ hash: 3628561552965720666
140
140
  required_rubygems_version: !ruby/object:Gem::Requirement
141
141
  none: false
142
142
  requirements:
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
145
145
  version: '0'
146
146
  segments:
147
147
  - 0
148
- hash: -1856366192010729382
148
+ hash: 3628561552965720666
149
149
  requirements: []
150
150
  rubyforge_project: nivo
151
151
  rubygems_version: 1.8.6