From ec5860b12d8bdb56380318c7cde5621462a505b6 Mon Sep 17 00:00:00 2001
From: Low Chin Chau <chinclow@gmail.com>
Date: Thu, 19 Apr 2012 17:13:23 +0800
Subject: [PATCH] Added option to create and use local scrolls in
 ENV['APPSCROLLS_DIR']

'rake new' creates new scrolls in ENV['APPSCROLLS_DIR'] if specified
appscrolls.rb reads local scrolls in  ENV['APPSCROLLS_DIR']
default scroll of the same names as local scrolls are discarded
---
 Rakefile                        |  7 +++++--
 lib/appscrolls.rb               | 14 +++++++++++++-
 lib/appscrolls/scrolls.rb       |  2 ++
 spec/appscrolls/scrolls_spec.rb |  7 +++++++
 4 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/Rakefile b/Rakefile
index 640819b..8d1d579 100644
--- a/Rakefile
+++ b/Rakefile
@@ -54,8 +54,11 @@ task :new do
   require 'active_support/inflector'
   require 'erb'
   require 'appscrolls/template'
+  unless (scrolls_dir = ENV["APPSCROLLS_DIR"]) and scrolls_dir != ""
+    scrolls_dir = "scrolls"
+  end
   scroll = AppScrollsScrolls::Template.render("new_scroll", binding)
-  scroll_path = "scrolls/#{name}.rb"
+  scroll_path = "#{scrolls_dir}/#{name}.rb"
   File.open(scroll_path, "w") { |file| file << scroll }
   `open #{scroll_path}`
 end
@@ -75,4 +78,4 @@ namespace :list do
   # task :exclusions do
   # 
   # end
-end
\ No newline at end of file
+end
diff --git a/lib/appscrolls.rb b/lib/appscrolls.rb
index 3a3e3d8..22dc793 100644
--- a/lib/appscrolls.rb
+++ b/lib/appscrolls.rb
@@ -3,8 +3,20 @@
 require 'appscrolls/config'
 require 'appscrolls/template'
 
-Dir[File.dirname(__FILE__) + '/../scrolls/*.rb'].each do |path|
+def enroll_scroll_at(path)
   key = File.basename(path, '.rb')
   scroll = AppScrollsScrolls::Scroll.generate(key, File.open(path))
   AppScrollsScrolls::Scrolls.add(scroll)
 end
+
+# set up local scrolls if available
+if dir = ENV['APPSCROLLS_DIR'] and dir != ""
+  Dir[dir + '/*.rb'].each do |path|
+    enroll_scroll_at(path)
+  end
+end
+
+# default files of same keys as local scrolls are discarded
+Dir[File.dirname(__FILE__) + '/../scrolls/*.rb'].each do |path|
+  enroll_scroll_at(path)
+end
diff --git a/lib/appscrolls/scrolls.rb b/lib/appscrolls/scrolls.rb
index 7852c73..2135413 100644
--- a/lib/appscrolls/scrolls.rb
+++ b/lib/appscrolls/scrolls.rb
@@ -4,6 +4,8 @@ module Scrolls
     @@list = {}
 
     def self.add(scroll)
+      sym = ActiveSupport::Inflector.camelize(scroll.key.gsub("-", "_"))
+      return if AppScrollsScrolls::Scrolls.const_defined?(sym)
       AppScrollsScrolls::Scrolls.const_set ActiveSupport::Inflector.camelize(scroll.key.gsub("-", "_")), scroll
       @@list[scroll.key] = scroll
       (@@categories[scroll.category.to_s] ||= []) << scroll.key
diff --git a/spec/appscrolls/scrolls_spec.rb b/spec/appscrolls/scrolls_spec.rb
index 3264372..de12250 100644
--- a/spec/appscrolls/scrolls_spec.rb
+++ b/spec/appscrolls/scrolls_spec.rb
@@ -16,6 +16,13 @@
     subject.list.should be_include('scroll_test')
   end
 
+  it '.add should not overwrite scroll of same key' do
+    new_scroll = AppScrollsScrolls::Scroll.generate("scroll_test", "# Overwrite Testing", :name => "New Test Scroll", :category => "test", :description => "Just an overwrite test.")
+    AppScrollsScrolls::Scrolls.add(new_scroll)
+    subject["scroll_test"].should eql(scroll)
+    subject["scroll_test"].should_not eql(new_scroll)
+  end
+
   describe '.for' do
     it 'should find for a given category' do
       AppScrollsScrolls::Scrolls.for('test').should be_include('scroll_test')