releaf 0.1.1 → 0.1.2

data/app/models/releaf/node.rb

@@ -46,7 +46,7 @@ module Releaf
       if parent_id
         url = parent.url + "/" + slug.to_s
       else
-        url = slug.to_s
+        url = "/" + slug.to_s
       end
 
       url
@@ -56,16 +56,17 @@ module Releaf
     # Return node content object public controller
 
     def controller
-      raise "Missing content object" if content_object.blank?
-      return "#{content_type}_controller".classify.constantize
+      raise "Missing content object" if content_type.blank?
+      return "#{content_type.classify.pluralize}Controller".constantize
     end
 
     def self.get_object_from_path path, params = {}
+      raise ArgumentError, 'path must be String or Array' unless path.is_a?(String) || path.is_a?(Array)
       node = nil
       parent_node = nil
 
-      if path.class == String
-        path = path.split("/").reject(&:empty?)
+      if path.is_a? String
+        path = path.split('?').first.split("/").reject(&:empty?)
       end
 
       unless params[:locale].nil?

data/app/models/releaf/node_base.rb

@@ -7,12 +7,18 @@ module Releaf
       return _node_classes(self).reject { |n| n.name =~ /^Releaf::/ }
     end
 
+    def self.releaf_fields_to_display action
+      column_names - %w[id created_at updated_at position]
+    end
+
+    def self.node_type
+      "Releaf::NodeBase"
+    end
+
     private
 
     def self._node_classes(klass)
-      return [klass] if klass.subclasses.blank?
-
-      classes = []
+      classes = [klass]
 
       klass.subclasses.each do |sublcass|
         classes += _node_classes(sublcass)

data/app/models/releaf/role.rb

@@ -10,11 +10,16 @@ module Releaf
     before_save :update_permissions
     after_save :update_default_role
 
+    attr_accessible \
+      :name,
+      :default,
+      :default_controller
+
     alias_attribute :to_text, :name
 
     ::AdminAbility::PERMISSIONS.each do |perms|
       if perms.is_a? Array
-        # attr_accessible :"#{perms[0]}_permissions"
+        attr_accessible :"#{perms[0]}_permissions"
         define_method :"#{perms[0]}_permissions=" do |p|
           return if p.nil?
           raise ArgumentError, "permission must be one of: #{perms[1].join(', ')}" unless perms[1].include? p.to_s
@@ -30,9 +35,10 @@ module Releaf
           end
           return perms[1].first
         end
+        alias_method "#{perms[0]}_permissions?", "#{perms[0]}_permissions"
 
       elsif perms.is_a? String
-        # attr_accessible :"#{perms}_permission"
+        attr_accessible :"#{perms}_permission"
         define_method "#{perms}_permission=" do |p|
           return if p.nil?
 
@@ -45,6 +51,7 @@ module Releaf
           return (iv == '1' || iv == true) unless iv.nil?
           permissions.include? perms
         end
+        alias_method "#{perms}_permission?", "#{perms}_permission"
       end
     end
 

data/app/views/layouts/releaf/admin.html.haml

@@ -10,9 +10,12 @@
     - _assets_path = __FILE__.split('/')[0...-1].join('/') + "/../../../assets"
 
     - controller_asset = params[:controller]
-    - ['.css.scss.erb', '.scss.erb', '.css.scss', '.scss', '.css.erb', '.css'].each do |ext|
-      - if File.exists?(_assets_path + "/stylesheets/releaf/controllers/#{controller_asset}" + ext)
+    - %w[css.scss.erb scss.erb css.scss scss css.erb css].each do |ext|
+      - if File.exists?(_assets_path + "/stylesheets/releaf/controllers/#{controller_asset}.#{ext}")
         = stylesheet_link_tag "releaf/controllers/#{controller_asset}"
+      - if File.exists?(Rails.root.to_s + "/app/assets/stylesheets/controllers/#{controller_asset}.#{ext}")
+        = stylesheet_link_tag "controllers/#{controller_asset}"
+
   %body.yui3-skin-sam
     - if self.send(:"#{Releaf::ReleafDeviseHelper.devise_admin_model_name}_signed_in?")
       .main_menu
