ab_admin 0.1.2 → 0.2.0

data/lib/generators/template.rb

@@ -55,6 +55,7 @@ if gem_adds
   gem 'nested_form', '0.2.2'
   gem 'has_scope'
   gem 'squeel'
+  gem 'fancybox2-rails'
 
   gem_group :development, :test do
     gem 'rspec-rails'

data/lib/tasks/i18n.rake

@@ -0,0 +1,7 @@
+desc 'Prepare model and attribute translations of AR models'
+
+namespace :i18n do
+  task :models => :environment do
+    AbAdmin::I18nTools::ModelTranslator.i18n_models!
+  end
+end

data/spec/dummy/app/models/ab_admin/ab_admin_collection.rb

@@ -0,0 +1,35 @@
+class AbAdminCollection < AbAdmin::AbstractResource
+
+  table do
+    field :name, :sortable => false
+    field :description, :sortable => false
+    field :is_visible
+    field :products_count
+    field :created_at
+  end
+
+  search do
+    field :name
+    field :description
+    field :id
+    field :is_visible
+    field :products_count
+    field :created_at
+    field :updated_at
+  end
+
+  form do
+    group :base do
+      field :is_visible
+      field :products_count
+    end
+    locale_tabs do
+      field :name
+      field :description, :as => :editor
+    end
+    field :picture, :as => :uploader
+    field :pictures, :as => :uploader
+    field :attachment_files, :as => :uploader, :file => true
+  end
+
+end

data/spec/dummy/app/models/ab_admin/ab_admin_product.rb

@@ -23,6 +23,8 @@ class AbAdminProduct < AbAdmin::AbstractResource
   #settings :comments => true
   settings :list_edit => true
 
+  belongs_to :collection
+
   table do
     field :sku, :editable => true
     field(:picture) { |item| item_image_link(item) }

data/spec/dummy/app/models/admin_menu.rb

@@ -1,10 +1,12 @@
 class AdminMenu < AbAdmin::MenuBuilder
   draw do
+    model Collection
+
     model User
     group :system do
       model Structure
-      model Locator
-      model Settings, :url => edit_admin_settings_path
+      link Locator.model_name.human, '/admin/locators'
+      link Settings.model_name.human, edit_admin_settings_path
     end
     group 'Moderator', :if => proc { moderator? } do
       link 'for moderator', 'dummy_path'

data/spec/dummy/app/models/collection.rb

@@ -5,8 +5,10 @@ class Collection < ActiveRecord::Base
   has_many :products
 
   has_one :picture, :as => :assetable, :dependent => :destroy, :conditions => {:is_main => true}
+  has_many :pictures, :as => :assetable, :dependent => :destroy, :conditions => {:is_main => false}
+  has_many :attachment_files, :as => :assetable, :dependent => :destroy
 
-  fileuploads :picture
+  fileuploads :picture, :pictures, :attachment_files
   translates :name, :description
 
   scope :visible, where(:is_visible => true)

data/spec/generators/install_generator_spec.rb

@@ -18,7 +18,7 @@ describe AbAdmin::Generators::InstallGenerator do
 
   it 'should copy_configurations' do
     ['config/initializers/ab_admin.rb', 'config/database.yml.sample', 'db/seeds.rb', 'config/i18n-js.yml', 'config/logrotate-config',
-     'config/nginx.conf', 'scripts/unicorn.sh', 'config/unicorn_config.rb', 'config/settings/settings.yml', 'config/settings/settings.local.yml',
+     'config/nginx.conf', 'script/unicorn.sh', 'config/unicorn_config.rb', 'config/settings/settings.yml', 'config/settings/settings.local.yml',
      '.gitignore'].each do |file|
       assert_file file
     end

data/spec/generators/resource_generator_spec.rb

@@ -29,7 +29,7 @@ describe AbAdmin::Generators::ResourceGenerator do
     assert_file 'app/views/admin/headers/_table.html.slim',
                 /table/, /collection\.each/, /batch_action_item/, /td/, /item_index_actions/
     assert_file 'app/views/admin/headers/_search_form.html.slim',
