snfn 0.1.2 → 0.2.0

data/Gemfile

@@ -12,4 +12,4 @@ group :development do
 #  gem "rcov", ">= 0"
 end
 
-gem "thor"
+gem "thor", "~> 0.14.6"

data/Gemfile.lock

@@ -15,4 +15,4 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.0.0)
   jeweler (~> 1.6.4)
-  thor
+  thor (~> 0.14.6)

data/README.mdown

@@ -3,11 +3,11 @@
 Snfn is an opinionated generator for Sinatra projects. It
 can be configured using the following options:
 
-*  -d : Database. Options are "postgres," "mysql," "sqlite",
+*  `-d` Database. Options are "postgres," "mysql," "sqlite",
    and "mongo." Default is "sqlite."
-*  --redis : Include Redis configuration options.
-* --no-database : Don't include any database config options.
-* --no-heroku : Don't include Heroku config options.
+*  `--redis` Include Redis configuration options.
+* `--no-database` Don't include any database config options.
+* `--no-heroku` Don't include Heroku config options.
 
 ## Installation
 
@@ -30,19 +30,30 @@ The template autoloads files in config/initializers and
 /lib. Database configuration options are stored in `config/db.yml`
 and are loaded via `config/initializers/database.rb`.
 
-Right now Snfn only supports Unicorn as a server, with the config
-stored at config/unicorn.rb.
+Right now Snfn only comes out of the box with support for Unicorn, (the
+config file is stored at config/unicorn.rb), but changing it out for
+thin or mongrel is pretty trivial.
 
 ## DB Setup
 