@@ -29,9 +32,9 @@
                   = image_tag("releaf/module.png")
                 %span.name_wrap= t(item, :scope => "admin.main_menu")
 
-    #body_wrap{:class => "module-#{controller.controller_name} method-#{controller.action_name} controller-#{params[:controller].tr( '/', '-' )} action-#{controller.action_name} view-#{ controller.active_template.virtual_path.split('/').pop() if controller.active_template }"}
+    #body_wrap{:class => "#{current_feature}-feature module-#{controller.controller_name} method-#{controller.action_name} controller-#{params[:controller].tr( '/', '-' )} action-#{controller.action_name} view-#{ controller.active_template.virtual_path.split('/').pop() if controller.active_template }"}
       - if self.send(:"#{Releaf::ReleafDeviseHelper.devise_admin_model_name}_signed_in?")
-        - if @panel_layout == true
+        - if @panel_layout
           .panel_layout
             .secondary_panel
               = controller.secondary_panel.html_safe
@@ -47,5 +50,8 @@
         .loading_icon
 
     = javascript_include_tag "releaf/application"
-    - if File.exists?(_assets_path + "/javascripts/releaf/controllers/#{controller_asset}.js")
-      = javascript_include_tag "releaf/controllers/#{controller_asset}"
+    - %w[js js.erb].each do |ext|
+      - if File.exists?(_assets_path + "/javascripts/releaf/controllers/#{controller_asset}.#{ext}")
+        = javascript_include_tag "releaf/controllers/#{controller_asset}"
+      - if File.exists?(Rails.root.to_s + "/app/assets/javascripts/controllers/#{controller_asset}.#{ext}")
+        = javascript_include_tag "controllers/#{controller_asset}"

data/app/views/layouts/releaf/devise.html.haml

@@ -0,0 +1,32 @@
+!!! 5
+%html
+  %head
+    %title re:leaf
+    = csrf_meta_tags
+    %link{ :rel =>"icon", :href => asset_path("releaf/favicon.ico"), :type => "image/x-icon" }
+
+    = stylesheet_link_tag "releaf/application"
+
+    - _assets_path = __FILE__.split('/')[0...-1].join('/') + "/../../../assets"
+
+    - controller_asset = params[:controller]
+    - %w[css.scss.erb scss.erb css.scss scss css.erb css].each do |ext|
+      - if File.exists?(_assets_path + "/stylesheets/releaf/controllers/#{controller_asset}.#{ext}")
+        = stylesheet_link_tag "releaf/controllers/#{controller_asset}"
+      - if File.exists?(Rails.root.to_s + "/app/assets/stylesheets/controllers/#{controller_asset}.#{ext}")
+        = stylesheet_link_tag "controllers/#{controller_asset}"
+
+  %body.yui3-skin-sam
+    #body_wrap{:class => "module-#{controller.controller_name} method-#{controller.action_name} controller-#{params[:controller].tr( '/', '-' )} action-#{controller.action_name} view-#{ controller.active_template.virtual_path.split('/').pop() if controller.active_template }"}
+      = yield
+
+    #preload_wrap
+      #preload
+        .loading_icon
+
+    = javascript_include_tag "releaf/application"
+    - %w[js js.erb].each do |ext|
+      - if File.exists?(_assets_path + "/javascripts/releaf/controllers/#{controller_asset}.#{ext}")
+        = javascript_include_tag "releaf/controllers/#{controller_asset}"
+      - if File.exists?(Rails.root.to_s + "/app/assets/javascripts/controllers/#{controller_asset}.#{ext}")
+        = javascript_include_tag "controllers/#{controller_asset}"

data/app/views/releaf/aliases/{_edit.header.haml → _edit.header.html.haml}

@@ -11,7 +11,7 @@
     .groupInfo
       .field
         %label{:for => "context"} Konteksts:
