sunrise-cms 0.6.1 → 0.6.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (23) hide show
  1. data/app/controllers/sunrise/manager_controller.rb +1 -2
  2. data/lib/generators/sunrise/templates/config/nginx-config +3 -3
  3. data/lib/sunrise/abstract_model.rb +9 -3
  4. data/lib/sunrise/version.rb +1 -1
  5. data/spec/dummy/log/test.log +8213 -0
  6. data/spec/dummy/public/uploads/tmp/20130307-1257-8980-0875/rails.png +0 -0
  7. data/spec/dummy/public/uploads/tmp/20130307-1257-8980-0875/small_rails.png +0 -0
  8. data/spec/dummy/public/uploads/tmp/20130307-1257-8980-0875/thumb_rails.png +0 -0
  9. data/spec/dummy/public/uploads/tmp/20130307-1257-8980-1524/rails.png +0 -0
  10. data/spec/dummy/public/uploads/tmp/20130307-1257-8980-1852/silicon_valley.jpg +0 -0
  11. data/spec/dummy/public/uploads/tmp/20130307-1257-8980-1852/small_silicon_valley.jpg +0 -0
  12. data/spec/dummy/public/uploads/tmp/20130307-1257-8980-1852/thumb_silicon_valley.jpg +0 -0
  13. data/spec/dummy/public/uploads/tmp/20130307-1257-8980-2984/rails.png +0 -0
  14. data/spec/dummy/public/uploads/tmp/20130307-1257-8980-2984/small_rails.png +0 -0
  15. data/spec/dummy/public/uploads/tmp/20130307-1257-8980-2984/thumb_rails.png +0 -0
  16. data/spec/dummy/public/uploads/tmp/20130307-1257-8980-4258/rails.png +0 -0
  17. data/spec/dummy/public/uploads/tmp/20130307-1257-8980-4258/small_rails.png +0 -0
  18. data/spec/dummy/public/uploads/tmp/20130307-1257-8980-4258/thumb_rails.png +0 -0
  19. data/spec/dummy/public/uploads/tmp/20130307-1257-8980-8785/rails.png +0 -0
  20. data/spec/models/avatar_spec.rb +9 -5
  21. data/spec/models/sunrise/abstract_model_spec.rb +0 -1
  22. data/spec/spec_helper.rb +0 -4
  23. metadata +30 -2
@@ -1,13 +1,17 @@
1
1
  require 'spec_helper'
2
+ require 'carrierwave/test/matchers'
2
3
 
3
4
  describe Avatar do
4
- before(:all) do
5
+ include CarrierWave::Test::Matchers
6
+
7
+ before(:each) do
5
8
  AvatarUploader.enable_processing = true
6
9
  @avatar = FactoryGirl.build(:asset_avatar)
7
10
  end
8
11
 
9
- after(:all) do
12
+ after(:each) do
10
13
  AvatarUploader.enable_processing = false
14
+ @avatar.destroy if @avatar.persisted?
11
15
  end
12
16
 
13
17
  it "should create a new instance given valid attributes" do
@@ -35,7 +39,7 @@ describe Avatar do
35
39
 
36
40
  context "after create" do
37
41
  before(:each) do
38
- @avatar = FactoryGirl.create(:asset_avatar)
42
+ @avatar.save!
39
43
  end
40
44
 
41
45
  it "filename should be valid" do
@@ -74,7 +78,7 @@ describe Avatar do
74
78
 
75
79
  context "cropping" do
76
80
  before(:each) do
77
- @avatar = FactoryGirl.create(:asset_avatar)
81
+ @avatar.save!
78
82
  @avatar.cropper_geometry = "50,64,10,10"
79
83
  end
80
84
 
@@ -104,7 +108,7 @@ describe Avatar do
104
108
 
105
109
  context "rotate" do
106
110
  before(:each) do
107
- @avatar = FactoryGirl.create(:asset_avatar)
111
+ @avatar.save
108
112
  @avatar.rotate_degrees = "-90"
109
113
  end
110
114
 
@@ -28,7 +28,6 @@ describe Sunrise::AbstractModel do
28
28
 
29
29
  it "should return record attrs" do
30
30
  @abstract_model.param_key.should == 'structure'
31
- @abstract_model.permited_attributes_for(nil).should == @params[:structure].keys
32
31
  end
33
32
 
34
33
  it "should return current list view" do
data/spec/spec_helper.rb CHANGED
@@ -61,10 +61,6 @@ RSpec.configure do |config|
61
61
  DatabaseCleaner.clean
62
62
  end
63
63
 
