ideyabox 0.1.7 → 0.1.8

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

@@ -583,4 +583,8 @@ ol.sortable {
     .actions {margin-top: 0.5em; }
     padding-bottom: 1em; 
   }
+}
+.admin_mini {
+  width: 160px;
+  height: 100px;
 }

data/lib/ar_ideyabox.rb

@@ -0,0 +1,67 @@
+module ArIdeyabox
+  # In model just add this line
+  # has_not_this :person, through: :professions_people, order: :title, by: :title, group_by: {play: :title}
+  # :order and :by - optionally
+  # :group_by is for group selectors, if you want grouping roles by play titles, just add group_by: {play: :title}
+  
+  def visible
+    where(visible: true)
+  end
+
+  def by_position
+    order(:position)
+  end
+
+  def visible_by_position
+    visible.by_position
+  end
+
+  def first_el_tryer(object, by)
+    if by.class == Hash
+      object.try(by.keys[0]).try(by.values[0])
+    else
+      object.try(by)
+    end
+  end
+
+  def has_not_this(model_name, *args)
+    options = args.extract_options!
+    join_model = options[:through].to_s.singularize.camelize
+    self_id_sym = "#{self.to_s.underscore}_id".to_sym
+    array_first_el = options[:by] ? options[:by] : :title
+    group_by = options[:group_by]
+    includes = options[:includes]
+    model_name_id = "#{model_name}_id"
+
+    define_singleton_method("has_not_this_#{model_name}") do |ids|
+      excluded_ids = join_model.constantize.where(model_name_id.to_sym => ids).collect(&self_id_sym)
+      output = self.where{id << excluded_ids}
+      output = output.includes(includes) if includes
+      output = output.order(options[:order]) if options[:order]
+      if group_by
+        output = output.group_by{|a| first_el_tryer(a, group_by)} 
+        output.delete(nil)
+        output.each do |key, value|
+          array = []
+          value.each do |el|
+            array << [first_el_tryer(el, array_first_el), el.id]
+          end
+          output[key] = array
+        end
+        # output.to_a.sort
+      else
+        output.collect{|p| [first_el_tryer(p, array_first_el), p.id]}
+      end
+    end
+  end
+  
+  # Original method for one model looks like this
+  # def self.has_not_this_person(person_id)
+  #   excluded_ids = ProfessionsPerson.where(person_id: person_id).collect(&:profession_id)
+  #   self.where{id << excluded_ids}.order(:title).collect{|p| [p.title, p.id]}
+  # end
+end
+
+ActiveSupport.on_load :active_record do
+  extend ArIdeyabox
+end

data/lib/generators/ideyabox/many_to_many/many_to_many_generator.rb

@@ -7,6 +7,7 @@ module Ideyabox
       source_root File.expand_path('../templates', __FILE__)
       argument :controller_path,    :type => :string
       argument :child_controller_path,    :type => :string
+      argument :join_controller_path, :type => :string, :default => nil, :required => false
       argument :model_name,         :type => :string, :required => false
       argument :layout,             :type => :string, :default => "application",
                                     :banner => "Specify application layout"
@@ -95,7 +96,9 @@ module Ideyabox
 
       #linking model
       def linking_model_name
-        if ActiveRecord::Base.connection.table_exists? "#{child_name}_#{plural_resource_name}"
+        if join_controller_path
+          join_controller_path.singelarize.camelize
+        elsif ActiveRecord::Base.connection.table_exists? "#{child_name}_#{plural_resource_name}"
           "#{child_name}_#{plural_resource_name}".singularize.camelize
         elsif
           ActiveRecord::Base.connection.table_exists? "#{resource_name}_#{plural_child_name}"

data/lib/generators/ideyabox/many_to_many/templates/views/_form.html.haml

@@ -1,9 +1,10 @@
-= form_for [:admin, <%=linking_model_name%>.new], :remote => true do |f|
-  %table
-    %tr
-      %td= f.select :<%=child_name%>_id,  <%=plural_child_name%>, {:include_blank => true, :prompt => "add <%=child_name%>" }, :class => "chosen_select"
-      %td
+- unless <%=plural_child_name%>.empty?
+  = form_for [:admin, <%=linking_model_name%>.new], :remote => true do |f|
+    %table
+      %tr
+        %td= f.select :<%=child_name%>_id,  <%=plural_child_name%>, {:include_blank => true, :prompt => "add <%=child_name%>" }, :class => "chosen_select"
+        %td
 
-  = f.hidden_field :<%=resource_name%>_id, :value => <%=resource_name%>.id
+    = f.hidden_field :<%=resource_name%>_id, :value => <%=resource_name%>.id
 
-  = f.submit "Добавить", :class =>'black_button'
+    = f.submit "Добавить", :class =>'black_button'

data/lib/ideyabox.rb

@@ -2,4 +2,5 @@ require "ideyabox/version"
 
 module Ideyabox
   require 'ideyabox/engine'
+  require 'ar_ideyabox'
 end

data/lib/ideyabox/version.rb

@@ -1,3 +1,3 @@
 module Ideyabox
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ideyabox
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-06 00:00:00.000000000 Z
+date: 2013-04-07 00:00:00.000000000 Z
 dependencies: []
 description: Write a gem description
 email:
@@ -59,6 +59,7 @@ files:
 - app/helpers/admin_helper.rb
 - app/tasks/reset_db.rake
 - ideyabox.gemspec
+- lib/ar_ideyabox.rb
 - lib/generators/ideyabox/admin/admin_generator.rb
 - lib/generators/ideyabox/admin/templates/assets/admin.js
 - lib/generators/ideyabox/admin/templates/assets/admin.scss.erb