-                /f\.input :translations_title, :label => ha\(:title\)/, /f\.input :created_at/
+                /f\.input :title/, /f\.input :created_at/
     assert_file 'app/helpers/admin/headers_helper.rb', /Admin::HeadersHelper/
   end
 

data/spec/models/avatar_spec.rb

@@ -102,7 +102,34 @@ describe Avatar do
     end
   end
 
-  context 'rotate' do
+  context 'renaming' do
+    before(:each) do
+      @avatar = create(:asset_avatar)
+    end
+
+    it 'rename file' do
+      old_name = @avatar.data_file_name
+      @avatar.rename!
+      @avatar.data_file_name.should_not == old_name
+    end
+
+  end
+
+  context 'rotation' do
+    before(:each) do
+      @avatar = create(:asset_avatar)
+    end
+
+    it 'rotate image' do
+      @avatar.data.dimensions.should == [50, 64]
+      @avatar.rotate!
+      @avatar.data.dimensions.should == [64, 50]
+      @avatar.width.should == 64
+      @avatar.height.should == 50
+    end
+  end
+
+  context 'rotate', :focus => true do
     before(:each) do
       @avatar = create(:asset_avatar)
       @avatar.rotate_degrees = '-90'
@@ -124,7 +151,7 @@ describe Avatar do
         @avatar.save
       end
 
-      it 'should crop image by specific geometry' do
+      it 'should rotate image by degrees' do
         @avatar.width.should == 64
         @avatar.height.should == 50
         @avatar.data.dimensions.should == [64, 50]

metadata

@@ -2,14 +2,14 @@
 name: ab_admin
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Alex Leschenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-13 00:00:00.000000000 Z
+date: 2013-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
@@ -606,6 +606,7 @@ files:
 - app/assets/images/admin/flags/b_en.png
 - app/assets/images/admin/flags/b_it.png
 - app/assets/images/admin/flags/b_ru.png
+- app/assets/images/admin/flags/b_uk.png
 - app/assets/images/admin/flags/flag_en.gif
 - app/assets/images/admin/flags/flag_en_nonact.gif
 - app/assets/images/admin/flags/flag_it.gif
@@ -636,6 +637,7 @@ files:
 - app/assets/javascripts/ab_admin/core/ui_utils.js.coffee
 - app/assets/javascripts/ab_admin/core/utils.js.coffee
 - app/assets/javascripts/ab_admin/inputs/datetime_input.js.coffee
+- app/assets/javascripts/ab_admin/main.js
 - app/assets/javascripts/i18n/translations.js
 - app/assets/stylesheets/ab_admin/application.css.scss
 - app/assets/stylesheets/ab_admin/bootstrap_and_overrides.css.scss
@@ -653,6 +655,7 @@ files:
 - app/assets/stylesheets/ab_admin/components/_translations.css.scss
 - app/assets/stylesheets/ab_admin/devise.css.scss
 - app/assets/stylesheets/ab_admin/fileupload.css.scss
+- app/assets/stylesheets/ab_admin/main.css.scss
 - app/controllers/admin/admin_comments_controller.rb
 - app/controllers/admin/assets_controller.rb
 - app/controllers/admin/base_controller.rb
@@ -687,12 +690,11 @@ files:
 - app/views/admin/base/show.html.slim
 - app/views/admin/base/update.js.erb
 - app/views/admin/dashboards/index.html.slim
-- app/views/admin/fileupload/_asset.html.erb
-- app/views/admin/fileupload/_container.html.erb
-- app/views/admin/fileupload/_fcontainer.html.erb
-- app/views/admin/fileupload/_file.html.erb
-- app/views/admin/fileupload/_ftmpl.html.erb
-- app/views/admin/fileupload/_tmpl.html.erb
+- app/views/admin/fileupload/_asset.html.slim
+- app/views/admin/fileupload/_container.html.slim
+- app/views/admin/fileupload/_file.html.slim
+- app/views/admin/fileupload/_ftmpl.html.slim
+- app/views/admin/fileupload/_tmpl.html.slim
 - app/views/admin/headers/_form.html.slim
 - app/views/admin/locators/edit.html.slim
 - app/views/admin/locators/show.html.slim
@@ -736,10 +738,12 @@ files:
 - features/dsl/admin_comments.feature
 - features/dsl/batch_actions.feature
 - features/dsl/config.feature
