embargo 0.3.6 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d25b9c0620ef0ef5d9fdd24cf0e3fc066f14e715
-  data.tar.gz: 94dde09b12bdff0b649279f4d7832216dba645a7
+  metadata.gz: 615332e4a7a1dbdc6708665bd7d7b1063ddaf420
+  data.tar.gz: 479032e9796ca794708268d556b1bc612483be44
 SHA512:
-  metadata.gz: d647d3e7dae981153951e4d6d121da77ffc8239140531b913c101cf6dda595d4e538c8f3b8ada117affe30461fdcb9be258964c523ad79765af2a7ecae902097
-  data.tar.gz: bac29f7d83c7878f5079e2cc8260de5b091c9aac73921dd00abcc1f94a844056d02745bcdd7e49b855a723e1b497cb8c8fc87fb61b74d48df82cab33d8fcbbdd
+  metadata.gz: 5b11b64e94982083fb234908ce29c9e93dd27c9b1517581315603a8793f97d1bc4c7931a9e1596b978f2f24616afbfbbf12c8c68bd98d7532b36a5173df6cb00
+  data.tar.gz: 4843155d2ef310ae821c71de6e19f03156971e17a9f227d35efc99a4147e76b8ab4c0cf5a64798994a1697d469673fa64a6d6d24459e3f1997eba36cc1dc8fbb

data/boilerplate/project/app/controllers/api_controller.rb

@@ -0,0 +1,7 @@
+class ApiController < Embargo
+
+  on get do
+    res.write("The API Embargo is on!")
+  end
+
+end

data/boilerplate/project/app/controllers/application_controller.rb

@@ -0,0 +1,18 @@
+# This is the main cntroller for your application. This file must be in your project. You can 
+# include other controllers by following the example below for `/api`
+
+class ApplicationController < Embargo
+  define do
+    on "api" do
+      run ApiController
+    end
+
+    on root do
+      res.write(MyModel.find.my_item)
+    end
+
+    on default do
+      render "index", body_class: "page-index", page: "index"
+    end
+  end  
+end

data/boilerplate/project/app/models/my_model.rb

@@ -2,6 +2,6 @@ require 'ostruct'
 
 class MyModel
 	def self.find
-		OpenStruct.new(my_item: "Hello world!")
+		OpenStruct.new(my_item: "The Embargo is on!")
 	end
 end

data/boilerplate/project/config.ru

@@ -1,3 +1,3 @@
 require "embargo"
 
-run Embargo.application
+run Embargo

data/lib/embargo.rb

@@ -13,102 +13,52 @@ Cuba.plugin(Cuba::Render)
 Cuba.use Rack::Session::Cookie, :secret => "__a_very_long_string__"
 Cuba.use Rack::Protection
 
-class Embargo
-	def self.application
-		Pages
-	end
-	def self.app_directory
-		@@magis_working_directory ||= Dir.pwd
-	end
+Dir[__FILE__+"/lib/helpers/*.rb"].each {|file| require file }
 
-	def self.directory
-		@@magis_directory ||= __FILE__
-	end
+class Embargo < Cuba
+  def content_for(key, &block)
+    if block
+      @_content_for ||= {}
+      buf_was = @haml_buffer.buffer
+      @haml_buffer.buffer = ''
+      yield
+      @_content_for[key] = @haml_buffer.buffer
+      @haml_buffer.buffer = buf_was
+    elsif @_content_for
+      @_content_for[key]
+    end
+  end
+
+  def self.app_directory
+    @@app_directory ||= Dir.pwd
+  end
 
-	def self.require_file(file_name)
-		project_file_name = Embargo.app_directory + "/" + file_name
-		project_file_exists = File.exist?(project_file_name)
+  def self.require_file(file_name)
+    project_file_name = Embargo.app_directory + "/" + file_name
+    project_file_exists = File.exist?(project_file_name)
 
     if project_file_exists
       require project_file_name
     else
-  		embargo_file_name = Embargo.directory + "/" + file_name
-  		embargo_file_exists = File.exist?(embargo_file_name)
+      embargo_file_name = Embargo.directory + "/" + file_name
+      embargo_file_exists = File.exist?(embargo_file_name)
       if embargo_file_exists
         require embargo_file_name
       end
