activeadmin 0.4.0 → 0.4.1

data/spec/unit/resource_controller/collection_spec.rb

@@ -26,7 +26,7 @@ describe ActiveAdmin::ResourceController::Collection do
     let(:params){ {:order => "id_asc" }}
     it "should prepend the table name" do
       chain = mock("ChainObj")
-      chain.should_receive(:order).with("\"posts\".id asc").once.and_return(Post.search)
+      chain.should_receive(:order).with("\"posts\".\"id\" asc").once.and_return(Post.search)
       controller.send :sort_order, chain
     end
   end

data/spec/unit/views/components/columns_spec.rb

@@ -20,8 +20,8 @@ describe ActiveAdmin::Views::Columns do
       cols.children.first.class_list.should include("column")
     end
 
-    it "should have one column with the width 100%" do
-      cols.children.first.attr(:style).should include("width: 100%")
+    it "should have one column with the width 100.0%" do
+      cols.children.first.attr(:style).should include("width: 100.0%")
     end
   end
 
@@ -38,11 +38,11 @@ describe ActiveAdmin::Views::Columns do
     end
 
     it "should have a first column with width 49% and margin 2%" do
-      cols.children.first.attr(:style).should == "width: 49%; margin-right: 2%;"
+      cols.children.first.attr(:style).should == "width: 49.0%; margin-right: 2%;"
     end
 
     it "should have a second column with width 49% and no right margin" do
-      cols.children.last.attr(:style).should == "width: 49%;"
+      cols.children.last.attr(:style).should == "width: 49.0%;"
     end
   end
 
@@ -72,4 +72,61 @@ describe ActiveAdmin::Views::Columns do
     end
   end
 
+
+  describe "Column Spans" do
+    let(:cols) do
+      columns do
+        column(:span => 2){ "Hello World" }
+        column(){ "Hello World" }
+        column(){ "Hello World" }
+      end
+    end
+
+    it "should set the span when declared" do
+      cols.children.first.attr(:style).should == "width: 49.0%; margin-right: 2%;"
+    end
+
+    it "should default to 1 if not passed in" do
+      cols.children.last.attr(:style).should == "width: 23.5%;"
+    end
+  end
+
+  describe "Column max width" do
+
+    let(:cols) do
+      columns do
+        column(:max_width => "100px"){ "Hello World" }
+        column(){ "Hello World" }
+      end
+    end
+
+    it "should set the max with if passed in" do
+      cols.children.first.attr(:style).should == "width: 49.0%; max-width: 100px; margin-right: 2%;"
+    end
+
+    it "should omit the value if not presetn" do
+      cols.children.last.attr(:style).should == "width: 49.0%;"
+    end
+
+  end
+
+  describe "Column min width" do
+
+    let(:cols) do
+      columns do
+        column(:min_width => "100px"){ "Hello World" }
+        column(){ "Hello World" }
+      end
+    end
+
+    it "should set the min with if passed in" do
+      cols.children.first.attr(:style).should == "width: 49.0%; min-width: 100px; margin-right: 2%;"
+    end
+
+    it "should omit the value if not presetn" do
+      cols.children.last.attr(:style).should == "width: 49.0%;"
+    end
+
+  end
+
 end

data/spec/unit/views/tabbed_navigation_spec.rb

@@ -16,7 +16,7 @@ describe ActiveAdmin::Views::TabbedNavigation do
   describe "rendering a menu" do
 
     before do
-      menu.add "Blog Posts", "/admin/blog-posts"
+      menu.add "Blog Posts", :admin_posts_path
       menu.add "Reports", "/admin/reports"
       reports = menu["Reports"]
       reports.add "A Sub Reports", "/admin/a-sub-reports"
@@ -39,7 +39,7 @@ describe ActiveAdmin::Views::TabbedNavigation do
     end
 
     it "should generate a link for each item" do
-      html.should have_tag("a", "Blog Posts", :attributes => { :href => '/admin/blog-posts' })
+      html.should have_tag("a", "Blog Posts", :attributes => { :href => '/admin/posts' })
     end
 
     it "should generate a nested list for children" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activeadmin
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Greg Bell
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-30 00:00:00 Z
+date: 2012-02-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -117,14 +117,12 @@ dependencies:
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - <
+    - - ">"
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 3
         segments: 
-        - 1
-        - 3
         - 0
-        version: 1.3.0
+        version: "0"
   requirement: *id007
   prerelease: false
   name: inherited_resources
@@ -217,6 +215,7 @@ files:
 - app/assets/stylesheets/active_admin/components/_blank_slates.scss
 - app/assets/stylesheets/active_admin/components/_breadcrumbs.scss
 - app/assets/stylesheets/active_admin/components/_buttons.scss
+- app/assets/stylesheets/active_admin/components/_columns.scss
 - app/assets/stylesheets/active_admin/components/_comments.css.scss
 - app/assets/stylesheets/active_admin/components/_date_picker.css.scss
 - app/assets/stylesheets/active_admin/components/_flash_messages.css.scss
