andrewroth_activeadmin 0.3.4.3 → 0.3.4.4

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

@@ -65,14 +65,14 @@ module Arbre
 
       # Returns a string of classes
       def class_names
-        class_list.to_html
+        class_list.to_s
       end
 
       def class_list
         get_attribute(:class) || set_attribute(:class, ClassList.new)
       end
 
-      def to_html
+      def to_s
         indent("<#{tag_name}#{attributes_html}>", content, "</#{tag_name}>").html_safe
       end
 
@@ -118,7 +118,7 @@ module Arbre
 
 
       def attributes_html
-        attributes.any? ? " " + attributes.to_html : nil
+        attributes.any? ? " " + attributes.to_s : nil
       end
 
       def set_for_attribute(record)

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

@@ -26,8 +26,8 @@ module Arbre
         nil
       end
 
-      def to_html
-        ERB::Util.html_escape(@content.to_html)
+      def to_s
+        ERB::Util.html_escape(@content.to_s)
       end
     end
 

data/lib/active_admin/locales/de.yml

@@ -9,6 +9,7 @@ de:
     delete: "Löschen"
     delete_confirmation: "Wollen Sie dieses Element wirklich löschen?"
     new_model: "%{model} erstellen"
+    create_model: "%{model} erstellen"
     edit_model: "%{model} bearbeiten"
     delete_model: "%{model} löschen"
     details: "%{model} Details"

data/lib/active_admin/menu_item.rb

@@ -1,18 +1,25 @@
 module ActiveAdmin
   class MenuItem
-    
-    # Use this to get to the routes
-    include Rails.application.routes.url_helpers
-    
+
+
+    # Generates a route using the rails application url helpers
+    #
+    # @param [Symbol] named_route
+    #
+    # @returns [String] The generated route
+    def self.generate_url(named_route)
+      Rails.application.routes.url_helpers.send(named_route)
+    end
+
     attr_accessor :name, :url, :priority, :parent, :display_if_block
-    
+
     def initialize(name, url, priority = 10, options = {})
       @name, @url, @priority = name, url, priority
       @children = []
       @cached_url = {} # Stores the cached url in a hash to allow us to change it and still cache it
 
       @display_if_block = options.delete(:if)
-      
+
       yield(self) if block_given? # Builder style syntax
     end
 
@@ -20,54 +27,55 @@ module ActiveAdmin
       item = MenuItem.new(name, url, priority, options, &block)
       item.parent = self
       @children << item
-    end  
-    
+    end
+
     def children
       @children.sort
     end
-    
+
     def parent?
       !parent.nil?
     end
-    
+
     def dom_id
       name.downcase.gsub( " ", '_' ).gsub( /[^a-z0-9_]/, '' )
     end
-    
+
     def url
       case @url
       when Symbol
-        generated = send(@url) # Call the named route
+        generated = self.class.generate_url(@url) # Call the named route
       else
         generated = @url
       end
       @cached_url[@url] ||= generated
     end
-    
+
     # Returns an array of the ancestory of this menu item
     # The first item is the immediate parent fo the item
     def ancestors
       return [] unless parent?
       [parent, parent.ancestors].flatten
     end
-    
+
     # Returns the child item with the name passed in
     #    @blog_menu["Create New"] => <#MenuItem @name="Create New" >
     def [](name)
       @children.find{ |i| i.name == name }
     end
-    
+
     def <=>(other)
       result = priority <=> other.priority
       result = name <=> other.name if result == 0
       result
     end
-    
+
     # Returns the display if block. If the block was not explicitly defined
     # a default block always returning true will be returned.
     def display_if_block
       @display_if_block || lambda { |_| true }
     end
 
-  end  
+
+  end
 end

data/lib/active_admin/resource_controller/collection.rb

@@ -124,7 +124,7 @@ module ActiveAdmin
         end
 
         def paginate(chain)
-          chain.page(params[:page]).per(@per_page || active_admin_namespace.default_per_page)
+          chain.send(Kaminari.config.page_method_name, params[:page]).per(@per_page || active_admin_namespace.default_per_page)
         end
       end
 

data/lib/active_admin/version.rb

@@ -1,3 +1,3 @@
 module ActiveAdmin
-  VERSION = '0.3.4.3'
+  VERSION = '0.3.4.4'
 end

data/lib/active_admin/views/components/columns.rb

@@ -14,6 +14,10 @@ module ActiveAdmin
         calculate_columns!
       end
 
+      def to_s
+        super.to_s + "<div style=\"clear:both;\"></div>".html_safe
+      end
+
       protected
 
       def margin_size
@@ -35,10 +39,6 @@ module ActiveAdmin
         end
       end
 
-      def to_html
-        super.to_s + "<div style=\"clear:both;\"></div>".html_safe
-      end
-
     end
 
     class Column < ActiveAdmin::Component

data/script/use_rails

@@ -3,6 +3,8 @@
 # Switches the development environment to use the given
 # version of rails. Caches the Gemfile.locks so that 
 # switching it very fast.
+#
+require File.expand_path("../../spec/support/detect_rails_version", __FILE__)
 
 def cmd(command)
   puts command
@@ -34,13 +36,18 @@ if File.exists?(gem_lock_file) && ARGV.include?('--clobber')
   cmd "rm #{gem_lock_file}"
 end
 
-unless File.exists?(gem_lock_file)
-  # Generate it
+write_rails_version(version)
+
+# Ensure that bundler installs
+ENV['RUBYOPT'] = ''
+
+if File.exists?(gem_lock_file)
+  cmd("rm Gemfile.lock") if file_or_symlink?("Gemfile.lock")
+  cmd("ln -s #{gem_lock_file} Gemfile.lock")
+  cmd("bundle")
+else
   cmd "rm Gemfile.lock" if file_or_symlink?("Gemfile.lock")
-  cmd "export RAILS=#{version} && bundle install"
+  cmd "bundle install"
   cmd "mv Gemfile.lock #{gem_lock_file}"
+  cmd("ln -s #{gem_lock_file} Gemfile.lock")
 end
-
-cmd("rm Gemfile.lock") if file_or_symlink?("Gemfile.lock")
-cmd("ln -s #{gem_lock_file} Gemfile.lock")
-cmd("bundle")

data/spec/spec_helper.rb

@@ -1,13 +1,4 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH << File.expand_path('../support', __FILE__)
-
-ENV['BUNDLE_GEMFILE'] = File.expand_path('../../Gemfile', __FILE__)
-
-require 'detect_rails_version'
-ENV['RAILS'] = detect_rails_version
-
-require "bundler"
-Bundler.setup
+require File.expand_path("../spec_helper_without_rails", __FILE__)
 
 require 'shoulda/active_record'
 include Shoulda::ActiveRecord::Macros
@@ -97,7 +88,10 @@ module ActiveAdminIntegrationSpecHelper
 end
 
 ENV['RAILS_ENV'] = 'test'
-ENV['RAILS_ROOT'] = File.expand_path("../rails/rails-#{ENV["RAILS"]}", __FILE__)
+
+require 'detect_rails_version'
+rails_version = detect_rails_version
+ENV['RAILS_ROOT'] = File.expand_path("../rails/rails-#{rails_version}", __FILE__)
 
 # Create the test app if it doesn't exists
 unless File.exists?(ENV['RAILS_ROOT'])

data/spec/spec_helper_without_rails.rb

@@ -0,0 +1,10 @@
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH << File.expand_path('../support', __FILE__)
+
+ENV['BUNDLE_GEMFILE'] = File.expand_path('../../Gemfile', __FILE__)
+
+require 'detect_rails_version'
+ENV['RAILS'] = detect_rails_version
+
+require "bundler"
+Bundler.setup

data/spec/support/detect_rails_version.rb

@@ -2,9 +2,28 @@
 #
 # You can pass it in as an ENV variable or it will use
 # the current Gemfile.lock to find it
+
+unless defined?(RAILS_VERSION_FILE)
+  RAILS_VERSION_FILE = File.expand_path("../../../.rails-version", __FILE__)
+end
+
+unless defined?(DEFAULT_RAILS_VERSION)
+  DEFAULT_RAILS_VERSION = "3.1.3"
+end
+
 def detect_rails_version
