Merge branch 'master' of https://github.com/hyperoslo/singleton-rails

Conflicts: lib/singleton-rails.rb singleton_rails.gemspec
hyperoslo · Jan 23, 2015 · d7b8da9 · d7b8da9
2 parents 79dc457 + 8c055cb
commit d7b8da9
Show file tree

Hide file tree

Showing 47 changed files with 33 additions and 735 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,14 +1,4 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-# Declare your gem's dependencies in singleton_rails.gemspec.
-# Bundler will treat runtime dependencies like base dependencies, and
-# development dependencies will be added by default to the :development group.
+# For the actual gemspec see singleton_rails.gemspec
 gemspec
-
-# Declare any dependencies that are still in development here instead of in
-# your gemspec. These might include edge Rails or gems from your path or
-# Git. Remember to move these dependencies to your gemspec before releasing
-# your gem to rubygems.org.
-
-# To use debugger
-# gem 'debugger'
diff --git a/README.md b/README.md
@@ -1,6 +1,14 @@
-# SingletonRails
+# Singleton Rails
 
-This project rocks and uses the MIT license.
+[![Gem Version](https://img.shields.io/gem/v/singleton-rails.svg?style=flat)](https://rubygems.org/gems/singleton-rails)
+[![Dependency Status](https://img.shields.io/gemnasium/hyperoslo/singleton-rails.svg?style=flat)](https://gemnasium.com/hyperoslo/singleton-rails)
+[![Code Climate](https://img.shields.io/codeclimate/github/hyperoslo/singleton-rails.svg?style=flat)](https://codeclimate.com/github/hyperoslo/singleton-rails)
+
+Adds singleton functionallity to ActiveRecord models.
+
+**Supported Rails versions: 4.0.0 or higher**
+
+Licensed under the **MIT** license, see LICENSE for more information.
 
 ## Installation
 
@@ -9,19 +17,21 @@ This project rocks and uses the MIT license.
 ## Usage
 
 ### Include Singleton in your model
+
 ```ruby
 class AboutPage < ActiveRecord::Base
   include ActiveRecord::Singleton
 end
 ```
 
 ### Configure rails_admin
+
 ```ruby
 RailsAdmin.config do |config|
-  
+
   config.actions do
     dashboard
- 
+
     index &RailsAdmin::Config::Actions::SingletonAwareIndex::PATCH
     new
     export
@@ -34,11 +44,12 @@ RailsAdmin.config do |config|
     history_show
     show_in_app
   end
-  
+
 end
 ```
 
 ### How to use it in your controller
+
 ```ruby
   class AboutPageController < ApplicationController
     def index

diff --git a/Rakefile b/Rakefile
@@ -14,9 +14,6 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-
-
-
 Bundler::GemHelper.install_tasks
 
 require 'rake/testtask'
@@ -28,5 +25,4 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = false
 end
 
-
 task default: :test
diff --git a/lib/singleton-rails.rb b/lib/singleton-rails.rb
@@ -1,8 +1,8 @@
 require 'active_record' rescue nil
 
 if defined? ActiveRecord
-  require "active_record/singleton"
-  require "rails_admin/config/actions/singleton_aware_delete"
-  require "rails_admin/config/actions/singleton_aware_index"
-  require "rails_admin/config/actions/singleton_aware_new"
+  require 'active_record/singleton'
+  require 'rails_admin/config/actions/singleton_aware_delete'
+  require 'rails_admin/config/actions/singleton_aware_index'
+  require 'rails_admin/config/actions/singleton_aware_new'
 end
diff --git a/singleton_rails.gemspec b/singleton_rails.gemspec
@@ -1,20 +1,17 @@
-$:.push File.expand_path("../lib", __FILE__)
+$:.push File.expand_path('../lib', __FILE__)
 
 # Describe your gem and declare its dependencies:
 Gem::Specification.new do |s|
-  s.name        = "singleton-rails"
-  s.version     = "0.0.2.1"
-  s.authors     = ["Tim Kurvers", "Christoffer Winterkvist"]
-  s.email       = ["[email protected]"]
-  s.homepage    = "https://github.com/hyperoslo/singleton-rails"
-  s.summary     = "Forever Alone Ruby Gem"
-  s.description = "Adds singleton functionallity to ActiveRecord models"
-  s.license     = "MIT"
+  s.name        = 'singleton-rails'
+  s.version     = '0.0.2.1'
+  s.authors     = ['Tim Kurvers', 'Christoffer Winterkvist']
+  s.email       = ['[email protected]']
+  s.homepage    = 'https://github.com/hyperoslo/singleton-rails'
+  s.summary     = 'Adds singleton functionallity to ActiveRecord models'
+  s.description = 'Adds singleton functionallity to ActiveRecord models'
+  s.license     = 'MIT'
 
-  s.files = Dir["{app,config,db,lib}/**/*", "LICENSE", "Rakefile"]
-  s.test_files = Dir["test/**/*"]
+  s.files = Dir['{app,config,db,lib}/**/*', 'LICENSE', 'Rakefile']
 
-  s.add_dependency "rails", '>= 4.0.6', '< 5.0.0'
-
-  s.add_development_dependency "sqlite3"
+  s.add_dependency 'rails', '>= 4.0.6', '< 5.0.0'
 end
diff --git a/test/dummy/README.rdoc b/test/dummy/README.rdoc
diff --git a/test/dummy/Rakefile b/test/dummy/Rakefile
diff --git a/test/dummy/app/assets/images/.keep b/test/dummy/app/assets/images/.keep
diff --git a/test/dummy/app/assets/javascripts/application.js b/test/dummy/app/assets/javascripts/application.js
diff --git a/test/dummy/app/assets/stylesheets/application.css b/test/dummy/app/assets/stylesheets/application.css
diff --git a/test/dummy/app/controllers/application_controller.rb b/test/dummy/app/controllers/application_controller.rb
diff --git a/test/dummy/app/controllers/concerns/.keep b/test/dummy/app/controllers/concerns/.keep
diff --git a/test/dummy/app/helpers/application_helper.rb b/test/dummy/app/helpers/application_helper.rb
diff --git a/test/dummy/app/mailers/.keep b/test/dummy/app/mailers/.keep
diff --git a/test/dummy/app/models/.keep b/test/dummy/app/models/.keep
diff --git a/test/dummy/app/models/concerns/.keep b/test/dummy/app/models/concerns/.keep
diff --git a/test/dummy/app/views/layouts/application.html.erb b/test/dummy/app/views/layouts/application.html.erb
diff --git a/test/dummy/bin/bundle b/test/dummy/bin/bundle
diff --git a/test/dummy/bin/rails b/test/dummy/bin/rails
diff --git a/test/dummy/bin/rake b/test/dummy/bin/rake
diff --git a/test/dummy/config.ru b/test/dummy/config.ru
diff --git a/test/dummy/config/application.rb b/test/dummy/config/application.rb
diff --git a/test/dummy/config/boot.rb b/test/dummy/config/boot.rb
diff --git a/test/dummy/config/database.yml b/test/dummy/config/database.yml
diff --git a/test/dummy/config/environment.rb b/test/dummy/config/environment.rb
diff --git a/test/dummy/config/environments/development.rb b/test/dummy/config/environments/development.rb