+- features/dsl/custom_actions.feature
 - features/dsl/export.feature
 - features/dsl/form.feature
 - features/dsl/in_place_edit.feature
 - features/dsl/list_edit.feature
+- features/dsl/parent_resource.feature
 - features/dsl/resource_action_items.feature
 - features/dsl/search.feature
 - features/dsl/show.feature
@@ -754,6 +758,7 @@ files:
 - features/step_definitions/dsl/admin_comments_steps.rb
 - features/step_definitions/dsl/batch_actions_steps.rb
 - features/step_definitions/dsl/in_place_edit_steps.rb
+- features/step_definitions/dsl/parent_resource_steps.rb
 - features/step_definitions/dsl/resource_action_items_steps.rb
 - features/step_definitions/dsl/show_steps.rb
 - features/step_definitions/dsl/table_steps.rb
@@ -768,6 +773,7 @@ files:
 - features/step_definitions/web_steps/form_steps.rb
 - features/step_definitions/web_steps/i18n_steps.rb
 - features/step_definitions/web_steps/step_scoper.rb
+- features/step_definitions/web_steps/transforms_steps.rb
 - features/structure/tree.feature
 - features/support/capybara_helpers.rb
 - features/support/carrierwave.rb
@@ -810,6 +816,7 @@ files:
 - lib/ab_admin/hooks/quiet_scope_page.rb
 - lib/ab_admin/hooks/simple_form_hooks.rb
 - lib/ab_admin/i18n_tools/google_translate.rb
+- lib/ab_admin/i18n_tools/model_translator.rb
 - lib/ab_admin/i18n_tools/translate_app.rb
 - lib/ab_admin/mailers/development_mail_interceptor.rb
 - lib/ab_admin/mailers/helpers.rb
@@ -824,7 +831,6 @@ files:
 - lib/ab_admin/models/type_model.rb
 - lib/ab_admin/models/user.rb
 - lib/ab_admin/utils.rb
-- lib/ab_admin/utils/csv_builder.rb
 - lib/ab_admin/utils/csv_document.rb
 - lib/ab_admin/utils/eval_helpers.rb
 - lib/ab_admin/utils/logger.rb
@@ -1271,7 +1277,7 @@ files:
 - lib/generators/ab_admin/install/templates/models/user_role_type.rb
 - lib/generators/ab_admin/install/templates/models/user_state.rb
 - lib/generators/ab_admin/install/templates/rspec
-- lib/generators/ab_admin/install/templates/scripts/unicorn.sh
+- lib/generators/ab_admin/install/templates/script/unicorn.sh
 - lib/generators/ab_admin/install/templates/spec/factories/sequences.rb
 - lib/generators/ab_admin/install/templates/spec/factories/structure_factory.rb
 - lib/generators/ab_admin/install/templates/spec/factories/user_factory.rb
@@ -1297,6 +1303,7 @@ files:
 - lib/generators/template.rb
 - lib/tasks/assets.rake
 - lib/tasks/cache.rake
+- lib/tasks/i18n.rake
 - spec/ab_admin_spec.rb
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/images/rails.png
@@ -1309,6 +1316,7 @@ files:
 - spec/dummy/app/helpers/welcome_helper.rb
 - spec/dummy/app/mailers/.gitkeep
 - spec/dummy/app/models/ab_admin/ab_admin_catalogue.rb
+- spec/dummy/app/models/ab_admin/ab_admin_collection.rb
 - spec/dummy/app/models/ab_admin/ab_admin_product.rb
 - spec/dummy/app/models/admin_menu.rb
 - spec/dummy/app/models/catalogue.rb
@@ -1840,7 +1848,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3634313491502164760
+      hash: 3413386508977600575
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
@@ -1849,7 +1857,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3634313491502164760
+      hash: 3413386508977600575
   none: false
 requirements: []
 rubyforge_project: 
@@ -1863,10 +1871,12 @@ test_files:
 - features/dsl/admin_comments.feature
 - features/dsl/batch_actions.feature
 - features/dsl/config.feature
