app_config 2.1.1 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 318df4378067f6ec5f0e70c42ab7af32ee235acf
-  data.tar.gz: 931193b4ba2fa09e79c0fd0772598cbde0deba45
+  metadata.gz: 35fd2897702d6f84752be6616c399de404e77e2d
+  data.tar.gz: 65d8a105d4b606ea1edc931b839360ea04fd6216
 SHA512:
-  metadata.gz: ef84fdbb0dfa7c9deab6351d0a54eaa7f60c2c0758d49fd17c78ab5d6070762a17e6e93204a4c46ff1b79f1813623df549f5d594dd46d3c36aca1086a1794461
-  data.tar.gz: 7376e88e227b05ea545515109edff9426ab5d6f92702d1f799e04211bc66b5607f9be917c11587c8595653d29195799082fe7a0b63c86e135441e0bc8d64a58f
+  metadata.gz: fb77e2f64fd7379620af5cc23fa8d72a7c9d7cf401a86f40514d124243879aeee9446224673cd4bc6b270e3af2b9d368ae9b628ed5f398cc4d71d0fd722acc2e
+  data.tar.gz: e24fa2a2197fbfbb8c413a1ec3e46139d812797368876a8d4ab42aee5cc0c69b8f6eaf37b13b65aa5ca59888b428f1d4f658684572569520adc765271e1a7c34

data/.travis.yml

@@ -4,6 +4,12 @@ rvm:
   - 1.9.3
   - 2.0.0
 
+before_script:
+  # Setup test Postgres database.
+  - psql -c 'create database app_config_test;' -U postgres
+  - psql -d app_config_test -U postgres -c 'CREATE TABLE app_config (id bigserial primary key, admin_email character varying(255), api_name character varying(255), api_key character varying(255));'
+  - psql -d app_config_test -U postgres -c "INSERT INTO app_config (admin_email, api_name, api_key) VALUES ('admin@example.com', 'Supr Webz 2.0', 'SUPERAWESOMESERVICE')"
+
 env:
   # Ignore warnings when running specs.
   - RUBYOPT="-W0"
@@ -14,3 +20,4 @@ branches:
 
 services:
   - mongodb
+  - postgres

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    app_config (2.1.0)
+    app_config (2.1.3)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -1,7 +1,7 @@
 # AppConfig [![Build Status](https://travis-ci.org/Oshuma/app_config.png?branch=master)](https://travis-ci.org/Oshuma/app_config) [![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donate_SM.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=3N885MZB7QCY6&lc=US&item_name=Dale%20Campbell&item_number=app_config&currency_code=USD&bn=PP%2dDonationsBF%3abtn_donate_SM%2egif%3aNonHosted)
 
 An easy to use, customizable library to easily store and retrieve application
-(or library) configuration, API keys or basically anything in 'key/value' pairs.
+configuration; basically anything in 'key/value' pairs.
 
 AppConfig requires at least Ruby 1.9.
 
@@ -22,8 +22,9 @@ end
 AppConfig.admin_email  # => 'admin@example.com'
 ```
 
-You may also specify the storage method along with options specific to that storage method.
-Check the [wiki](https://github.com/Oshuma/app_config/wiki) for more usage examples.
+AppConfig also supports many different 'storage types', such as YAML and MongoDB,
+allowing you to tailor AppConfig to many different use cases.  For example,
+storing your configuration in the same database as your development/production environment.
 
 
 ## YAML

data/lib/app_config/storage/config_data.rb

@@ -11,6 +11,7 @@ module AppConfig
       def to_hash
         marshal_dump
       end
+      alias_method :to_h, :to_hash
 
     end
   end

data/lib/app_config/storage/mongo.rb

@@ -30,9 +30,9 @@ module AppConfig
       # Saves the data back to Mongo.  Returns `true`/`false`.
       def save!
         if @_id
-          retval = collection.update({ '_id' => @_id}, @data.to_h)
+          retval = collection.update({ '_id' => @_id}, @data.to_hash)
         else
-          retval = collection.save(@data.to_h)
+          retval = collection.save(@data.to_hash)
         end
 
         !!retval
@@ -40,11 +40,6 @@ module AppConfig
 
       private
 
-      def setup_connection!
-        @connection = ::Mongo::Connection.new(@options[:host], @options[:port].to_i)
-        authenticate_connection! if @options[:username] && @options[:password]
-      end
-
       def authenticate_connection!
         database.authenticate(@options[:username], @options[:password])
       end
@@ -53,6 +48,14 @@ module AppConfig
         @connection && @connection.connected?
       end
 
+      def collection
+        @collection ||= database.collection(@options[:collection])
+      end
+
+      def database
+        @database ||= @connection.db(@options[:database])
+      end
+
       def fetch_data!
         raise 'Not connected to MongoDB' unless connected?
 
@@ -60,12 +63,9 @@ module AppConfig
         @_id = @data._id
       end
 
-      def database
-        @database ||= @connection.db(@options[:database])
-      end
-
-      def collection
-        @collection ||= database.collection(@options[:collection])
+      def setup_connection!
+        @connection = ::Mongo::Connection.new(@options[:host], @options[:port].to_i)
+        authenticate_connection! if @options[:username] && @options[:password]
       end
 
     end # Mongo

data/lib/app_config/version.rb

@@ -1,3 +1,3 @@
 module AppConfig
-  VERSION = '2.1.1'
+  VERSION = '2.1.3'
 end

data/spec/app_config/storage/mongo_spec.rb

@@ -1,6 +1,5 @@
 require 'spec_helper'
 
-# TODO: Drop the Mongo test db before running specs.
 describe AppConfig::Storage::Mongo do
 
   before(:all) do

data/spec/spec_helper.rb

@@ -33,6 +33,10 @@ RSpec.configure do |config|
     begin
       load_mongo_test_config(mongo) if load_test_data
       config_for({mongo: mongo}.merge(opts))
+
+      collection = AppConfig.class_variable_get(:@@storage)
+        .send(:collection)
+        .drop
     rescue Mongo::ConnectionFailure
       pending "***** Mongo specs require a running MongoDB server *****"
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: app_config
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.3
 platform: ruby
 authors:
 - Dale Campbell