@@ -275,6 +274,7 @@ files:
 - docs/7-sidebars.md
 - docs/8-custom-actions.md
 - docs/9-custom-pages.md
+- features/action_item.feature
 - features/belongs_to.feature
 - features/comments/commenting.feature
 - features/comments/viewing_index.feature
@@ -283,7 +283,6 @@ files:
 - features/edit_page.feature
 - features/first_boot.feature
 - features/global_navigation.feature
-- features/index/filter_with_check_boxes.feature
 - features/index/filters.feature
 - features/index/format_as_csv.feature
 - features/index/formats.feature
@@ -292,6 +291,8 @@ files:
 - features/index/index_as_grid.feature
 - features/index/index_as_table.feature
 - features/index/index_blank_slate.feature
+- features/index/index_parameters.feature
+- features/index/index_scope_to.feature
 - features/index/index_scopes.feature
 - features/index/pagination.feature
 - features/menu.feature
@@ -313,6 +314,7 @@ files:
 - features/step_definitions/configuration_steps.rb
 - features/step_definitions/dashboard_steps.rb
 - features/step_definitions/factory_steps.rb
+- features/step_definitions/filter_steps.rb
 - features/step_definitions/flash_steps.rb
 - features/step_definitions/format_steps.rb
 - features/step_definitions/index_scope_steps.rb
@@ -392,6 +394,7 @@ files:
 - lib/active_admin/locales/en.yml
 - lib/active_admin/locales/es.yml
 - lib/active_admin/locales/fr.yml
+- lib/active_admin/locales/he_il.yml
 - lib/active_admin/locales/hr.yml
 - lib/active_admin/locales/hu.yml
 - lib/active_admin/locales/it.yml
@@ -421,6 +424,7 @@ files:
 - lib/active_admin/resource/menu.rb
 - lib/active_admin/resource/naming.rb
 - lib/active_admin/resource/page_presenters.rb
+- lib/active_admin/resource/pagination.rb
 - lib/active_admin/resource/scopes.rb
 - lib/active_admin/resource/sidebars.rb
 - lib/active_admin/resource_collection.rb
@@ -557,6 +561,7 @@ files:
 - spec/unit/resource/menu_spec.rb
 - spec/unit/resource/naming_spec.rb
 - spec/unit/resource/page_presenters_spec.rb
+- spec/unit/resource/pagination_spec.rb
 - spec/unit/resource/scopes_spec.rb
 - spec/unit/resource/sidebars_spec.rb
 - spec/unit/resource_collection_spec.rb
@@ -615,6 +620,7 @@ signing_key:
 specification_version: 3
 summary: The administration framework for Ruby on Rails.
 test_files: 
+- features/action_item.feature
 - features/belongs_to.feature
 - features/comments/commenting.feature
 - features/comments/viewing_index.feature
@@ -623,7 +629,6 @@ test_files:
 - features/edit_page.feature
 - features/first_boot.feature
 - features/global_navigation.feature
-- features/index/filter_with_check_boxes.feature
 - features/index/filters.feature
 - features/index/format_as_csv.feature
 - features/index/formats.feature
@@ -632,6 +637,8 @@ test_files:
 - features/index/index_as_grid.feature
 - features/index/index_as_table.feature
 - features/index/index_blank_slate.feature
+- features/index/index_parameters.feature
+- features/index/index_scope_to.feature
 - features/index/index_scopes.feature
 - features/index/pagination.feature
 - features/menu.feature
@@ -653,6 +660,7 @@ test_files:
 - features/step_definitions/configuration_steps.rb
 - features/step_definitions/dashboard_steps.rb
 - features/step_definitions/factory_steps.rb
+- features/step_definitions/filter_steps.rb
 - features/step_definitions/flash_steps.rb
 - features/step_definitions/format_steps.rb
 - features/step_definitions/index_scope_steps.rb
@@ -731,6 +739,7 @@ test_files:
 - spec/unit/resource/menu_spec.rb
 - spec/unit/resource/naming_spec.rb
 - spec/unit/resource/page_presenters_spec.rb
+- spec/unit/resource/pagination_spec.rb
 - spec/unit/resource/scopes_spec.rb
 - spec/unit/resource/sidebars_spec.rb
 - spec/unit/resource_collection_spec.rb

data/features/index/filter_with_check_boxes.feature

@@ -1,25 +0,0 @@
-Feature: Filter with check boxes
-
-  Background:
-    Given an index configuration of:
-    """
-      ActiveAdmin.register Post do
-        filter :author, :as => :check_boxes
-      end
-    """
-    And a post with the title "Hello World" written by "Jane Doe" exists
-    And 1 post exists
-    And I am on the index page for posts
-
-  Scenario: Filtering posts written by anyone
-    When I press "Filter"
-    Then I should see 2 posts in the table
-    And I should see "Hello World" within ".index_table"
-    And the "jane_doe" checkbox should not be checked
-
-  Scenario: Filtering posts written by Jane Doe
-    When I check "jane_doe"
-    And I press "Filter"
-    Then I should see 1 posts in the table
-    And I should see "Hello World" within ".index_table"
-    And the "jane_doe" checkbox should be checked