refinerycms-images 2.0.5 → 2.0.6
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.
- data/app/views/refinery/admin/images/_grid_view.html.erb +3 -1
 - data/app/views/refinery/admin/images/_list_view_image.html.erb +3 -1
 - data/lib/refinery/images/configuration.rb +2 -2
 - data/spec/lib/generators/refinery/images/images_generator_spec.rb +1 -1
 - data/spec/models/refinery/image_spec.rb +3 -3
 - metadata +6 -6
 
| 
         @@ -13,7 +13,9 @@ 
     | 
|
| 
       13 
13 
     | 
    
         
             
                                refinery.admin_image_path(image),
         
     | 
| 
       14 
14 
     | 
    
         
             
                                :class => "cancel confirm-delete",
         
     | 
| 
       15 
15 
     | 
    
         
             
                                :title => t('delete', :scope => 'refinery.admin.images'),
         
     | 
| 
       16 
     | 
    
         
            -
                                : 
     | 
| 
      
 16 
     | 
    
         
            +
                                :data => {
         
     | 
| 
      
 17 
     | 
    
         
            +
                                  :confirm => t('message', :scope => 'refinery.admin.delete', :title => image.title)
         
     | 
| 
      
 18 
     | 
    
         
            +
                                },
         
     | 
| 
       17 
19 
     | 
    
         
             
                                :method => :delete %>
         
     | 
| 
       18 
20 
     | 
    
         
             
                  </span>
         
     | 
| 
       19 
21 
     | 
    
         
             
                </li>
         
     | 
| 
         @@ -13,7 +13,9 @@ 
     | 
|
| 
       13 
13 
     | 
    
         
             
                            refinery.admin_image_path(list_view_image),
         
     | 
| 
       14 
14 
     | 
    
         
             
                            :class => "cancel confirm-delete",
         
     | 
| 
       15 
15 
     | 
    
         
             
                            :title => t('delete', :scope => 'refinery.admin.images'),
         
     | 
| 
       16 
     | 
    
         
            -
                            : 
     | 
| 
      
 16 
     | 
    
         
            +
                            :data => {
         
     | 
| 
      
 17 
     | 
    
         
            +
                              :confirm => t('message', :scope => 'refinery.admin.delete', :title => list_view_image.title)
         
     | 
| 
      
 18 
     | 
    
         
            +
                            },
         
     | 
| 
       17 
19 
     | 
    
         
             
                            :method => :delete %>
         
     | 
| 
       18 
20 
     | 
    
         
             
              </span>
         
     | 
| 
       19 
21 
     | 
    
         
             
            </li>
         
     | 
| 
         @@ -53,11 +53,11 @@ module Refinery 
     | 
|
| 
       53 
53 
     | 
    
         
             
                  def s3_secret_access_key
         
     | 
| 
       54 
54 
     | 
    
         
             
                    config.s3_secret_access_key.nil? ? Refinery::Core.s3_secret_access_key : config.s3_secret_access_key
         
     | 
| 
       55 
55 
     | 
    
         
             
                  end
         
     | 
| 
       56 
     | 
    
         
            -
             
     | 
| 
      
 56 
     | 
    
         
            +
             
     | 
| 
       57 
57 
     | 
    
         
             
                  def s3_region
         
     | 
| 
       58 
58 
     | 
    
         
             
                    config.s3_region.nil? ? Refinery::Core.s3_region : config.s3_region
         
     | 
| 
       59 
59 
     | 
    
         
             
                  end
         
     | 
| 
       60 
     | 
    
         
            -
             
     | 
| 
      
 60 
     | 
    
         
            +
             
     | 
| 
       61 
61 
     | 
    
         
             
                end
         
     | 
| 
       62 
62 
     | 
    
         
             
              end
         
     | 
| 
       63 
63 
     | 
    
         
             
            end
         
     | 
| 
         @@ -114,7 +114,7 @@ module Refinery 
     | 
|
| 
       114 
114 
     | 
    
         | 
| 
       115 
115 
     | 
    
         
             
                describe "validations" do
         
     | 
| 
       116 
116 
     | 
    
         
             
                  describe "valid #image" do
         
     | 
| 
       117 
     | 
    
         
            -
                    before 
     | 
| 
      
 117 
     | 
    
         
            +
                    before do
         
     | 
| 
       118 
118 
     | 
    
         
             
                      @file = Refinery.roots(:'refinery/images').join("spec/fixtures/beach.jpeg")
         
     | 
| 
       119 
119 
     | 
    
         
             
                      Images.max_image_size = (File.read(@file).size + 10.megabytes)
         
     | 
| 
       120 
120 
     | 
    
         
             
                    end
         
     | 
| 
         @@ -125,7 +125,7 @@ module Refinery 
     | 
|
| 
       125 
125 
     | 
    
         
             
                  end
         
     | 
| 
       126 
126 
     | 
    
         | 
| 
       127 
127 
     | 
    
         
             
                  describe "too large #image" do
         
     | 
| 
       128 
     | 
    
         
            -
                    before 
     | 
| 
      
 128 
     | 
    
         
            +
                    before do
         
     | 
| 
       129 
129 
     | 
    
         
             
                      @file = Refinery.roots(:'refinery/images').join("spec/fixtures/beach.jpeg")
         
     | 
| 
       130 
130 
     | 
    
         
             
                      Images.max_image_size = 0
         
     | 
| 
       131 
131 
     | 
    
         
             
                      @image = Image.new(:image => @file)
         
     | 
| 
         @@ -143,7 +143,7 @@ module Refinery 
     | 
