merb-admin 0.8.7 → 0.8.8

data/.gitignore

@@ -1,6 +1,7 @@
 !gems/cache/
 *.db
 *.gem
+*.rbc
 *.sqlite
 *.sqlite3
 *.sw[p|o]

data/Gemfile

@@ -13,9 +13,13 @@ group :test do
   gem 'dm-migrations', '~> 1.0'
   gem 'dm-sqlite-adapter', '~> 1.0'
   gem 'dm-validations', '~> 1.0'
-  gem 'thin', '~> 1.2'
   gem 'rspec', '~> 1.3'
-  gem 'sequel', '~> 3.16'
-  gem 'sqlite3-ruby', '~> 1.3', :require => 'sqlite3'
+  gem 'sequel', '~> 3.18'
+  if 'java' == RUBY_PLATFORM
+    gem 'activerecord-jdbcsqlite3-adapter', '~> 1.0', :platform => :jruby
+    gem 'jdbc-sqlite3', '~> 3.6', :platform => :jruby
+  else
+    gem 'sqlite3-ruby', '~> 1.3'
+  end
   gem 'webrat', '~> 0.7'
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    merb-admin (0.8.7)
+    merb-admin (0.8.8)
       builder (~> 2.1)
       merb-assets (~> 1.1)
       merb-helpers (~> 1.1)
@@ -16,7 +16,6 @@ GEM
     activesupport (2.3.10)
     addressable (2.2.2)
     builder (2.1.2)
-    daemons (1.1.0)
     data_objects (0.10.2)
       addressable (~> 2.1)
     dm-aggregates (1.0.2)
@@ -40,13 +39,19 @@ GEM
       uuidtools (~> 2.1.1)
     dm-validations (1.0.2)
       dm-core (~> 1.0.2)
+    do_jdbc (0.10.2-java)
+      data_objects (= 0.10.2)
     do_sqlite3 (0.10.2)
       data_objects (= 0.10.2)
+    do_sqlite3 (0.10.2-java)
+      data_objects (= 0.10.2)
+      do_jdbc (= 0.10.2)
+      jdbc-sqlite3 (>= 3.5.8)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    eventmachine (0.12.10)
     extlib (0.9.15)
     fastercsv (1.5.3)
+    jdbc-sqlite3 (3.6.14.2.056-java)
     json_pure (1.4.6)
     merb-assets (1.1.3)
       merb-core (~> 1.1.3)
@@ -62,26 +67,26 @@ GEM
     merb-slices (1.1.3)
       merb-core (~> 1.1.3)
     mime-types (1.16)
-    nokogiri (1.4.3.1)
+    nokogiri (1.4.4)
+    nokogiri (1.4.4-java)
+      weakling (>= 0.0.3)
     rack (1.2.1)
     rack-test (0.5.6)
       rack (>= 1.0)
     rake (0.8.7)
     rspec (1.3.1)
-    sequel (3.16.0)
-    sqlite3-ruby (1.3.1)
+    sequel (3.18.0)
+    sqlite3-ruby (1.3.2)
     stringex (1.1.0)
-    thin (1.2.7)
-      daemons (>= 1.0.9)
-      eventmachine (>= 0.12.6)
-      rack (>= 1.0.0)
     uuidtools (2.1.1)
-    webrat (0.7.1)
+    weakling (0.0.4-java)
+    webrat (0.7.2)
       nokogiri (>= 1.2.0)
       rack (>= 1.0)
       rack-test (>= 0.5.3)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
@@ -98,7 +103,6 @@ DEPENDENCIES
   merb-helpers (~> 1.1)
   merb-slices (~> 1.1)
   rspec (~> 1.3)
-  sequel (~> 3.16)
+  sequel (~> 3.18)
   sqlite3-ruby (~> 1.3)
-  thin (~> 1.2)
   webrat (~> 0.7)

data/README.rdoc

