florida 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4e3f79bac70546f93c6961b8ebc01146570e476
-  data.tar.gz: b63f76fe741118e18a1a233d3f9e96926b27cdd6
+  metadata.gz: 790c8e349e5160cb793028d3231fb10a6feacf60
+  data.tar.gz: 135a9d5d0842e18a075222f737cafd4566922ee8
 SHA512:
-  metadata.gz: c9a50576fc162a882dc32392829ae073599a734e8427dcccb4e04311507ed1773bcbc489d8b8aecf40974491a69e6e0068c4ac3074876b8b0e17827943c00d56
-  data.tar.gz: c2f3b17140279dfc329e3734e1bea0ea1ace2c410cd476b1f7a68eb2cdcb9772783a8e49456b63a9c9c619d8719031068d498642eb93c86088edc50f59e09e0a
+  metadata.gz: 57e5331ce69da69f4adb1d379686a9a123f7bc3529c46ed8a61f5c0c22e69aadab9fb4cd57aa0a92ed717973d6ccf21540f1ee6de64b9e1c692f76385ac1e600
+  data.tar.gz: 7efbe79e64e0c6baab155022514940c75741d642e37de888fc4783a34eb071fe1e38ead6762876af86bc7a292ce1a5563d97b27b04add8410c05a34d1ca13e03

data/.gitignore

@@ -11,4 +11,5 @@
 *.so
 *.o
 *.a
+*.swp
 mkmf.log

data/Gemfile

@@ -3,4 +3,11 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in florida.gemspec
 gemspec
 
+# Server / Engine
+gem 'rack'
 gem 'sinatra'
+
+# for Testing
+gem 'rspec'
+gem 'guard-rspec'
+gem 'rack-test'

data/Guardfile

