rademade_admin 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f63a923ddc8a45dd33a59bc21f0f388b7889cc1
-  data.tar.gz: c108f46620d426b8782a8c4b31696e3977d9d893
+  metadata.gz: d7d3ca2426580bad9e67e2103140b383dab75f3d
+  data.tar.gz: c4a7f799fada0a7a5b4e13ecb02053e383c4f49e
 SHA512:
-  metadata.gz: 28b13653558630df92357813bcdf7e1f2e36824f462e81fbb82c890334e98d17171b5d8c979ccba6a644737c9d96aadee2d73dfe000bac36a83f8d76b36ebf44
-  data.tar.gz: 225d4afbd5e10d3b8db5311a87c36716888870209c8b8b42d84c439df6e12be47905f34ea2376df216185c882dd5af0695f6fc127eba98798a72216c23c92616
+  metadata.gz: d1459c6e0eff7fc3977e13dcb53d4814f53f4582557d6451e853f2d93a413167d3a0687511e58066002bf442ee45526a0c36d043083d7006486893fbcccfaf02
+  data.tar.gz: cc0288f1716a8537d044e24e91905b186cf0613c6bacad89496435426ccec358fa5ba4ced92cb437f899ebc6d6753ff0af6ef8773e5d4f1912cdd8b70a55f481

data/Rakefile

@@ -14,21 +14,14 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path('../spec/dummy/Rakefile', __FILE__)
 load 'rails/tasks/engine.rake'
 
-
-
 Bundler::GemHelper.install_tasks
 
-require 'rake/testtask'
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
-end
+require 'rspec/core'
+require 'rspec/core/rake_task'
 
+RSpec::Core::RakeTask.new(:spec => 'app:db:test:prepare')
 
-task default: :test
+task default: :spec

data/app/assets/javascripts/rademade_admin/app/common/related-index.coffee

@@ -1,17 +1,3 @@
-getUrlParams = ->
-  pl = /\+/g
-  search = /([^&=]+)=?([^&]*)/g
-
-  decode = (s) ->
-    decodeURIComponent s.replace(pl, " ")
-
-  query = window.location.search.substring(1)
-  urlParams = {}
-  urlParams[decode(match[1])] = decode(match[2]) while match = search.exec(query)
-
-  urlParams
-
-
 initSelect = ->
   $item = $('.select2-add-link')
   url = $item.data('relListUrl')
@@ -30,25 +16,20 @@ initSelect = ->
     ajax :
       url : url
       dataType : 'json'
-      data : (term) -> {q: term}
-      results : (data) -> {results: data}
+      data : (term) -> {q : term}
+      results : (data) -> {results : data}
   ).on 'change', (e) ->
-    sendNew(e.added)
+    sendNew(e.added.link_url)
 
 
-sendNew = (added) ->
+sendNew = (linkUrl) ->
   $.ajax
-    url : ajax_link(added.id)
+    url : linkUrl
     type : 'PUT'
-    data : getUrlParams()
     success : ->
       location.reload()
 
 
-ajax_link = (id) ->
-  location.href.substring(0, location.href.indexOf(location.search)) + '/' + id + '/link_relation'
-
-
 $ ->
   $(document)
     .on('ready page:load init-select', initSelect)

data/app/assets/javascripts/rademade_admin/form/form-ajax-submit.coffee

@@ -74,6 +74,7 @@ window.FormAjaxSubmit = ($form) ->
     # It finds all 'array' members of data hash,
     # and splits their values by ',', cleaning all
     # non-space characters.
+    #todo extract. All class need super refactoring. Sergey, you can do it :)
     for memb of items.data
       array = items.data[memb]
       if $.isArray(array)
@@ -86,6 +87,9 @@ window.FormAjaxSubmit = ($form) ->
 
         items.data[memb] = if newArray.length is 0 then [''] else newArray
 
+    input_method = @_$form.find('input[name="_method"]')
+    items['_method'] = input_method.val() if input_method instanceof jQuery
+
     $.ajax(
       url: @_$form.attr('action')
       type: @_$form.attr('method')

data/app/assets/javascripts/rademade_admin.coffee

@@ -1,14 +1,35 @@
-#= require jquery
-#= require jquery_ujs
+#= require jquery/dist/jquery
+#= require jquery-ui/ui/core
+#= require jquery-ui/ui/widget
+#= require jquery-ui/ui/mouse
+#= require jquery-ui/ui/draggable
+#= require jquery-ui/ui/resizable
+#= require jquery-ui/ui/sortable
+#= require jquery-ui/ui/slider
+#= require jquery-fileupload/js/jquery.fileupload
+#= require jquery-fileupload/js/jquery.iframe-transport
+#= require jquery-form/jquery.form
+#= require jquery-serialize/jquery.serialize-object
+#= require jquery-formrestrict/jquery.formrestrict
+#= require jquery-validation/src/core
+#= require jquery-validation/src/ajax
+#= require jquery-validation/src/delegate
 #= require turbolinks
 #= require select2
 #= require ckeditor/init
-#= require magnific-popup
-#= require rademade_admin/library/underscore.js
-#= require rademade_admin/library/backbone.js
+#= require magnific-popup/dist/jquery.magnific-popup
+#= require flot/jquery.flot
+#= require flot/jquery.flot.resize
+#= require flot/jquery.flot.stack
+#= require knob/js/jquery.knob
+#= require uniform/jquery.uniform
+#= require data-tables/media/js/jquery.dataTables
+#= require wysihtml5/dist/wysihtml5-0.3.0
+#= require underscore/underscore
+#= require backbone/backbone
+#= require bootstrap/dist/js/bootstrap
+#= require bootstrap-datepicker/js/bootstrap-datepicker
 #= require_tree ./rademade_admin/library
-#= require jquery-fileupload/basic
-#= require_tree ./rademade_admin/form/library
 #= require_tree ./rademade_admin/form
 #= require_tree ./rademade_admin/app
 #= require_tree ./rademade_admin

data/app/assets/stylesheets/rademade_admin/detail_admin/icons.scss.erb

@@ -1,7 +1,7 @@
 i.tool{
 	height: 14px;
 	width: 14px;
-	background: url("<%=image_path('rademade_admin/icons/btn-tools.png')%>") no-repeat;
+	background: url("<%=image_path('rademade_admin/icons/btn-tool.png')%>") no-repeat;
 	display: inline-block;
 	margin-top: 1px;
   	*margin-right: .3em;

data/app/assets/stylesheets/rademade_admin.scss.erb

@@ -0,0 +1,19 @@
+/*
+ *= require jquery-fileupload/css/jquery.fileupload-ui
+ *= require select2/select2
+ *= require magnific-popup/dist/magnific-popup
+ *= require bootstrap/dist/css/bootstrap
+ *= require jquery-ui/themes/base/core
+ *= require jquery-ui/themes/base/slider
+ *= require uniform/themes/default/css/uniform.default
+ *= require_tree ./rademade_admin
+ */
+
+.cke_chrome {
+    width: 76% !important;
+    overflow: hidden;
+}
+
+#sidebar-nav #dashboard-menu ul.submenu {
+    margin-left: -7px;
+}

data/app/controllers/rademade_admin/abstract_controller.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module RademadeAdmin
   class AbstractController < ApplicationController
     include ::RademadeAdmin::UriHelper
@@ -20,5 +21,6 @@ module RademadeAdmin
         :message => 'Error occurred'
       }, :status => :unprocessable_entity
     end
+
   end
 end

data/app/controllers/rademade_admin/admin_users_controller.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module RademadeAdmin
   class AdminUsersController < ModelController
 
@@ -13,4 +14,4 @@ module RademadeAdmin
     end
 
   end
-end
+end

data/app/controllers/rademade_admin/application_controller.rb

