coconut 0.1.0 → 0.1.1

data/.gitignore

@@ -1,3 +1,4 @@
+.DS_Store
 *.gem
 *.rbc
 .bundle

data/README.md

@@ -119,91 +119,10 @@ what environment the application is running on. Therefore **the environment
 will be the return value of that block**.
 
 
-#### Coconut flavours (a.k.a. how to structure your configuration).
-You can structure the configuration the way that suits you best. Maybe it fits
-in a single file best. Maybe you want to split it and have several configuration
-files. Coconut offers you three different alternatives.
-
-#####a) Single file
-If your configuration is small this is probably the best choice. In this case
-your application section will only be composed of *Assets*. You will need
-nothing more. The first example of this README uses this Coconut flavour.
-
-#####b) Folder
-If you want to split your configuration in several files and put them in the
-same folder you will be able to tell Coconut how to find them. Coconut will
-load **every file in that folder and run them as if they were Coconut scripts**.
-
-If the file that has the *Application* level configuration is in that folder
-too it will be run and will cause an error. You have two options to avoid this:
-
-1. Name that file `config.rb`. By convention Coconut won't run a file in an
-asset folder if it is called like that.
-2. Put the configuration file that has the *Application* level configuration
-in a different folder. In this case the files in the given folder will only
-have *Asset* configuration.
-
-```ruby
-Coconut.configure MyApp do
-  asset_folder 'path/to/folder'
-end
-```
-
-This allows you to write your files focusing only on *Assets*, given that
-when Coconut will run then within the *Application* block. So you could
-have the following project structure:
-
-    .
-    ..
-    /config
-      config.rb
-      database.rb
-      oauth.rb
-      s3.rb
-    /lib
-    /spec
-
-You could have the *Application* block on the `config.rb` file like this
-(assuming that you run the application from the root of the project):
-
-```ruby
-Coconut.configure MyApp do
-  asset_folder 'config'
-end
-```
-
-And each of the asset files would only include asset configuration:
-
-```ruby
-database do
-  environment :development do
-    #...
-  end
-
-  environment :staging, :production do
-    #...
-  end
-end
-```
-
-You would only need to require the `config/config.rb` file to access the
-configuration.
-
-#####c) List of files
-
-*NOT DEVELOPED YET: will be available on next version (0.1.1)*
-
-This flavour is exactly like the *folder* one with the difference that instead
-of providing the path to the folder to the asset configuration files you provide
-the path to every one of them:
-
-```ruby
-Coconut.configure MyApp do
-  asset_files 'database.rb', 'oauth.rb', 's3.rb'
-end
-```
-
-Notice that the paths are relative to where the `config.rb` file is located.
+#### Coconut flavours (how to structure your configuration).
+You can structure the configuration in several ways with coconut. See
+[coconut flavours](https://github.com/jacegu/coconut/wiki/Coconut-flavours--\(how-to-split-your-configuration\))
+in the wiki.
 
 ### 2) Asset
 Each of this blocks represent one of the assets of your application. Inside

data/changelog.md

@@ -6,3 +6,6 @@
 ## Version 0.1.0
 - Remove Hashie dependency.
 - Add *folder flavour* support.
+
+## Version 0.1.1
+- Add *file list flavour* support.

data/features/multiple_file_configuration.feature

@@ -0,0 +1,22 @@
+Feature: Load configuration from specific asset files.
+
+  You can split your configuration into asset files, and tell Coconut to load
+  the configuration from them.
+
+  Scenario: Loading asset configuration from specific files.
+    Given I have my application config in "/tmp/coconut_config/config.rb" with content:
+      """
+      Coconut.configure MyApp do
+        asset_files '/tmp/coconut_config/s3.rb'
+      end
+      """
+      And I have a "s3.rb" asset file on /tmp/coconut_config with content:
+      """
+      s3 do
+        env(:development) { key 'xxx' }
+        env(:production)  { key 'yyy' }
+      end
+      """
+     When I run my application on the "production" environment
+      And I query the configuration for "s3.key"
+     Then the configured value should be "yyy"

data/lib/coconut/dsl/application.rb

@@ -24,6 +24,10 @@ module Coconut
         instance_eval AssetFolder.config_from(path, IGNORED_FILES)
       end
 
+      def asset_files(*files)
+        instance_eval AssetFileList.config_from(*files)
+      end
+
       def method_missing(asset, *args, &config)
         ::Kernel::raise InvalidName, __taken_error_message(asset, 'asset name') if __taken?(asset)
         @assets_config[asset] = Asset.configure(@current_environment, &config)

data/lib/coconut/dsl/asset_file.rb

@@ -0,0 +1,13 @@
+module Coconut
+  module Dsl
+    class AssetFile
+      def initialize(path)
+        @path = path
+      end
+
+      def asset_config
+        ::File.read(@path)
+      end
+    end
+  end
+end

data/lib/coconut/dsl/asset_file_list.rb

@@ -0,0 +1,19 @@
+require_relative 'asset_file'
+
+module Coconut
+  module Dsl
+    class AssetFileList
+      def self.config_from(*file_paths)
+        new(*file_paths).assets_config
+      end
+
+      def initialize(*file_paths)
+        @files = file_paths.map { |file| AssetFile.new(file) }
+      end
+
+      def assets_config
+        @files.map { |file| file.asset_config }.join("\n")
+      end
+    end
+  end
+end

data/lib/coconut/dsl/asset_folder.rb

@@ -1,3 +1,5 @@
+require_relative 'asset_file_list'
+
 module Coconut
   module Dsl
     class AssetFolder
@@ -11,7 +13,7 @@ module Coconut
       end
 
       def assets_config
-        asset_files_in_folder.map { |file| content(file) }.join "\n"
+        AssetFileList.new(*asset_files_in_folder).assets_config
       end
 
       private
@@ -32,13 +34,10 @@ module Coconut
         Dir.open(@path)
       end
 
-      def content(file)
-        File.read(file)
-      end
-
       def path_to(file)
         File.expand_path(File.join(@path, file))
       end
     end
-  end
+
+      end
 end

data/lib/coconut/version.rb

@@ -1,3 +1,3 @@
 module Coconut
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/coconut/dsl/application_spec.rb

@@ -21,4 +21,11 @@ describe Coconut::Dsl::Application do
     config = described_class.configure(:current) { asset_folder path }
     config.asset.property.should eq 'value'
   end
+
+  it 'can load asset configuration from a list of files' do
+    Coconut::Dsl::AssetFileList.stub(:config_from).with('/file/path.rb').
+      and_return("asset { environment(:current) { property 'value' } }")
+    config = described_class.configure(:current) { asset_files '/file/path.rb' }
+    config.asset.property.should eq 'value'
+  end
 end

data/spec/coconut/dsl/asset_file_list_spec.rb

@@ -0,0 +1,21 @@
+require 'coconut/dsl/asset_file_list'
+
+describe Coconut::Dsl::AssetFileList do
+  let(:path1)   { '/tmp/asset1.rb' }
+  let(:path2)   { '/tmp/asset2.rb' }
+  let(:config1) { "asset1 { env(:current) { property 'value for asset1' } }" }
+  let(:config2) { "asset2 { env(:current) { property 'value for asset2' } }" }
+
+  before do
+    File.open('/tmp/asset1.rb', 'w+') { |f| f.write(config1) }
+    File.open('/tmp/asset2.rb', 'w+') { |f| f.write(config2) }
+  end
+
+  after do
+    File.delete('/tmp/asset1.rb', '/tmp/asset2.rb')
+  end
+
+  it 'reads the content of the asset file at path' do
+    described_class.config_from(path1, path2).should eq "#{config1}\n#{config2}"
+  end
+end

data/spec/coconut/dsl/asset_file_spec.rb

@@ -0,0 +1,19 @@
+require 'coconut/dsl/asset_file'
+
+describe Coconut::Dsl::AssetFile do
+  subject      { described_class.new(path) }
+  let(:path)   { '/tmp/asset.rb' }
+  let(:config) { "asset { env(:current) { property 'value' } }" }
+
+  before do
+    File.open('/tmp/asset.rb', 'w+') { |f| f.write(config) }
+  end
+
+  after do
+    File.delete('/tmp/asset.rb')
+  end
+
+  it 'reads the content of the asset file at path' do
+    subject.asset_config.should eq config
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coconut
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-11 00:00:00.000000000 Z
+date: 2012-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -91,6 +91,7 @@ files:
 - changelog.md
 - coconut.gemspec
 - features/folder_configuration.feature
+- features/multiple_file_configuration.feature
 - features/single_file_configuration.feature
 - features/step_definitions/configuration_steps.rb
 - features/support/env.rb
@@ -98,6 +99,8 @@ files:
 - lib/coconut/config.rb
 - lib/coconut/dsl/application.rb
 - lib/coconut/dsl/asset.rb
+- lib/coconut/dsl/asset_file.rb
+- lib/coconut/dsl/asset_file_list.rb
 - lib/coconut/dsl/asset_folder.rb
 - lib/coconut/dsl/blank_slate.rb
 - lib/coconut/dsl/environment.rb
@@ -105,8 +108,10 @@ files:
 - spec/coconut/coconut_spec.rb
 - spec/coconut/config_spec.rb
 - spec/coconut/dsl/application_spec.rb
+- spec/coconut/dsl/asset_file_list_spec.rb
+- spec/coconut/dsl/asset_file_spec.rb
+- spec/coconut/dsl/asset_folder_spec.rb
 - spec/coconut/dsl/asset_spec.rb
-- spec/coconut/dsl/assets_folder_spec.rb
 - spec/coconut/dsl/blank_slate_spec.rb
 - spec/coconut/dsl/environment_spec.rb
 homepage: http://github.com/jacegu/coconut
@@ -123,7 +128,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -443559654264598590
+      hash: -2312631787946944813
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -132,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -443559654264598590
+      hash: -2312631787946944813
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -142,14 +147,17 @@ summary: Coconut is a simple DSL that allows you to easily write and query your
   configuration with pure Ruby.
 test_files:
 - features/folder_configuration.feature
+- features/multiple_file_configuration.feature
 - features/single_file_configuration.feature
 - features/step_definitions/configuration_steps.rb
 - features/support/env.rb
 - spec/coconut/coconut_spec.rb
 - spec/coconut/config_spec.rb
 - spec/coconut/dsl/application_spec.rb
+- spec/coconut/dsl/asset_file_list_spec.rb
+- spec/coconut/dsl/asset_file_spec.rb
+- spec/coconut/dsl/asset_folder_spec.rb
 - spec/coconut/dsl/asset_spec.rb
-- spec/coconut/dsl/assets_folder_spec.rb
 - spec/coconut/dsl/blank_slate_spec.rb
 - spec/coconut/dsl/environment_spec.rb
 has_rdoc: