ideyabox 0.1.6 → 0.1.7

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

@@ -577,4 +577,10 @@ ol.sortable {
     cursor:pointer;
     &:hover {color:$a_hover_color;}
   }
+}
+.login {
+  #main, #page {
+    .actions {margin-top: 0.5em; }
+    padding-bottom: 1em; 
+  }
 }

data/app/helpers/admin_helper.rb

@@ -1,5 +1,33 @@
 # encoding: utf-8
 module AdminHelper
+
+  def multiple_sortable(table_id, url)
+    %Q{
+      <script type="text/javascript">
+        $(document).ready(function() {
+          $("##{table_id} tbody").sortable( {
+            placeholder: 'ui-sortable-placeholder',
+            forcePlaceholderSize: true,
+            dropOnEmpty: false,
+            cursor: 'crosshair',
+            opacity: 0.75,
+            items: 'tr',
+            handle: '.handle',
+            scroll: true,
+            update: function() {
+              $.ajax( {
+                type: 'post',
+                data: $("##{table_id} tbody").sortable('serialize') + '&authenticity_token=#{u(form_authenticity_token)}',
+                dataType: 'script',
+                url: '#{url}'
+                })
+              }
+            });
+          });
+      </script>
+    }.gsub(/[\n ]+/, ' ').strip.html_safe
+  end  
+  
   def sortable(url)
     %Q{
       <script type="text/javascript">

data/lib/generators/ideyabox/images_scaffold/images_scaffold_generator.rb

@@ -28,7 +28,7 @@ module Ideyabox
       end
 
       def add_to_parent_view
-        final_string = "\n- content_for(:page_sidebar) do\n  - unless @#{parent_name}.new_record?\n    = render 'admin/#{plural_resource_name}/#{plural_resource_name}'\n"
+        final_string = "\n- content_for(:page_sidebar) do\n  - unless @#{parent_name}.new_record?\n    %h2 Gallery\n    .bordered_box\n      = render 'admin/#{plural_resource_name}/#{plural_resource_name}'\n"
 
         inject_into_file "app/views/admin/#{plural_parent_name}/edit.html.haml", final_string, :before => "- content_for :page_header do"
 

data/lib/generators/ideyabox/images_scaffold/templates/controllers/controller.rb

@@ -3,9 +3,9 @@ class Admin::<%= @model_name.demodulize.pluralize -%>Controller < Admin::Applica
 
 <%- if column_names.include?("visible") -%>
   def toggleshow
-    @<%= plural_resource_name %> = <%= @model_name.demodulize -%>.find(params[:id])
-    @<%= plural_resource_name %>.toggle(:visible)
-    @<%= plural_resource_name %>.save
+    @<%= resource_name %> = <%= @model_name.demodulize -%>.find(params[:id])
+    @<%= resource_name %>.toggle(:visible)
+    @<%= resource_name %>.save
     render :nothing => true
   end
 <%- end -%><%- if column_names.include?("position") -%>

data/lib/generators/ideyabox/images_scaffold/templates/views/_images.html.haml

@@ -1,4 +1,3 @@
-%h2 Галерея изображений
 .image-list#<%=plural_resource_name%>
   = render @<%=parent_name%>.<%=plural_resource_name%>.order('position')
   = image_sortable("<%=plural_resource_name%>")

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

@@ -0,0 +1,289 @@
+require 'rails/generators'
+require 'rails/generators/generated_attribute'
+
+module Ideyabox
+  module Generators
+    class ManyToManyGenerator < ::Rails::Generators::Base
+      source_root File.expand_path('../templates', __FILE__)
+      argument :controller_path,    :type => :string
+      argument :child_controller_path,    :type => :string
+      argument :model_name,         :type => :string, :required => false
+      argument :layout,             :type => :string, :default => "application",
+                                    :banner => "Specify application layout"
+
+      def initialize(args, *options)
+        super(args, *options)
+        initialize_views_variables
+      end
+
+      def copy_views
+        generate_views
+      end
+
+      # def add_locale_templates
+      #   add_to_locales
+      # end
+
+      def add_resources_and_root
+        add_resource_route
+      end
+
+      def updating_views
+        update_views
+      end
+
+      def updating_controllers
+        update_controllers
+      end
+
+      def updating_models
+        update_model
+      end
+
+      protected
+
+      def initialize_views_variables
+        @base_name, @controller_class_path, @controller_file_path, @controller_class_nesting, @controller_class_nesting_depth = extract_modules(controller_path)
+
+        @child_contoller_class_nesting = child_controller_path
+
+        @controller_routing_path = @controller_file_path.gsub(/\//, '_')
+        @model_name = @controller_class_nesting + "::#{@base_name.singularize.camelize}" unless @model_name
+        @model_name = @model_name.camelize
+
+        @child_model_name = @child_contoller_class_nesting.singularize.camelize
+
+      end
+
+      def controller_routing_path
+        @controller_routing_path
+      end
+
+      def singular_controller_routing_path
+        @controller_routing_path.singularize
+      end
+
+      def model_name
+        @model_name.demodulize
+      end
+
+      def plural_model_name
+        @model_name.pluralize
+      end
+
+      #parent model
+      def resource_name
+        @model_name.demodulize.underscore
+      end
+
+      def plural_resource_name
+        resource_name.pluralize
+      end
+
+      #child model
+      def child_model
+        @child_model_name
+      end
+
+      def child_name
+        @child_model_name.demodulize.underscore
+      end
+
+      def plural_child_name
+        child_name.pluralize
+      end     
+
+      #linking model
+      def linking_model_name
+        if 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}"
+          "#{resource_name}_#{plural_child_name}".singularize.camelize
+        end       
+      end
+
+      def linking_resource_name
+        linking_model_name.underscore
+      end
+
+      def plural_linking_resource_name
+        linking_resource_name.pluralize
+      end
+
+
+      def sort_priority(column_name)
+        case column_name
+        when "position" then 1
+        when "visible" then 2
+        when "name" then 3
+        when "title" then 3
+        else 5
+        end
+      end
+
+      def columns
+        begin
+          excluded_column_names = %w[id created_at updated_at]
+          @model_name.constantize.columns.reject{|c| excluded_column_names.include?(c.name) || c.name.index("_id") }.sort{|a, b| sort_priority(a.name) <=> sort_priority(b.name)}.collect{|c| ::Rails::Generators::GeneratedAttribute.new(c.name, c.type)}
+        rescue NoMethodError
+          @model_name.constantize.fields.collect{|c| c[1]}.reject{|c| excluded_column_names.include?(c.name) || c.name.index("_id") }.collect{|c| ::Rails::Generators::GeneratedAttribute.new(c.name, c.type.to_s)}
+        end
+      end
+      
+      def column_names
+        @model_name.constantize.column_names
+      end
+      
+      def child_columns
+        child_model.constantize.column_names
+      end
+      
+      def linking_columns
+        linking_model_name.constantize.column_names
+      end
+
+      def get_title
+        if child_columns.include?("title")
+          t = 'title'
+        elsif child_columns.include?("name")
+          t = 'name'
+        elsif child_columns.include?("username")
+          t = 'username'
+        else
+          t = 'id'
+        end
+        t
+      end
+
+      def extract_modules(name)
+        modules = name.include?('/') ? name.split('/') : name.split('::')
+        name    = modules.pop
+        path    = modules.map { |m| m.underscore }
+        file_path = (path + [name.underscore]).join('/')
+        nesting = modules.map { |m| m.camelize }.join('::')
+        [name, path, file_path, nesting, modules.size]
+      end
+
+      def generate_views
+        views = {
+          "views/_form.html.#{ext}"            => "app/views/admin/#{plural_linking_resource_name}/_form.html.#{ext}",
+          "views/_one_to_one.html.#{ext}"            => "app/views/admin/#{plural_linking_resource_name}/_#{linking_resource_name}.html.#{ext}",
+          "views/destroy.js.erb"            => "app/views/admin/#{plural_linking_resource_name}/destroy.js.haml",
+          "views/create.js.erb"            => "app/views/admin/#{plural_linking_resource_name}/create.js.haml",
+          "views/_child.html.haml"            => "app/views/admin/#{plural_resource_name}/_#{plural_child_name}.html.haml",
+        }
+        views.delete("_sort_buttons.html.#{ext}") unless column_names.include?("position")
+        selected_views = views
+        options.engine == generate_erb(selected_views)
+      end
+
+      def generate_erb(views)
+        views.each do |template_name, output_path|
+          template template_name, output_path
+        end
+        generate_controller
+      end
+
+      def ext
+        :haml
+      end
+
+      def generate_controller
+        template "controllers/controller.rb", "app/controllers/admin/#{plural_linking_resource_name}_controller.rb"
+      end
+
+      def update_controllers
+        inject_into_file "app/controllers/admin/#{plural_resource_name}_controller.rb", "\n    @#{plural_child_name} = #{child_model}.has_not_this_#{resource_name}(params[:id])", :after => "\n  def edit"
+      end
+
+      def update_model
+        inject_into_file "app/models/#{resource_name}.rb", "\n  has_many :#{plural_child_name}, :through => :#{plural_linking_resource_name}\n  has_many :#{plural_linking_resource_name}\n
+  # def self.has_not_this_#{child_name}(#{child_name}_id)
+  #   h = Hash.new
+  #   self.order(#{child_model.constantize.column_names.include?('title') ? '\'title\'' : 'created_at'}).each do |p|
+  #     if p.#{plural_linking_resource_name}.where(:#{child_name}_id=>#{child_name}_id).length == 0
+  #       h[\"\#{p.#{@model_name.constantize.column_names.include?('title') ? 'title' : 'id'}}\"] = p.id
+  #     end
+  #   end
+  #   return h
+  # end
+        ", :after => "class #{model_name} < ActiveRecord::Base"
+
+        inject_into_file "app/models/#{child_model}.rb", "\n  has_many :#{plural_resource_name}, :through => :#{plural_linking_resource_name}\n  has_many :#{plural_linking_resource_name}\n
+  def self.has_not_this_#{resource_name}(#{resource_name}_id)
+    h = Hash.new
+    self.order('#{@model_name.constantize.column_names.include?(get_title.to_s) ? (get_title.to_s) : 'created_at'}').each do |p|
+      if p.#{plural_linking_resource_name}.where(:#{resource_name}_id=>#{resource_name}_id).length == 0
+        h[\"\#{p.#{get_title.to_s}}\"] = p.id
+      end
+    end
+    return h
+  end
+        ", :after => "class #{child_model} < ActiveRecord::Base"
+
+        inject_into_file "app/models/#{linking_resource_name}.rb", "\n  belongs_to :#{resource_name}\n  belongs_to :#{child_name}\n  validates :#{resource_name}_id, :#{child_name}_id, :presence => true", :after => "class #{linking_model_name} < ActiveRecord::Base" 
+        if linking_columns.include?("position")
+        inject_into_file "app/models/#{linking_resource_name}.rb", "\n
+  before_create :set_position
+  def set_position
+    if self.#{resource_name}.#{plural_linking_resource_name}.length > 0 && self.#{resource_name}.#{plural_linking_resource_name}.order('position').last.position
+      self.position = self.#{resource_name}.#{plural_linking_resource_name}.order('position').last.position + 1
+    else
+      self.position = 0
+    end
+  end
+        ", :after => "class #{linking_model_name} < ActiveRecord::Base" 
+        end
+      end
+
+
+
+
+      def update_views
+        prepend_to_file "app/views/admin/#{plural_resource_name}/edit.html.haml", "
+- content_for(:page_sidebar) do
+  - unless @#{resource_name}.new_record?
+    %h2 #{plural_child_name}
+    .bordered_box 
+      = render '#{plural_child_name}'
+"
+      end
+
+      def add_resource_route
+        resources_string = "\n    resources :#{plural_linking_resource_name} do\n"
+        sort_string = "      post \"sort\", :on => :collection\n"
+        toggleshow_string = "      get \"toggleshow\", :on => :member\n"
+        
+        if linking_columns.include?("visible") && linking_columns.include?("position")
+          final_string = "#{resources_string}#{sort_string}#{toggleshow_string}    end\n"
+        elsif linking_columns.include?("visible")
+          final_string = "#{resources_string}#{toggleshow_string}    end\n"
+        elsif linking_columns.include?("position")
+          final_string = "#{resources_string}#{sort_string}    end\n"
+        else
+          final_string = "\n    resources :#{plural_linking_resource_name}\n"
+        end
+
+        inject_into_file "config/routes.rb", final_string, :after => "\n  namespace :admin do\n"
+      end
+
+      # def add_to_locales
+      #   locales = [:ru, :en]
+        
+      #   attributes = column_names.collect {|column| "        #{column}: \"#{column}\"\n"}
+
+      #   attributes_string = "      #{resource_name}:\n#{attributes.join}"
+
+      #   locales.each do |locale|
+      #     inject_into_file "config/locales/#{locale}.yml", "      #{resource_name}: \"#{resource_name}\"\n", :after => "models:\n"
+      #     inject_into_file "config/locales/#{locale}.yml", attributes_string, :after => "attributes:\n"
+      #   end
+      # end
+
+
+
+
+    end
+  end
+end

data/lib/generators/ideyabox/many_to_many/templates/controllers/controller.rb

@@ -0,0 +1,54 @@
+#coding: utf-8
+class Admin::<%= linking_model_name.pluralize -%>Controller < Admin::ApplicationController
+<%- if linking_columns.include?("visible") -%>
+  def toggleshow
+    @<%= linking_resource_name %> = <%= linking_model_name -%>.find(params[:id])
+    @<%= linking_resource_name %>.toggle(:visible)
+    @<%= linking_resource_name %>.save
+    render :nothing => true
+  end
+<%- end -%><%- if linking_columns.include?("position") -%>
+  def sort
+    params[:<%= linking_resource_name %>].each_with_index do |id, idx|
+      @<%= linking_resource_name %> = <%= linking_model_name -%>.find(id)
+      @<%= linking_resource_name %>.position = idx
+      @<%= linking_resource_name %>.save
+    end
+    render :nothing => true
+  end
+  <%- end -%>
+  
+  def edit
+    @<%= linking_resource_name %> = <%= linking_model_name -%>.find(params[:id])
+  end
+  
+  def create
+    @<%= linking_resource_name %> = <%= linking_model_name %>.create(params[:<%= linking_resource_name %>])
+
+    @<%=resource_name%> = @<%= linking_resource_name %>.<%=resource_name%>
+    @<%=plural_child_name%> = <%=child_model%>.has_not_this_<%=resource_name%>(@<%=resource_name%>.id)
+
+    #@<%=child_name%> = @<%= linking_resource_name %>.<%=child_name%>
+    #@<%=plural_resource_name%> = <%=model_name%>.has_not_this_<%=child_name%>(@<%=child_name%>.id)
+  end
+
+  def update
+    @<%= linking_resource_name %> = <%= linking_model_name -%>.find(params[:id])
+    if @<%= linking_resource_name %>.update_attributes(params[:<%= linking_resource_name %>])
+      redirect_to [:edit, :admin, @<%= linking_resource_name %>.<%= resource_name %>], :notice => "#{<%= linking_model_name %>.model_name.human} #{t 'flash.notice.was_updated'}"
+    else
+      render 'edit'
+    end
+  end
+  
+  def destroy
+    @<%= linking_resource_name %> = <%= linking_model_name -%>.find(params[:id])
+    @<%= linking_resource_name %>.destroy
+
+    @<%=resource_name%> = @<%= linking_resource_name %>.<%=resource_name%>
+    @<%=plural_child_name%> = <%=child_model%>.has_not_this_<%=resource_name%>(@<%=resource_name%>.id)
+
+    #@<%=child_name%> = @<%= linking_resource_name %>.<%=child_name%>
+    #@<%=plural_resource_name%> = <%=model_name%>.has_not_this_<%=child_name%>(@<%=child_name%>.id)    
+  end
+end

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

@@ -0,0 +1,8 @@
+.<%=plural_linking_resource_name%>_form
+  = render 'admin/<%=plural_linking_resource_name%>/form', :<%=plural_child_name%> => @<%=plural_child_name%>, :<%=resource_name%> => @<%=resource_name%>
+%strong Список <%=plural_child_name%>
+%table.<%=plural_child_name%>{:id => "sort-list-<%=plural_linking_resource_name%>"}
+  = render @<%=resource_name%>.<%=plural_linking_resource_name%>.order(<%= linking_columns.include?("position") ? '\'position\'' : '\'created_at\'' %>)
+  <%- if linking_columns.include?("position") %>
+  = multiple_sortable('sort-list-<%=plural_linking_resource_name%>', sort_admin_<%=plural_linking_resource_name%>_path)
+  <%end%>

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

@@ -0,0 +1,9 @@
+= 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.submit "Добавить", :class =>'black_button'

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

@@ -0,0 +1,16 @@
+%tr{:id=> "<%=linking_resource_name%>_#{<%=linking_resource_name%>.id}"}
+  <%- if linking_columns.include?("position") -%>
+  %td.icon.handle
+    %i{:class => "icon-move icon-large"}
+  <% end %>
+  <%- if linking_columns.include?("visible") -%>
+  %td.icon.visibility
+    = link_to [:toggleshow, :admin, <%=linking_resource_name%>], :remote => true do
+      %i{:class => (<%=linking_resource_name%>.visible? ? "icon-eye-open icon-large" : "icon-eye-close icon-large not-work")}    
+  <% end %>
+  %td= link_to <%=linking_resource_name%>.<%=child_name%>.<%=get_title%>, [:edit,:admin, <%=linking_resource_name%>.<%=child_name%>]
+  %td
+  %td.right
+    = link_to [:admin, <%=linking_resource_name%>], :method => :delete, :confirm => "Точно удалить?", :class => :del, :remote => true do
+      %span Удалить
+      %i{:class => "icon-trash icon-large"} 

data/lib/generators/ideyabox/many_to_many/templates/views/create.js.erb

@@ -0,0 +1,3 @@
+$('.<%= plural_child_name%>').append("#{j render @<%=linking_resource_name%>}");
+$('.<%=plural_linking_resource_name%>_form').html("#{j render 'admin/<%=plural_linking_resource_name%>/form', :<%= plural_child_name%> => @<%= plural_child_name%>, :<%= resource_name%> => @<%= resource_name%>}");
+$(".chosen_select").chosen();

data/lib/generators/ideyabox/many_to_many/templates/views/destroy.js.erb

@@ -0,0 +1,3 @@
+$('.<%=plural_linking_resource_name%>_form').html("#{j render 'admin/<%=plural_linking_resource_name%>/form', :<%=plural_child_name%> => @<%=plural_child_name%>, :<%=resource_name%> => @<%=resource_name%>}");
+$("#<%=linking_resource_name%>_"+"#{@<%=linking_resource_name%>.id}").remove();
+$(".chosen_select").chosen();

data/lib/ideyabox/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ideyabox
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-24 00:00:00.000000000 Z
+date: 2013-01-06 00:00:00.000000000 Z
 dependencies: []
 description: Write a gem description
 email:
@@ -25,9 +25,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- app/assets/.DS_Store
-- app/assets/images/.DS_Store
-- app/assets/images/admin/.DS_Store
 - app/assets/images/admin/addphoto.png
 - app/assets/images/admin/background-image.png
 - app/assets/images/admin/rdws_cat.png
@@ -40,7 +37,6 @@ files:
 - app/assets/images/admin/uploadify/uploadify-cancel.png
 - app/assets/images/admin/uploadify/uploadify.css
 - app/assets/images/admin/uploadify/uploadify.swf
-- app/assets/javascripts/.DS_Store
 - app/assets/javascripts/chosen.jquery.js
 - app/assets/javascripts/default.js
 - app/assets/javascripts/jquery.Jcrop.min.js
@@ -49,7 +45,6 @@ files:
 - app/assets/javascripts/jquery.uploadify.min.js
 - app/assets/javascripts/modernizr.js
 - app/assets/javascripts/swfobject.js
-- app/assets/stylesheets/.DS_Store
 - app/assets/stylesheets/Jcrop.gif
 - app/assets/stylesheets/chosen.scss.erb
 - app/assets/stylesheets/default.scss.erb
@@ -61,27 +56,18 @@ files:
 - app/assets/stylesheets/font_awesome/font/fontawesome-webfont.woff
 - app/assets/stylesheets/jquery.Jcrop.css
 - app/assets/stylesheets/normalize.css
-- app/helpers/.DS_Store
 - app/helpers/admin_helper.rb
 - app/tasks/reset_db.rake
 - ideyabox.gemspec
-- lib/generators/.DS_Store
-- lib/generators/ideyabox/.DS_Store
-- lib/generators/ideyabox/admin/.DS_Store
 - lib/generators/ideyabox/admin/admin_generator.rb
-- lib/generators/ideyabox/admin/templates/.DS_Store
 - lib/generators/ideyabox/admin/templates/assets/admin.js
 - lib/generators/ideyabox/admin/templates/assets/admin.scss.erb
-- lib/generators/ideyabox/admin/templates/controllers/.DS_Store
-- lib/generators/ideyabox/admin/templates/controllers/admin/.DS_Store
 - lib/generators/ideyabox/admin/templates/controllers/admin/application_controller.rb
 - lib/generators/ideyabox/admin/templates/controllers/application_controller.rb
 - lib/generators/ideyabox/admin/templates/locales/devise.ru.yml
 - lib/generators/ideyabox/admin/templates/locales/en.yml
 - lib/generators/ideyabox/admin/templates/locales/ru.yml
 - lib/generators/ideyabox/admin/templates/tasks/seeds.rb
-- lib/generators/ideyabox/admin/templates/views/.DS_Store
-- lib/generators/ideyabox/admin/templates/views/admin/.DS_Store
 - lib/generators/ideyabox/admin/templates/views/admin/shared/_header.html.haml
 - lib/generators/ideyabox/admin/templates/views/admin/shared/_launchbar.html.haml
 - lib/generators/ideyabox/admin/templates/views/admin/shared/_topbar.html.haml
@@ -90,9 +76,7 @@ files:
 - lib/generators/ideyabox/assets/assets_generator.rb
 - lib/generators/ideyabox/crop/crop_generator.rb
 - lib/generators/ideyabox/crop/templates/_crop.html.haml
-- lib/generators/ideyabox/images_scaffold/.DS_Store
 - lib/generators/ideyabox/images_scaffold/images_scaffold_generator.rb
-- lib/generators/ideyabox/images_scaffold/templates/.DS_Store
 - lib/generators/ideyabox/images_scaffold/templates/controllers/controller.rb
 - lib/generators/ideyabox/images_scaffold/templates/uploader.rb
 - lib/generators/ideyabox/images_scaffold/templates/views/_image.html.haml
@@ -100,9 +84,14 @@ files:
 - lib/generators/ideyabox/images_scaffold/templates/views/create.js.haml
 - lib/generators/ideyabox/images_scaffold/templates/views/destroy.js.haml
 - lib/generators/ideyabox/images_scaffold/templates/views/edit.html.haml
-- lib/generators/ideyabox/scaffold/.DS_Store
+- lib/generators/ideyabox/many_to_many/many_to_many_generator.rb
+- lib/generators/ideyabox/many_to_many/templates/controllers/controller.rb
+- lib/generators/ideyabox/many_to_many/templates/views/_child.html.haml
+- lib/generators/ideyabox/many_to_many/templates/views/_form.html.haml
+- lib/generators/ideyabox/many_to_many/templates/views/_one_to_one.html.haml
+- lib/generators/ideyabox/many_to_many/templates/views/create.js.erb
+- lib/generators/ideyabox/many_to_many/templates/views/destroy.js.erb
 - lib/generators/ideyabox/scaffold/scaffold_generator.rb
-- lib/generators/ideyabox/scaffold/templates/.DS_Store
 - lib/generators/ideyabox/scaffold/templates/_index.html.haml
 - lib/generators/ideyabox/scaffold/templates/_sort_buttons.html.haml
 - lib/generators/ideyabox/scaffold/templates/controllers/controller.rb