@@ -1,7 +1,10 @@
+# -*- encoding : utf-8 -*-
 module RademadeAdmin
   class ApplicationController < ActionController::Base
+
     def current_ability
       @current_ability ||= RademadeAdmin::Ability.new(current_user)
     end
+
   end
 end

data/app/controllers/rademade_admin/dashboard_controller.rb

@@ -1,5 +1,5 @@
+# -*- encoding : utf-8 -*-
 module RademadeAdmin
-
   class DashboardController < RademadeAdmin::AbstractController
 
     skip_before_action :require_login, :only => [:login]

data/app/controllers/rademade_admin/model_controller.rb

@@ -1,8 +1,8 @@
+# -*- encoding : utf-8 -*-
 module RademadeAdmin
   class ModelController < RademadeAdmin::AbstractController
 
     extend RademadeAdmin::ModelOptions
-    include RademadeAdmin::Linker
     include RademadeAdmin::InstanceOptions
     include RademadeAdmin::Templates
     include RademadeAdmin::Notifier
@@ -15,7 +15,8 @@ module RademadeAdmin
       saver.create_model
       if saver.save_model
         saver.save_aggregated_data
-        success_insert saver.item
+        @item = saver.item
+        success_insert @item
       else
         render_errors saver.errors
       end
@@ -26,7 +27,8 @@ module RademadeAdmin
       saver = Saver.new(model_info, params)
       if saver.update_model
         saver.save_aggregated_data
-        success_update saver.item
+        @item = saver.item
+        success_update @item
       else
         render_errors saver.errors
       end
@@ -41,22 +43,34 @@ module RademadeAdmin
 
     def autocomplete
       authorize! :read, model_class
-      search_conditions = Search::AutocompleteConditions.new(params, origin_fields, model_info.filter_fields)
-      searcher = Search::Searcher.new model_info
-      items = searcher.search search_conditions
-      render :json => AutocompleteSerializer.new(items)
+      init_search Search::Conditions::Autocomplete.new(params, origin_fields, model_info.filter_fields)
+      render :json => Autocomplete::BaseSerializer.new(@items)
+    end
+
+    def link_autocomplete
+      authorize! :read, model_class
+      init_search Search::Conditions::Autocomplete.new(params, origin_fields, model_info.filter_fields)
+      render :json => Autocomplete::LinkSerializer.new(@items, params[:parent], params[:parent_id])
     end
 
-    # todo another action for related
     def index
       authorize! :read, model_class
-      is_related_list = !!params[:parent]
-      search_conditions = Search::ListConditions.new(params, origin_fields)
-      @searcher = Search::Searcher.new model_info
-      @items = @searcher.search search_conditions, is_related_list
-      @sortable_service = RademadeAdmin::SortableService.new(model_info, params)
+      init_search Search::Conditions::List.new(params, origin_fields)
+      init_sortable_service
+      respond_to do |format|
+        format.html { render_template }
+        format.json { render :json => @items }
+      end
+    end
+
+    def related_index
+      authorize! :read, model_class
+      init_search Search::Conditions::RelatedList.new(params, origin_fields)
+      init_sortable_service
+      @parent_model_info = RademadeAdmin::Model::Graph.instance.model_info(params[:parent])
+      @parent = @parent_model_info.model.find(params[:parent_id])
       respond_to do |format|
-        format.html { is_related_list ? render_template('related_index') : render_template }
+        format.html { render_template }
         format.json { render :json => @items }
       end
     end
@@ -73,18 +87,12 @@ module RademadeAdmin
       render_template
     end
 
-    def unlink_relation
-      item = find_item(params[:id])
-      unlink(item)
-      item.save
-      success_unlink item
+    def link_relation
+      process_link :link
     end
 
-    def link_relation
-      item = find_item(params[:id])
-      link(item)
-      item.save
-      success_link item
+    def unlink_relation
+      process_link :unlink
     end
 
     def show
@@ -103,7 +111,7 @@ module RademadeAdmin
     end
 
     def re_sort
