app_config 2.3.1 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 089295fe6570693687189c8bf48b762741ed4a19
-  data.tar.gz: bd621ae9f22c26f2486d6a4e6b905a8289e48089
+  metadata.gz: 61b54a9e60063869d1fb5dd8195685012c09d27a
+  data.tar.gz: abe0121e7d221f4510548c5e5d2517f2bf0a1fed
 SHA512:
-  metadata.gz: 6d19ce9e2ff7a7d95061b09ff821d82c433c855ac6cb16d5374f8f1f530e77ae0d2d74f836723c95f3948bc346b81280f556fd19adaf39218557f683a9cc67d4
-  data.tar.gz: 4f862e5befb0fe94604d4a69386b9f11059f55778b363b724acc5d840b342b3019dab0303d90ca91a460d1fcd22d18ad434b92435b01fa7bf853ac09c66083ec
+  metadata.gz: a430884e1eaeee82e0ec768a5fbdd745604c7b8589be4210a697fa1f6fb4237138ea88b74a93194484ce81da2b08c4611db3aaf7feb14e1bc7ce44264a73c292
+  data.tar.gz: 3b0b28c1a51c0f37d884f63d9f4591365a9305222048794b83e03ee4d6f379bd286c7b73db8e9f91a8ff951b5ca17f8738cf7b73ce756239e0dc98fb313af08f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    app_config (2.3.1)
+    app_config (2.4.1)
 
 GEM
   remote: https://rubygems.org/
@@ -27,6 +27,7 @@ GEM
       multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
+    sqlite3 (1.3.7)
     yard (0.8.2)
 
 PLATFORMS
@@ -41,4 +42,5 @@ DEPENDENCIES
   redcarpet
   rspec
   simplecov
+  sqlite3
   yard

data/README.md