-    end
-	end
-
-  def self.action(&block)
-    @@actions ||= Array.new
-    @@actions.push(block)
-  end
-  def self.actions
-    $actions ||= @@actions
-  end
-  def self.first_load?
-    !$actions
-  end
-end
-
-#################
-# Content For
-#################
-class Cuba
-  module Render
-    def content_for(key, &block)
-      if block
-        @_content_for ||= {}
-        buf_was = @haml_buffer.buffer
-        @haml_buffer.buffer = ''
-        yield
-        @_content_for[key] = @haml_buffer.buffer
-        @haml_buffer.buffer = buf_was
-      elsif @_content_for
-        @_content_for[key]
-      end
     end
   end
 end
 
-#################
-# Blank
-#################
-class Object
-  def blank?
-    respond_to?(:empty?) ? !!empty? : !self
-  end
-end
-
-#################
-# Humanize
-#################
-class String
-  def humanize
-    sub(/\A_+/, '')
-      .tr('_', ' ')
-      .sub(/\A\w/) { |match| match.upcase }
-  end
-end
-
-class Symbol
-  def humanize
-    to_s.humanize
-  end
-end
-
-class Api < Cuba; end
-class Pages < Cuba; end
-
-#################
-# Project Files
-#################
 Embargo.require_file("config/app.rb")
 Dir[Embargo.app_directory+"/lib/*.rb"].each {|file| require file }
 Dir[Embargo.app_directory+"/config/initializers/*.rb"].each {|file| require file }
 Dir[Embargo.app_directory+"/app/models/*.rb"].each {|file| require file }
 Dir[Embargo.app_directory+"/app/serializers/*.rb"].each {|file| require file }
-Embargo.require_file("app/pages_controller.rb")
-Embargo.require_file("app/api_controller.rb")
-Embargo.require_file("app/pages_controller.rb")
+Dir[Embargo.app_directory+"/app/controllers/*_controller.rb"].each {|file| require file }
+Dir[Embargo.app_directory+"/app/controllers/**/*_controller.rb"].each {|file| require file }
+
+Embargo.define do
+  on default do
+    run ApplicationController
+  end
+end

data/lib/helpers/ruby_ext.rb

@@ -0,0 +1,25 @@
+#################
+# Blank
+#################
+class Object
+  def blank?
+    respond_to?(:empty?) ? !!empty? : !self
+  end
+end
+
+#################
+# Humanize
+#################
+class String
+  def humanize
+    sub(/\A_+/, '')
+      .tr('_', ' ')
+      .sub(/\A\w/) { |match| match.upcase }
+  end
+end
+
+class Symbol
+  def humanize
+    to_s.humanize
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: embargo
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.4.0
 platform: ruby
 authors:
 - Eric Fleming
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-29 00:00:00.000000000 Z
+date: 2015-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cuba
@@ -226,7 +226,6 @@ files:
 - boilerplate/project/Procfile
 - boilerplate/project/Procfile.prod
 - boilerplate/project/README.md
-- boilerplate/project/app/api_controller.rb
 - boilerplate/project/app/assets/gulpfile.js
 - boilerplate/project/app/assets/package.json
 - boilerplate/project/app/assets/src/apple-touch-icon-precomposed.png
@@ -234,8 +233,9 @@ files:
 - boilerplate/project/app/assets/src/favicon.ico
 - boilerplate/project/app/assets/src/humans.txt
 - boilerplate/project/app/assets/src/robots.txt
+- boilerplate/project/app/controllers/api_controller.rb
+- boilerplate/project/app/controllers/application_controller.rb
 - boilerplate/project/app/models/my_model.rb
-- boilerplate/project/app/pages_controller.rb
 - boilerplate/project/app/views/index.haml
 - boilerplate/project/app/views/layout.haml
 - boilerplate/project/app/views/partials/_footer.haml
@@ -245,8 +245,8 @@ files:
 - lib/config/environments/development.rb
 - lib/config/init.rb
 - lib/config/unicorn.rb
-- lib/content_for.rb
 - lib/embargo.rb
+- lib/helpers/ruby_ext.rb
 homepage: https://rubygems.org/gems/embargo
 licenses:
 - MIT

data/boilerplate/project/app/api_controller.rb

@@ -1,10 +0,0 @@
-Cuba.define do
-  on get do
-    on root do
-      res.write(MyModel.find.my_item)
-    end
-    on "home" do
-      render "index", body_class: "page-index", page: "index"
-    end
-  end
-end

data/boilerplate/project/app/pages_controller.rb

@@ -1,13 +0,0 @@
-Pages.define do
-  on get do
-    on root do
-      res.write(MyModel.find.my_item)
-    end
-    on "home" do
-      render "index", body_class: "page-index", page: "index"
-    end
-  end
-  on "api" do
-    run Api
-  end
-end

data/lib/content_for.rb

@@ -1 +0,0 @@
-