api_controller 0.1.2 → 0.2.0

data/Gemfile

@@ -1,14 +1,9 @@
 source "http://rubygems.org"
-# Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
 
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "shoulda", ">= 0"
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.5.2"
   gem "rcov", ">= 0"
   gem "rails", ">= 3.0.0"
+  gem "cucumber", ">= 0.10.0"
 end

data/Gemfile.lock

@@ -30,14 +30,24 @@ GEM
     activesupport (3.0.3)
     arel (2.0.8)
     builder (2.1.2)
+    cucumber (0.10.0)
+      builder (>= 2.1.2)
+      diff-lcs (~> 1.1.2)
+      gherkin (~> 2.3.2)
+      json (~> 1.4.6)
+      term-ansicolor (~> 1.0.5)
+    diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
+    gherkin (2.3.3)
+      json (~> 1.4.6)
     git (1.2.5)
     i18n (0.5.0)
     jeweler (1.5.2)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
+    json (1.4.6)
     mail (2.2.15)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
@@ -65,7 +75,7 @@ GEM
       thor (~> 0.14.4)
     rake (0.8.7)
     rcov (0.9.9)
-    shoulda (2.11.3)
+    term-ansicolor (1.0.5)
     thor (0.14.6)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
@@ -76,7 +86,7 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.0.0)
+  cucumber (>= 0.10.0)
   jeweler (~> 1.5.2)
   rails (>= 3.0.0)
   rcov
-  shoulda

data/README.rdoc

@@ -14,13 +14,15 @@ generates:
 == To do
 
 * modularize test framework usage
-* add proper requirements to all files so that everything works outside of a
-rails project (and in different versions of rails)
+* add proper requirements to all files so that everything works outside of a rails project (and in different versions of rails)
 * make opinionated, robust api and test generation
 * test!
-* change the parameters for the command so that either the plural (people) or
-class name (Person) can be used.
+* change the parameters for the command so that either the plural (people) or class name (Person) can be used.
 * use variable caching in generation methods (version)
+* shorten generator name
+* only make new routes if necessary
+* default generator should be 'api' (generates test and controller); possibly add other generators (test, controller, barebones, etc.)
+* properly insert routes
 
 == Contributing to api_controller
  

data/VERSION

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

data/api_controller.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{api_controller}
-  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 = ["Cody Frazer"]
-  s.date = %q{2011-02-17}
+  s.date = %q{2011-02-18}
   s.description = %q{Genarator for controllers dedicated to custom APIs.}
   s.email = %q{cody.frazer@cph.org}
   s.extra_rdoc_files = [
@@ -25,45 +25,40 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "api_controller.gemspec",
+    "features/routes.feature",
     "lib/generators/api_controller/USAGE",
     "lib/generators/api_controller/api_controller_generator.rb",
     "lib/generators/api_controller/templates/api_controller.rb",
-    "lib/generators/api_controller/templates/api_controller_test.rb",
-    "test/helper.rb",
-    "test/test_api_controller.rb"
+    "lib/generators/api_controller/templates/api_controller_test.rb"
   ]
   s.homepage = %q{http://github.com/crfrazer/api_controller}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.5.2}
   s.summary = %q{Genarator for controllers dedicated to custom APIs.}
-  s.test_files = [
-    "test/helper.rb",
-    "test/test_api_controller.rb"
-  ]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<rails>, [">= 3.0.0"])
+      s.add_development_dependency(%q<cucumber>, [">= 0.10.0"])
     else
-      s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<rails>, [">= 3.0.0"])
+      s.add_dependency(%q<cucumber>, [">= 0.10.0"])
     end
   else
-    s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<rails>, [">= 3.0.0"])
+    s.add_dependency(%q<cucumber>, [">= 0.10.0"])
   end
 end
 

data/features/routes.feature

@@ -0,0 +1,29 @@
+Feature: API Generator
+  In order to allow access to data
+  As a rails developer
+  I want to generate a controller, routes, and a test for that controller
+
+  Scenario: Generate standard API for resource
+    Given a new rails app
+    When I run "rails g scaffold person"
+    And I run "rails g api people"
+    Then I should see the following files
+      | app/controllers/api/v1/people_api_controller.rb |
+      | test/functional/api/v1/people_api_test.rb       |
+    And I should see "resources :people" in file "config/routes.rb"
+
+  Scenario: Generate API with a different version
+
+  Scenario: Generate API with Test::Unit tests
+
+  Scenario: Generate API with cucumber tests
+
+  Scenario: Generate API with shoulda tests
+
+  Scenario: Generate blank API
+
+  Scenario: Generate API controller
+
+  Scenario: Generate API test
+
+  Scenario: Generate API routes

data/lib/generators/api_controller/api_controller_generator.rb

@@ -46,14 +46,19 @@ class ApiControllerGenerator < Rails::Generators::Base
     File.open("#{RAILS_ROOT}/config/routes.rb", "r+") do |file|
       file.each do |line|
         final << line
-        if line =~ /[\d]+?::Application.routes.draw/
+        if line =~ /\w+::Application.routes.draw/
           final << <<-ROUTES
-            namespace :api do
-              namespace v#{version} do
-                resources :#{model}, :controller => '#{model}_api', :only => [:index, :show, :create, :update, :destroy]
+
+  namespace :api do
+    namespace v#{version} do
+      resources :#{model}, :controller => '#{model}_api', :only => [:index, :show, :create, :update, :destroy]
+    end
+  end
+
           ROUTES
         end
       end
+      file.pos = 0
       file.puts final
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: api_controller
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
   - 2
-  version: 0.1.2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Cody Frazer
@@ -15,27 +15,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-17 00:00:00 -06:00
+date: 2011-02-18 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: shoulda
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :development
-  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -47,11 +33,11 @@ dependencies:
         - 0
         version: 1.0.0
   name: bundler
-  version_requirements: *id002
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -63,11 +49,11 @@ dependencies:
         - 2
         version: 1.5.2
   name: jeweler
-  version_requirements: *id003
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -77,11 +63,11 @@ dependencies:
         - 0
         version: "0"
   name: rcov
-  version_requirements: *id004
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -93,6 +79,22 @@ dependencies:
         - 0
         version: 3.0.0
   name: rails
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 55
+        segments: 
+        - 0
+        - 10
+        - 0
+        version: 0.10.0
+  name: cucumber
   version_requirements: *id005
 description: Genarator for controllers dedicated to custom APIs.
 email: cody.frazer@cph.org
@@ -112,12 +114,11 @@ files:
 - Rakefile
 - VERSION
 - api_controller.gemspec
+- features/routes.feature
 - lib/generators/api_controller/USAGE
 - lib/generators/api_controller/api_controller_generator.rb
 - lib/generators/api_controller/templates/api_controller.rb
 - lib/generators/api_controller/templates/api_controller_test.rb
-- test/helper.rb
-- test/test_api_controller.rb
 has_rdoc: true
 homepage: http://github.com/crfrazer/api_controller
 licenses: 
@@ -152,6 +153,5 @@ rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Genarator for controllers dedicated to custom APIs.
-test_files: 
-- test/helper.rb
-- test/test_api_controller.rb
+test_files: []
+

data/test/helper.rb

@@ -1,19 +0,0 @@
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'test/unit'
-require 'shoulda'
-require 'rails'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'generators/api_controller/api_controller_generator.rb'
-
-class Test::Unit::TestCase
-end

data/test/test_api_controller.rb

@@ -1,7 +0,0 @@
-require 'helper'
-
-class TestApiController < 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