-        %input#context{:name => "translation_group[scope]", :size => "50", :type => "text", :value => @item.scope}/
+        %input#context{:name => "translation_group[scope]", :size => "50", :type => "text", :value => @resource.scope}/
     .aliasesTable.aliasesTableHead
       .th.codeHeader{:style => "width: 208px; "}>< Nosaukums
       - Settings.i18n_locales.each do |locale|

data/app/views/releaf/aliases/_index.row.html.haml

@@ -0,0 +1,5 @@
+%a.row{ 'data-id' => resource.id, :href => "#{url_for( :action => list_action, :id => resource.group_id )}#translation_#{resource.id}" }
+  %span= resource.translation_group.scope
+  %span= resource.key
+  - Settings.i18n_locales.each do |locale|
+    %span= resource.locales[locale]

data/app/views/releaf/base/_edit.body.html.haml

@@ -0,0 +1,11 @@
+.body.inset_box
+  .section
+    -#TODO: improve style/html
+    -if f.object.errors.any?
+      #error_explanation
+        %strong= "#{pluralize(f.object.errors.count, "error")} prohibited this news from being saved:"
+        %ul
+          - f.object.errors.full_messages.each do |msg|
+            %li= msg
+
+    = render 'edit.fields', :f => f, :fields => fields_to_display, :view_prefix => 'edit.field'

data/app/views/releaf/base/_edit.field.html.haml

@@ -0,0 +1,23 @@
+- name_without_id_or_type = name.sub(/_(id|type)$/, '')
+
+- if f.object.class.reflect_on_association(name_without_id_or_type).try(:options).try('[]', :polymorphic) == true
+  -# name =~ /_id$/ is required to prevent user template from being renedred 2x times:
+  -# first time for _id field, second time for _type field
+  - if name =~ /_id$/ && has_template?( "_#{view_prefix}.#{name_without_id_or_type}" )
+    = render "#{view_prefix}.#{name_without_id_or_type}", :f => f, :name => name, :view_prefix => view_prefix
+
+- else
+  - if has_template? "_#{view_prefix}.#{name}"
+    = render "#{view_prefix}.#{name}", :f => f, :name => name, :view_prefix => view_prefix
+  - else
+
+    - render_field_type, use_i18n = render_field_type(f.object, name)
+
+    - if use_i18n and has_template?( "_edit.field_type_#{render_field_type}_i18n" )
+      = render "edit.field_type_#{render_field_type}_i18n", :f => f, :name => name
+
+    - elsif has_template? "_edit.field_type_#{render_field_type}"
+      = render "edit.field_type_#{render_field_type}", :f => f, :name => name
+
+    - else
+      = render "edit.field_type_text", :f => f, :name => name

data/app/views/releaf/base/{_edit.field.type_autocomplete.haml → _edit.field_type_autocomplete.html.haml}

@@ -8,7 +8,7 @@
     - if can_create == true
       = f.text_field :"#{name}_text", :'data-autocomplete-url' => autocomplete_url
     - else
-      %input{:type => :text, :name => "_tmp_field_#{f.object.object_id}_#{rand(999999999)}", :'data-autocomplete-url' => autocomplete_url, :value => f.object.send(name.sub(/_id$/, '')).to_text }/
+      %input{:type => :text, :name => "_tmp_field_#{f.object.object_id}_#{rand(999999999)}", :'data-autocomplete-url' => autocomplete_url, :value => resource_to_text(f.object.send(name.sub(/_id$/, ''))) }/
     = image_tag 'releaf/input/autocompleteExpandIcon.png', :alt => '', :class => :autocomplete_expand_icon
     = f.hidden_field name
 

data/app/views/releaf/base/{_edit.field.type_checkbox.haml → _edit.field_type_boolean.html.haml}

@@ -1,4 +1,4 @@
-.field.type_checkbox{ 'data-name' => name }
+.field.type_boolean{ 'data-name' => name }
   .value
     = f.check_box name
     = f.label name, name.to_s.humanize

data/app/views/releaf/base/_edit.field_type_image.html.haml

