sunrise-core 0.1.5 → 0.2.0

data/lib/sunrise/models/asset.rb

@@ -1,5 +1,4 @@
 # encoding: utf-8
-require 'mime/types'
 
 module Sunrise
   module Models
@@ -15,10 +14,10 @@ module Sunrise
             belongs_to :user
             belongs_to :assetable, :polymorphic => true
     
-            before_validation :make_content_type
-            before_create :read_dimensions
+            #before_validation :make_content_type
+            #before_create :read_dimensions
             
-            delegate :url, :original_filename, :content_type, :size, :path, :styles, :to => :data
+            delegate :url, :original_filename, :to => :data
             alias :filename :original_filename
           end
         end
@@ -31,7 +30,7 @@ module Sunrise
       module InstanceMethods
         
         def thumb_url
-          url(:thumb)
+          data.thumb.url
         end
         
         def format_created_at
@@ -44,15 +43,7 @@ module Sunrise
           options[:procs] ||= Proc.new do |options, record| 
             options[:builder].tag!('filename', filename)
             options[:builder].tag!('path', url)
-            options[:builder].tag!('size', size)
-            
-            unless styles.empty?
-              options[:builder].tag!('styles') do |xml|
-                styles.each do |style|
-                  xml.tag!(style.first, url(style.first))
-                end
-              end
-            end
+            options[:builder].tag!('size', data_file_size)
           end
           
           super
@@ -60,9 +51,9 @@ module Sunrise
         
         def as_json(options = nil)
           options = {
-            :only => [:id, :guid, :assetable_id, :assetable_type, :user_id], 
-            :root => 'asset', 
-            :methods => [:filename, :url, :size, :content_type, :thumb_url]
+            :only => [:id, :guid, :assetable_id, :assetable_type, :user_id, :data_file_size, :data_content_type], 
+            :root => 'asset',
+            :methods => [:filename, :url, :thumb_url]
           }.merge(options || {})
           
           super
@@ -73,29 +64,9 @@ module Sunrise
         end
         
         def image?
-          Sunrise::Utils::IMAGE_TYPES.include?(content_type)
-        end
-        
-        def geometry
-          @geometry ||= Paperclip::Geometry.from_file(data.to_file)
-          @geometry
+          Sunrise::Utils::IMAGE_TYPES.include?(self.data_content_type)
         end
         
-        protected
-        
-          def read_dimensions
-            if image? && has_dimensions?
-              self.width = geometry.width
-              self.height = geometry.height
-            end
-          end
-          
-          def make_content_type
-            if filename && (data_content_type.blank? || data_content_type == "application/octet-stream")
-              content_types = MIME::Types.type_for(filename)
-              self.data_content_type = content_types.first.to_s unless content_types.empty?
-            end
-          end
       end
     end
   end

data/lib/sunrise/models/role.rb

@@ -14,6 +14,8 @@ module Sunrise
         
             enumerated_attribute :role_type, :id_attribute => :role_type
             attr_accessible :role_type
+            
+            scope :with_type, lambda { |role_type| where(:role_type => role_type) } 
           end
         end
       end

data/lib/sunrise/models/structure.rb

@@ -30,7 +30,14 @@ module Sunrise
         end
         
         def find_by_permalink(value)
-          value.to_s.is_int? ? find(value) : where(:slug => value.to_s).first
+          return if value.blank?
+          value.to_s.is_int? ? where(:id => value.to_i).first : where(:slug => value.to_s).first
+        end
+        
+        def find_by_permalink!(value)
+          record = find_by_permalink(value)
+          raise ActiveRecord::RecordNotFound, "Couldn't find structure by #{value}" if record.nil?
+          return record
         end
       end
       

data/lib/sunrise/models/user.rb

@@ -18,11 +18,14 @@ module Sunrise
             before_validation :generate_login, :if => :has_login?
             before_create :set_default_role, :if => :roles_empty?
             
+            validates_presence_of :name
+            
             scope :with_email, lambda {|email| where(["email LIKE ?", "#{email}%"]) }
