andrewroth_activeadmin 0.3.4.3 → 0.3.4.4

data/.gitignore

@@ -33,3 +33,4 @@ test-rails*
 public
 .rvmrc
 .rspec
+.rails-version

data/CHANGELOG.md

@@ -10,6 +10,8 @@ since we've changed both the CSS and JS files.
 * In the initializer `config.allow_comments_in = []` is now
   `config.allow_comments = true`. Use the new namespace specific configurations
   to allow or disallow configuration within a specific namespace.
+* Removed `Object#to_html` in favour of `to_s`. Any Arbre components
+  implementing a `to_html` method need to be updated to use `to_s` instead.
 
 ### New Features
 
@@ -47,6 +49,9 @@ since we've changed both the CSS and JS files.
 * [#780][]: Fix stack level too deep exception when logout path is setup to use
   `:logout_path` named route. ([@george][])
 * [#637][]: Fix scope all I18n ([@fbuenemann][])
+* [#496][]: Remove global `Object#to_html` [@ebeigarts][]
+* [#470][], [#154][]: Arbre properly supports blocks that return Numeric values
+  ([@bobbytables][], [@utkarshkukreti][], [@gregbell][])
 
 ### Dependencies
 
@@ -57,6 +62,9 @@ since we've changed both the CSS and JS files.
 * [#711][]: Active admin now depends on Bourbon > 1.0.0. If you're using Rails
   3.0.x, make sure to run `rails generate active_admin:assets` to ensure you
   have the correct css files ([@mattvague][])
+* [#869][]: Upgraded Kaminari to >= 0.13.0 and added support for
+  `Kaminari.config.page_method_name`. Active Admin should now be happy if
+  `will_paginate` is installed with it. ([@j][]-manu)
 
 ### Contributors
 
@@ -123,36 +131,6 @@ since we've changed both the CSS and JS files.
 
 * Greg Bell
 
-## 0.3.4
-
-2 commits by 2 authors
-
-### Bug Fixes
-
-* Fix reloading issues across operating systems.
-* Fix issue where SASS was recompiling on every request. This can seriously
-  decrease the load time of applications when running in development mode.
-  Thanks @dhiemstra for tracking this one down!
-
-### Contributors
-
-* Danny Hiemstra
-* Greg Bell
-
-## 0.3.3
-
-1 commit by 1 author
-
-### Enhancements
-
-* Only reload Active Admin when files in the load paths have changed. This is a
-  major speed increase in development mode. Also helps with memory consumption
-  because we aren't reloading Active admin all the time.
-
-### Contributors
-
-* Greg Bell
-
 ## 0.3.2
 
 45 commits by 15 contributors
@@ -399,6 +377,7 @@ of the highlights. 250 commits. Enough said.
 [#122]: https://github.com/gregbell/active_admin/issues/122
 [#131]: https://github.com/gregbell/active_admin/issues/131
 [#135]: https://github.com/gregbell/active_admin/issues/135
+[#154]: https://github.com/gregbell/active_admin/issues/154
 [#171]: https://github.com/gregbell/active_admin/issues/171
 [#186]: https://github.com/gregbell/active_admin/issues/186
 [#197]: https://github.com/gregbell/active_admin/issues/197
@@ -411,6 +390,8 @@ of the highlights. 250 commits. Enough said.
 [#381]: https://github.com/gregbell/active_admin/issues/381
 [#428]: https://github.com/gregbell/active_admin/issues/428
 [#468]: https://github.com/gregbell/active_admin/issues/468
+[#470]: https://github.com/gregbell/active_admin/issues/470
+[#496]: https://github.com/gregbell/active_admin/issues/496
 [#505]: https://github.com/gregbell/active_admin/issues/505
 [#527]: https://github.com/gregbell/active_admin/issues/527
 [#551]: https://github.com/gregbell/active_admin/issues/551
@@ -425,12 +406,15 @@ of the highlights. 250 commits. Enough said.
 [#644]: https://github.com/gregbell/active_admin/issues/644
 [#689]: https://github.com/gregbell/active_admin/issues/689
 [#711]: https://github.com/gregbell/active_admin/issues/711
+[#723]: https://github.com/gregbell/active_admin/issues/723
 [#741]: https://github.com/gregbell/active_admin/issues/741
 [#751]: https://github.com/gregbell/active_admin/issues/751
 [#758]: https://github.com/gregbell/active_admin/issues/758
 [#780]: https://github.com/gregbell/active_admin/issues/780
+[#869]: https://github.com/gregbell/active_admin/issues/869
 [@DMajrekar]: https://github.com/DMajrekar
 [@ZequeZ]: https://github.com/ZequeZ
+[@bobbytables]: https://github.com/bobbytables
 [@dhiemstra]: https://github.com/dhiemstra
 [@doug316]: https://github.com/doug316
 [@ebeigarts]: https://github.com/ebeigarts
@@ -439,6 +423,7 @@ of the highlights. 250 commits. Enough said.
 [@fbuenemann]: https://github.com/fbuenemann
 [@george]: https://github.com/george
 [@gregbell]: https://github.com/gregbell
+[@j]: https://github.com/j
 [@jbarket]: https://github.com/jbarket
 [@knoopx]: https://github.com/knoopx
 [@krug]: https://github.com/krug
@@ -453,5 +438,6 @@ of the highlights. 250 commits. Enough said.
 [@sftsang]: https://github.com/sftsang
 [@shayfrendt]: https://github.com/shayfrendt
 [@tricknotes]: https://github.com/tricknotes
-[@vairix]: https://github.com/vairix-ssierra
-[@watson]: https://github.com/watson
+[@utkarshkukreti]: https://github.com/utkarshkukreti
+[@vairix]: https://github.com/vairix
+[@watson]: https://github.com/watson

data/Gemfile

@@ -4,7 +4,7 @@ gemspec
 
 require File.expand_path('../spec/support/detect_rails_version', __FILE__)
 
-rails_version = ENV['RAILS'] || detect_rails_version || "3.1.0"
+rails_version = detect_rails_version
 gem 'rails',          rails_version
 
 case rails_version
@@ -20,18 +20,16 @@ end
 
 group :development, :test do
   gem 'sqlite3-ruby',   :require => 'sqlite3'
-  gem 'rake',           '0.8.7', :require => false
+  gem 'rake',           '~> 0.9.2.2', :require => false
   gem 'haml',           '~> 3.1.1', :require => false
   gem 'yard'
   gem 'rdiscount' # For yard
 end
 
 group :test do
-  gem 'rspec',          '~> 2.6.0'
-  gem 'rspec-rails',    '~> 2.6.0'
-  gem 'capybara',       '1.0.0'
-  gem 'cucumber',       '0.10.6'
-  gem 'cucumber-rails', '0.5.2'
+  gem 'rspec-rails',    '~> 2.8.1'
+  gem 'cucumber-rails', '1.2.1'
+  gem 'capybara',       '1.1.2'
   gem 'database_cleaner'
   gem 'shoulda',        '2.11.2',           :require => nil
   gem 'launchy'

data/activeadmin.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   s.add_dependency("devise", ">= 1.1.2")
   s.add_dependency("formtastic", ">= 2.0.0")
   s.add_dependency("inherited_resources", "< 1.3.0")
-  s.add_dependency("kaminari", ">= 0.12.4")
+  s.add_dependency("kaminari", ">= 0.13.0")
   s.add_dependency("sass", ">= 3.1.0")
   s.add_dependency("fastercsv", ">= 0")
 end

data/features/step_definitions/additional_web_steps.rb

@@ -11,7 +11,7 @@ Then /^I should see a sortable table header with "([^"]*)"$/ do |content|
 end
 
 Then /^I should not see a sortable table header$/ do
-  Then "I should not see \"th.sortable\""
+  step "I should not see \"th.sortable\""
 end
 
 Then /^the table "([^"]*)" should have (\d+) rows/ do |selector, count|
@@ -48,7 +48,7 @@ end
 
 Then /^an "([^"]*)" exception should be raised when I follow "([^"]*)"$/ do |error, link|
   lambda {
-    When "I follow \"#{link}\""
+    step "I follow \"#{link}\""
   }.should raise_error(error.constantize)
 end
 
@@ -58,7 +58,7 @@ end
 
 Then /^I should wait and see "([^"]*)"(?: within "([^"]*)")?$/ do |text, selector|
   sleep 1
-  Then 'show me the page'
+  step 'show me the page'
   selector ||= "*"
   locate(:xpath, "//#{selector}[text()='#{text}']")
 end

data/features/step_definitions/asset_steps.rb

@@ -1,5 +1,5 @@
 Then /^I should see the css file "([^"]*)"$/ do |path|
-  Then %{I should see the css file "#{path}" of media "screen"}  
+  step %{I should see the css file "#{path}" of media "screen"}  
 end
 
 Then /^I should see the css file "([^"]*)" of media "([^"]*)"$/ do |path, media|

data/features/step_definitions/comment_steps.rb

@@ -1,8 +1,8 @@
 Then /^I should see a comment by "([^"]*)"$/ do |name|
-  Then %{I should see "#{name}" within ".active_admin_comment_author"}
+  step %{I should see "#{name}" within ".active_admin_comment_author"}
 end
 
 When /^I add a comment "([^"]*)"$/ do |comment|
-  When %{I fill in "active_admin_comment_body" with "#{comment}"}
-  And  %{I press "Add Comment"}
+  step %{I fill in "active_admin_comment_body" with "#{comment}"}
+  step  %{I press "Add Comment"}
 end

data/features/step_definitions/configuration_steps.rb

@@ -46,16 +46,16 @@ end
 Given /^an index configuration of:$/ do |configuration_content|
   load_active_admin_configuration(configuration_content)
 
-  And 'I am logged in'
-  When "I am on the index page for posts"
+  step 'I am logged in'
+  step "I am on the index page for posts"
 end
 
 Given /^a show configuration of:$/ do |configuration_content|
   load_active_admin_configuration(configuration_content)
 
-  And 'I am logged in'
-  When "I am on the index page for posts"
-  And 'I follow "View"'
+  step 'I am logged in'
+  step "I am on the index page for posts"
+  step 'I follow "View"'
 end
 
 Given /^"([^"]*)" contains:$/ do |filename, contents|

data/features/step_definitions/dashboard_steps.rb

@@ -1,9 +1,9 @@
 Then /^I should see the default welcome message$/ do
-  Then %{I should see "Welcome to Active Admin" within "#dashboard_default_message"}
+  step %{I should see "Welcome to Active Admin" within "#dashboard_default_message"}
 end
 
 Then /^I should not see the default welcome message$/ do
-  Then %{I should not see "Welcome to Active Admin"}
+  step %{I should not see "Welcome to Active Admin"}
 end
 
 Then /^I should see a dashboard widget "([^"]*)"$/ do |name|

data/features/step_definitions/index_scope_steps.rb

@@ -1,22 +1,22 @@
 Then /^I should see the scope "([^"]*)"$/ do |name|
-  Then %{I should see "#{name}" within ".scopes"}
+  step %{I should see "#{name}" within ".scopes"}
 end
 
 Then /^I should not see the scope "([^"]*)"$/ do |name|
-  Then %{I should not see "#{name}" within ".scopes"}
+  step %{I should not see "#{name}" within ".scopes"}
 end
 
 Then /^I should see the scope "([^"]*)" selected$/ do |name|
-  Then %{I should see "#{name}" within ".scopes .selected"}
+  step %{I should see "#{name}" within ".scopes .selected"}
 end
 
 Then /^I should see the scope "([^"]*)" not selected$/ do |name|
-  Then %{I should see the scope "#{name}"}
+  step %{I should see the scope "#{name}"}
   page.should_not have_css('.scopes .selected', :text => name)
 end
 
 Then /^I should see the scope "([^"]*)" with the count (\d+)$/ do |name, count|
-  Then %{I should see "#{count}" within ".scopes .#{name.gsub(" ", "").underscore.downcase} .count"}
+  step %{I should see "#{count}" within ".scopes .#{name.gsub(" ", "").underscore.downcase} .count"}
 end
 
 Then /^I should see (\d+) ([\w]*) in the table$/ do |count, resource_type|

data/features/step_definitions/pagination_steps.rb

@@ -3,6 +3,6 @@ Then /^I should not see pagination$/ do
 end
 
 Then /^I should see pagination with (\d+) pages$/ do |count|
-  Then %{I should see "#{count}" within ".pagination a"}
-  Then %{I should not see "#{count.to_i + 1}" within ".pagination a"}
+  step %{I should see "#{count}" within ".pagination a"}
+  step %{I should not see "#{count.to_i + 1}" within ".pagination a"}
 end

data/features/step_definitions/tab_steps.rb

@@ -1,3 +1,3 @@
 Then /^the "([^"]*)" tab should be selected$/ do |name|
-  Then %{I should see "#{name}" within "ul#tabs li.current"}
+  step %{I should see "#{name}" within "ul#tabs li.current"}
 end

data/features/step_definitions/user_steps.rb

@@ -5,7 +5,7 @@ Given /^I am logged out$/ do
 end
 
 Given /^I am logged in$/ do
-  Given 'an admin user "admin@example.com" exists'
+  step 'an admin user "admin@example.com" exists'
 
   if page.all(:css, "a", :text => "Logout").size > 0
     click_link "Logout"

data/features/step_definitions/web_steps.rb

@@ -32,13 +32,13 @@ end
 World(WithinHelpers)
 
 # Single-line step scoper
-When /^(.*) within (.*[^:])$/ do |step, parent|
-  with_scope(parent) { When step }
+When /^(.*) within (.*[^:])$/ do |step_name, parent|
+  with_scope(parent) { step step_name }
 end
 
 # Multi-line step scoper
-When /^(.*) within (.*[^:]):$/ do |step, parent, table_or_string|
-  with_scope(parent) { When "#{step}:", table_or_string }
+When /^(.*) within (.*[^:]):$/ do |step_name, parent, table_or_string|
+  with_scope(parent) { step "#{step_name}:", table_or_string }
 end
 
 Given /^(?:|I )am on (.+)$/ do |page_name|

data/lib/active_admin/arbre.rb

@@ -1,5 +1,4 @@
 require "active_admin/arbre/builder"
-require "active_admin/arbre/core_extensions"
 require "active_admin/arbre/context"
 require "active_admin/arbre/html/element"
 require "active_admin/arbre/html/attributes"

data/lib/active_admin/arbre/builder.rb

@@ -65,7 +65,7 @@ module Arbre
           # Render the blocks contents
           if block_given?
             with_current_dom_context tag do
-              insert_text_node_if_string(yield)
+              append_return_block(yield)
             end
           end
         end
@@ -98,10 +98,13 @@ module Arbre
       end
       alias_method :within, :with_current_dom_context
 
-      # Inserts a text node if the tag is a string
-      def insert_text_node_if_string(tag)
-        if tag.is_a?(String)
-          current_dom_context << Arbre::HTML::TextNode.from_string(tag)
+      # Appends the value to the current DOM element if there are no
+      # existing DOM Children and it responds to #to_s
+      def append_return_block(tag)
+        return nil if current_dom_context.children.any?
+
+        if !tag.is_a?(Arbre::HTML::Element) && tag.respond_to?(:to_s)
+          current_dom_context << Arbre::HTML::TextNode.from_string(tag.to_s)
         end
       end
     end

data/lib/active_admin/arbre/context.rb

@@ -35,7 +35,7 @@ module Arbre
       if defined?(@cached_html)
         @cached_html
       else
-        html = to_html
+        html = to_s
         @cached_html = html if html.length > 0
         html
       end

data/lib/active_admin/arbre/html/attributes.rb

@@ -3,7 +3,7 @@ module Arbre
 
     class Attributes < Hash
 
-      def to_html
+      def to_s
         self.collect do |name, value|
           "#{html_escape(name)}=\"#{html_escape(value)}\""
         end.join(" ")

data/lib/active_admin/arbre/html/class_list.rb

@@ -15,10 +15,6 @@ module Arbre
       alias :<< :add
 
       def to_s
-        to_html
-      end
-
-      def to_html
         to_a.join(" ")
       end
 

data/lib/active_admin/arbre/html/collection.rb

@@ -16,9 +16,9 @@ module Arbre
         self.class.new(super)
       end
 
-      def to_html
+      def to_s
         self.collect do |element|
-          element.to_html
+          element.to_s
         end.join.html_safe
       end
     end

data/lib/active_admin/arbre/html/document.rb

@@ -21,7 +21,7 @@ module Arbre
         '<!DOCTYPE html>'.html_safe
       end
 
-      def to_html
+      def to_s
         doctype + super
       end
 

data/lib/active_admin/arbre/html/element.rb

@@ -35,7 +35,7 @@ module Arbre
 
       def build(*args, &block)
         # Render the block passing ourselves in
-        insert_text_node_if_string(block.call(self)) if block
+        append_return_block(block.call(self)) if block
       end
 
       def add_child(child)
@@ -108,11 +108,11 @@ module Arbre
       alias_method :find_by_class, :get_elements_by_class_name
 
       def content
-        children.to_html
+        children.to_s
       end
 
       def html_safe
-        to_html
+        to_s
       end
 
       def indent_level
@@ -120,18 +120,14 @@ module Arbre
       end
 
       def each(&block)
-        [to_html].each(&block)
-      end
-
-      def to_s
-        to_html
+        [to_s].each(&block)
       end
 
       def to_str
         to_s
       end
 
-      def to_html
+      def to_s
         content
       end