-      @sortable_service = RademadeAdmin::SortableService.new(model_info, params)
+      init_sortable_service
       @sortable_service.re_sort_items
       success_action
     end
@@ -118,5 +126,20 @@ module RademadeAdmin
       render abstract_template(template)
     end
 
+    def init_search(search_conditions)
+      @searcher = Search::Searcher.new model_info
+      @items = @searcher.search search_conditions
+    end
+
+    def init_sortable_service
+      @sortable_service = RademadeAdmin::SortableService.new(model_info, params)
+    end
+
+    def process_link(method)
+      linker = Linker.new(model_info, params[:parent], params[:parent_id])
+      linker.send(method, params[:id])
+      send("success_#{method}", find_item(params[:id]))
+    end
+
   end
 end

data/app/controllers/rademade_admin/sessions_controller.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module RademadeAdmin
   class SessionsController < RademadeAdmin::AbstractController
 
@@ -5,7 +6,7 @@ module RademadeAdmin
 
     def create
       begin
-        user = RademadeAdmin::Login.admin( params )
+        user = RademadeAdmin::Login.admin(params)
         sign_in user
         render :json => user, :status => :ok
       rescue RademadeAdmin::Login::Error => e

data/app/helpers/rademade_admin/field_helper.rb

@@ -1,8 +1,29 @@
-# encoding: utf-8
+# -*- encoding : utf-8 -*-
 module RademadeAdmin::FieldHelper
 
   def field_to_label(field)
-    field.to_s.sub('_', ' ').capitalize
+    if configured_field?(field) and field.values.first[:label].present?
+      field.values.first[:label]
+    else
+      field.to_s.humanize
+    end
+  end
+
+  def field_name(field)
+    configured_field?(field) ? field.keys.first : field
+  end
+
+  def field_value(field, item)
+    if configured_field?(field)
+      if field.values.first[:method].present?
+        method_name = field.values.first[:method]
+      else
+        method_name = field.keys.first
+      end
+    else
+      method_name = field
+    end
+    item.send(method_name)
   end
 
   def pagination_option(number, name = 'paginate')
@@ -24,4 +45,10 @@ module RademadeAdmin::FieldHelper
                 :input_html => {:class => 'form-control'}
   end
 
-end
+  private
+
+  def configured_field?(field)
+    field.is_a? Hash
+  end
+
+end

data/app/helpers/rademade_admin/form_helper.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module RademadeAdmin::FormHelper
 
   def admin_form(record, model, &block)
@@ -20,7 +21,7 @@ module RademadeAdmin::FormHelper
 
     field = form.input(name, input_attr(attrs))
 
-    if multiple_relation?(model_info, name)
+    if model_info.model_reflection.many_relation? name
       link = admin_field_link_to_list(name, model_info, record).to_s
     else
       link = ''
@@ -34,12 +35,15 @@ module RademadeAdmin::FormHelper
   end
 
   def admin_field_link_to_list(name, model_info, record)
-    uri = admin_model_url_for(model_info.reflect_on_association(name).class_name, {
-      :action => :index,
-      :parent => model_info.model,
-      :parent_id => record.id.to_s
-    })
-    link_to(field_to_label(name).pluralize + ' list', uri)
+    if record.id
+      related_model = model_info.reflect_on_association(name).class_name
+      uri = admin_model_url_for(related_model, {
+        :action => :related_index,
+        :parent => model_info.model,
+        :parent_id => record.id.to_s
+      })
+      link_to(RademadeAdmin::Model::Graph.instance.model_info(related_model).item_name + ' list', uri) if uri
+    end
   end
 
   def admin_field_params(field_params)
@@ -50,14 +54,4 @@ module RademadeAdmin::FormHelper
     end
   end
 
-  private
-
-  def multiple_relation?(model_info, name)
-    association = model_info.reflect_on_association(name)
-    if association
-      inner_model = association.class_name.to_s
-      model_info.has_many.include? inner_model
-    end
-  end
-
-end
+end