@@ -0,0 +1,33 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+# Note: The cmd option is now required due to the increasing number of ways
+#       rspec may be run, below are examples of the most common uses.
+#  * bundler: 'bundle exec rspec'
+#  * bundler binstubs: 'bin/rspec'
+#  * spring: 'bin/rsspec' (This will use spring if running and you have
+#                          installed the spring binstubs per the docs)
+#  * zeus: 'zeus rspec' (requires the server to be started separetly)
+#  * 'just' rspec: 'rspec'
+guard :rspec, cmd: 'bundle exec rspec' do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+
+  # Rails example
+  watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
+  watch(%r{^app/(.*)(\.erb|\.haml|\.slim)$})          { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
+  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
+  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
+  watch('config/routes.rb')                           { "spec/routing" }
+  watch('app/controllers/application_controller.rb')  { "spec/controllers" }
+  watch('spec/rails_helper.rb')                       { "spec" }
+
+  # Capybara features specs
+  watch(%r{^app/views/(.+)/.*\.(erb|haml|slim)$})     { |m| "spec/features/#{m[1]}_spec.rb" }
+
+  # Turnip features and steps
+  watch(%r{^spec/acceptance/(.+)\.feature$})
+  watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$})   { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' }
+end
+

data/README.md

@@ -25,13 +25,17 @@ write application ruby script.
 ```ruby
 require 'florida'
 
-class MyApplication < Florida::Application
-  get '/' do
+class HomeController < Florida::Controller::Base
+  def index
     'Hello Florida!!'
   end
 end
 
-MyApplication.run
+class MyApplication < Florida::Application::Base
+  routings do
+    path "/", to: HomeController
+  end
+end
 ```
 
 and script execute in ruby.

data/lib/florida.rb

@@ -1,4 +1,5 @@
 require 'florida/version'
 require 'florida/application'
+require 'florida/sinatra_server'
 
 module Florida; end

data/lib/florida/application.rb

@@ -1,9 +1 @@
-require 'sinatra'
-
-module Florida
-  class Application < Sinatra::Base
-    def self.run(port: 4567)
-      Rack::Server.start(app: new, Port: port)
-    end
-  end
-end
+require 'florida/application/base'

data/lib/florida/application/base.rb

@@ -0,0 +1,11 @@
+module Florida::Application; end
+require 'florida/router'
+require 'florida/controller/base'
+
+module Florida
+  module Application
+    class Base
+      extend Florida::Router
+    end
+  end
+end

data/lib/florida/controller/base.rb

@@ -0,0 +1,13 @@
+module Florida
+  module Controller
+    class Base
+      def initialize(sinatra_app = nil)
+        @sinatra_app = sinatra_app
+      end
+
+      def params
+        @sinatra_app.params
+      end
+    end
+  end
+end

data/lib/florida/router.rb

@@ -0,0 +1,14 @@
+module Florida::Router
+  def path(path, options = {})
+    @routings ||= {}
+    @routings[path] = options
+  end
+
+  def routings(&block)
+    if block_given?
+      block.call
+    else
+      @routings
+    end
+  end
+end

data/lib/florida/sinatra_server.rb

@@ -0,0 +1,34 @@
+require 'sinatra'
+require 'rack'
+
+class Florida::SinatraServer; end
+require 'florida/sinatra_server/router'
+
+module Florida
+  class SinatraServer
+    attr_reader :sinatra_app
+
+    def initialize(app, params = {})
+      @sinatra_app = Class.new(Sinatra::Base)
+      @params = params
+      setup(app)
+    end
+
+    def application
+      @sinatra_app
+    end
+
+    def run
+      Rack::Server.start(app: @sinatra_app.new, Port: @params[:port] || 4567)
+    end
+
+    def self.run(app, params = {})
+      self.new(app, params).run
+    end
+
+    private
+    def setup(app)
+      Router.setup(app, @sinatra_app)
+    end
+  end
+end

data/lib/florida/sinatra_server/router.rb

@@ -0,0 +1,42 @@
+class Florida::SinatraServer::Router
+  def initialize(app, sinatra)
+    @app = app
+    @sinatra = sinatra
+  end
+
+  def self.setup(app, sinatra)
+    self.new(app, sinatra).routing!
+  end
+
+  def routing!
+    @app.routings.each do |path, data|
+      setup_routing(path, data)
+    end
+  end
+
+  private
+  def setup_routing(path, params)
+    controller_class = params[:to]
+    controller = controller_class.new
+
+    if controller.respond_to? :index
+      @sinatra.get self.class.index_routing_matcher(path) do
+        controller_class.new(self).index
+      end
+    end
+
+    if controller.respond_to? :show
+      @sinatra.get(self.class.show_routing_matcher(path)) do
+        controller_class.new(self).show(self.params[:captures].first)
+      end
+    end
+  end
+
+  def self.index_routing_matcher(path)
+    %r{\A#{path}(\.[\w]+)?/?\z}
+  end
+
+  def self.show_routing_matcher(path)
+    %r{\A#{path}/(\w+)(\.[\w]+)?/?\z}
+  end
+end

data/lib/florida/version.rb

@@ -1,3 +1,3 @@
 module Florida
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/florida/request_spec.rb

@@ -0,0 +1,64 @@
+require 'florida'
+
+ENV['RACK_ENV'] = 'test'
+require 'rack/test'
+
+describe Florida do
+  describe "Application" do
+    include Rack::Test::Methods
+
+    let!(:example_application) do
+      class HomeController < Florida::Controller::Base
+        def index
+          'Hello Florida!!'
+        end
+      end
+
+      class ExampleController < Florida::Controller::Base
+        def index
+          'This is example index page.'
+        end
+
+        def show(id)
+          "This is example of #{id}"
+        end
+      end
+
+      class MyApplication < Florida::Application::Base
+        routings do
+          path "/", to: HomeController
+          path "/examples", to: ExampleController
+        end
+      end
+      MyApplication
+    end
+
+    def app
+      Florida::SinatraServer.new(example_application).application
+    end
+
+    describe "access to /" do
+      before do
+        get '/'
+      end
+      it { expect(last_response).to be_ok }
+      it { expect(last_response.body).to eq 'Hello Florida!!' }
+    end
+
+    describe "access to /examples" do
+      before do
+        get '/examples'
+      end
+      it { expect(last_response).to be_ok }
+      it { expect(last_response.body).to eq 'This is example index page.' }
+    end
+
+    describe "access to /examples/1" do
+      before do
+        get '/examples/1'
+      end
+      it { expect(last_response).to be_ok }
+      it { expect(last_response.body).to eq 'This is example of 1' }
+    end
+  end
+end

data/test/application_test.rb

@@ -1,10 +1,20 @@
 $:.unshift File.expand_path('../lib/', File.dirname(__FILE__))
 require 'florida'
 
-class MyApplication < Florida::Application
-  get '/' do
-    'Hello Florida!!'
+class HomeController < Florida::Controller::Base
+  def index
+    'Hello Index!!'
+  end
+
+  def show(id)
+    "This page is #{id}"
+  end
+end
+
+class MyApplication < Florida::Application::Base
+  routings do
+    path "/home", to: HomeController
   end
 end
 
-MyApplication.run
+Florida::SinatraServer.run(MyApplication)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: florida
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - myun2
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-17 00:00:00.000000000 Z
+date: 2014-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -61,13 +61,20 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - florida.gemspec
 - lib/florida.rb
 - lib/florida/application.rb
+- lib/florida/application/base.rb
+- lib/florida/controller/base.rb
+- lib/florida/router.rb
+- lib/florida/sinatra_server.rb
+- lib/florida/sinatra_server/router.rb
 - lib/florida/version.rb
+- spec/florida/request_spec.rb
 - test/application_test.rb
 homepage: ''
 licenses:
@@ -94,4 +101,5 @@ signing_key:
 specification_version: 4
 summary: Sinatra Based web Application framework.
 test_files:
+- spec/florida/request_spec.rb
 - test/application_test.rb