64
- config.after(:suite) do
65
- FileUtils.rm_rf(Dir["#{Rails.root}/public/uploads/[^.]*"])
66
- end
67
-
68
64
  config.before(:all) do
69
65
  DatabaseCleaner.clean
70
66
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: sunrise-cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.6.1
4
+ version: 0.6.2
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2013-02-28 00:00:00.000000000 Z
13
+ date: 2013-03-07 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: rails
@@ -687,6 +687,20 @@ files:
687
687
  - spec/dummy/tmp/cache/assets/DDE/270/sprockets%2F0dd428ae1aed245ab1c713f6f0aabb06
688
688
  - spec/dummy/tmp/cache/assets/D21/5D0/sprockets%2Fe2c4f946939f2d7d0b42d86383755cae
689
689
  - spec/dummy/Rakefile
690
+ - spec/dummy/public/uploads/tmp/20130307-1257-8980-1852/silicon_valley.jpg
691
+ - spec/dummy/public/uploads/tmp/20130307-1257-8980-1852/thumb_silicon_valley.jpg
692
+ - spec/dummy/public/uploads/tmp/20130307-1257-8980-1852/small_silicon_valley.jpg
693
+ - spec/dummy/public/uploads/tmp/20130307-1257-8980-2984/small_rails.png
694
+ - spec/dummy/public/uploads/tmp/20130307-1257-8980-2984/rails.png
695
+ - spec/dummy/public/uploads/tmp/20130307-1257-8980-2984/thumb_rails.png
696
+ - spec/dummy/public/uploads/tmp/20130307-1257-8980-4258/small_rails.png
697
+ - spec/dummy/public/uploads/tmp/20130307-1257-8980-4258/rails.png
698
+ - spec/dummy/public/uploads/tmp/20130307-1257-8980-4258/thumb_rails.png
699
+ - spec/dummy/public/uploads/tmp/20130307-1257-8980-0875/small_rails.png
700
+ - spec/dummy/public/uploads/tmp/20130307-1257-8980-0875/rails.png
701
+ - spec/dummy/public/uploads/tmp/20130307-1257-8980-0875/thumb_rails.png
702
+ - spec/dummy/public/uploads/tmp/20130307-1257-8980-8785/rails.png
703
+ - spec/dummy/public/uploads/tmp/20130307-1257-8980-1524/rails.png
690
704
  - spec/dummy/public/500.html
691
705
  - spec/dummy/public/favicon.ico
692
706
  - spec/dummy/public/404.html
@@ -825,6 +839,20 @@ test_files:
825
839
  - spec/dummy/tmp/cache/assets/DDE/270/sprockets%2F0dd428ae1aed245ab1c713f6f0aabb06
826
840
  - spec/dummy/tmp/cache/assets/D21/5D0/sprockets%2Fe2c4f946939f2d7d0b42d86383755cae
827
841
  - spec/dummy/Rakefile
842
+ - spec/dummy/public/uploads/tmp/20130307-1257-8980-1852/silicon_valley.jpg
843
+ - spec/dummy/public/uploads/tmp/20130307-1257-8980-1852/thumb_silicon_valley.jpg
844
+ - spec/dummy/public/uploads/tmp/20130307-1257-8980-1852/small_silicon_valley.jpg
845
+ - spec/dummy/public/uploads/tmp/20130307-1257-8980-2984/small_rails.png
846
+ - spec/dummy/public/uploads/tmp/20130307-1257-8980-2984/rails.png
847
+ - spec/dummy/public/uploads/tmp/20130307-1257-8980-2984/thumb_rails.png
848
+ - spec/dummy/public/uploads/tmp/20130307-1257-8980-4258/small_rails.png
849
+ - spec/dummy/public/uploads/tmp/20130307-1257-8980-4258/rails.png
850
+ - spec/dummy/public/uploads/tmp/20130307-1257-8980-4258/thumb_rails.png
851
+ - spec/dummy/public/uploads/tmp/20130307-1257-8980-0875/small_rails.png
852
+ - spec/dummy/public/uploads/tmp/20130307-1257-8980-0875/rails.png
853
+ - spec/dummy/public/uploads/tmp/20130307-1257-8980-0875/thumb_rails.png
854
+ - spec/dummy/public/uploads/tmp/20130307-1257-8980-8785/rails.png
855
+ - spec/dummy/public/uploads/tmp/20130307-1257-8980-1524/rails.png
828
856
  - spec/dummy/public/500.html
829
857
  - spec/dummy/public/favicon.ico
830
858
  - spec/dummy/public/404.html