cynic 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 921909ae4a5f456d4a8a6ab259cabd6db7cba467
-  data.tar.gz: 57097bc3f55fb85f001eb6708b4fa7f6cf230191
+  metadata.gz: 386528d8ad4483f347d5b07827b8858c31fb919f
+  data.tar.gz: 8b6b303da8866422bc0aa8bbf820c4e00ddfde48
 SHA512:
-  metadata.gz: fa68271e395072d4f6cfa50ff873fb76c2a13997e245f47762842770b8e11935267b6fb9aeeaec0192a90690893d4f84481454f68c9d7cdd1c86550faab25b27
-  data.tar.gz: f73f4f287c5db2b37e109e33d8baf4dd116a4776dbca4281d4995b5456d3521eb70a704bdbfbbb7498920ef012f32c4963e43640ecfffbc21f5ca625899b421e
+  metadata.gz: d1abf0e9a88251822232e472e5fc4cfefe222901b74e7fe00e10fc02a14bcc792da028409a302cba9b597eff2c50f94bfdcf538059459e68b638dab5c7a9f542
+  data.tar.gz: 9250c5e4df267f107920b0a3e446648a7dd9ea4318d7697b2613342707d22587d05722ff61ab4a4bba8bc5c4906f089e616ab82602c168488ec2b47732e75cea

data/Gemfile

@@ -2,3 +2,6 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in cynic.gemspec
 gemspec
+
+gem "guard-rspec"
+gem 'terminal-notifier-guard'

data/Guardfile

@@ -0,0 +1,9 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard :rspec do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+end
+

data/README.md

@@ -1,6 +1,6 @@
 # Cynic
 
-TODO: Write a gem description
+Cynic is a Lightweight Rack-based framework. Cynic provides a framework with a few tools built on the ideas of rails.
 
 ## Installation
 
@@ -18,7 +18,9 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+```bash
+cynic new <name>
+```
 
 ## Contributing
 

data/bin/cynic

@@ -51,9 +51,6 @@ module #{@app_name}
     # Your code here
   end
 end
-
-
-
         HEREDOC
       end
     end
@@ -69,6 +66,16 @@ run #{self.name}
       end
     end
     
+    def create_controller
+      make_file("app/controllers/application_controller.rb") do |file|
+        file.write <<-HEREDOC
+class ApplicationController < Cynic::Controller
+  # Application wide methods and before_actions go here
+end
+        HEREDOC
+      end
+    end
+    
     def create_layout
       Dir.mkdir([self.name, "app", "views", "layouts"].join("/"))
       make_file("app/views/layouts/application.html.erb") do |file|
@@ -102,6 +109,7 @@ when "new"
   Dir.mkdir([generator.name, "public", "images"].join("/"))
   generator.create_config
   generator.create_application
+  generator.create_controller
   generator.create_gemfile
   generator.create_routes
   generator.create_layout

data/lib/cynic/app.rb

@@ -30,7 +30,12 @@ module Cynic
     end
     
     def response
-      Response.new(self.routing_to_request)
+      Response.new(execute_controller_actions)
+    end
+    
+    def execute_controller_actions
+      object, method = self.routing_to_request
+      object.response(method)
     end
     
     def status

data/lib/cynic/controller.rb

@@ -1,16 +1,54 @@
 module Cynic
   class Controller
+    class << self
+      attr_accessor :before_actions
+      def before_actions
+        @before_actions ||= Hash.new { Set.new }
+      end
+      
+      def before_action(method, options={})
+        if options.has_key? :only
+          [options[:only]].flatten.each { |action|  add_before_action(method, action) }
+        else
+          add_before_action(method)
+        end
+      end
+      
+      def add_before_action(method, action=:all)
+        before_actions[action] <<= method
+      end
+    end
+    
     def render(action)
       @action = action
-      Renderer.new(full_path).body
+      Renderer.new(full_path, self).body
+    end
+    
+    def response(method)
+      eval_set_of_actions
+      eval_set_of_actions(method)
+      send method
     end
 
