finatra 0.0.9 → 0.0.11

data/Rakefile

@@ -21,7 +21,7 @@ Jeweler::Tasks.new do |gem|
   gem.description = %Q{Project Generator for Finatra}
   gem.email = "signalstatic@gmail.com"
   gem.authors = ["twoism"]
-  gem.executables = ["fin"]
+  gem.executables = ["finatra"]
 end
 Jeweler::RubygemsDotOrgTasks.new
 

data/VERSION

@@ -1 +1 @@
-0.0.9
+0.0.11

data/finatra.gemspec

@@ -5,14 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = "finatra"
-  s.version = "0.0.9"
+  s.version = "0.0.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["twoism"]
-  s.date = "2012-05-22"
+  s.date = "2012-07-13"
   s.description = "Project Generator for Finatra"
   s.email = "signalstatic@gmail.com"
-  s.executables = ["fin"]
+  s.executables = ["finatra"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.md"
@@ -27,15 +27,16 @@ Gem::Specification.new do |s|
     "README.md",
     "Rakefile",
     "VERSION",
-    "bin/fin",
+    "bin/finatra",
     "finatra.gemspec",
     "lib/finatra.rb",
     "lib/templates/App.scala.tt",
+    "lib/templates/Spec.scala.tt",
     "lib/templates/project/Procfile.tt",
     "lib/templates/project/README.markdown",
     "lib/templates/project/pom.xml.tt",
     "lib/templates/project/public/dealwithit.gif",
-    "lib/templates/project/templates/example.mustache",
+    "lib/templates/timeline.mustache.tt",
     "spec/finatra-gem_spec.rb",
     "spec/spec_helper.rb"
   ]

data/lib/finatra.rb

@@ -5,19 +5,21 @@ class Finatra < Thor
   include Thor::Actions
 
   def self.source_root
-    File.expand_path(File.dirname(__FILE__)) 
+    File.expand_path(File.dirname(__FILE__))
   end
 
   desc "new <MyAppName>", "Create a new Finatra app"
   def new(name)
-    @app_name = name.to_s.gsub(/[^a-zA-Z0-9]/,'')  
-    @dir_name = name.downcase.to_s.gsub(/[^a-zA-Z0-9]/,'')  
+    @app_name = name.to_s.gsub(/[^a-zA-Z0-9]/,'')
+    @dir_name = name.downcase.to_s.gsub(/[^a-zA-Z0-9]/,'')
     @org_name = ask 'Org Name (com.<username>)' while @org_name.to_s.empty?
 
     log "Creating #{@app_name} in #{Dir.pwd}..."
 
     copy_project_files
     create_controller
+    create_controller_test
+    create_template
   end
 
   desc "console", "Starts a scala console"
@@ -35,6 +37,11 @@ class Finatra < Thor
     exec "mvn scala:run"
   end
 
+  desc "test", "Run the tests"
+  def test
+    exec "mvn test"
+  end
+
   desc "package", "Package a jar for your app"
   def package
     exec "mvn package"
@@ -50,10 +57,26 @@ class Finatra < Thor
     template "templates/App.scala.tt", "#{src_dir}/#{@app_name}.scala"
   end
 
+  def create_controller_test
+    template "templates/Spec.scala.tt", "#{test_dir}/#{@app_name}Spec.scala"
+  end
+
+  def create_template
+    template "templates/timeline.mustache.tt", "#{resource_dir}/timeline.mustache"
+  end
+
   def src_dir
     "#{@dir_name}/src/main/scala/#{@org_name.gsub('.','/')}/#{@dir_name}"
   end
 
+  def resource_dir
+    "#{@dir_name}/src/main/resources"
+  end
+
+  def test_dir
+    "#{@dir_name}/src/test/scala/#{@org_name.gsub('.','/')}/#{@dir_name}"
+  end
+
   def log(msg)
     puts "[finatra] :: #{msg}"
   end

data/lib/templates/App.scala.tt

@@ -1,24 +1,51 @@
 package <%= @org_name %>.<%= @dir_name %>
 