-            scope :with_role, lambda {|role| joins(:roles).where(["`roles`.role_type = ?", role.id]) }
-            scope :defaults, with_role(::RoleType.default)
-            scope :moderators, with_role(::RoleType.moderator)
-            scope :admins, with_role(::RoleType.admin)            
+            scope :with_name, lambda {|name| where(["name LIKE ?", "#{name}%"]) }
+            scope :with_role, lambda {|role_id| joins(:roles).merge(::Role.with_type(role_id)) }
+            scope :defaults, with_role(::RoleType.default.id)
+            scope :moderators, with_role(::RoleType.moderator.id)
+            scope :admins, with_role(::RoleType.admin.id)            
           end
         end
         
@@ -118,7 +121,7 @@ module Sunrise
         
         def avatar_small_url
           if self.avatar
-            self.avatar.url(:small)
+            self.avatar.data.small.url
           else
             "/images/manage/user_pic_small.gif"
           end

data/lib/sunrise/version.rb

@@ -1,3 +1,3 @@
 module Sunrise
-  VERSION = "0.1.5".freeze
+  VERSION = "0.2.0".freeze
 end

data/lib/tasks/assets.rake

@@ -0,0 +1,20 @@
+module Sunrise
+  module CarrierWave
+    def self.obtain_class
+      class_name = ENV['CLASS'] || ENV['class']
+      raise "Must specify CLASS" unless class_name
+      "#{class_name}".constantize
+    end
+  end
+end
+
+namespace :assets do
+  desc "Refresh carrierwave assets by model"
+  task :refresh => :environment do
+    klass = Sunrise::CarrierWave.obtain_class
+    
+    klass.all.each do |item|
+      item.data.recreate_versions!
+    end
+  end
+end

data/spec/controllers/manage/assets_controller_spec.rb

@@ -0,0 +1,65 @@
+require 'spec_helper'
+
+describe Manage::AssetsController do
+  render_views
+  
+  after(:all) do
+    Avatar.destroy_all
+  end
+  
+  context "administrator" do
+    login_admin
+    
+    before(:each) do
+      @attrs = { 
+        :assetable_type => @admin.class.name, 
+        :assetable_id => @admin.id, 
+        :data => fixture_file_upload('files/rails.png', 'image/png')
+      }
+    end
+    
+    it "should create new asset" do
+      lambda {
+        post :create, @attrs.merge(:klass => "Avatar")
+      }.should change { Avatar.count }.by(1)
+    end
+    
+    it "should not create asset with invalid params" do
+      lambda {
+        post :create, @attrs.merge(:data => nil, :klass => "Avatar")
+      }.should_not change { Avatar.count }
+    end
+    
+    context "exists avatar" do
+      before(:each) do
+        @avatar = @admin.create_avatar(:data => @attrs[:data])
+      end
+      
+      it "should destroy avatar" do
+        lambda {
+          delete :destroy, :id => @avatar.id
+        }.should change { Avatar.count }.by(-1)
+      end
+    end
+  end
+  
+  context "anonymous user" do
+    user_logout
+    
+    it "should not render create action" do
+      controller.should_not_receive :create
+      post :create, :klass => "Avatar"
+    end
+    
+    context "with avatar" do
+      before(:each) do
+        @avatar = Factory.create(:asset_avatar)
+      end
+      
+      it "should not render destroy action" do
+        controller.should_not_receive :destroy
+        delete :destroy, :id => @avatar.id
+      end
+    end
+  end
+end

data/spec/controllers/manage/pages_controller_spec.rb