+    private
+    
+    # The +name+ split and joined into a string seperated by "/"'s
     def path
-      self.class.to_s.split("::").join("/").downcase.gsub(/controller$/i, "")
+      name.split("::").join("/").downcase
     end
     
+    # The +path+ plus the current action.html.erb
     def full_path
       path + "/#{@action}.html.erb"
     end
+    
+    # The Controllers class name without the word `controller` in it.
+    def name
+      self.class.to_s.gsub(/controller$/i, "")
+    end    
+    
+    def eval_set_of_actions(set=:all)
+      self.class.before_actions[set].each {|action| eval(action.to_s)}
+    end
   end
 end

data/lib/cynic/renderer.rb

@@ -1,12 +1,17 @@
 module Cynic
   class Renderer
-    def initialize(path)
+    def initialize(path, controller=nil)
+      
+      controller.instance_variables.each do |method|
+        self.instance_variable_set(method, controller.instance_variable_get(method))
+      end
+      
       @full_path = path_prefix + path
       @layout    = path_prefix + "layouts/application.html.erb"
     end
     
     def body
-      layout { ERB.new(File.read(@full_path)).result }
+      layout { ERB.new(File.read(@full_path)).result(binding) }
     end
     
     def layout 

data/lib/cynic/routing.rb

@@ -12,10 +12,15 @@ module Cynic
     end
     
     def go_to(request_method, request_path)
-      klass, action = @routings[request_method.to_sym][request_path]
-      klass.send(action)
-    rescue TypeError
-      raise Error, "undefined routing #{request_method.upcase} '#{request_path}'"
+      if action(request_method, request_path)
+        action
+      else
+        raise Error, "undefined routing #{request_method.upcase} '#{request_path}'"
+      end
+    end
+    
+    def action(request_method=nil, request_path=nil)
+      @action ||= @routings[request_method.to_sym][request_path]
     end
     
     def get(path, options={})

data/lib/cynic/version.rb

@@ -1,3 +1,3 @@
 module Cynic
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/lib/cynic/controller_spec.rb

@@ -1,13 +1,81 @@
 require 'spec_helper'
-class CynicController < Cynic::Controller;end
+
+class CynicController < Cynic::Controller
+  def index
+    @greeting = "hello"
+    render :template
+  end
+  
+  def do_i_live_in_a_tub?
+    @answer = "not yet"
+  end
+end
+
 describe Cynic::Controller do
   let(:controller) { CynicController.new }
-  
+  before { CynicController.instance_variable_set(:@before_actions, nil)}
   describe "#render" do
     it "finds a file" do
       Cynic::Renderer.any_instance.stub(:layout_file).and_return("<%= yield %>")
       File.should_receive(:read).with("app/views/cynic/index.html.erb").once.and_return('This is erb <%= "olleh".reverse %>')
       expect(controller.render(:index)).to eq "This is erb hello"
     end
+    
+    it "controller instance vars are available to the view" do
+      Cynic::Renderer.any_instance.stub(:layout_file).and_return("<%= yield %>")
+      File.should_receive(:read).with("app/views/cynic/template.html.erb").once.and_return('This is erb <%= @greeting %>')
+      expect(controller.index).to eq "This is erb hello"
+    end
+    
+    it "controller instance vars are available to the layout" do
+      Cynic::Renderer.any_instance.stub(:layout_file).and_return("<%= @greeting %> <%= yield %>")
+      File.should_receive(:read).with("app/views/cynic/template.html.erb").once.and_return('This is erb.')
+      expect(controller.index).to eq "hello This is erb."
+    end
+  end
+  
+  describe ".before_action" do
+    it "responds to" do
+      expect(CynicController.respond_to?(:before_action)).to be_true
+    end
+    
+    it "assigns each of the things to an array" do
+      CynicController.before_action :do_i_live_in_a_tub?
+      expect(CynicController.before_actions[:all]).to include :do_i_live_in_a_tub?
+    end
+    
+    context ":all" do
+      it "calls each before action within :all" do
+        CynicController.before_action :do_i_live_in_a_tub?
+        File.should_receive(:read).with("app/views/cynic/template.html.erb").once.and_return('This is erb.')
+        controller.should_receive(:do_i_live_in_a_tub?).once.and_return(true)
+        controller.response(:index)
+      end
+    
+      it "can use a instance var defined in a before action" do
+        CynicController.before_action :do_i_live_in_a_tub?
+        File.should_receive(:read).with("app/views/cynic/template.html.erb").once.and_return('Do I live in a tub? <%= @answer %>.')
+        expect(controller.response(:index)).to eq 'Do I live in a tub? not yet.'
+      end
+    end
+    
+    context "when using the :only option" do
+      it "assigns the action name it should be nested under" do
+        CynicController.before_action :do_i_live_in_a_tub?, only: :show
+        expect(CynicController.before_actions[:show]).to include :do_i_live_in_a_tub?
+      end
+
+      it "assigns the action names it should be nested under" do
+        CynicController.before_action :do_i_live_in_a_tub?, only: [:show]
+        expect(CynicController.before_actions[:show]).to include :do_i_live_in_a_tub?
+      end
+      
+      it "calls each before action within :all" do
+        CynicController.before_action :do_i_live_in_a_tub?, only: :index
+        File.should_receive(:read).with("app/views/cynic/template.html.erb").once.and_return('This is erb.')
+        controller.should_receive(:do_i_live_in_a_tub?).once.and_return(true)
+        controller.response(:index)
+      end
+    end
   end
 end

data/spec/lib/cynic/renderer_spec.rb

@@ -2,9 +2,9 @@ require 'spec_helper'
 
 describe Cynic::Renderer do
   path = "cynic/controller/index.html.erb"
-  let(:renderer) { Cynic::Renderer.new(path) }
   
   describe "#render" do
+    let(:renderer) { Cynic::Renderer.new(path) }
     it "finds a file" do
       File.should_receive(:read).with("app/views/" + path).and_return('This is erb <%= "olleh".reverse %>')
       expect(renderer.body).to eq "This is erb hello"
@@ -15,6 +15,15 @@ describe Cynic::Renderer do
       File.should_receive(:read).with("app/views/" + path).and_return('This is erb <%= "olleh".reverse %>')
       expect(renderer.body).to eq "Layout: This is erb hello :file"
     end
+  end
+  
+  describe "controller" do
+    let(:controller) { Cynic::Controller.new }
+    before { controller.instance_variable_set(:@test, "Test")}
+    let(:renderer) { Cynic::Renderer.new(path, controller) }
     
+    it "assigns the cynic controllers instance methods" do
+      expect(renderer.instance_variable_get(:@test)).to eq "Test"
+    end
   end
 end

data/spec/lib/cynic/routing_spec.rb

@@ -5,16 +5,16 @@ describe Cynic::Routing do
   let(:routing) { defined_routing }
 
   it "calls the method to be returned" do
-    expect(routing.go_to(:get, "/")).to eq ""
+    expect(routing.go_to(:get, "/")).to eq [String, :new]
   end
   
   it "calls the method to be returned" do
-    expect(routing.go_to(:get, "/blog")).to be_an_instance_of Float
+    expect(routing.go_to(:get, "/blog").last).to eq :rand
   end
   
   it "returns the index" do
     Cynic::Controller.any_instance.stub(:index).and_return("This is erb hello")
-    expect(routing.go_to(:get, "/cynic")).to eq "This is erb hello"
+    expect(routing.go_to(:get, "/cynic").first).to be_an_instance_of Cynic::Controller
   end
   
   it "raises an Routing::Error when the path doesn't exist" do

data/spec/spec_helper.rb

@@ -1,2 +1,8 @@
 require 'cynic'
 require 'support/routing'
+
+RSpec.configure do |config|
+  config.filter_run focus: true
+  config.run_all_when_everything_filtered = true
+  config.order = "random"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cynic
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Bookis Smuin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-28 00:00:00.000000000 Z
+date: 2014-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -62,6 +62,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile