rademade_admin 0.0.1 → 0.0.2

data/app/views/rademade_admin/_layouts/inner/related_index_table.html.erb

@@ -38,8 +38,7 @@
           <% end %>
           <td>
             <ul class="actions">
-              <li><%= button_to 'Unlink',
-                admin_unlink_uri(item, params[:parent], params[:parent_id]), {
+              <li><%= button_to 'Unlink', admin_unlink_uri(item, params[:parent], params[:parent_id]), {
                 :method => :patch,
                 :form => {:class => 'delete-item-form'}
               } %></li>

data/app/views/rademade_admin/abstract/index.html.erb

@@ -21,12 +21,13 @@
 
         <thead>
             <tr>
-                <% @list_fields.each_with_index do |name, index| %>
-                    <th class="col-md-3 sort-button" data-column="<%= name %>">
+                <% @list_fields.each_with_index do |name, index|
+                    list_field_name = field_name(name)
+                    %><th class="col-md-3 sort-button" data-column="<%= list_field_name %>">
                         <% unless index == 0 %>
                             <span class="line"></span>
                         <% end %>
-                        <span><%= field_to_label(name) + @sortable_service.sorting_sign(name) %></span>
+                        <span><%= field_to_label(name) + @sortable_service.sorting_sign(list_field_name) %></span>
                     </th>
                 <% end %>
 
@@ -39,7 +40,7 @@
 
         <% has_position = @sortable_service.has_position? %>
         <tbody class="table-sortable" data-position='<%= has_position %>'>
-            <% @items.each_with_index do |item, index| %>
+            <% @items.each_with_index do |item| %>
                 <tr<%
                     if has_position
                         %> id='<%= item.position %>'<%
@@ -47,7 +48,7 @@
                 %> data-id='<%= item.id %>'>
                     <% @list_fields.each do |name|
                         %><td><%
-                            value = item.send(name)
+                            value = field_value(name, item)
                             # todo remove hard code, extract helper (data adapter)
                             if value.respond_to? :id
                                 concat link_to value.to_s, admin_edit_uri(value)

data/app/views/rademade_admin/abstract/related_index.html.erb

@@ -1,5 +1,7 @@
 <% content_for :last_crumbs do %>
-  <%= link_to("#{params[:parent]}", admin_model_url_for(params[:parent], {
+  <%= link_to(admin_list_name(@parent_model_info), admin_list_uri(@parent_model_info)) %>
+  <span class="separator">-></span>
+  <%= link_to(@parent, admin_model_url_for(params[:parent], {
     :action => :edit,
     :id => params[:parent_id]
   })) %>
@@ -8,17 +10,22 @@
 <% end %>
 
 <% content_for :page_header do %>
-  <h3><%= admin_list_name(@model_info) %> of <%= params[:parent] %></h3>
+  <h3><%= admin_list_name(@model_info) %> of "<%= @parent %>"</h3>
 <% end %>
 
 <% content_for :content do %>
+  <% autocomplete_uri = admin_link_autocomplete_uri(@model_info, {
+    :parent => params[:parent],
+    :parent_id => params[:parent_id],
+    :format => :json
+  }) %>
   <%= content_tag(
     :input,
     nil,
     :type => 'hidden',
     :class => 'select2-add-link',
     :'data-model' => @model_class.to_s,
-    :'data-rel-list-url' => admin_autocomplete_uri(@model_info) + '.json')
+    :'data-rel-list-url' => autocomplete_uri)
   %><table class="table table-hover">
     <thead>
       <tr>
@@ -40,7 +47,7 @@
 
     <% has_position = @sortable_service.has_position? %>
     <tbody data-position='false'>
-      <% @items.each_with_index do |item, index| %>
+      <% @items.each do |item| %>
         <tr<%
           if has_position
             %> id='<%= item.position %>'<%

data/config/initializers/bower_rails.rb

@@ -0,0 +1,6 @@
+# -*- encoding : utf-8 -*-
+BowerRails.configure do |bower_rails|
+  bower_rails.install_before_precompile = true
+  bower_rails.resolve_before_precompile = true
+  bower_rails.clean_before_precompile = true
+end

data/config/initializers/devise.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 # Use this hook to configure devise mailer, warden hooks and so forth.
 # Many of these configuration options can be set straight in your model.
 Devise.setup do |config|

data/config/initializers/formtastic.rb

@@ -0,0 +1,13 @@
+# -*- encoding : utf-8 -*-
+module Formtastic
+  module Helpers
+    module InputHelper
+
+      def input_class(as)
+        @input_classes_cache ||= {}
+        @input_classes_cache[as] ||= input_class_by_trying(as)
+      end
+
+    end
+  end
+end

data/config/initializers/routes.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 class ActionDispatch::Routing::Mapper
   include RademadeAdmin::Routing::Mapper
-end
+end

data/config/routes.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 RademadeAdmin::Engine.routes.draw do
 
   mount Ckeditor::Engine => '/ckeditor'
@@ -11,7 +12,7 @@ RademadeAdmin::Engine.routes.draw do
   get 'login' => 'dashboard#login', :as => 'login'
 
   resources :sessions do
-    delete 'logout', :on => :collection
+    get 'logout', :on => :collection
   end
 
 end

data/lib/rademade_admin/bower/performer.rb

@@ -0,0 +1,14 @@
+# -*- encoding : utf-8 -*-
+require 'bower-rails/performer'
+
+module RademadeAdmin
+  module Bower
+    class Performer < BowerRails::Performer
+
+      def bower_root_path
+        @root_path ||= RademadeAdmin::Engine.root.to_s
+      end
+
+    end
+  end
+end

data/lib/rademade_admin/configuration.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module RademadeAdmin
   class Configuration
     class << self
@@ -14,4 +15,4 @@ module RademadeAdmin
       end
     end
   end
-end
+end

data/lib/rademade_admin/engine.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require 'rademade_admin/routing/mapper'
 require 'formtastic'
 
@@ -5,9 +6,12 @@ module RademadeAdmin
   class Engine < ::Rails::Engine
     isolate_namespace RademadeAdmin
 
+    config.assets.paths << "#{config.root}/vendor/assets/javascript/bower_components"
+
+    $LOAD_PATH << "#{config.root}/app/services/"
+
     paths = %W(
       #{config.root}/app/helpers/**/*.rb
-      #{config.root}/app/services/crud_controller/*.rb
       #{config.root}/app/services/**/*.rb
       #{config.root}/app/inputs/**/*.rb
       #{config.root}/lib/rademade_admin/**/*.rb

data/lib/rademade_admin/file_info_formatter.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module RademadeAdmin
   class FileInfoFormatter
 
@@ -9,4 +10,4 @@ module RademadeAdmin
     end
 
   end
-end
+end

data/lib/rademade_admin/hrml_buffer.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 #todo move to concern dir
 module RademadeAdmin
   class HtmlBuffer < Array
@@ -11,4 +12,4 @@ module RademadeAdmin
     end
 
   end
-end
+end

data/lib/rademade_admin/model/configuration/fields.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module RademadeAdmin
   module Model
     class Fields
@@ -30,4 +31,4 @@ module RademadeAdmin
 
     end
   end
-end
+end

data/lib/rademade_admin/model/configuration.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module RademadeAdmin
   module Model
     class Configuration
@@ -49,4 +50,4 @@ module RademadeAdmin
 
     end
   end
-end
+end

data/lib/rademade_admin/model/data_adapter/active_record.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module RademadeAdmin
   module Model
     module DataAdapter
@@ -12,12 +13,17 @@ module RademadeAdmin
           @model.reflect_on_association(name)
         end
 
+        def many_relation?(field)
+          reflect_on_association(field).try(:collection?)
+        end
+
         def association_foreign_key(relation)
-          assoc_key = relation.association_foreign_key
+          assoc_key = relation.name.to_s
           if relation.collection?
-            assoc_key += 's'
+            assoc_key.singularize.foreign_key.pluralize
+          else
+            assoc_key.foreign_key
           end
-          assoc_key
         end
 
         def fields
@@ -50,4 +56,4 @@ module RademadeAdmin
       end
     end
   end
-end
+end

data/lib/rademade_admin/model/data_adapter/mongoid.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module RademadeAdmin
   module Model
     module DataAdapter
@@ -12,6 +13,10 @@ module RademadeAdmin
           @model.reflect_on_association(name)
         end
 
+        def many_relation?(field)
+          reflect_on_association(field).try(:many?)
+        end
+
         def association_foreign_key(relation)
           rel_name = relation.name.to_s
           if relation.many?
@@ -46,4 +51,4 @@ module RademadeAdmin
       end
     end
   end
-end
+end

data/lib/rademade_admin/model/data_adapter.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module RademadeAdmin
   module Model
     module DataAdapter
@@ -14,6 +15,10 @@ module RademadeAdmin
         nil
       end
 
+      def many_relation?(field)
+        false
+      end
+
       def association_foreign_key(relation)
         nil
       end
@@ -56,4 +61,4 @@ module RademadeAdmin
 
     end
   end
-end
+end

data/lib/rademade_admin/model/graph.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module RademadeAdmin
   module Model
     class Graph
@@ -33,4 +34,4 @@ module RademadeAdmin
 
     end
   end
-end
+end

data/lib/rademade_admin/model/info.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module RademadeAdmin
   module Model
     class Info
@@ -93,9 +94,9 @@ module RademadeAdmin
 
       def default_field_type(field)
         if @model_reflection.association_fields.include? field
-          :'rademade_admin/admin_select'
+          'rademade_admin/admin_select'
         elsif @model_reflection.uploader_fields.include? field
-          :'rademade_admin/admin_file'
+          'rademade_admin/admin_file'
         else
           nil
         end
@@ -103,4 +104,4 @@ module RademadeAdmin
 
     end
   end
-end
+end

data/lib/rademade_admin/model/reflection/data.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module RademadeAdmin
   module Model
     class Reflection
@@ -44,4 +45,4 @@ module RademadeAdmin
       end
     end
   end
-end
+end

data/lib/rademade_admin/model/reflection/uploader.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module RademadeAdmin
   module Model
     class Reflection
@@ -7,7 +8,6 @@ module RademadeAdmin
           @model.respond_to?(:uploaders) ? @model.uploaders : []
         end
 
-        # todo move to module
         def uploader_fields
           @model.respond_to?(:uploaders) ? @model.uploaders.keys : []
         end
@@ -15,4 +15,4 @@ module RademadeAdmin
       end
     end
   end
-end
+end

data/lib/rademade_admin/model/reflection.rb

@@ -1,4 +1,7 @@
-#todo move to routing dir
+# -*- encoding : utf-8 -*-
+require 'rademade_admin/model/reflection/uploader'
+require 'rademade_admin/model/reflection/data'
+
 module RademadeAdmin
   module Model
     class Reflection
@@ -11,21 +14,10 @@ module RademadeAdmin
         @model, @controller, @controller_name, @inner = model, controller, controller_name, inner
       end
 
-      def parent_menu_item
-        @controller_name.camelize.constantize.instance_variable_get('@parent_item')
-      end
-
       def nested?
         @inner
       end
 
-      # @doc
-      # Admin::User => :users
-      # RademadeAdmin::User::Adapter => :adapters
-      def model_related_name
-        @model.to_s.demodulize.pluralize.downcase.to_sym
-      end
-
     end
   end
-end
+end

data/lib/rademade_admin/routing/mapper.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module RademadeAdmin
   module Routing
     module Mapper
@@ -15,6 +16,8 @@ module RademadeAdmin
 
             collection do
               get :autocomplete
+              get :link_autocomplete
+              get :related_index if parent_resource_actions.include? :index
               patch :re_sort
             end
 
@@ -24,7 +27,7 @@ module RademadeAdmin
 
             member do
               get :form if parent_resource_actions.include? :edit
-              patch :unlink_relation if parent_resource_actions.include? :update
+              post :unlink_relation if parent_resource_actions.include? :update
               put :link_relation if parent_resource_actions.include? :update
             end
 

data/lib/rademade_admin/routing/resource.rb

@@ -1,6 +1,7 @@
+# -*- encoding : utf-8 -*-
 module RademadeAdmin
   module Routing
     class Resource < ActionDispatch::Routing::Mapper::Resources::Resource
     end
   end
-end
+end

data/lib/rademade_admin/routing.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module RademadeAdmin::Routing
 
-end
+end