cushion_defaults 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a1104ccff1b2c54e13c350d175df3c351c85571
-  data.tar.gz: 20fbda4deff85972a3d067e77609af2e649a4211
+  metadata.gz: 6be31769619d31078b95f3ce90c4dbe1e23948d0
+  data.tar.gz: 0f883a5d3b1721e29abc6588ee4fc5be86d9a7a2
 SHA512:
-  metadata.gz: 1a76e6db1d44d2713889d3f7bfe17b5a9e49ec2964493d6dca4b9a5d76efbcb33005b29b95fc5344c19d683efe5d2b2b1a916e7d2f15115b208d282196f1b5fd
-  data.tar.gz: e505feac28cf55c9b4716f35fa960c75a162fc804ca4057d1ec5959a0a4816f36e455e70f4dfdc80830a44557701c4a08456a6f80546383b7afbd012595b9c41
+  metadata.gz: f71ace7a7cd19e962f49333ad57192acf18fa82752e93bab345ce5f89321091e4df00cb8c7778d4da650b19632e238d57a2bd38364fe5acf299fbbee043ca92d
+  data.tar.gz: f65b07dfb5c5d58e8220c16c0d47fa1968b19269d9fdcf923d94ccc7f0d988afae8fe426452c2dd6132d4e7d8e3fe4516c8179f215a1b2bb2545682f8443b4f1

data/lib/cushion_defaults/configuration.rb

@@ -19,7 +19,7 @@ class Configuration # :nodoc:
   # +loaded_config+ :: hash from which options will be derived
   def from_hash(loaded_config)
     loaded_config.each do |key, val|
-      instance_variable_set(key.to_sym, val) if instance_variable_defined? key.to_sym
+      instance_variable_set("@#{key.to_sym}", val) if instance_variable_defined? "@#{key.to_sym}"
     end
   end
 

data/lib/cushion_defaults.rb

@@ -10,15 +10,15 @@ require 'cushion_defaults/defaults_hash'
 # +Klass+.
 module CushionDefaults
 
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 
   # CONFIG
 
   # Location CushionDefaults looks for (optional) config file
-  CONFIG_LOCATION = 'config/cushion_defaults.yaml'
-
   CALLING_PATH = File.expand_path(File.dirname($0)) + '/'
 
+  CONFIG_LOCATION = CALLING_PATH + 'config/cushion_defaults.yaml'
+
   # If set to true, will automatically look at +YAML_PATH+ for each class that includes +CushionDefaults+ to try to
   # load defaults from yaml file located at the result of +YAML_PROC+.  By default, this would be 'config/klass.yaml'.
 
@@ -64,13 +64,13 @@ module CushionDefaults
 
   if File.exists?(CONFIG_LOCATION)
     t = File.open(CONFIG_LOCATION)
-  elsif File.exists?(configuration.yaml_source_folder + 'cushion_defaults.yaml')
-    t = File.open(configuration.yaml_source_folder + 'cushion_defaults.yaml')
+  elsif File.exists?(CALLING_PATH + configuration.yaml_source_folder + 'cushion_defaults.yaml')
+    t = File.open(CALLING_PATH + configuration.yaml_source_folder + 'cushion_defaults.yaml')
   else
     t = nil
   end
 
-  config.from_hash(YAML::load(t)) if t
+  conf.from_hash(YAML::load(t)) if t
 
   # Add class methods and set up +DefaultsHash+ when the module is included in a class.
   #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cushion_defaults
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Ryan Mitchell