embargo 0.1.5 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6fe305bc963bb3d8c06ca14cc26d86714f4cd00
-  data.tar.gz: 576e202902a2eba26e45442df8d5c5c0c55fa23e
+  metadata.gz: 54222070b2811497cacc7a3971671ddea9dd09f5
+  data.tar.gz: 0ed331cf8426646e967768374b62d50fca5249d9
 SHA512:
-  metadata.gz: 06f4a15ec3b2acef5a2991b712420b5f8dd10c8b38f3266485847d814c8719870d2177ebfe0d812edb1ddc677b4afe34cafc3fb99c8350fa86a63a4c8db5837b
-  data.tar.gz: 19770197e89acc90f134f385551a64487ef53367027d02c3691671ff2b69be530c25cc7b2e6aec58e642f3315e13e5d623094c07888c18cabe671983bd29fd58
+  metadata.gz: 57e93668aa4e2d440d5cccca750d86bf67dc583f8cf90b4baee49af2ac0f3e1972c89ca3d3c6135d638c0a6dc51cf8017d138bd839d8ef6ec146e81d811256cb
+  data.tar.gz: bea9cf9de0781ea4d3ef88a2b4913830263e6b0e49b0dc3098d31d2219fc399a454e4a70e76c0fe81911673a5a0ab215d28574411ef014fd8b109170f073cf01

data/boilerplate/project/app/{controllers/home_controller.rb → api_controller.rb}

@@ -3,5 +3,8 @@ Cuba.define 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/models/my_model.rb

@@ -1,5 +1,7 @@
+require 'ostruct'
+
 class MyModel
-	def find
-		{my_item: "is here"}
+	def self.find
+		OpenStruct.new(my_item: "Hello world!")
 	end
 end

data/boilerplate/project/app/pages_controller.rb

@@ -0,0 +1,13 @@
+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/boilerplate/project/app/views/index.haml

@@ -1,9 +1,2 @@
-!!! 5
-%html(lang="en")
-  %head
-    %meta(charset="utf-8")
-    %meta(http-equiv="X-UA-Compatible" content="IE=edge")
-    %title Traitify, Life With Personality
-  %body.page-index
-
-    = partial("partials/_footer")
+- content_for :title do
+	%title "The Title"

data/boilerplate/project/app/views/partials/_nav-homepage.haml

@@ -1,14 +0,0 @@
-%header.header(role="banner")
-  .wrapper
-    .row
-      .header__icon
-        %div
-        %svg(version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" preserveAspectRatio="none")
-          %circle(cx="8" cy="8" r="6.24" transform="rotate(90 8 8)")
-
-      %nav.header__nav
-        %ul
-          %li
-            %a(href="#page" title="How It Works") how it works?
-          %li
-            %a(href="mailto:support@yoursite.com" title="Contact") contact

data/lib/embargo.rb

@@ -12,9 +12,8 @@ Cuba.plugin(Cuba::Render)
 
 class Embargo
 	def self.application
-		Cuba
+		Pages
 	end
-	
 	def self.app_directory
 		@@magis_working_directory ||= Dir.pwd
 	end
@@ -27,15 +26,27 @@ class Embargo
 		project_file_name = Embargo.app_directory + "/" + file_name
 		project_file_exists = File.exist?(project_file_name)
 
-		magis_file_name = Embargo.directory + "/" + file_name
-		magis_file_exists = File.exist?(magis_file_name)
-		
-		if project_file_exists
-			require home_file_name
-		elsif magis_file_exists
-			require magis_file_name
-		end
+    if project_file_exists
+      require project_file_name
+    else
+  		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
 
 #################
@@ -84,10 +95,16 @@ class Symbol
   end
 end
 
+class Api < Cuba; end
+class Pages < Cuba; end
+
 #################
 # Project Files
 #################
 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/controllers/*_controller.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")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: embargo
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.5
 platform: ruby
 authors:
 - Eric Fleming
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-17 00:00:00.000000000 Z
+date: 2014-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cuba
@@ -124,6 +124,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.10.1
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.10.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.10.1
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
@@ -198,6 +212,7 @@ 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
@@ -205,8 +220,8 @@ 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/home_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