@@ -4,8 +4,8 @@ It currently offers the features listed here[http://sferik.tadalist.com/lists/13
 
 Take it for a test drive with sample data here[http://merb-admin.heroku.com/].
 == Screenshots
-http://github.com/sferik/merb-admin/raw/master/screenshots/list.png
-http://github.com/sferik/merb-admin/raw/master/screenshots/edit.png
+https://github.com/sferik/merb-admin/raw/master/screenshots/list.png
+https://github.com/sferik/merb-admin/raw/master/screenshots/edit.png
 == Installation
   $ gem install merb-admin
 In your app, add the following dependency to <tt>Gemfile</tt>:

data/Rakefile

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'merb-core'
 require 'merb-core/tasks/merb'
 require 'spec/rake/spectask'

data/lib/merb-admin.rb

@@ -1,7 +1,5 @@
 if defined?(Merb::Plugins)
 
-  $:.unshift File.dirname(__FILE__)
-
   require 'merb-slices'
   Merb::Plugins.add_rakefiles "merb-admin/merbtasks", "merb-admin/slicetasks", "merb-admin/spectasks"
 
@@ -24,6 +22,7 @@ if defined?(Merb::Plugins)
 
     # Slice metadata
     self.description = "MerbAdmin is a Merb plugin that provides an easy-to-use interface for managing your data."
+    require File.expand_path('../merb-admin/version', __FILE__)
     self.version = VERSION
     self.author = "Erik Michaels-Ober"
 

data/lib/merb-admin/version.rb

@@ -1,3 +1,3 @@
 module MerbAdmin
-  VERSION = "0.8.7"
+  VERSION = "0.8.8"
 end

data/merb-admin.gemspec

@@ -1,40 +1,38 @@
 # -*- encoding: utf-8 -*-
-require File.expand_path("../lib/merb-admin/version", __FILE__)
+require File.expand_path('../lib/merb-admin/version', __FILE__)
 
 Gem::Specification.new do |s|
-  s.add_development_dependency("activerecord", "~> 2.3")
-  s.add_development_dependency("dm-core", "~> 1.0")
-  s.add_development_dependency("dm-aggregates", "~> 1.0")
-  s.add_development_dependency("dm-types", "~> 1.0")
-  s.add_development_dependency("dm-migrations", "~> 1.0")
-  s.add_development_dependency("dm-sqlite-adapter", "~> 1.0")
-  s.add_development_dependency("dm-validations", "~> 1.0")
-  s.add_development_dependency("thin", "~> 1.2")
-  s.add_development_dependency("rspec", "~> 1.3")
-  s.add_development_dependency("sequel", "~> 3.16")
-  s.add_development_dependency("sqlite3-ruby", "~> 1.3")
-  s.add_development_dependency("webrat", "~> 0.7")
-  s.add_runtime_dependency("builder", "~> 2.1")
-  s.add_runtime_dependency("merb-assets", "~> 1.1")
-  s.add_runtime_dependency("merb-helpers", "~> 1.1")
-  s.add_runtime_dependency("merb-slices", "~> 1.1")
+  s.add_development_dependency('activerecord', '~> 2.3')
+  s.add_development_dependency('dm-core', '~> 1.0')
+  s.add_development_dependency('dm-aggregates', '~> 1.0')
+  s.add_development_dependency('dm-types', '~> 1.0')
+  s.add_development_dependency('dm-migrations', '~> 1.0')
+  s.add_development_dependency('dm-sqlite-adapter', '~> 1.0')
+  s.add_development_dependency('dm-validations', '~> 1.0')
+  s.add_development_dependency('rspec', '~> 1.3')
+  s.add_development_dependency('sequel', '~> 3.18')
+  s.add_development_dependency('webrat', '~> 0.7')
+  s.add_runtime_dependency('builder', '~> 2.1')
+  s.add_runtime_dependency('merb-assets', '~> 1.1')
+  s.add_runtime_dependency('merb-helpers', '~> 1.1')
+  s.add_runtime_dependency('merb-slices', '~> 1.1')
   s.authors = ["Erik Michaels-Ober"]
   s.description = %q{MerbAdmin is a Merb plugin that provides an easy-to-use interface for managing your data}
-  s.email = "sferik@gmail.com"
-  s.extra_rdoc_files = ["LICENSE", "README.rdoc"]
+  s.email = ['sferik@gmail.com']
+  s.extra_rdoc_files = ['LICENSE', 'README.rdoc']
   s.files = `git ls-files`.split("\n")
-  s.homepage = "http://rubygems.org/gems/merb-admin"
-  s.name = "merb-admin"
+  s.homepage = 'http://rubygems.org/gems/merb-admin'
+  s.name = 'merb-admin'
   s.post_install_message =<<eos
 ********************************************************************************
   Make sure to add authorization logic before deploying to production!
   WARNING: MerbAdmin does not implement any authorization scheme.
 ********************************************************************************
 eos
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.required_rubygems_version = Gem::Requirement.new(">= 1.3.6") if s.respond_to? :required_rubygems_version=
-  s.rubyforge_project = "merb-admin"
+  s.rdoc_options = ['--charset=UTF-8']
+  s.require_paths = ['lib']
+  s.required_rubygems_version = Gem::Requirement.new('>= 1.3.6') if s.respond_to? :required_rubygems_version=
+  s.rubyforge_project = 'merb-admin'
   s.summary = %q{MerbAdmin is a Merb plugin that provides an easy-to-use interface for managing your data}
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.version = MerbAdmin::VERSION

data/spec/requests/main_spec.rb

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-require File.join(File.dirname(__FILE__), '..', 'spec_helper.rb')
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe "MerbAdmin" do
   before(:each) do

data/spec/spec_helper.rb

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'merb-core'
 require 'merb-slices'
 require 'spec'

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: merb-admin
 version: !ruby/object:Gem::Version 
-  hash: 49
   prerelease: false
   segments: 
   - 0
   - 8
-  - 7
-  version: 0.8.7
+  - 8
+  version: 0.8.8
 platform: ruby
 authors: 
 - Erik Michaels-Ober
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-16 00:00:00 -07:00
+date: 2010-12-13 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
         segments: 
         - 2
         - 3
@@ -41,7 +39,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 1
         - 0
@@ -56,7 +53,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 1
         - 0
@@ -71,7 +67,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 1
         - 0
@@ -86,7 +81,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 1
         - 0
@@ -101,7 +95,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 1
         - 0
@@ -116,150 +109,113 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 1
         - 0
         version: "1.0"
   type: :development
   version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: thin
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 2
-        version: "1.2"
-  type: :development
-  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
         segments: 
         - 1
         - 3
         version: "1.3"
   type: :development
-  version_requirements: *id009
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: sequel
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 39
-        segments: 
-        - 3
-        - 16
-        version: "3.16"
-  type: :development
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
-  prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
         segments: 
-        - 1
         - 3
-        version: "1.3"
+        - 18
+        version: "3.18"
   type: :development
-  version_requirements: *id011
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: webrat
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
         segments: 
         - 0
         - 7
         version: "0.7"
   type: :development
-  version_requirements: *id012
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: builder
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
         segments: 
         - 2
         - 1
         version: "2.1"
   type: :runtime
-  version_requirements: *id013
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: merb-assets
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
         segments: 
         - 1
         - 1
         version: "1.1"
   type: :runtime
-  version_requirements: *id014
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: merb-helpers
   prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
         segments: 
         - 1
         - 1
         version: "1.1"
   type: :runtime
-  version_requirements: *id015
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
   name: merb-slices
   prerelease: false
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
         segments: 
         - 1
         - 1
         version: "1.1"
   type: :runtime
-  version_requirements: *id016
+  version_requirements: *id014
 description: MerbAdmin is a Merb plugin that provides an easy-to-use interface for managing your data
-email: sferik@gmail.com
+email: 
+- sferik@gmail.com
 executables: []
 
 extensions: []
@@ -393,7 +349,6 @@ files:
 - screenshots/index.png
 - screenshots/list.png
 - screenshots/new.png
-- spec/controllers/main_spec.rb
 - spec/migrations/activerecord/001_create_divisions_migration.rb
 - spec/migrations/activerecord/002_create_drafts_migration.rb
 - spec/migrations/activerecord/003_create_leagues_migration.rb
@@ -440,7 +395,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -449,7 +403,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 23
       segments: 
       - 1
       - 3
@@ -463,7 +416,6 @@ signing_key:
 specification_version: 3
 summary: MerbAdmin is a Merb plugin that provides an easy-to-use interface for managing your data
 test_files: 
-- spec/controllers/main_spec.rb
 - spec/migrations/activerecord/001_create_divisions_migration.rb
 - spec/migrations/activerecord/002_create_drafts_migration.rb
 - spec/migrations/activerecord/003_create_leagues_migration.rb

data/spec/controllers/main_spec.rb

@@ -1,25 +0,0 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-
-describe MerbAdmin::Main do
-
-  before(:each) do
-    mount_slice
-  end
-
-  it "should have helper methods for dealing with public paths" do
-    @controller = dispatch_to(MerbAdmin::Main, :index)
-
-    @controller.public_path_for(:image).should == "/slices/merb-admin/images"
-    @controller.public_path_for(:javascript).should == "/slices/merb-admin/javascripts"
-    @controller.public_path_for(:stylesheet).should == "/slices/merb-admin/stylesheets"
-
-    @controller.image_path.should == "/slices/merb-admin/images"
-    @controller.javascript_path.should == "/slices/merb-admin/javascripts"
-    @controller.stylesheet_path.should == "/slices/merb-admin/stylesheets"
-
-    @controller.app_path_for(:image).should == "#{Merb.root}/public/slices/merb-admin/images"
-    @controller.app_path_for(:javascript).should == "#{Merb.root}/public/slices/merb-admin/javascripts"
-    @controller.app_path_for(:stylesheet).should == "#{Merb.root}/public/slices/merb-admin/stylesheets"
-  end
-
-end