@@ -0,0 +1,12 @@
+.field.type_text{ 'data-name' => name }
+  - field_name = name.sub(/_uid$/, '')
+
+  .label_wrap><= f.label field_name, field_name.to_s.humanize + ':'
+  .value><
+    = f.file_field field_name, :accept => 'image/png,image/jpeg,image/bmp,image/gif'
+    - unless f.object.send(name).blank?
+      .value_preview
+        = f.hidden_field "retained_#{field_name}"
+        - img_object = f.object.send(field_name)
+        = link_to image_tag(img_object.thumb('x128>').url, :alt => ''), img_object.url, :target => :_blank, :data => {:lightbox => true }
+  .clear

data/app/views/releaf/base/_edit.field_type_item.html.haml

@@ -0,0 +1,31 @@
+:ruby
+  select_params = [name]
+
+
+  if local_assigns.key? :select_options
+    select_params.push select_options
+  else
+    collection = f.object.class.reflect_on_association(name.sub(/_id$/, '').to_sym).try(:klass).try(:all)
+    select_params.push options_from_collection_for_select(collection, :id, resource_to_text_method(collection.first), f.object.send(name))
+  end
+
+  if local_assigns.key? :options
+    select_params.push options
+  end
+  if local_assigns.key? :html_options
+    select_params.push html_options
+  end
+
+  include_blank = true
+  f.object.class.validators_on(name).each do |validator|
+    if validator.is_a? ActiveModel::Validations::PresenceValidator
+      include_blank = f.object.new_record?
+      break
+    end
+  end
+  select_params.push Hash[:include_blank, include_blank]
+
+.field.type_item{ 'data-name' => name }
+  .label_wrap><= f.label name, name.to_s.humanize + ':'
+  .value><= f.select *select_params
+  .clear

data/app/views/releaf/base/_edit.field_type_link_i18n.html.haml

@@ -0,0 +1,26 @@
+- default_locale = Settings.i18n_locales.first
+.field.type_link.i18n{ :'data-name' => name }
+  - Settings.i18n_locales.each_with_index do |locale, i|
+    - translation = f.object.translations.find_or_initialize_by_locale(locale)
+    - is_default_locale = locale == default_locale
+
+    .localization{:"data-locale" => locale, :style => is_default_locale ? nil : 'display:none'}
+      = f.fields_for :"translations", translation, :child_index => i do |ff|
+        .label_wrap
+          = ff.label name, name.to_s.humanize + ':'
+        .value
+          - unless translation.new_record?
+            = ff.hidden_field :id
+          = ff.hidden_field :locale
+
+          - if is_default_locale
+            = f.hidden_field name, :class => :sync_field
+            = ff.text_field name, :class => :sync_field
+          - else
+            = ff.text_field name
+        .clear
+
+  .localization_buttons
+    - Settings.i18n_locales.each_with_index do |locale, i|
+      - is_default_locale = locale == default_locale
+      %button{:type => :button, :"data-locale" => locale, :class => is_default_locale ? :active : nil}= locale

data/app/views/releaf/base/_edit.fields.association.html.haml

