freeberry 0.2.6 → 0.2.7

data/README.rdoc

@@ -9,8 +9,8 @@ For more instruction see {Wiki}[http://wiki.github.com/galetahub/freeberry].
 
 In your Gemfile:
   
-  gem 'devise', '1.1.3'
-  gem 'paperclip', '2.3.6'
+  gem 'devise', '1.1.5'
+  gem 'paperclip', '2.3.7'
   gem 'nokogiri', '1.4.4'
   gem 'declarative_authorization', '0.5.1'
   gem 'responders', '0.6.2'

data/Rakefile

@@ -36,15 +36,6 @@ begin
     gemspec.authors = ["Igor Galeta", "Pavlo Galeta"]
     gemspec.files = FileList["[A-Z]*", "{app,config,lib}/**/*"]
     gemspec.rubyforge_project = "freeberry"
-    
-    #gemspec.add_dependency('devise', '>= 1.1.3')
-    #gemspec.add_dependency('paperclip', '>= 2.3.3')
-    #gemspec.add_dependency('nokogiri', '>= 1.4.3.1')
-    #gemspec.add_dependency('declarative_authorization', '>= 0.5.1')
-    #gemspec.add_dependency('responders', '>= 0.6.2')
-    #gemspec.add_dependency('inherited_resources', '>= 1.1.2')
-    #gemspec.add_dependency('haddock', '>= 0.2.2')
-    #gemspec.add_dependency('will_paginate', '>= 2.3.15')
   end
   
   Jeweler::GemcutterTasks.new

data/lib/freeberry.rb

@@ -5,7 +5,7 @@ module Freeberry
   autoload :SystemSettings,       'freeberry/system_settings'
   autoload :MysqlUtils,           'freeberry/mysql_utils'
   autoload :Settingslogic,        'freeberry/settingslogic'
-  autoload :HeaderTools,          'freeberry/header_tools'
+  autoload :HeaderUtils,          'freeberry/header_utils'
   autoload :ModelFilter,          'freeberry/model_filter'
   autoload :Transliteration,      'freeberry/transliteration'
   autoload :AccessibleAttributes, 'freeberry/accessible_attributes'
@@ -15,7 +15,7 @@ module Freeberry
   module Controllers
     autoload :AuthorizedSystem, 'freeberry/controllers/authorized_system'
     autoload :HeadOptions,      'freeberry/controllers/head_options'
-    autoload :HelperTools,      'freeberry/controllers/helper_tools'
+    autoload :HelperUtils,      'freeberry/controllers/helper_utils'
   end
   
   # Models

data/lib/freeberry/controllers/authorized_system.rb

@@ -4,14 +4,19 @@ module Freeberry
       def self.included(base)
         base.send(:extend, ClassMethods)
         base.send(:include, InstanceMethods)
-        
-        # Send current_user to Declarative authorization module
-        base.before_filter :set_current_user
-        
-        base.helper_method :content_manager?
       end
     
       module ClassMethods
+        def self.extended(base)
+          base.class_eval do
+            skip_before_filter :set_current_user
+            
+            # Send current_user to Declarative authorization module
+            before_filter :set_current_user
+        
+            helper_method :content_manager?
+          end
+        end
       end
 
       module InstanceMethods

data/lib/freeberry/controllers/head_options.rb

@@ -7,25 +7,26 @@ module Freeberry
         base.send :helper_method, :head_options if base.respond_to? :helper_method
       end
       
-      def head_options(record, options={})
+      def head_options(record, options = {})
         return if record.nil?
         
-        header = nil
-        header = record.header if record.respond_to?(:header)
+        options = { :spliter => " | " }.merge(options)
+        
+        header = record.respond_to?(:header) ? record.header : nil
         
         @view_title = record.title if record.respond_to?(:title)
-        @view_title ||= t('page.title')
+        @view_title ||= I18n.t('page.title')
         
         # title
         page_title = []
 		    page_title << options[:title] if options.key?(:title)
 		    page_title << ((header.nil? || header.title.blank?) ? record.title : header.title)
-		    page_title << t('page.title') if options[:append_title]
+		    page_title << I18n.t('page.title') if options[:append_title]
 		    page_title.flatten!
 		    page_title.compact!
 		    page_title.uniq!
 		
-		    @page_title = page_title.join(" | ")
+		    @page_title = page_title.join(options[:spliter])
 		
 		    # keywords
 		    keywords = record.keywords.join(', ') if record.respond_to?(:keywords)

data/lib/freeberry/controllers/{helper_tools.rb → helper_utils.rb}

@@ -1,6 +1,6 @@
 module Freeberry
   module Controllers
-    module HelperTools
+    module HelperUtils
       
       def title(content)
 	      content_for(:title) { content } unless content.blank?

data/lib/freeberry/{header_tools.rb → header_utils.rb}

@@ -1,6 +1,6 @@
 # encoding: utf-8
 module Freeberry
-  module HeaderTools
+  module HeaderUtils
     def self.included(base)
       base.send(:extend, ClassMethods)
       base.send(:include, InstanceMethods)
@@ -10,6 +10,9 @@ module Freeberry
       def self.extended(base)
         base.class_eval do
           has_one :header, :as => :headerable, :dependent => :delete
+          
+          attr_accessible :header_attributes
+          
           accepts_nested_attributes_for :header, :reject_if => :all_blank
         end
       end

data/lib/freeberry/models/post.rb

@@ -9,7 +9,7 @@ module Freeberry
       
       module ClassMethods
         def self.extended(base)
-          base.send(:include, HeaderTools)
+          base.send(:include, HeaderUtils)
           base.class_eval do
             belongs_to :structure
             has_many :comments, :as => :commentable, :dependent => :delete_all

data/lib/freeberry/models/structure.rb

@@ -9,7 +9,7 @@ module Freeberry
       
       module ClassMethods
         def self.extended(base)
-          base.send(:include, HeaderTools)
+          base.send(:include, HeaderUtils)
           base.class_eval do
             enumerated_attribute :structure_type, :id_attribute => :kind
             enumerated_attribute :position_type, :id_attribute => :position

data/lib/freeberry/models/user.rb

@@ -17,6 +17,8 @@ module Freeberry
             
             scope :admins, joins(:roles).where(["`roles`.role_type = ?", ::RoleType.admin.id])
             scope :with_role, proc {|role| joins(:roles).where(["`roles`.role_type = ?", role.id]) }
+            
+            before_create :set_default_role, :if => :roles_empty?
           end
         end
       end
@@ -33,16 +35,15 @@ module Freeberry
 	      def has_role?(role_name)
 	        role_symbols.include?(role_name.to_sym)
 	      end
+	      
+	      def roles_empty?
+	        self.roles.empty?
+	      end
 	
 	      def roles_attributes=(value)
           options = value || {}
           options.each do |k, v|
-            r = self.roles.detect { |r| r.role_type.id == k.to_i }
-            if v.to_i == 0
-              self.roles.delete(r) unless r.nil?
-            else
-              r ||= self.roles.build(:role_type => ::RoleType.find(k.to_i))
-            end
+            create_or_destroy_role(k.to_i, v.to_i == 1)
           end
         end
 	
@@ -64,7 +65,22 @@ module Freeberry
         end
         
         protected
-    
+          
+          def set_default_role
+            unless has_role?(:default)
+              self.roles.build(:role_type => ::RoleType.default)
+            end
+          end
+          
+          def create_or_destroy_role(role_id, need_create = true)
+            role = self.roles.detect { |r| r.role_type.id == role_id }
+            if need_create
+              role ||= self.roles.build(:role_type => ::RoleType.find(role_id))
+            elsif !role.nil?
+              self.roles.delete(role)
+            end
+          end
+          
           def make_login
 	          return if self.email.blank?
 	          

data/lib/freeberry/railtie.rb

@@ -24,7 +24,7 @@ module Freeberry
       ::ActionController::Base.send :include, Freeberry::Controllers::AuthorizedSystem
       ::ActionController::Base.send :include, Freeberry::Controllers::HeadOptions
     
-      ::ActionView::Base.send :include, Freeberry::Controllers::HelperTools
+      ::ActionView::Base.send :include, Freeberry::Controllers::HelperUtils
     end
     
     rake_tasks do

data/lib/freeberry/utils.rb

@@ -18,7 +18,7 @@ module Freeberry
           when :datetime, :date, :timestamp, :time then 
             options[:extra_html] ||= "<script type='text/javascript'>
               $(function() {
-	              $('#_#{field_name}').datepicker({
+	              $('\##{form_name}_#{field_name}').datepicker({
 		              numberOfMonths: 1,
 		              dateFormat: 'dd.mm.yy'
 	              });

data/lib/freeberry/version.rb

@@ -1,8 +1,9 @@
+# encoding: utf-8
 module Freeberry
   module Version
     MAJOR = 0
     MINOR = 2
-    RELEASE = 6
+    RELEASE = 7
 
     def self.dup
       "#{MAJOR}.#{MINOR}.#{RELEASE}"

data/lib/generators/freeberry/manage_scaffold/templates/multiplay/views/item.html.erb

@@ -13,7 +13,7 @@
           <div class="dinamic-inner">
           	<div class="r-block">
               <div class="r-block-cont">
-                <%%= link_to <%= singular_name %>.name, edit_manage_<%= parent_singular_name %>_<%= singular_name %>_path(@<%= parent_singular_name %>.id, <%= singular_name %>.id), :class=>"title" %>
+                <%%= link_to <%= singular_name %>.title, edit_manage_<%= parent_singular_name %>_<%= singular_name %>_path(@<%= parent_singular_name %>.id, <%= singular_name %>.id), :class=>"title" %>
               </div>
             </div>
           </div>

data/lib/generators/freeberry/manage_scaffold/templates/single/views/item.html.erb

@@ -13,7 +13,7 @@
           <div class="dinamic-inner">
           	<div class="r-block">
               <div class="r-block-cont">
-                <%%= link_to <%= singular_name %>.name, edit_manage_<%= singular_name %>_path(:id=><%= singular_name %>.id), :class=>"title" %>
+                <%%= link_to <%= singular_name %>.title, edit_manage_<%= singular_name %>_path(:id=><%= singular_name %>.id), :class=>"title" %>
               </div>
             </div>
           </div>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: freeberry
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 2
-  - 6
-  version: 0.2.6
+  - 7
+  version: 0.2.7
 platform: ruby
 authors: 
 - Igor Galeta
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-01 00:00:00 +02:00
+date: 2011-02-07 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -54,12 +54,12 @@ files:
 - lib/freeberry/accessible_attributes.rb
 - lib/freeberry/controllers/authorized_system.rb
 - lib/freeberry/controllers/head_options.rb
-- lib/freeberry/controllers/helper_tools.rb
+- lib/freeberry/controllers/helper_utils.rb
 - lib/freeberry/core_ext.rb
 - lib/freeberry/core_ext/array.rb
 - lib/freeberry/core_ext/i18n.rb
 - lib/freeberry/core_ext/string.rb
-- lib/freeberry/header_tools.rb
+- lib/freeberry/header_utils.rb
 - lib/freeberry/model_filter.rb
 - lib/freeberry/models/asset.rb
 - lib/freeberry/models/comment.rb
@@ -331,8 +331,8 @@ homepage: https://github.com/galetahub/freeberry
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement