fiddling with dependencies

luddement · Oct 19, 2011 · 202c6bf · 202c6bf
1 parent 8d0d1b4
commit 202c6bf
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 30 deletions.
diff --git a/Gemfile b/Gemfile
@@ -14,12 +14,13 @@ gemspec
 # gem 'ruby-debug'
 
 gem 'jquery-rails'
-gem 'formtastic', '< 2.0.0'
+gem 'formtastic'
 #gem 'sass-rails'
 
 #testing
-gem 'activeadmin'
+gem 'activeadmin', :git => 'https://github.com/gregbell/active_admin.git'
 gem 'sass-rails'
 gem "meta_search",    '>= 1.1.0.pre'
 
-gem 'uglifier'
+gem 'uglifier'
+
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,3 +1,17 @@
+GIT
+  remote: https://github.com/gregbell/active_admin.git
+  revision: 70f22388685b1d8bd92548e4e9e9ced777b46542
+  specs:
+    activeadmin (0.3.2)
+      devise (>= 1.1.2)
+      fastercsv
+      formtastic (>= 2.0.0)
+      inherited_resources (< 1.3.0)
+      kaminari (>= 0.12.4)
+      meta_search (>= 0.9.2)
+      rails (>= 3.0.0)
+      sass (>= 3.1.0)
+
 PATH
   remote: .
   specs:
@@ -26,15 +40,6 @@ GEM
       rack-mount (~> 0.8.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.0.2)
-    activeadmin (0.3.1)
-      devise (>= 1.1.2)
-      fastercsv
-      formtastic (>= 1.1.0)
-      inherited_resources (< 1.3.0)
-      kaminari (>= 0.12.4)
-      meta_search (>= 0.9.2)
-      rails (>= 3.0.0)
-      sass (>= 3.1.0)
     activemodel (3.1.1)
       activesupport (= 3.1.1)
       builder (~> 3.0.0)
@@ -53,18 +58,16 @@ GEM
     bcrypt-ruby (3.0.1)
     builder (3.0.0)
     cocaine (0.2.0)
-    devise (1.4.5)
+    devise (1.4.8)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.0.3)
       warden (~> 1.0.3)
     erubis (2.7.0)
-    execjs (1.2.8)
+    execjs (1.2.9)
       multi_json (~> 1.0)
     fastercsv (1.5.4)
-    formtastic (1.2.4)
-      actionpack (>= 2.3.7)
-      activesupport (>= 2.3.7)
-      i18n (~> 0.4)
+    formtastic (2.0.2)
+      rails (~> 3.0)
     has_scope (0.5.1)
     hike (1.2.1)
     i18n (0.6.0)
@@ -89,15 +92,15 @@ GEM
     mime-types (1.16)
     multi_json (1.0.3)
     orm_adapter (0.0.5)
-    paperclip (2.4.3)
+    paperclip (2.4.4)
       activerecord (>= 2.3.0)
       activesupport (>= 2.3.2)
       cocaine (>= 0.0.2)
       mime-types
     polyamorous (0.5.0)
       activerecord (~> 3.0)
     polyglot (0.3.2)
-    rack (1.3.4)
+    rack (1.3.5)
     rack-cache (1.1)
       rack (>= 0.4)
     rack-mount (0.8.3)
@@ -124,7 +127,7 @@ GEM
       rdoc (~> 3.4)
       thor (~> 0.14.6)
     rake (0.9.2)
-    rdoc (3.10)
+    rdoc (3.11)
       json (~> 1.4)
     responders (0.6.4)
     sass (3.1.10)
@@ -134,29 +137,29 @@ GEM
       sass (>= 3.1.4)
       sprockets (~> 2.0.0)
       tilt (~> 1.3.2)
-    sprockets (2.0.2)
+    sprockets (2.0.3)
       hike (~> 1.2)
       rack (~> 1.0)
-      tilt (!= 1.3.0, ~> 1.1)
+      tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.4)
     thor (0.14.6)
     tilt (1.3.3)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.30)
-    uglifier (1.0.3)
+    uglifier (1.0.4)
       execjs (>= 0.3.0)
       multi_json (>= 1.0.2)
-    warden (1.0.5)
+    warden (1.0.6)
       rack (>= 1.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activeadmin
-  formtastic (< 2.0.0)
+  activeadmin!
+  formtastic
   jquery-rails
   meta_search (>= 1.1.0.pre)
   rich!

diff --git a/rich.gemspec b/rich.gemspec
@@ -23,8 +23,7 @@ Gem::Specification.new do |s|
   s.add_dependency "sass-rails"
   s.add_dependency "mime-types"
 
-  s.add_development_dependency("formtastic", "< 2.0.0")
-  s.add_development_dependency "sqlite3"
   s.add_development_dependency "formtastic"
+  s.add_development_dependency "sqlite3"
 
 end
diff --git a/test/dummy/app/views/posts/_formtastic_form.html.erb b/test/dummy/app/views/posts/_formtastic_form.html.erb
@@ -2,7 +2,7 @@
    <%= f.inputs do %>
      <%= f.input :name %>
      <%= f.input :title %>
-     <%= f.input :content, :as => :rich, :editor => {:skin => 'office2003' } %>
+     <%= f.input :content, :as => :rich, :editor => { } %>
    <% end %>
    <%= f.buttons do %>
      <%= f.commit_button %>