-  return nil unless (File.exists?("Gemfile.lock") || File.symlink?("Gemfile.lock"))
+  detected_version = if File.exists?(RAILS_VERSION_FILE)
+    version = File.read(RAILS_VERSION_FILE).chomp.strip
+    version != "" ? version : DEFAULT_RAILS_VERSION
+  else
+    DEFAULT_RAILS_VERSION
+  end
+
+  puts "Detected Rails: #{detected_version}" if ENV['DEBUG']
+
+  detected_version
+end
 
-  File.read("Gemfile.lock").match(/^\W*rails \(([a-z\d.]*)\)/)
-  return $1
+def write_rails_version(version)
+  File.open(RAILS_VERSION_FILE, "w+"){|f| f << version }
 end

data/spec/unit/arbre/context_spec.rb

@@ -27,7 +27,7 @@ describe Arbre::Context do
   end
 
   it "should use a cached version of the HTML for method delegation" do
-    current_dom_context.should_receive(:to_html).once.and_return("<h1>札幌市北区</h1>")
+    current_dom_context.should_receive(:to_s).once.and_return("<h1>札幌市北区</h1>")
     current_dom_context.index('<').should == 0
     current_dom_context.index('<').should == 0
   end

data/spec/unit/arbre/html/element_spec.rb

@@ -73,7 +73,7 @@ describe Arbre::HTML::Element do
       let(:child){ "Hello World" }
       it "should add as a TextNode" do
         element.children.first.should be_instance_of(Arbre::HTML::TextNode)
-        element.children.first.to_html.should == "Hello World"
+        element.children.first.to_s.should == "Hello World"
       end
     end
   end
@@ -90,13 +90,13 @@ describe Arbre::HTML::Element do
       end
 
       it "should add the string as a child" do
-        element.children.first.to_html.should == "Goodbye"
+        element.children.first.to_s.should == "Goodbye"
       end
 
       it "should html escape the string" do
         string = "Goodbye <br />"
         element.content = string
-        element.content.to_html.should == "Goodbye &lt;br /&gt;"
+        element.to_s.should == "Goodbye &lt;br /&gt;"
       end
     end
 
@@ -146,8 +146,8 @@ describe Arbre::HTML::Element do
 
   describe "rendering to html" do
     it "should render the children collection" do
-      element.children.should_receive(:to_html).and_return("content")
-      element.to_html.should == "content"
+      element.children.should_receive(:to_s).and_return("content")
+      element.to_s.should == "content"
     end
   end
 

data/spec/unit/arbre/html/tag_attributes_spec.rb

@@ -14,7 +14,7 @@ describe Arbre::HTML::Tag, "Attributes" do
     end
 
     it "should render the attributes to html" do
-      tag.to_html.should == <<-HTML
+      tag.to_s.should == <<-HTML
 <tag id="my_id"></tag>
 HTML
     end
@@ -47,13 +47,13 @@ HTML
   describe "rendering attributes" do
     it "should html safe the attribute values" do
       tag.set_attribute(:class, "\">bad things!")
-      tag.to_html.should == <<-HTML
+      tag.to_s.should == <<-HTML
 <tag class="&quot;&gt;bad things!"></tag>
 HTML
     end
     it "should should escape the attribute names" do
       tag.set_attribute(">bad", "things")
-      tag.to_html.should == <<-HTML
+      tag.to_s.should == <<-HTML
 <tag &gt;bad="things"></tag>
 HTML
     end

data/spec/unit/arbre/html_spec.rb

@@ -6,7 +6,7 @@ describe Arbre do
 
   it "should render a single element" do
     content = span("Hello World")
-    content.to_html.should == <<-HTML
+    content.to_s.should == <<-HTML
 <span>Hello World</span>
 HTML
   end
@@ -15,7 +15,7 @@ HTML
     content = span do
       span "Hello World"
     end
-    content.to_html.should == <<-HTML
+    content.to_s.should == <<-HTML
 <span>
   <span>Hello World</span>
 </span>
@@ -28,7 +28,7 @@ HTML
       li "Second"
       li "Third"
     end
-    content.to_html.should == <<-HTML
+    content.to_s.should == <<-HTML
 <ul>
   <li>First</li>
   <li>Second</li>
@@ -51,7 +51,7 @@ HTML
       li first
       li second
     end
-    content.to_html.should == <<-EOS
+    content.to_s.should == <<-EOS
 <ul>
   <li>First</li>
   <li>Second</li>
@@ -66,7 +66,7 @@ EOS
         li
       end
     end
-    content.to_html.should == <<-HTML
+    content.to_s.should == <<-HTML
 <div>
   <ul></ul>
   <li>
@@ -82,7 +82,7 @@ HTML
         li
       end
     end
-    content.to_html.should == <<-HTML
+    content.to_s.should == <<-HTML
 <div>
   <ul>
     <li></li>
@@ -95,7 +95,7 @@ HTML
     content = div do
       span(ul(li))
     end
-    content.to_html.should == <<-HTML
+    content.to_s.should == <<-HTML
 <div>
   <span>
     <ul>
@@ -113,7 +113,7 @@ HTML
         li
       end
     end
-    content.to_html.should == <<-HTML
+    content.to_s.should == <<-HTML
 <div id="my-tag">
   <ul>
     <li></li>
@@ -131,12 +131,22 @@ HTML
     item.parent.should == list
   end
 
-  it "should set a string content return value with no children" do
-    li do
-      "Hello World"
-    end.to_html.should == <<-HTML
-<li>Hello World</li>
-HTML
+
+  ["Hello World", 1, 1.5].each do |value|
+    it "should append the return value of '#{value}' when no other children added to the DOM" do
+      li do
+        value
+      end.to_s.should == "<li>#{value}</li>\n"
+    end
+  end
+
+  ["Hello World", 1, 1.5].each do |value|
+    it "should not append the return value of '#{value}' when children have been added to the DOM" do
+      li do
+        text_node("Already Added")
+        value
+      end.to_s.should == "<li>Already Added</li>\n"
+    end
   end
 
   describe "text nodes" do
@@ -150,19 +160,19 @@ HTML
   describe "self-closing nodes" do
     it "should not self-close script tags" do
       tag = script :type => 'text/javascript'
-      tag.to_html.should == <<-HTML
+      tag.to_s.should == <<-HTML
 <script type="text/javascript"></script>
 HTML
     end
     it "should self-close meta tags" do
       tag = meta :content => "text/html; charset=utf-8"
-      tag.to_html.should == <<-HTML
+      tag.to_s.should == <<-HTML
 <meta content="text/html; charset=utf-8\"/>
 HTML
     end
     it "should self-close link tags" do
       tag = link :rel => "stylesheet"
-      tag.to_html.should == <<-HTML
+      tag.to_s.should == <<-HTML
 <link rel="stylesheet"/>
 HTML
     end
@@ -170,17 +180,17 @@ HTML
 
   describe "html safe" do
     it "should escape the contents" do
-      span("<br />").to_html.should == <<-HTML
+      span("<br />").to_s.should == <<-HTML
 <span>&lt;br /&gt;</span>
 HTML
     end
 
     it "should return html safe strings" do
-      span("<br />").to_html.should be_html_safe
+      span("<br />").to_s.should be_html_safe
     end
 
     it "should not escape html passed in" do
-      span(span("<br />")).to_html.should == <<-HTML
+      span(span("<br />")).to_s.should == <<-HTML
 <span>
   <span>&lt;br /&gt;</span>
 </span>
@@ -192,7 +202,7 @@ HTML
         span {
           "<br />"
         }
-      }.to_html.should == <<-HTML
+      }.to_s.should == <<-HTML
 <span>
   <span>&lt;br /&gt;</span>
 </span>
@@ -200,7 +210,7 @@ HTML
     end
 
     it "should escape the contents of attributes" do
-      span(:class => "<br />").to_html.should == <<-HTML
+      span(:class => "<br />").to_s.should == <<-HTML
 <span class="&lt;br /&gt;"></span>
 HTML
     end