@@ -49,6 +49,22 @@ AppConfig.api_name     # => 'Supr Webz 2.0'
 AppConfig.api_key      # => 'SUPERAWESOMESERVICE'
 ```
 
+You can also use environments in the YAML file (like Rails `database.yml`):
+
+```yaml
+---
+development:
+  api_url: 'http://localhost:3000/endpoint.json'
+
+production:
+  api_url: 'http://api.example.com/endpoint.json'
+```
+
+```ruby
+AppConfig.setup!(yaml: '/path/to/app_config.yml', env: :development)
+AppConfig.api_url  # => 'http://localhost:3000/endpoint.json'
+```
+
 
 ## Mongo
 

data/app_config.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'redcarpet'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'simplecov'
+  s.add_development_dependency 'sqlite3'
   s.add_development_dependency 'yard'
 
   s.has_rdoc = true

data/lib/app_config.rb

@@ -14,16 +14,19 @@ module AppConfig
     # Valid storage methods:
     # * `:mongo` - {AppConfig::Storage::Mongo AppConfig::Storage::Mongo}
     # * `:postgres` - {AppConfig::Storage::Mongo AppConfig::Storage::Postgres}
+    # * `:sqlite` - {AppConfig::Storage::Mongo AppConfig::Storage::SQLite}
     # * `:yaml` - {AppConfig::Storage::YAML AppConfig::Storage::YAML}
     def setup!(options = {}, &block)
       @@options = options
 
       if @@options[:yaml]
-        @@storage = AppConfig::Storage::YAML.new(@@options.delete(:yaml))
+        @@storage = AppConfig::Storage::YAML.new(@@options.delete(:yaml), @@options)
       elsif @@options[:mongo]
         @@storage = AppConfig::Storage::Mongo.new(@@options.delete(:mongo))
       elsif @@options[:postgres]
         @@storage = AppConfig::Storage::Postgres.new(@@options.delete(:postgres))
+      elsif @@options[:sqlite]
+        @@storage = AppConfig::Storage::SQLite.new(@@options.delete(:sqlite))
       else
         @@storage = AppConfig::Storage::Base.new
       end

data/lib/app_config/storage.rb

@@ -4,6 +4,7 @@ module AppConfig
     autoload :ConfigData, 'app_config/storage/config_data'
     autoload :Mongo,      'app_config/storage/mongo'
     autoload :Postgres,   'app_config/storage/postgres'
+    autoload :SQLite,     'app_config/storage/sqlite'
     autoload :YAML,       'app_config/storage/yaml'
   end
 end

data/lib/app_config/storage/sqlite.rb

@@ -0,0 +1,53 @@
+module AppConfig
+  module Storage
+
+    require 'sqlite3'
+
+    # SQLite storage method.
+    class SQLite < Storage::Base
+
+      DEFAULTS = {
+        database: File.join(Dir.home, '.app_config.sqlite3'),
+        table: 'app_config',
+      }
+
+      def initialize(options)
+        # Allows passing `true` as an option to just use defaults.
+        if options.is_a?(Hash)
+          @options = DEFAULTS.merge(options)
+        else
+          @options = DEFAULTS
+        end
+
+        @database = ::SQLite3::Database.new(@options[:database])
+        @table = @options[:table]
+
+        fetch_data!
+      end
+
+      private
+
+      def fetch_data!
+        config = {}
+
+        # Get the column names in same order as schema.
+        columns = []
+        table_info = "PRAGMA table_info('#{@table}')"
+        @database.execute(table_info) do |row|
+          columns << row[1]
+        end
+
+        # Get the values in order of columns.
+        fetch_query = "SELECT #{columns.join(', ')} FROM #{@table} ORDER BY id DESC LIMIT 1"
+        @database.execute(fetch_query) do |row|
+          columns.each_with_index do |attr, i|
+            config[attr.to_sym] = row[i]
+          end
+        end
+
+        @data = Storage::ConfigData.new(config)
+      end
+
+    end
+  end
+end

data/lib/app_config/storage/yaml.rb

@@ -12,12 +12,17 @@ module AppConfig
       # `@data` will be the OpenStruct that is accessed with `AppConfig.some_var`.
       #
       # Defaults to `Dir.home/.app_config.yml`
-      def initialize(path = DEFAULT_PATH)
+      def initialize(path = DEFAULT_PATH, options = {})
         # Allows passing `true` as an option.
         path = DEFAULT_PATH if path == true
 
         # Make sure to use the top-level YAML module here.
-        @data = Storage::ConfigData.new(::YAML.load_file(path))
+        if options.has_key?(:env)
+          env = options[:env].to_s  # Force a String here since YAML's keys are strings.
+          @data = Storage::ConfigData.new(::YAML.load_file(path)[env])
+        else
+          @data = Storage::ConfigData.new(::YAML.load_file(path))
+        end
       end
 
     end # YAML

data/lib/app_config/version.rb

@@ -1,3 +1,3 @@
 module AppConfig
-  VERSION = '2.3.1'
+  VERSION = '2.4.1'
 end

data/spec/app_config/storage/sqlite_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe AppConfig::Storage::SQLite do
+
+  before(:all) do
+    config_for_sqlite
+  end
+
+  it 'should have some values' do
+    AppConfig.api_key.should_not be_nil
+  end
+
+end

data/spec/app_config/storage/yaml_spec.rb

@@ -34,4 +34,15 @@ describe AppConfig::Storage::YAML do
     AppConfig.setup!(yaml: true)
     AppConfig.api_key.should_not be_nil
   end
+
+  it 'accepts an :env option' do
+    AppConfig.setup!(yaml: fixture('app_config_env.yml'), env: :production)
+    AppConfig.production.should be_true
+  end
+
+  it 'accepts a String as :env option' do
+    AppConfig.setup!(yaml: fixture('app_config_env.yml'), env: 'production')
+    AppConfig.production.should be_true
+  end
+
 end

data/spec/fixtures/app_config_env.yml

@@ -0,0 +1,15 @@
+---
+defaults: &defaults
+  admin_email: 'admin@example.com'
+  api_name:    'Supr Webz 2.0'
+  api_key:     'SUPERAWESOMESERVICE'
+  true_option:  true
+  false_option: false
+
+development:
+  <<: *defaults
+  production: false
+
+production:
+  <<: *defaults
+  production: true

data/spec/spec_helper.rb

@@ -62,6 +62,43 @@ RSpec.configure do |config|
     end
   end
 
+  def config_for_sqlite(wipe_database = true)
+    Dir.mkdir(File.expand_path('tmp')) unless Dir.exists?(File.expand_path('tmp'))
+
+    database = File.expand_path(File.join('tmp', 'app_config_spec.sqlite3'))
+
+    if wipe_database
+      File.delete(database) if File.exists?(database)
+
+      db = ::SQLite3::Database.new(database)
+      table = AppConfig::Storage::SQLite::DEFAULTS[:table]
+
+      config = ::YAML.load_file(fixture('app_config.yml'))
+      attrs = config.map do |k, v|
+        if v.class == String
+          "#{k} varchar(255)"
+        else
+          "#{k} INTEGER DEFAULT #{v ? 1 : 0}"
+        end
+      end.join(', ')
+
+      create_query = "CREATE TABLE #{table} (id INTEGER PRIMARY KEY, #{attrs})"
+      insert_query = "INSERT INTO #{table} (#{config.keys.join(', ')}) VALUES (#{config.values.map { |v|
+        if v.is_a?(TrueClass) || v.is_a?(FalseClass)
+          # Convert to SQLite boolean INT
+          v ? '1' : '0'
+        else
+          "'#{v}'"
+        end
+      }.join(', ')})"
+
+      db.execute(create_query)
+      db.execute(insert_query)
+    end
+
+    config_for(sqlite: { database: database })
+  end
+
   private
 
   def load_mongo_test_config(options)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: app_config
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.4.1
 platform: ruby
 authors:
 - Dale Campbell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-25 00:00:00.000000000 Z
+date: 2013-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson_ext
@@ -108,6 +108,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -146,15 +160,18 @@ files:
 - lib/app_config/storage/config_data.rb
 - lib/app_config/storage/mongo.rb
 - lib/app_config/storage/postgres.rb
+- lib/app_config/storage/sqlite.rb
 - lib/app_config/storage/yaml.rb
 - lib/app_config/version.rb
 - spec/app_config/storage/config_data_spec.rb
 - spec/app_config/storage/mongo_spec.rb
 - spec/app_config/storage/postgres_spec.rb
+- spec/app_config/storage/sqlite_spec.rb
 - spec/app_config/storage/yaml_spec.rb
 - spec/app_config/storage_spec.rb
 - spec/app_config_spec.rb
 - spec/fixtures/app_config.yml
+- spec/fixtures/app_config_env.yml
 - spec/spec_helper.rb
 homepage: http://oshuma.github.io/app_config
 licenses:
@@ -186,9 +203,11 @@ test_files:
 - spec/app_config/storage/config_data_spec.rb
 - spec/app_config/storage/mongo_spec.rb
 - spec/app_config/storage/postgres_spec.rb
+- spec/app_config/storage/sqlite_spec.rb
 - spec/app_config/storage/yaml_spec.rb
 - spec/app_config/storage_spec.rb
 - spec/app_config_spec.rb
 - spec/fixtures/app_config.yml
+- spec/fixtures/app_config_env.yml
 - spec/spec_helper.rb
 has_rdoc: true