+- features/dsl/custom_actions.feature
 - features/dsl/export.feature
 - features/dsl/form.feature
 - features/dsl/in_place_edit.feature
 - features/dsl/list_edit.feature
+- features/dsl/parent_resource.feature
 - features/dsl/resource_action_items.feature
 - features/dsl/search.feature
 - features/dsl/show.feature
@@ -1881,6 +1891,7 @@ test_files:
 - features/step_definitions/dsl/admin_comments_steps.rb
 - features/step_definitions/dsl/batch_actions_steps.rb
 - features/step_definitions/dsl/in_place_edit_steps.rb
+- features/step_definitions/dsl/parent_resource_steps.rb
 - features/step_definitions/dsl/resource_action_items_steps.rb
 - features/step_definitions/dsl/show_steps.rb
 - features/step_definitions/dsl/table_steps.rb
@@ -1895,6 +1906,7 @@ test_files:
 - features/step_definitions/web_steps/form_steps.rb
 - features/step_definitions/web_steps/i18n_steps.rb
 - features/step_definitions/web_steps/step_scoper.rb
+- features/step_definitions/web_steps/transforms_steps.rb
 - features/structure/tree.feature
 - features/support/capybara_helpers.rb
 - features/support/carrierwave.rb
@@ -1919,6 +1931,7 @@ test_files:
 - spec/dummy/app/helpers/welcome_helper.rb
 - spec/dummy/app/mailers/.gitkeep
 - spec/dummy/app/models/ab_admin/ab_admin_catalogue.rb
+- spec/dummy/app/models/ab_admin/ab_admin_collection.rb
 - spec/dummy/app/models/ab_admin/ab_admin_product.rb
 - spec/dummy/app/models/admin_menu.rb
 - spec/dummy/app/models/catalogue.rb

data/app/views/admin/fileupload/_asset.html.erb

@@ -1,5 +0,0 @@
-<%= content_tag(:div, :class => 'asset ill', :'data-id' => asset.id, :id => "asset_#{asset.id}") do %>
-  <%= link_to '', admin_asset_path(asset), :title=>t('admin.delete'), :remote => true, :method => :delete,
-              :data => {:confirm => t('admin.delete_confirmation')}, :class => 'del' %>
-  <%= link_to image_tag(asset.thumb_url, :title => asset.filename), asset.url, :class => 'fileupload-file fancybox', :rel => 'fancybox' %>
-<% end %>

data/app/views/admin/fileupload/_container.html.erb

@@ -1,28 +0,0 @@
-<%= content_tag(:div, :class => "fileupload #{multiple ? 'many_assets' : 'one_asset'} #{asset_render_template}_asset_type",
-                :id => element_id, :data => container_data) do %>
-  <div class="gray-blocks">
-    <div>
-      <div class="fileupload-drop-area"><span><%= t('admin.fileupload.drop_here') %></span></div>
-
-      <div class="fileupload-list <%= 'ill-bl galery' unless asset_render_template == 'file' %>">
-        <%= render :partial => "admin/fileupload/#{asset_render_template}", :collection => assets %>
-      </div>
-      <div class="file-types">
-        <span class="fileupload-button">
-          <button type="button" class="btn btn-primary"><%= t("admin.fileupload.button#{'s' if multiple}") %></button>
-        </span>
-        <div class="type-info">
-          <span><%= file_title %>. <%= t('admin.fileupload.max_size') %>:</span><strong><%= file_max_size %> MB</strong>
-        </div>
-      </div>
-    </div>
-  </div>
-<% end %>
-
-<script type="text/javascript">
-  $(document).ready(function () {
-    var upl = new qq.FileUploaderInput(<%= raw script_options %>);
-    upl._setupDragDrop();
-    new AdminAssets('<%= element_id %>', '<%= sort_admin_assets_path(:klass => asset_klass) %>', <%= multiple ? 'true' : 'false' %>);
-  });
-</script>

data/app/views/admin/fileupload/_fcontainer.html.erb