@@ -0,0 +1,75 @@
+require 'spec_helper'
+
+describe Manage::PagesController do
+  render_views
+  
+  before(:all) do
+    @root = Factory.create(:structure_main)
+    @structure = Factory.create(:structure_page, :parent => @root)
+  end
+  
+  context "administrator" do
+    login_admin
+    
+    it "should render edit action" do
+      get :edit, :structure_id => @structure.id
+      response.should be_success
+      response.should render_template("new")
+    end
+    
+    it "should create new page" do
+      lambda {
+        post :create, :structure_id => @structure.id, :page => Factory.attributes_for(:page)
+      }.should change { Page.count }.by(1)
+    end
+        
+    context "exists page" do
+      before(:each) do
+        @page = Factory.create(:page, :structure => @structure)
+      end
+      
+      it "should call edit action" do
+        controller.should_receive :edit
+        get :edit, :structure_id => @structure.id
+      end
+      
+      it "should render edit action" do
+        get :edit, :structure_id => @structure.id
+        response.should be_success
+        response.should render_template("edit")
+      end
+      
+      it "should update page" do
+        put :update, :structure_id => @structure.id, :page => { :title => "Update" }
+        assigns(:page).should be_valid
+        assigns(:page).title.should == 'Update'
+        response.should redirect_to(manage_structures_path)
+      end
+    end
+  end
+  
+  context "anonymous user" do
+    user_logout
+    
+    it "should not render create action" do
+      controller.should_not_receive :create
+      post :create, :structure_id => @structure.id
+    end
+    
+    context "with exists page" do
+      before(:each) do
+        @page = Factory.create(:page, :structure => @structure)
+      end
+      
+      it "should not render edit action" do
+        controller.should_not_receive :edit
+        get :edit, :structure_id => @structure.id
+      end
+      
+      it "should not render update action" do
+        controller.should_not_receive :update
+        put :update, :structure_id => @structure.id
+      end
+    end
+  end
+end

data/spec/controllers/manage/settings_controller_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe Manage::SettingsController do
+  render_views
+  
+  context "administrator" do
+    login_admin
+    
+    it "should render index action" do
+      get :index
+      response.should be_success
+      response.should render_template("index")
+    end
+    
+    it "should update system settings" do
+      post :create, :settings => { :mailer => {:subject_prefix => "Test"} }
+      Sunrise::SystemSettings.mailer.subject_prefix.should == "Test"
+    end
+  end
+  
+  context "anonymous user" do
+    user_logout
+    
+    it "should not render index action" do
+      controller.should_not_receive :index
+      get :index
+    end
+    
+    it "should not render create action" do
+      controller.should_not_receive :create
+      post :create
+    end
+  end
+end

data/spec/controllers/manage/structures_controller_spec.rb

@@ -0,0 +1,97 @@
+require 'spec_helper'
+
+describe Manage::StructuresController do
+  render_views
+  
+  before(:all) do
+    @root = Factory.create(:structure_main)
+    @page = Factory.create(:structure_page, :parent => @root)
+  end
+  
+  context "administrator" do
+    login_admin
+    
+    it "should render index action" do
+      get :index
+      assigns(:structure).should == @root
+      assigns(:structures).should include(@page)
+      response.should render_template('index')
+    end
+    
+    it "should render new action" do
+      get :new
+      response.should be_success
+      response.should render_template("new")
+    end
+    
+    it "should create new structure" do
+      lambda {
+        post :create, :structure => Factory.attributes_for(:structure_page).merge(:parent_id => @root.id)
+      }.should change { @root.children.count }.by(1)
+    end
+        
+    context "exists structure" do
+      before(:each) do
+        @structure = Factory.create(:structure_page, :parent => @root)
+      end
+      
+      it "should render edit action" do
+        controller.should_receive :edit
+        get :edit, :id => @structure.id
+      end
+      
+      it "should update structure" do
+        put :update, :id => @structure.id, :structure => { :title => "Update" }
+        assigns(:structure).should be_valid
+        assigns(:structure).title.should == 'Update'
+        response.should redirect_to(manage_structures_path)
+      end
+      
+      it "should destroy user" do
+        lambda {
+          delete :destroy, :id => @structure.id
+        }.should change { Structure.count }.by(-1)
+      end
+    end
+  end
+  
+  context "anonymous user" do
+    user_logout
+    
+    it "should not render index action" do
+      controller.should_not_receive :index
+      get :index
+    end
+    
+    it "should not render new action" do
+      controller.should_not_receive :new
+      get :new
+    end
+    
+    it "should not render create action" do
+      controller.should_not_receive :create
+      post :create
+    end
+    
+    context "with exists structure" do
+      before(:each) do
+        @structure = Factory.create(:structure_page, :parent => @root)
+      end
+      
+      it "should not render edit action" do
+        controller.should_not_receive :edit
+        get :edit, :id => @structure.id
+      end
+      
+      it "should not render update action" do
+        controller.should_not_receive :update
+        put :update, :id => @structure.id
+      end
+      
+      it "should not render destroy action" do
+        controller.should_not_receive :destroy
+        delete :destroy, :id => @structure.id
+      end
+    end
+  end
+end