-import com.posterous.finatra.{FinatraApp, FinatraServer}
-import com.capotej.finatra_core.MultipartItem
+import com.twitter.finatra.{Controller, FinatraServer, View}
+
+
+case class Tweet(status:String)
+
+class TimelineView(val tweets:List[Tweet]) extends View {
+  val template = "timeline.mustache"
+}
 
 object App {
 
-  class <%= @app_name %> extends FinatraApp {
+  class  <%= @app_name %> extends Controller {
+
+    def tweets = List(new Tweet("hey!"), new Tweet("lol"))
+
+    get("/tweets.json") { request =>
+      render.json(tweets)
+    }
+
+    get("/tweets") { request =>
+      val tweetsView  = new TimelineView(tweets)
+
+      render.view(tweetsView)
+    }
+
+    get("/status/:status") { request =>
+      val statusCode = request.params("status").toInt
+
+      render.nothing.status(statusCode)
+    }
+
+    get("/not_found") { request =>
+      render.nothing.notFound
+    }
 
-    get("/") { request =>
-      response(body="hey")
+    get("/headers") { request =>
+      render.nothing.header("X-GitSHA", "1ecd6b1")
     }
 
   }
 
   def main(args: Array[String]) {
-    val port = util.Properties.envOrElse("PORT", "7070").toInt
     val app = new <%= @app_name %>
 
     FinatraServer.register(app)
-    FinatraServer.start(port)
+    FinatraServer.start()
   }
 
 }

data/lib/templates/Spec.scala.tt

@@ -0,0 +1,39 @@
+package <%= @org_name %>.<%= @dir_name %>.test
+
+import com.twitter.finatra.test.SpecHelper
+import  <%= @org_name %>.<%= @dir_name %>.App
+
+import org.junit.runner.RunWith
+import org.scalatest.junit.JUnitRunner
+
+@RunWith(classOf[JUnitRunner])
+class AppSpec extends SpecHelper {
+
+  def app = { new App.<%= @app_name %> }
+
+  "GET /tweets.json" should "respond 200" in {
+    get("/tweets.json")
+    response.code should equal (200)
+  }
+
+  "GET /tweets" should "respond 200" in {
+    get("/tweets")
+    response.code should equal (200)
+    response.body should include ("lol")
+  }
+
+  "GET /status/401" should "respond 401" in {
+    get("/status/401")
+    response.code should equal (401)
+  }
+
+  "GET /not_found" should "respond 404" in {
+    get("/not_found")
+    response.code should equal (404)
+  }
+
+  "GET /headers" should "respond with headers" in {
+    get("/headers")
+    response.getHeader("X-GitSHA") should equal ("1ecd6b1")
+  }
+}

data/lib/templates/project/README.markdown

@@ -1,13 +1,15 @@
-# Finatra HelloWorld
+#Finatra#
 
-An example finatra app
+## Running the Server
 
-## Install
+```finatra start```
 
-```git clone git@github.com:capotej/finatra-helloworld.git```
+## Start a console
 
-## Running
+```finatra console```
 
-```mvn scala:run```
+## Running tests
+
+```finatra test```
 
 It'll be running on http://localhost:7070

data/lib/templates/project/pom.xml.tt

@@ -14,11 +14,11 @@
     </license>
   </licenses>
 
-  <properties>
+<properties>
     <maven.compiler.source>1.5</maven.compiler.source>
     <maven.compiler.target>1.5</maven.compiler.target>
     <encoding>UTF-8</encoding>
-    <scala.version>2.9.1</scala.version>
+    <scala.version>2.9.2</scala.version>
   </properties>
 
   <repositories>
@@ -41,11 +41,27 @@
     </pluginRepository>
   </pluginRepositories>
   <dependencies>
+
     <dependency>
-      <groupId>com.posterous</groupId>
+      <groupId>com.twitter</groupId>
       <artifactId>finatra</artifactId>
-      <version>4.0.4</version>
+      <version>0.1.7</version>
     </dependency>
+
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.8.1</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.scalatest</groupId>
+      <artifactId>scalatest_${scala.version}</artifactId>
+      <version>1.7.2</version>
+      <scope>test</scope>
+    </dependency>
+
   </dependencies>
 
   <build>
@@ -65,6 +81,8 @@
             <!-- you could define other launcher -->
           </launchers>
         </configuration>
+
+
         <executions>
           <execution>
             <goals>
@@ -81,31 +99,19 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <version>2.4</version>
-        <executions>
-          <execution>
-            <id>copy-dependencies</id>
-            <phase>package</phase>
-            <goals><goal>copy-dependencies</goal></goals>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.6</version>
+        <version>2.12</version>
         <configuration>
-          <useFile>false</useFile>
-          <disableXmlReport>true</disableXmlReport>
-          <!-- If you have classpath issue like NoDefClassError,... -->
-          <!-- useManifestOnlyJar>false</useManifestOnlyJar -->
+          <useSystemClassLoader>false</useSystemClassLoader>
+          <argLine>-Xmx1024m</argLine>
           <includes>
-            <include>**/*Test.*</include>
-            <include>**/*Suite.*</include>
+            <include>**/*Spec.java</include>
           </includes>
+          <excludes>
+            <exclude>**/*Test.java</exclude>
+          </excludes>
         </configuration>
       </plugin>
     </plugins>

data/lib/templates/timeline.mustache.tt

@@ -0,0 +1,5 @@
+Tweets
+
+{{#tweets}}
+  {{status}}</br>
+{{/tweets}}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: finatra
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-22 00:00:00.000000000Z
+date: 2012-07-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70113358860320 !ruby/object:Gem::Requirement
+  requirement: &70231312211700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70113358860320
+  version_requirements: *70231312211700
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70113358859720 !ruby/object:Gem::Requirement
+  requirement: &70231312211180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70113358859720
+  version_requirements: *70231312211180
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70113358859120 !ruby/object:Gem::Requirement
+  requirement: &70231312210700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *70113358859120
+  version_requirements: *70231312210700
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70113358858460 !ruby/object:Gem::Requirement
+  requirement: &70231312210200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70113358858460
+  version_requirements: *70231312210200
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70113358857920 !ruby/object:Gem::Requirement
+  requirement: &70231312209720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,11 +65,11 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *70113358857920
+  version_requirements: *70231312209720
 description: Project Generator for Finatra
 email: signalstatic@gmail.com
 executables:
-- fin
+- finatra
 extensions: []
 extra_rdoc_files:
 - LICENSE.txt
@@ -84,15 +84,16 @@ files:
 - README.md
 - Rakefile
 - VERSION
-- bin/fin
+- bin/finatra
 - finatra.gemspec
 - lib/finatra.rb
 - lib/templates/App.scala.tt
+- lib/templates/Spec.scala.tt
 - lib/templates/project/Procfile.tt
 - lib/templates/project/README.markdown
 - lib/templates/project/pom.xml.tt
 - lib/templates/project/public/dealwithit.gif
-- lib/templates/project/templates/example.mustache
+- lib/templates/timeline.mustache.tt
 - spec/finatra-gem_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/twoism/finatra-gem
@@ -110,7 +111,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 545884740613486098
+      hash: 3840495853745466210
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/templates/project/templates/example.mustache

@@ -1 +0,0 @@
-sup {{foo}}