touchstone 0.4.1 → 0.5.0

data/README.markdown

@@ -32,6 +32,9 @@ This will:
 * ~~Add a before filter to your application controller. *NB*: This defaults to setting a private method for the filter. If you already have `private` defined in your application controller, you will need to remove the duplicate declaration.~~ **Not currently working. You will need to update application\_controller.rb manually. See below.**
 * Mounts the engine in your routes.rb file
 
+## Authentication
+By default, Touchstone will require http\_basic authentication to access. The credentials for access will be read from a YAML file called touchstone.yml in your config folder. You will need to create this file unless you choose not to restrict access to Touchstone (not recommended).
+
 ## Installation continued
 Copy the migrations across to your application by running `rake touchstone:install:migrations`. This will add migrations to create the tables for the 3 classes set out above.
 

data/app/controllers/touchstone/application_controller.rb

@@ -1,4 +1,10 @@
 module Touchstone
   class ApplicationController < ActionController::Base
+    
+    if Touchstone.authenticate == true
+      config = YAML::load(File.open("#{Rails.root}/config/touchstone.yml"))
+      http_basic_authenticate_with :name => config['name'], :password => config['password']
+    end
+    
   end
 end

data/app/controllers/touchstone/campaigns_controller.rb

@@ -1,44 +1,46 @@
-class Touchstone::CampaignsController < ApplicationController
+module Touchstone
+  class CampaignsController < ApplicationController
   
-  layout 'touchstone/touchstone'
+    layout 'touchstone/touchstone'
   
-  def index
-    @campaigns = Campaign.all
-  end
+    def index
+      @campaigns = Campaign.all
+    end
   
-  def new
-    @campaign = Campaign.new
-  end
+    def new
+      @campaign = Campaign.new
+    end
   
-  def create
-    @campaign = Campaign.new(params[:campaign])
-    if @campaign.save
-      flash[:notice] = "Campaign added"
-      redirect_to campaigns_url
-    else
-      flash[:error] = "Could not add campaign"
-      redirect_to new_campaign_url
+    def create
+      @campaign = Campaign.new(params[:campaign])
+      if @campaign.save
+        flash[:notice] = "Campaign added"
+        redirect_to campaigns_url
+      else
+        flash[:error] = "Could not add campaign"
+        redirect_to new_campaign_url
+      end
     end
-  end
   
-  def show
-    @campaign = Campaign.find(params[:id])
-    @columns = Touchstone.column_names
-  end
+    def show
+      @campaign = Campaign.find(params[:id])
+      @columns = Touchstone.column_names
+    end
   
-  def edit
-    @campaign = Campaign.find(params[:id])
-  end
+    def edit
+      @campaign = Campaign.find(params[:id])
+    end
   
-  def update
-    @campaign = Campaign.find(params[:id])
-    if @campaign.update_attributes(params[:campaign]) && @campaign.save
-      flash[:notice] = "Campaign details updated"
-      redirect_to campaign_path(@campaign)
-    else
-      flash[:error] = "Could not update details at this time."
-      redirect_to campaign_path(@campaign)
+    def update
+      @campaign = Campaign.find(params[:id])
+      if @campaign.update_attributes(params[:campaign]) && @campaign.save
+        flash[:notice] = "Campaign details updated"
+        redirect_to campaign_path(@campaign)
+      else
+        flash[:error] = "Could not update details at this time."
+        redirect_to campaign_path(@campaign)
+      end
     end
-  end
   
+  end
 end

data/lib/generators/touchstone/templates/touchstone.rb

@@ -23,4 +23,11 @@ Touchstone.config do |c|
   
   c.currency = "$"
   
+  # If set to true, http_basic authentication will be in place
+  # before you can access Touchstone. You should create a YAML
+  # file in Rails.root/config called touchstone.yml containing
+  # a name and password
+  
+  c.authenticate = true
+  
 end

data/lib/touchstone/configuration.rb

@@ -30,5 +30,13 @@ module Touchstone
       @currency || "$"
     end
     
+    def authenticate=authenticate
+      @authenticate = authenticate
+    end
+    
+    def authenticate
+      @authenticate
+    end
+    
   end
 end

data/lib/touchstone/version.rb

@@ -1,3 +1,3 @@
 module Touchstone
-  VERSION = "0.4.1"
+  VERSION = "0.5.0"
 end

data/lib/touchstone.rb

@@ -23,6 +23,10 @@ module Touchstone
       Touchstone::Configuration.currency
     end
     
+    def authenticate
+      Touchstone::Configuration.authenticate
+    end
+    
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: touchstone
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -159,7 +159,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3797469945151478900
+      hash: 3352637730166065621
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -168,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3797469945151478900
+      hash: 3352637730166065621
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.20