@@ -0,0 +1,48 @@
+- if has_template? "_#{view_prefix}.#{field}"
+  = render "#{view_prefix}.#{field}", :f => f, :name => field
+
+- else
+  - new_view_prefix = "#{view_prefix}.#{field}"
+
+
+  - case reflection.macro
+  - when :has_many
+    - sortable_objects = reflection.klass.column_names.include?('position')
+    .nested_wrap{:'data-name' => field}
+      .nested_title= I18n.t(field)
+      .list{:'data-sortable' => sortable_objects ? '' : nil}
+
+        .item.template{:style => 'display:none;'}
+          = f.fields_for field, reflection.klass.new, :child_index => '_template_' do |ff|
+            = render 'edit.fields.has_many_template', :ff => ff, :sortable_objects => sortable_objects, :subfields => subfields, :view_prefix => new_view_prefix, :field => field
+
+        - f.object.send(field).each_with_index do |obj, i|
+          .item
+            = f.fields_for field, obj, :child_index => i do |ff|
+              = render 'edit.fields.has_many_template', :ff => ff, :sortable_objects => sortable_objects, :subfields => subfields, :view_prefix => new_view_prefix, :field => field
+
+
+      %button.add.new(type='button')
+        = image_tag 'releaf/icons/add.png', :atl => ''
+        %span= I18n.t("New")
+
+
+  - when :belongs_to
+    .nested_wrap{:'data-name' => field}
+      .nested_title= I18n.t(field)
+      .item
+        = f.fields_for field, f.object.send(field) do |ff|
+
+          - if subfields.is_a? Array
+            - subfields.each do |subfield|
+              - if has_template? "_#{new_view_prefix}.#{subfield}"
+                = render "#{new_view_prefix}.#{subfield}", :f => ff, :name => subfield
+              - else
+                = render 'edit.fields', :f => ff, :fields => subfields, :view_prefix => new_view_prefix
+
+          - elsif subfields.is_a? String or subfields.is_a? Symbol
+            - if has_template? "_#{new_view_prefix}.#{field}"
+              = render "_#{new_view_prefix}.#{field}", :f => ff, :name => field
+            - else
+              = render 'edit.field', :f => ff, :name => field
+

data/app/views/releaf/base/_edit.fields.has_many_template.html.haml

@@ -0,0 +1,15 @@
+- if sortable_objects
+  = ff.hidden_field :position, :class => :position
+  .handle  
+
+- if subfields.is_a? Array
+
+  = render 'edit.fields', :f => ff, :fields => subfields, :view_prefix => view_prefix
+
+- elsif subfields.is_a? String or subfields.is_a? Symbol
+  - if has_template? "_#{view_prefix}.#{field}"
+    = render "#{view_prefix}.#{field}", :f => ff, :name => field
+  - else
+    = render 'edit.field', :f => ff, :name => field, :view_prefix => view_prefix
+
+= render 'edit.field_type_delete_nested', :f => ff

data/app/views/releaf/base/_edit.fields.html.haml

@@ -0,0 +1,20 @@
+- fields.each do |field|
+  - if field.is_a?(String) or field.is_a?(Symbol)
+    -# = Rails.logger.debug "\n\n\n"
+    -# = Rails.logger.debug f.object.class
+    -# = Rails.logger.debug "\n\n\n"
+    - reflection = f.object.class.reflections[field.to_sym]
+
+  - if (field.is_a?(String) or field.is_a?(Symbol)) && !reflection
+    - if has_template? "_#{view_prefix}.#{field}"
+      = render "#{view_prefix}.#{field}", :f => f, :name => field
+    - else
+      = render 'edit.field', :f => f, :name => field, :view_prefix => view_prefix
+
+  - elsif field.is_a? Hash
+    - field.each_pair do |field, subfields|
+      - reflection = f.object.class.reflections[field.to_sym]
+      = render 'edit.fields.association', :f => f, :field => field, :subfields => subfields, :reflection => reflection, :view_prefix => view_prefix
+  - elsif reflection
+    - subfields = reflection.klass.column_names - %w[id created_at updated_at password password_confirmation encrypted_password position]
+    = render 'edit.fields.association', :f => f, :field => field, :subfields => subfields, :reflection => reflection, :view_prefix => view_prefix

data/app/views/releaf/base/{_edit.footer.haml → _edit.footer.html.haml}

@@ -8,7 +8,7 @@
       = image_tag("releaf/icons/disk.png", :alt => "") \
       = t('save')
   .block.right_block
-    - if @features[:destroy] && !f.object.new_record?
-      %a.button{ :href => url_for( :action => 'confirm_destroy', :id => f.object.id ) }
+    - if @features[:destroy] && !resource.new_record?
+      %a.button{ :href => url_for( :action => 'confirm_destroy', :id => resource.id ) }
         = image_tag('releaf/icons/bin_empty.png', :alt => '')
         %span= t('destroy')