|
| 
       143 
143 
     | 
    
         
             
                  end
         
     | 
| 
       144 
144 
     | 
    
         | 
| 
       145 
145 
     | 
    
         
             
                  describe "invalid argument for #image" do
         
     | 
| 
       146 
     | 
    
         
            -
                    before 
     | 
| 
      
 146 
     | 
    
         
            +
                    before do
         
     | 
| 
       147 
147 
     | 
    
         
             
                      @image = Image.new
         
     | 
| 
       148 
148 
     | 
    
         
             
                    end
         
     | 
| 
       149 
149 
     | 
    
         | 
    
        metadata
    CHANGED
    
    | 
         @@ -1,7 +1,7 @@ 
     | 
|
| 
       1 
1 
     | 
    
         
             
            --- !ruby/object:Gem::Specification
         
     | 
| 
       2 
2 
     | 
    
         
             
            name: refinerycms-images
         
     | 
| 
       3 
3 
     | 
    
         
             
            version: !ruby/object:Gem::Version
         
     | 
| 
       4 
     | 
    
         
            -
              version: 2.0. 
     | 
| 
      
 4 
     | 
    
         
            +
              version: 2.0.6
         
     | 
| 
       5 
5 
     | 
    
         
             
              prerelease: 
         
     | 
| 
       6 
6 
     | 
    
         
             
            platform: ruby
         
     | 
| 
       7 
7 
     | 
    
         
             
            authors:
         
     | 
| 
         @@ -13,7 +13,7 @@ authors: 
     | 
|
| 
       13 
13 
     | 
    
         
             
            autorequire: 
         
     | 
| 
       14 
14 
     | 
    
         
             
            bindir: bin
         
     | 
| 
       15 
15 
     | 
    
         
             
            cert_chain: []
         
     | 
| 
       16 
     | 
    
         
            -
            date: 2012- 
     | 
| 
      
 16 
     | 
    
         
            +
            date: 2012-08-07 00:00:00.000000000 Z
         
     | 
| 
       17 
17 
     | 
    
         
             
            dependencies:
         
     | 
| 
       18 
18 
     | 
    
         
             
            - !ruby/object:Gem::Dependency
         
     | 
| 
       19 
19 
     | 
    
         
             
              name: dragonfly
         
     | 
| 
         @@ -54,7 +54,7 @@ dependencies: 
     | 
|
| 
       54 
54 
     | 
    
         
             
                requirements:
         
     | 
| 
       55 
55 
     | 
    
         
             
                - - '='
         
     | 
| 
       56 
56 
     | 
    
         
             
                  - !ruby/object:Gem::Version
         
     | 
| 
       57 
     | 
    
         
            -
                    version: 2.0. 
     | 
| 
      
 57 
     | 
    
         
            +
                    version: 2.0.6
         
     | 
| 
       58 
58 
     | 
    
         
             
              type: :runtime
         
     | 
| 
       59 
59 
     | 
    
         
             
              prerelease: false
         
     | 
| 
       60 
60 
     | 
    
         
             
              version_requirements: !ruby/object:Gem::Requirement
         
     | 
| 
         @@ -62,7 +62,7 @@ dependencies: 
     | 
|
| 
       62 
62 
     | 
    
         
             
                requirements:
         
     | 
| 
       63 
63 
     | 
    
         
             
                - - '='
         
     | 
| 
       64 
64 
     | 
    
         
             
                  - !ruby/object:Gem::Version
         
     | 
| 
       65 
     | 
    
         
            -
                    version: 2.0. 
     | 
| 
      
 65 
     | 
    
         
            +
                    version: 2.0.6
         
     | 
| 
       66 
66 
     | 
    
         
             
            description: Handles all image upload and processing functionality in Refinery CMS.
         
     | 
| 
       67 
67 
     | 
    
         
             
            email: info@refinerycms.com
         
     | 
| 
       68 
68 
     | 
    
         
             
            executables: []
         
     | 
| 
         @@ -145,7 +145,7 @@ required_ruby_version: !ruby/object:Gem::Requirement 
     | 
|
| 
       145 
145 
     | 
    
         
             
                  version: '0'
         
     | 
| 
       146 
146 
     | 
    
         
             
                  segments:
         
     | 
| 
       147 
147 
     | 
    
         
             
                  - 0
         
     | 
| 
       148 
     | 
    
         
            -
                  hash:  
     | 
| 
      
 148 
     | 
    
         
            +
                  hash: 4053869689072159548
         
     | 
| 
       149 
149 
     | 
    
         
             
            required_rubygems_version: !ruby/object:Gem::Requirement
         
     | 
| 
       150 
150 
     | 
    
         
             
              none: false
         
     | 
| 
       151 
151 
     | 
    
         
             
              requirements:
         
     | 
| 
         @@ -154,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement 
     | 
|
| 
       154 
154 
     | 
    
         
             
                  version: '0'
         
     | 
| 
       155 
155 
     | 
    
         
             
                  segments:
         
     | 
| 
       156 
156 
     | 
    
         
             
                  - 0
         
     | 
| 
       157 
     | 
    
         
            -
                  hash:  
     | 
| 
      
 157 
     | 
    
         
            +
                  hash: 4053869689072159548
         
     | 
| 
       158 
158 
     | 
    
         
             
            requirements: []
         
     | 
| 
       159 
159 
     | 
    
         
             
            rubyforge_project: refinerycms
         
     | 
| 
       160 
160 
     | 
    
         
             
            rubygems_version: 1.8.22
         
     |