@@ -1,25 +0,0 @@
-<%= content_tag(:div, :class => 'fileupload', :id => element_id) do %>
-  <div class="gray-blocks">
-    <div class="bg-bl">
-      <div class="gr-title"><%= label %></div>
-      <div class="fileupload-list ill-bl galery">
-        <%= render :partial => 'admin/fileupload/file', :collection => assets %>
-      </div>
-      <div class="file-types">
-        <span class="fileupload-button">
-          <button type="button"><%= t('admin.fileupload.button') %></button>
-        </span>
-        <div class="type-info">
-          <span><%= file_title %>. <%= t('admin.fileupload.max_size') %>:</span><strong><%= file_max_size %> MB</strong>
-        </div>
-      </div>
-    </div>
-  </div>
-<% end %>
-
-<script type="text/javascript">
-  $(document).ready(function(){
-    new qq.FileUploaderInput(<%=raw script_options %>);
-    new AdminAssets('<%= element_id %>', '<%= sort_admin_assets_path(:klass=>asset_klass) %>', <%= multiple ? 'true' : 'false' %>);
-  });
-</script>

data/app/views/admin/fileupload/_file.html.erb

@@ -1,5 +0,0 @@
-<%= content_tag(:div, :class => "asset", :id => "asset_#{file.id}") do %>
-  <%= link_to file.original_name, file.url, :target => '_blank' %>
-  <%= link_to t('admin.delete'), admin_asset_path(file), :remote => true, :method => :delete,
-              :data => {:confirm => t('admin.delete_confirmation')}, :class => 'del btn btn-danger btn-mini' %>
-<% end %>

data/app/views/admin/fileupload/_ftmpl.html.erb

@@ -1,7 +0,0 @@
-<script id="fileupload_ftmpl" type="text/x-jquery-tmpl" xmlns="http://www.w3.org/1999/html">
-  <div class="asset" id="asset_${id}">
-    <a href="${url}" target="_blank">${original_name}</a>
-    <a href="/admin/assets/${id}" class="del btn btn-danger btn-mini"
-       data-confirm="<%= t('admin.delete_confirmation') %>" data-method="delete" data-remote="true" rel="nofollow"><%= t('admin.delete') %></a>
-  </div>
-</script>

data/app/views/admin/fileupload/_tmpl.html.erb

@@ -1,9 +0,0 @@
-<script id="fileupload_tmpl" type="text/x-jquery-tmpl" xmlns="http://www.w3.org/1999/html">
-  <div class="asset ill" data-id="${id}" id="asset_${id}">
-    <%= link_to '', '/admin/assets/${id}', :title => t('admin.delete'), :remote => true, :method => :delete,
-                :data => {:confirm => t('admin.delete_confirmation')}, :class => 'fileupload-cancel del' %>
-    <a href="${url}" class="fileupload-file fancybox" rel='fancybox'>
-      <img src="${thumb_url}" title="${filename}">
-    </a>
-  </div>
-</script>

data/lib/ab_admin/utils/csv_builder.rb

@@ -1,52 +0,0 @@
-module AbAdmin
-  module Utils
-    # CSVBuilder stores CSV configuration
-    #
-    # Usage example:
-    #
-    #   csv_builder = CSVBuilder.new
-    #   csv_builder.column :id
-    #   csv_builder.column("Name") { |resource| resource.full_name }
-    #
-    #   csv_builder = CSVBuilder.new :separator => ";"
-    #   csv_builder.column :id
-    #
-    #
-    class CSVBuilder
-
-      # Return a default CSVBuilder for a resource
-      # The CSVBuilder's columns would be Id followed by this
-      # resource's content columns
-      def self.default_for_resource(resource)
-        new.tap do |csv_builder|
-          csv_builder.column(:id)
-          resource.content_columns.each do |content_column|
-            csv_builder.column(content_column.name.to_sym)
-          end
-        end
-      end
-
-      attr_reader :columns, :column_separator
-
-      def initialize(options={}, &block)
-        @columns = []
-        @column_separator = options.delete(:separator)
-        instance_eval &block if block_given?
-      end
-
-      # Add a column
-      def column(name, &block)
-        @columns << Column.new(name, block)
-      end
-
-      class Column
-        attr_reader :name, :data
-
-        def initialize(name, block = nil)
-          @name = name.is_a?(Symbol) ? name.to_s.titleize : name
-          @data = block || name.to_sym
-        end
-      end
-    end
-  end
-end