-Sequel is used as an ORM for relational databases,
-and migrations are stored in db/migrate. Migrations can be
-run using the rake command `rake migrate`.
+[Sequel](http://sequel.rubyforge.org) is used as an ORM for
+relational databases, and migrations are stored in db/migrate.
+Migrations can be run using the rake command `rake rb:migrate`.
 
 MongoMapper is used for Mongo apps, with the config options
 stored in the same files as relational databases (`config/db.yml`
 and `config/initializers/database.rb`).
 
+### More information
+
+*  [Sequel Migrations](http://sequel.rubyforge.org/rdoc/files/doc/migration_rdoc.html)
+*  [Sequel Models](http://sequel.rubyforge.org/rdoc/classes/Sequel/Model.html)
+*  [MongoMapper](http://mongomapper.com)
+
+If there is any interest in supporting other ORMs like DataMapper or
+ActiveRecord, either please let me know or implement it yourself and
+send a pull request.
+
 ## Set up on Heroku
 
 By default, Snfn creates an app with the proper options for deployment
@@ -59,8 +70,8 @@ on Heroku. To get Snfn up and running on Heroku:
 To use PostgreSQL, MongoDB, or Redis on Heroku, you'll need to add
 the proper Heroku add-ons. The commands to do this are, respectively:
 
-    heroku addons:add shared_database # PostgreSQL
-    heroku addons:add mongolab:starter: # MongoDB
+    heroku addons:add shared-database # PostgreSQL
+    heroku addons:add mongolab:starter # MongoDB
     heroku addons:add redistogo:nano # Redis
 
 ## Contributing to snfn

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.0

data/bin/snfn

@@ -9,7 +9,7 @@ class SnfnGenerator < Thor
   include Thor::Actions
 
   desc "new NAME", "Creates new Snfn application"
-  method_option :database, :aliases => "-d", :default => "postgres", :desc => "The type of database to use. Values are \"sqlite\", \"postgres\", \"mysql\", and \"mongo\". Default is \"postgres\"."
+  method_option :database, :aliases => "-d", :default => "sqlite", :desc => "The type of database to use. Values are \"sqlite\", \"postgres\", \"mysql\", and \"mongo\". Default is \"postgres\"."
   method_option :no_heroku, :type => :boolean, :desc => "Include Heroku configuration options."
   method_option :no_database, :type => :boolean, :desc => "Do not use any database."
   method_option :redis, :type => :boolean, :desc => "Include Redis configuration options."

data/lib/extensions/string.rb

@@ -2,9 +2,9 @@ module Snfn
   module Extensions
     module String
       def camel_case
-        return self if !match(/_/)
-        altered_self = self.capitalize
-        altered_self.scan(/_[a-zA-Z]/).each do |match|
+        return self.gsub(/^./) { |l| l.capitalize } if !match(/[_-]/)
+        altered_self = self.downcase.capitalize
+        altered_self.scan(/[_-][a-zA-Z]/).each do |match|
           altered_self.gsub!(match, match[1].upcase)
         end
 
@@ -16,13 +16,14 @@ module Snfn
       end
 
       def file_name
-        return self if !match(/[A-Z]/)
+        return self.gsub(/-/, "_") if !match(/[A-Z]/)
         altered_self = self.strip
+
         altered_self.scan(/[A-Z]/).each do |match|
           altered_self.gsub!(match, "_#{match.downcase}")
         end
 
-        altered_self.sub(/^_/, "")
+        altered_self.sub(/^_/, "").gsub(/_{2,}+/, "_").downcase
       end
 
       def file_name!

data/lib/templates/README.mdown

@@ -3,11 +3,15 @@
 Snfn is an opinionated generator for Sinatra projects. It
 can be configured using the following options:
 
-*  -d : Database. Options are "postgres," "mysql," "sqlite",
+*  `-d` Database. Options are "postgres," "mysql," "sqlite",
    and "mongo." Default is "sqlite."
-*  --redis : Include Redis configuration options.
-* --no-database : Don't include any database config options.
-* --no-heroku : Don't include Heroku config options.
+*  `--redis` Include Redis configuration options.
+* `--no-database` Don't include any database config options.
+* `--no-heroku` Don't include Heroku config options.
+
+## Installation
+
+    gem install snfn
 
 ## Example
 
@@ -26,19 +30,30 @@ The template autoloads files in config/initializers and
 /lib. Database configuration options are stored in `config/db.yml`
 and are loaded via `config/initializers/database.rb`.
 
-Right now Snfn only supports Unicorn as a server, with the config
-stored at config/unicorn.rb.
+Right now Snfn only comes out of the box with support for Unicorn, (the
+config file is stored at config/unicorn.rb), but changing it out for
+thin or mongrel is pretty trivial.
 
 ## DB Setup
 
-Sequel is used as an ORM for relational databases,
-and migrations are stored in db/migrate. Migrations can be
-run using the rake command `rake migrate`.
+[Sequel](http://sequel.rubyforge.org) is used as an ORM for
+relational databases, and migrations are stored in db/migrate.
+Migrations can be run using the rake command `rake rb:migrate`.
 
 MongoMapper is used for Mongo apps, with the config options
 stored in the same files as relational databases (`config/db.yml`
 and `config/initializers/database.rb`).
 
+### More information
+
+*  [Sequel Migrations](http://sequel.rubyforge.org/rdoc/files/doc/migration_rdoc.html)
+*  [Sequel Models](http://sequel.rubyforge.org/rdoc/classes/Sequel/Model.html)
+*  [MongoMapper](http://mongomapper.com)
+
+If there is any interest in supporting other ORMs like DataMapper or
+ActiveRecord, either please let me know or implement it yourself and
+send a pull request.
+
 ## Set up on Heroku
 
 By default, Snfn creates an app with the proper options for deployment
@@ -55,6 +70,7 @@ on Heroku. To get Snfn up and running on Heroku:
 To use PostgreSQL, MongoDB, or Redis on Heroku, you'll need to add
 the proper Heroku add-ons. The commands to do this are, respectively:
 
-    heroku addons:add shared_database # PostgreSQL
-    heroku addons:add mongolab:starter: # MongoDB
+    heroku addons:add shared-database # PostgreSQL
+    heroku addons:add mongolab:starter # MongoDB
     heroku addons:add redistogo:nano # Redis
+

data/lib/templates/Rakefile

@@ -15,6 +15,8 @@ end
 task :environment, [:env] do |cmd, args|
   Bundler.require
   ENV['RACK_ENV'] = args[:env] || "development"
-  Find.find("lib") { |f| require f unless f.match(/\/\..+$/) || File.directory?(f) }
+  %w{ ./config/initializers ./lib }.each do
+    Find.find(lib) { |f| require f unless f.match(/\/\..+$/) || File.directory?(f) }
+  end
 end
 

data/snfn.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{snfn}
-  s.version = "0.1.2"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Zach Pendleton}]
@@ -46,6 +46,7 @@ Gem::Specification.new do |s|
     "lib/templates/views/welcome.erb",
     "snfn.gemspec",
     "test/helper.rb",
+    "test/test_extension_string.rb",
     "test/test_snfn.rb",
     "vendor/cache/git-1.2.5.gem",
     "vendor/cache/jeweler-1.6.4.gem",
@@ -62,16 +63,16 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<thor>, [">= 0"])
+      s.add_runtime_dependency(%q<thor>, ["~> 0.14.6"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
     else
-      s.add_dependency(%q<thor>, [">= 0"])
+      s.add_dependency(%q<thor>, ["~> 0.14.6"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
     end
   else
-    s.add_dependency(%q<thor>, [">= 0"])
+    s.add_dependency(%q<thor>, ["~> 0.14.6"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
   end

data/test/helper.rb

@@ -8,11 +8,11 @@ rescue Bundler::BundlerError => e
   exit e.status_code
 end
 require 'test/unit'
-require 'shoulda'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'snfn'
+require 'extensions/string'
 
 class Test::Unit::TestCase
 end

data/test/test_extension_string.rb

@@ -0,0 +1,47 @@
+require 'helper'
+
+class TestExtensionString < Test::Unit::TestCase
+def test_should_ignore_an_already_camel_cased_string
+    assert_equal "MyApp", "MyApp".camel_case
+  end
+
+  def test_should_capitalize_an_all_lower_case_string
+    assert_equal "Myapp", "myapp".camel_case
+  end
+
+  def test_should_camel_case_a_lower_case_string_with_underscores
+    assert_equal "MyApp", "my_app".camel_case
+  end
+
+  def test_should_camel_case_a_lower_case_string_with_hyphens
+    assert_equal "MyApp", "my-app".camel_case
+  end
+
+  def test_should_camel_case_an_uppercase_string_with_underscores
+    assert_equal "MyApp", "MY_APP".camel_case
+  end
+
+  def test_should_camel_case_an_uppercase_string_with_hyphens
+    assert_equal "MyApp", "MY-APP".camel_case
+  end
+
+  def test_should_camel_case_a_string_with_a_hyphen_preceding_a_capital_letter
+    assert_equal "MyApp", "my_App".camel_case
+  end
+
+  def test_should_underscore_a_camel_cased_string
+    assert_equal "my_app", "MyApp".file_name
+  end
+
+  def test_should_underscore_a_hypenated_string
+    assert_equal "my_app", "my-app".file_name
+  end
+
+  def test_should_ignore_an_already_underscored_string
+    assert_equal "my_app", "my_app".file_name
+  end
+
+  def test_should_underscore_a_string_with_a_hyphen_preceding_a_capital_letter
+    assert_equal "my_app", "my_App".file_name
+  end
+end

data/test/test_snfn.rb

@@ -1,7 +1,4 @@
 require 'helper'
 
 class TestSnfn < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: snfn
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,18 +13,18 @@ date: 2011-08-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70142122282040 !ruby/object:Gem::Requirement
+  requirement: &70096437864820 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *70142122282040
+  version_requirements: *70096437864820
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70142122279780 !ruby/object:Gem::Requirement
+  requirement: &70096437861960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70142122279780
+  version_requirements: *70096437861960
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70142122276320 !ruby/object:Gem::Requirement
+  requirement: &70096437859720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70142122276320
+  version_requirements: *70096437859720
 description: An app generator for Sinatra apps with an eye towards easy Heroku setup
   and deployment.
 email: zachpendleton@gmail.com
@@ -82,6 +82,7 @@ files:
 - lib/templates/views/welcome.erb
 - snfn.gemspec
 - test/helper.rb
+- test/test_extension_string.rb
 - test/test_snfn.rb
 - vendor/cache/git-1.2.5.gem
 - vendor/cache/jeweler-1.6.4.gem
@@ -102,7 +103,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1680689362822137794
+      hash: 1803279801753176280
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: