RubyGems - stachio - Versions diffs - 0.0.2 → 0.0.3 - Mend

stachio 0.0.2 → 0.0.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (20) hide show

data/.gitignore +1 -0
data/.simplecov +0 -9
data/app/controllers/stachio/application_controller.rb +3 -0
data/app/controllers/stachio/templates_controller.rb +12 -0
data/app/helpers/stachio/application_helper.rb +3 -0
data/app/helpers/stachio/templates_helper.rb +3 -0
data/app/models/stachio/template.rb +18 -8
data/app/views/layouts/stachio/application.html.erb +7 -1
data/app/views/stachio/templates/index.html.erb +7 -3
data/app/views/stachio/templates/show.html.erb +3 -1
data/config/routes.rb +1 -2
data/lib/stachio/engine.rb +2 -0
data/lib/stachio/version.rb +1 -1
data/spec/controllers/stachio/templates_controller_spec.rb +57 -0
data/spec/models/stachio/template_spec.rb +53 -17
data/spec/routing/stachio/templates_routing_spec.rb +7 -7
data/spec/spec_helper.rb +10 -1
metadata +2 -4
data/Gemfile.lock +0 -152
data/lib/stachio/proxy.rb +0 -20

data/.gitignore CHANGED

@@ -1,6 +1,7 @@
 .bundle/
 log/*.log
 *.gem
+Gemfile.lock
 pkg/
 spec/dummy/db/*.sqlite3
 spec/dummy/log/*.log

data/.simplecov CHANGED

@@ -9,13 +9,4 @@ unless ENV['COVERAGE'] == 'false'
   end
   SimpleCov.formatter = SimpleCov::Formatter::MergedFormatter
-  SimpleCov.start('rails') do
-    add_filter                "vendor/ruby/"
-    add_filter                "spec/dummy"
-    add_group "Models",       "app/models"
-    add_group "Views",        "app/views"
-    add_group "Controllers",  "app/controllers"
-  end
 end

data/app/controllers/stachio/application_controller.rb CHANGED

@@ -1,4 +1,7 @@
 module Stachio
   class ApplicationController < ActionController::Base
+    def readonly
+      !!(Stachio::Engine.config.readonly)
+    end
   end
 end

data/app/controllers/stachio/templates_controller.rb CHANGED

@@ -2,6 +2,10 @@ require_dependency "stachio/application_controller"
 module Stachio
   class TemplatesController < ApplicationController
+    before_filter      :permission
+    skip_before_filter :permission, :only => [:index, :show]
     # GET /templates
     # GET /templates.json
     def index
@@ -83,5 +87,13 @@ module Stachio
         format.json { head :no_content }
       end
     end
+    private
+    def permission
+      return true unless readonly
+      flash[:notice] = "Templates are readonly"
+      redirect_to :action => :index
+    end
   end
 end

data/app/helpers/stachio/application_helper.rb CHANGED

@@ -1,4 +1,7 @@
 module Stachio
   module ApplicationHelper
+    def readonly
+      !!(Stachio::Engine.config.readonly)
+    end
   end
 end

data/app/helpers/stachio/templates_helper.rb CHANGED

@@ -1,4 +1,7 @@
 module Stachio
   module TemplatesHelper
+    def readonly
+      !!(Stachio::Engine.config.readonly)
+    end
   end
 end

data/app/models/stachio/template.rb CHANGED

@@ -1,21 +1,31 @@
-require 'stachio/proxy'
 module Stachio
+  Mustache.raise_on_context_miss = true
   class Template < ActiveRecord::Base
     lookup_by :template_name
     attr_accessible :template_name, :content
     validates_presence_of :template_name, :content
-    attr_accessor :proxied
+    attr_accessor :presents, :rendered
+    def reset
+      self.rendered = nil
+    end
-    def proxy
-      @proxy ||= Stachio::Proxy.new(proxied) unless proxied.nil?
+    def render(options={})
+      options = options.with_indifferent_access
+      reset if !!(options[:force] or options[:reset])
+      self.rendered ||= Mustache.render(content, presents) unless presents.nil?
     end
+    alias_method :assemble,  :render
+    alias_method :composite, :render
+    alias_method :compose,   :render
-    def compose
-      proxy.template = content
-      proxy.render
+    def present(values=nil, options={})
+      return render if values.nil?
+      self.presents = values
+      render options.merge(:force => true)
     end
   end
 end

data/app/views/layouts/stachio/application.html.erb CHANGED

@@ -8,7 +8,13 @@
 </head>
 <body>
-<%= yield %>
+  <% if flash.any? %>
+    <% flash.each do |key, value| %>
+      <%= content_tag(:div, value, :class => "flash #{key}") %>
+    <% end %>
+  <% end %>
+  <%= yield %>
 </body>
 </html>

data/app/views/stachio/templates/index.html.erb CHANGED

@@ -14,12 +14,16 @@
     <td><%= template.template_name %></td>
     <td><%= template.content %></td>
     <td><%= link_to 'Show', template %></td>
-    <td><%= link_to 'Edit', edit_template_path(template) %></td>
-    <td><%= link_to 'Destroy', template, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+    <% unless readonly %>
+      <td><%= link_to 'Edit', edit_template_path(template) %></td>
+      <td><%= link_to 'Destroy', template, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+    <% end %>
   </tr>
 <% end %>
 </table>
 <br />
-<%= link_to 'New Template', new_template_path %>
+<% unless readonly %>
+  <%= link_to 'New Template', new_template_path %>
+<% end %>

data/app/views/stachio/templates/show.html.erb CHANGED

@@ -11,5 +11,7 @@
 </p>
-<%= link_to 'Edit', edit_template_path(@template) %> |
+<% unless readonly %>
+  <%= link_to 'Edit', edit_template_path(@template) %> |
+<% end %>
 <%= link_to 'Back', templates_path %>

data/config/routes.rb CHANGED

@@ -1,4 +1,3 @@
 Stachio::Engine.routes.draw do
-  resources :templates
-  root :to => 'templates#index'
+  resources :templates, :path => '/'
 end

data/lib/stachio/engine.rb CHANGED

@@ -9,6 +9,8 @@ module Stachio
     require "stache"     ## use mustache/handlebars for views
     Stache.use :mustache
+    config.readonly = false unless defined?(Rails) && Rails.env.production?
     config.generators do |g|
       g.test_framework :rspec
       g.integration_tool :rspec

data/lib/stachio/version.rb CHANGED

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

data/spec/controllers/stachio/templates_controller_spec.rb CHANGED

@@ -20,6 +20,9 @@ require 'spec_helper'
 module Stachio
   describe TemplatesController do
+    # 'render_views' will render any erb /haml/whatever as part of the tests, thus
+    # providing some (minimal) assurance that nothing stupid was done
+    render_views
     # This should return the minimal set of attributes required to create a valid
     # Template. As you add validations to Template, be sure to
@@ -41,6 +44,13 @@ module Stachio
         get :index, {}, valid_session
         assigns(:templates).should eq([template])
       end
+      it "does not require permission" do
+        Stachio::Engine.config.stub(:readonly).and_return(true)
+        template = Template.create! valid_attributes
+        get :index, {}, valid_session
+        response.should_not redirect_to(templates_path)
+      end
     end
     describe "GET show" do
@@ -49,9 +59,22 @@ module Stachio
         get :show, {:id => template.to_param}, valid_session
         assigns(:template).should eq(template)
       end
+      it "does not require permission" do
+        Stachio::Engine.config.stub(:readonly).and_return(true)
+        template = Template.create! valid_attributes
+        get :show, {:id => template.to_param}, valid_session
+        response.should_not redirect_to(templates_path)
+      end
     end
     describe "GET new" do
+      it "requires permission" do
+        Stachio::Engine.config.stub(:readonly).and_return(true)
+        get :new, {}, valid_session
+        response.should redirect_to(templates_path)
+      end
       it "assigns a new template as @template" do
         get :new, {}, valid_session
         assigns(:template).should be_a_new(Template)
@@ -59,6 +82,13 @@ module Stachio
     end
     describe "GET edit" do
+      it "requires permission" do
+        Stachio::Engine.config.stub(:readonly).and_return(true)
+        template = Template.create! valid_attributes
+        get :edit, {:id => template.to_param}, valid_session
+        response.should redirect_to(templates_path)
+      end
       it "assigns the requested template as @template" do
         template = Template.create! valid_attributes
         get :edit, {:id => template.to_param}, valid_session
@@ -68,6 +98,14 @@ module Stachio
     describe "POST create" do
       describe "with valid params" do
+        it "requires permission" do
+          Stachio::Engine.config.stub(:readonly).and_return(true)
+          expect {
+            post :create, {:template => valid_attributes}, valid_session
+          }.to_not change(Template, :count).by(1)
+          response.should redirect_to(templates_path)
+        end
         it "creates a new Template" do
           expect {
             post :create, {:template => valid_attributes}, valid_session
@@ -105,6 +143,14 @@ module Stachio
     describe "PUT update" do
       describe "with valid params" do
+        it "requires permission" do
+          template = Template.create! valid_attributes
+          Stachio::Engine.config.stub(:readonly).and_return(true)
+          Template.any_instance.should_not_receive(:update_attributes).with({ "template_name" => "MyString" })
+          put :update, {:id => template.to_param, :template => { "template_name" => "MyString" }}, valid_session
+          response.should redirect_to(templates_path)
+        end
         it "updates the requested template" do
           template = Template.create! valid_attributes
           # Assuming there are no other templates in the database, this
@@ -148,6 +194,17 @@ module Stachio
     end
     describe "DELETE destroy" do
+      it "requires permission" do
+        template = Template.create! valid_attributes
+        Stachio::Engine.config.stub(:readonly).and_return(true)
+        expect {
+          delete :destroy, {:id => template.to_param}, valid_session
+        }.to_not change(Template, :count).by(-1)
+        response.should redirect_to(templates_path)
+      end
       it "destroys the requested template" do
         template = Template.create! valid_attributes
         expect {

data/spec/models/stachio/template_spec.rb CHANGED

@@ -1,20 +1,16 @@
 require 'spec_helper'
 module Stachio
-  class MockProxyObject
-    def teapot
-      "TEAPOT"
+  describe Template do
+    let(:presents) do
+      Class.new { def self.teapot; 'TEAPOT'; end }
     end
-  end
-  describe Template do
     let(:template) do
-      attrs = { :template_name => "my silly teapot",
-                :content => "I am a {{teapot}}",
-              }
-      template = Template.new(attrs)
-      template.proxied = MockProxyObject.new
-      template
+      tmpl = Template.new :template_name => "mrs.potts",
+                          :content => "I am a {{teapot}}"
+      tmpl.presents = presents
+      tmpl
     end
     it "stores templates in the database" do
@@ -39,16 +35,56 @@ module Stachio
     it "fetches templates from the database using the template name" do
       template.save!
-      template.should == Template['my silly teapot']
-    end
-    it "composes messages using the content of the template" do
-      template.compose.should == "I am a TEAPOT"
+      template.should == Template['mrs.potts']
     end
     it "reports an error when it can't compose the message" do
       template.content = "I am not a valid {{horseradish}}"
-      expect { template.compose }.to raise_error(Mustache::ContextMiss)
+      expect { template.render }.to raise_error(Mustache::ContextMiss)
     end
+    describe '#render' do
+      it "renders using the content of the template" do
+        template.presents.should be_a_kind_of(Class)
+        template.render.should == "I am a TEAPOT"
+      end
+      it "can render values from a hash" do
+        template.presents = {:teapot => 'TEAPOT' }
+        template.render.should == "I am a TEAPOT"
+      end
+      it "renders nothing when presenting a nil" do
+        template.presents = nil
+        template.render.should == nil
+      end
+      it "memoizes rendered text" do
+        template.render.should   == "I am a TEAPOT"
+        template.rendered.should == "I am a TEAPOT"
+        template.presents = {:teapot => 'HORSERADISH'}
+        template.render.should   == "I am a TEAPOT"
+        template.rendered.should == "I am a TEAPOT"
+      end
+      it "can be reset when memoized" do
+        template.render.should   == "I am a TEAPOT"
+        template.presents = {:teapot => 'HORSERADISH'}
+        template.render.should                 == "I am a TEAPOT"
+        template.render(:force => true).should == "I am a HORSERADISH"
+      end
+    end
+    describe '#present' do
+      it "sets attribute 'presents' & renders all at once" do
+        template.render.should   == "I am a TEAPOT"
+        template.present(:teapot => 'TURNIP').should == "I am a TURNIP"
+        template.presents.should == {:teapot => 'TURNIP'}
+      end
+    end
   end
 end

data/spec/routing/stachio/templates_routing_spec.rb CHANGED

@@ -5,31 +5,31 @@ module Stachio
     describe "routing" do
       it "routes to #index" do
-        get("/templates").should route_to("stachio/templates#index")
+        get("/").should route_to("stachio/templates#index")
       end
       it "routes to #new" do
-        get("/templates/new").should route_to("stachio/templates#new")
+        get("/new").should route_to("stachio/templates#new")
       end
       it "routes to #show" do
-        get("/templates/1").should route_to("stachio/templates#show", :id => "1")
+        get("/1").should route_to("stachio/templates#show", :id => "1")
       end
       it "routes to #edit" do
-        get("/templates/1/edit").should route_to("stachio/templates#edit", :id => "1")
+        get("/1/edit").should route_to("stachio/templates#edit", :id => "1")
       end
       it "routes to #create" do
-        post("/templates").should route_to("stachio/templates#create")
+        post("/").should route_to("stachio/templates#create")
       end
       it "routes to #update" do
-        put("/templates/1").should route_to("stachio/templates#update", :id => "1")
+        put("/1").should route_to("stachio/templates#update", :id => "1")
       end
       it "routes to #destroy" do
-        delete("/templates/1").should route_to("stachio/templates#destroy", :id => "1")
+        delete("/1").should route_to("stachio/templates#destroy", :id => "1")
       end
     end

data/spec/spec_helper.rb CHANGED

@@ -1,3 +1,13 @@
+require 'simplecov'
+SimpleCov.start do
+  add_filter                "vendor"
+  add_filter                "spec"
+  add_group "Models",       "app/models"
+  add_group "Controllers",  "app/controllers"
+end
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 ENV["RAILS_ENV"] ||= 'test'
@@ -6,7 +16,6 @@ require File.expand_path("../dummy/config/environment", __FILE__)
 require 'rspec/rails'
 require 'rspec/autorun'
-require 'simplecov'
 require 'pry'
 # Requires supporting ruby files with custom matchers and macros, etc,

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stachio
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease:
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-05-13 00:00:00.000000000 Z
+date: 2013-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -234,7 +234,6 @@ files:
 - .ruby-version
 - .simplecov
 - Gemfile
-- Gemfile.lock
 - MIT-LICENSE
 - README.md
 - Rakefile
@@ -259,7 +258,6 @@ files:
 - db/migrate/20130509172418_create_stachio_templates.rb
 - lib/stachio.rb
 - lib/stachio/engine.rb
-- lib/stachio/proxy.rb
 - lib/stachio/version.rb
 - lib/tasks/stachio_tasks.rake
 - script/rails

data/Gemfile.lock DELETED

@@ -1,152 +0,0 @@
-PATH
-  remote: .
-  specs:
-    stachio (0.0.1)
-      handlebars
-      jquery-rails
-      lookup_by
-      mustache
-      rails (~> 3.2.13)
-      stache
-GEM
-  remote: http://rubygems.org/
-  specs:
-    actionmailer (3.2.13)
-      actionpack (= 3.2.13)
-      mail (~> 2.5.3)
-    actionpack (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
-    activerecord (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
-      multi_json (~> 1.0)
-    arel (3.0.2)
-    builder (3.0.4)
-    coderay (1.0.9)
-    commonjs (0.2.6)
-    diff-lcs (1.2.4)
-    erubis (2.7.0)
-    handlebars (0.4.0)
-      commonjs (~> 0.2.3)
-      therubyracer (~> 0.11.1)
-    hike (1.2.2)
-    i18n (0.6.1)
-    journey (1.0.4)
-    jquery-rails (2.2.1)
-      railties (>= 3.0, < 5.0)
-      thor (>= 0.14, < 2.0)
-    json (1.7.7)
-    libv8 (3.11.8.17)
-    lookup_by (0.1.0)
-      rails (>= 3.0.0)
-    mail (2.5.3)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    method_source (0.8.1)
-    mime-types (1.23)
-    multi_json (1.7.3)
-    mustache (0.99.4)
-    polyglot (0.3.3)
-    pry (0.9.12.1)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-    rack (1.4.5)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.3)
-      rack
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rails (3.2.13)
-      actionmailer (= 3.2.13)
-      actionpack (= 3.2.13)
-      activerecord (= 3.2.13)
-      activeresource (= 3.2.13)
-      activesupport (= 3.2.13)
-      bundler (~> 1.0)
-      railties (= 3.2.13)
-    railties (3.2.13)
-      actionpack (= 3.2.13)
-      activesupport (= 3.2.13)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (10.0.4)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    ref (1.0.4)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-fire (1.1.3)
-      rspec (~> 2.11)
-    rspec-mocks (2.13.1)
-    rspec-rails (2.13.1)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
-    simplecov-rcov (0.2.3)
-      simplecov (>= 0.4.1)
-    slop (3.4.4)
-    sprockets (2.2.2)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.7)
-    stache (1.0.1)
-    therubyracer (0.11.4)
-      libv8 (~> 3.11.8.12)
-      ref
-    thor (0.18.1)
-    tilt (1.4.1)
-    treetop (1.4.12)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.37)
-PLATFORMS
-  ruby
-DEPENDENCIES
-  pry
-  rspec
-  rspec-fire
-  rspec-rails
-  simplecov
-  simplecov-rcov
-  sqlite3
-  stachio!

data/lib/stachio/proxy.rb DELETED

@@ -1,20 +0,0 @@
-module Stachio
-  class Proxy < Mustache
-    self.raise_on_context_miss = true
-    attr_accessor :proxied
-    def initialize(proxied)
-      self.proxied = proxied
-    end
-    def respond_to?(method, include_privates=false)
-      return true if proxied.respond_to? method
-      super
-    end
-    def method_missing(method, *args, &block)
-      super unless proxied.respond_to?(method)
-      proxied.send method, *args, &block
-    end
-  end
-end