app_config 1.1.1 → 2.0.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 57a758d17f3cf8b5932064d8daaba948f2b0e51a
+  data.tar.gz: a9851dc01c313b651654a52a1b8ad8e397f82380
+SHA512:
+  metadata.gz: d7e65918fd775a55c5611d24084fe36ccc212b609fe4a864379e357b4a2f5ead09061a6c992ea40d1f80ea240e5ba75fd7a65de915665215f6009dcb2265d4b8
+  data.tar.gz: 1f7d96ba6828400f2784cbc523b4078697d8cce396b2bd8abe221f130070d69f9a5ccad961402500aa2b6012337f3be4bfe9338323dd5e00f63c1708aace227f

data/.travis.yml

@@ -0,0 +1,16 @@
+language: ruby
+rvm:
+  - 1.9.2
+  - 1.9.3
+  - 2.0.0
+
+env:
+  # Ignore warnings when running specs.
+  - RUBYOPT="-W0"
+
+branches:
+  only:
+    - master
+
+services:
+  - mongodb

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    app_config (1.1.0)
+    app_config (2.0.1)
 
 GEM
   remote: https://rubygems.org/
@@ -9,12 +9,11 @@ GEM
     bson (1.3.1)
     bson_ext (1.3.1)
     diff-lcs (1.1.3)
-    maruku (0.6.0)
-      syntax (>= 1.0.0)
     mongo (1.3.1)
       bson (>= 1.3.1)
     multi_json (1.3.6)
     rake (0.9.2.2)
+    redcarpet (2.3.0)
     rspec (2.10.0)
       rspec-core (~> 2.10.0)
       rspec-expectations (~> 2.10.0)
@@ -27,7 +26,6 @@ GEM
       multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
-    syntax (1.0.0)
     yard (0.8.2)
 
 PLATFORMS
@@ -36,9 +34,9 @@ PLATFORMS
 DEPENDENCIES
   app_config!
   bson_ext
-  maruku
   mongo
   rake
+  redcarpet
   rspec (~> 2.10.0)
   simplecov
   yard

data/README.md

@@ -1,33 +1,35 @@
-# AppConfig
+# 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.
 
 AppConfig requires at least Ruby 1.9.
 
+
+## Deprecation Note
+
+Version `2.0` is **not** backwards compatible with the `1.x` branch.
+
+See the [wiki](https://github.com/Oshuma/app_config/wiki) for upgrade instructions.
+
+
 ## Usage
 
-Usage is simple.  Just pass either a hash of options, or a block, to {AppConfig.setup}.
+Usage is simple.  Just pass either a hash of options, or a block, to {AppConfig.setup!}.
 
 In it's simplest form, you can use it like so:
 
-    AppConfig.setup(:admin_email => 'admin@example.com')
+    AppConfig.setup!(:admin_email => 'admin@example.com')
     # ..or..
-    AppConfig.setup do |config|
-      config[:admin_email] = 'admin@example.com'
+    AppConfig.setup! do |config|
+      config.admin_email = 'admin@example.com'
     end
 
-    # Strings or symbols as keys.
-    AppConfig[:admin_email] # => 'admin@example.com'
+    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.
 
-## Deprecation Note
-
-Version `1.0` is \***not**\* backwards compatible with `0.7.1`!  See the [wiki](https://github.com/Oshuma/app_config/wiki)
-for upgrade instructions.
-
 
 ## AppConfig::Storage::YAML
 
@@ -40,18 +42,17 @@ Given this YAML file:
 
 Use it like so:
 
-    AppConfig.setup(:yaml => '/path/to/app_config.yml')
+    AppConfig.setup!(:yaml => '/path/to/app_config.yml')
 
     # Later on...
-    # Strings or symbols as keys.
-    AppConfig['admin_email'] # => 'admin@example.com'
-    AppConfig[:api_name]     # => 'Supr Webz 2.0'
-    AppConfig[:api_key]      # => 'SUPERAWESOMESERVICE'
+    AppConfig.admin_email  # => 'admin@example.com'
+    AppConfig.api_name     # => 'Supr Webz 2.0'
+    AppConfig.api_key      # => 'SUPERAWESOMESERVICE'
 
 
 ## AppConfig::Storage::Mongo
 
-You can pass a `:mongo` options hash to {AppConfig.setup} which should contain
+You can pass a `:mongo` options hash to {AppConfig.setup!} which should contain
 configuration values for a Mongo database.  Check the {AppConfig::Storage::Mongo::DEFAULTS}
 constant for the default Mongo connection options.
 
@@ -61,43 +62,18 @@ constant for the default Mongo connection options.
       :collection => 'app_config'   # default
     }
 
-    AppConfig.setup(:mongo => mongo_opts)
+    AppConfig.setup!(:mongo => mongo_opts)
 
-    AppConfig[:admin_email]
-    # => 'admin@example.com'
+    AppConfig.admin_email  # => 'admin@example.com'
 
-    # Override an existing value (saves to the database):
-    AppConfig[:admin_email] = 'other_admin@example.com'
+    # Override an existing value and save to the database:
+    AppConfig.admin_email = 'other_admin@example.com'
+    AppConfig.save!
 
 The values are read/saved (by default) to the `app_config` database and
 `app_config` collection.  These defaults can be overridden, however, which
 might lend well to versioned configurations; collection names such as
 `app_config_v1`, `app_config_v2`, etc.
 
-    AppConfig.setup(:mongo => { :collection => 'app_config_v2' })
-
-
-## Environment Mode
-
-There's also an 'environment mode' where you can organize the config
-sort of like the Rails database config. Given this YAML file:
-
-    # Rails.root/config/app_config.yml
-    development:
-      title: 'Development Mode'
-
-    production:
-      title: 'Production Mode'
-
-Set the `:env` option to your desired environment.
-
-    # Rails.root/config/initializers/app_config.rb
-    AppConfig.setup({
-      :yaml => "#{Rails.root}/config/app_config.yml",
-      :env  => Rails.env  # or any string
-    })
-
-    # Uses the given environment section of the config.
-    AppConfig[:title]
-    # => 'Production Mode'
+    AppConfig.setup!(:mongo => { :collection => 'app_config_v2' })
 

data/app_config.gemspec

@@ -7,15 +7,15 @@ Gem::Specification.new do |s|
 
   s.authors = ['Dale Campbell']
   s.email = ['oshuma@gmail.com']
-  s.homepage = 'http://oshuma.github.com/app_config'
+  s.homepage = 'http://oshuma.github.io/app_config'
 
   s.summary = %q{Quick and easy application configuration.}
   s.description = %q{An easy to use, customizable library to easily store and retrieve application configuration.}
 
   s.add_development_dependency 'bson_ext'
-  s.add_development_dependency 'maruku'
   s.add_development_dependency 'mongo'
   s.add_development_dependency 'rake'
+  s.add_development_dependency 'redcarpet'
   s.add_development_dependency 'rspec', '~> 2.10.0'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'yard'

data/lib/app_config/error.rb

@@ -8,7 +8,7 @@ module AppConfig
     end
 
     class NotSetup < Exception
-      def to_s; "Must call 'AppConfig.setup' to setup storage!"; end
+      def to_s; "Must call 'AppConfig.setup!' to setup storage!"; end
     end
 
     class UnknownStorageMethod < Exception; end

data/lib/app_config/storage/base.rb

@@ -2,12 +2,22 @@ module AppConfig
   module Storage
     class Base
 
-      def initialize(options)
-        @options = options
+      def initialize
       end
 
       def to_hash
-        defined?(@data) ? @data.to_hash : Hash.new(&Storage::DEEP_HASH)
+        defined?(@data) ? @data.marshal_dump : Hash.new
+      end
+
+      # Wrap `method_missing` to proxy to `@data`.
+      def method_missing(name, *args)
+        unless @data.nil?
+          if name =~ /.+=$/  # Caller is a setter.
+            @data.send(name.to_sym, *args[0])
+          else
+            @data.send(name.to_sym)
+          end
+        end
       end
 
     end # Base

data/lib/app_config/storage/mongo.rb

@@ -22,29 +22,19 @@ module AppConfig
         fetch_data!
       end
 
-      def [](key)
-        @data[key]
-      end
-
-      def []=(key, value)
-        @data[key] = value
-        save!
-      end
-
-      def empty?
-        @data.empty?
-      end
-
-      private
-
+      # Saves the data back to Mongo.  Returns `true`/`false`.
       def save!
         if @_id
-          collection.update({ '_id' => @_id}, @data)
+          retval = collection.update({ '_id' => @_id}, @data.to_h)
         else
-          collection.save(@data)
+          retval = collection.save(@data.to_h)
         end
+
+        !!retval
       end
 
+      private
+
       def setup_connection
         @connection = ::Mongo::Connection.new(@options[:host], @options[:port].to_i)
         authenticate_connection if @options[:user] && @options[:password]
@@ -61,10 +51,8 @@ module AppConfig
       def fetch_data!
         raise 'Not connected to MongoDB' unless connected?
 
-        @data = Hashish.new(collection.find_one)
-        @data.default_proc = Storage::DEEP_HASH
-
-        @_id = @data.delete('_id')
+        @data = OpenStruct.new(collection.find_one)
+        @_id = @data._id
       end
 
       def database

data/lib/app_config/storage/yaml.rb

@@ -9,24 +9,12 @@ module AppConfig
       DEFAULT_PATH = File.join(Dir.home, '.app_config.yml')
 
       # Loads `@data` with the YAML file located at `path`.
-      # `@data` will be the Hashish that is accessed with `AppConfig[:key]`.
+      # `@data` will be the OpenStruct that is accessed with `AppConfig.some_var`.
       #
       # Defaults to `Dir.home/.app_config.yml`
       def initialize(path = DEFAULT_PATH)
         # Make sure to use the top-level YAML module here.
-        @data = Hashish.new(::YAML.load_file(path))
-      end
-
-      def [](key)
-        @data[key]
-      end
-
-      def []=(key, value)
-        @data[key] = value
-      end
-
-      def empty?
-        @data.empty?
+        @data = OpenStruct.new(::YAML.load_file(path))
       end
 
     end # YAML

data/lib/app_config/version.rb

@@ -0,0 +1,3 @@
+module AppConfig
+  VERSION = '2.0.1'
+end

data/lib/app_config.rb

@@ -1,7 +1,7 @@
-require 'core_ext/hashish'
+require 'ostruct'
 
 module AppConfig
-  VERSION = '1.1.1'
+  autoload :VERSION, 'app_config/version'
 
   autoload :Error,   'app_config/error'
   autoload :Storage, 'app_config/storage'
@@ -14,8 +14,7 @@ module AppConfig
     # Valid storage methods:
     # * `:mongo` - {AppConfig::Storage::Mongo AppConfig::Storage::Mongo}
     # * `:yaml` - {AppConfig::Storage::YAML AppConfig::Storage::YAML}
-    def setup(options = {}, &block)
-      warn "DEPRECATED: AppConfig.setup will be renamed to AppConfig.setup! in 2.0."
+    def setup!(options = {}, &block)
       @@options = options
 
       if @@options[:yaml]
@@ -23,7 +22,7 @@ module AppConfig
       elsif @@options[:mongo]
         @@storage = AppConfig::Storage::Mongo.new(@@options.delete(:mongo))
       else
-        @@storage = Hash.new(&Storage::DEEP_HASH)
+        @@storage = AppConfig::Storage::Base.new
       end
 
       yield @@storage if block_given?
@@ -31,64 +30,30 @@ module AppConfig
       to_hash
     end
 
-    # Returns `true` if {AppConfig.setup AppConfig.setup} has been called.
+    # Returns `true` if {AppConfig.setup! AppConfig.setup!} has been called.
     def setup?
-      !!(defined?(@@storage) && !@@storage.empty?)
+      defined?(@@storage) && !@@storage.nil?
     end
 
     # Clears the `@@storage`.
     def reset!
-      if defined?(@@storage)
-        remove_class_variable(:@@storage)
-        true
-      else
-        false
-      end
-    end
-
-    # Access the configured `key`'s value.
-    def [](key)
-      warn "DEPRECATED: AppConfig.[] is deprecated and will be removed in 2.0."
-      setup unless setup?
-      storage[key]
-    end
-
-    # Set a new `value` for `key` (persistence depends on the type of Storage).
-    def []=(key, value)
-      warn "DEPRECATED: AppConfig.[]= is deprecated and will be removed in 2.0."
-      setup unless setup?
-      storage[key] = value
-    end
-
-    def empty?
-      warn "DEPRECATED: AppConfig.empty? is deprecated and will be removed in 2.0."
-      storage.empty?
+      @@storage = nil
     end
 
     def to_hash
-      unless setup?
-        @@storage = default_storage
-      end
-
-      storage.to_hash
+      storage ? storage.to_hash : {}
     end
 
-    private
-
-    # Returns a nested Hash as a sane default.
-    def default_storage
-      Hash.new(&Storage::DEEP_HASH)
+    # Wrap `method_missing` to proxy to `storage`.
+    def method_missing(name, *args)
+      storage.send(name.to_sym, *args)
     end
 
-    def environment
-      warn "DEPRECATED: Environment mode will be removed in 2.0."
-      (@@options[:environment] || @@options[:env]) || nil
-    end
-    alias_method :env, :environment
+    private
 
     # Returns the `@@storage` contents, which is what is exposed as the configuration.
     def storage
-      environment ? @@storage[environment] : @@storage
+      @@storage
     end
 
   end # self

data/spec/app_config/storage/mongo_spec.rb

@@ -9,17 +9,15 @@ describe AppConfig::Storage::Mongo do
   end
 
   it 'should have some values' do
-    AppConfig[:api_key].should_not be_nil
+    AppConfig.api_key.should_not be_nil
   end
 
   it 'should update the values' do
-    AppConfig.class_variable_get(:@@storage).should_receive(:save!)
-    AppConfig[:api_key] = 'SOME_NEW_API_KEY'
-    AppConfig[:api_key].should == 'SOME_NEW_API_KEY'
-  end
+    AppConfig.api_key = 'SOME_NEW_API_KEY'
+    AppConfig.api_key.should == 'SOME_NEW_API_KEY'
 
-  it 'should not have the Mongo _id in storage' do
-    AppConfig['_id'].should be_empty
+    AppConfig.class_variable_get(:@@storage).should_receive(:save!)
+    AppConfig.save!
   end
 
   it 'should have a @_id variable for the Mongo ID' do

data/spec/app_config/storage/yaml_spec.rb

@@ -4,7 +4,7 @@ describe AppConfig::Storage::YAML do
 
   it 'should have some values' do
     config_for_yaml
-    AppConfig[:api_key].should_not be_nil
+    AppConfig.api_key.should_not be_nil
   end
 
   it 'should raise file not found' do
@@ -15,8 +15,8 @@ describe AppConfig::Storage::YAML do
 
   it 'saves the new value in memory' do
     config_for_yaml
-    AppConfig[:new_key] = 'new value'
-    AppConfig[:new_key].should == 'new value'
+    AppConfig.new_key = 'new value'
+    AppConfig.new_key.should == 'new value'
   end
 
   it "requires the use of 'Dir.home'" do

data/spec/app_config_spec.rb

@@ -6,8 +6,8 @@ describe AppConfig do
     AppConfig::VERSION.should_not be_nil
   end
 
-  it 'responds to .setup()' do
-    AppConfig.should respond_to(:setup)
+  it 'responds to .setup!()' do
+    AppConfig.should respond_to(:setup!)
   end
 
   it 'responds to .setup?()' do
@@ -28,7 +28,7 @@ describe AppConfig do
     config_for_yaml(:api_key => 'API_KEY')
     # then reset
     AppConfig.reset!
-    AppConfig[:api_key].should be_empty
+    AppConfig.send(:storage).should be_nil
   end
 
   it 'to_hash() returns an empty hash if storage not set' do
@@ -36,14 +36,6 @@ describe AppConfig do
     AppConfig.to_hash.should == {}
   end
 
-  describe 'environment mode' do
-    it 'should load the proper environment' do
-      config_for_yaml(:yaml => fixture('env_app_config.yml'),
-                      :env  => 'development')
-      AppConfig[:api_key].should_not be_nil
-    end
-  end
-
   it 'should not be setup' do
     AppConfig.reset!
     AppConfig.should_not be_setup
@@ -55,26 +47,21 @@ describe AppConfig do
   end
 
   it 'should create nested keys' do
+    pending 'Re-implement this later.'
     AppConfig.reset!
-    AppConfig.setup
+    AppConfig.setup!
 
-    AppConfig[:person][:name][:first] = 'Dale'
-    AppConfig[:person][:name][:first].should == 'Dale'
+    AppConfig.person.name.first = 'Dale'
+    AppConfig.person.name.first.should == 'Dale'
   end
 
   it 'returns a Hash on setup' do
     AppConfig.reset!
-    config = AppConfig.setup do |c|
-      c[:name] = 'Dale'
-      c[:nick] = 'Oshuma'
+    config = AppConfig.setup! do |c|
+      c.name = 'Dale'
+      c.nick = 'Oshuma'
     end
     config.should be_instance_of(Hash)
   end
 
-  it '.default_storage() returns a nested Hash' do
-    hash = AppConfig.send(:default_storage)
-    hash[:name][:first] = 'Dale'
-    hash[:name][:first].should == 'Dale'
-  end
-
 end

data/spec/spec_helper.rb

@@ -14,10 +14,10 @@ RSpec.configure do |config|
     File.expand_path(File.join(File.dirname(__FILE__), 'fixtures', name))
   end
 
-  # AppConfig.setup wrapper.  Accepts a hash of +options+.
+  # AppConfig.setup! wrapper.  Accepts a hash of +options+.
   def config_for(options)
     AppConfig.reset!
-    AppConfig.setup(options)
+    AppConfig.setup!(options)
   end
 
   # Setup YAML options and pass to config_for().

metadata

@@ -1,84 +1,74 @@
 --- !ruby/object:Gem::Specification
 name: app_config
 version: !ruby/object:Gem::Version
-  version: 1.1.1
-  prerelease: 
+  version: 2.0.1
 platform: ruby
 authors:
 - Dale Campbell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-20 00:00:00.000000000 Z
+date: 2013-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson_ext
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: maruku
+  name: mongo
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mongo
+  name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: redcarpet
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -94,33 +83,29 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: An easy to use, customizable library to easily store and retrieve application
@@ -133,6 +118,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -145,18 +131,18 @@ files:
 - lib/app_config/storage/base.rb
 - lib/app_config/storage/mongo.rb
 - lib/app_config/storage/yaml.rb
-- lib/core_ext/hashish.rb
+- lib/app_config/version.rb
 - spec/app_config/storage/mongo_spec.rb
 - spec/app_config/storage/yaml_spec.rb
 - spec/app_config/storage_spec.rb
 - spec/app_config_spec.rb
-- spec/core_ext/hashish_spec.rb
 - spec/fixtures/app_config.yml
 - spec/fixtures/app_config_mongo.yml
 - spec/fixtures/env_app_config.yml
 - spec/spec_helper.rb
-homepage: http://oshuma.github.com/app_config
+homepage: http://oshuma.github.io/app_config
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --inline-source
@@ -164,22 +150,28 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Quick and easy application configuration.
-test_files: []
+test_files:
+- spec/app_config/storage/mongo_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_mongo.yml
+- spec/fixtures/env_app_config.yml
+- spec/spec_helper.rb
 has_rdoc: true

data/lib/core_ext/hashish.rb

@@ -1,140 +0,0 @@
-# Stolen from Rails `ActiveSupport::HashWithIndifferentAccess` and renamed to Hashish.
-#
-# This class has dubious semantics and we only have it so that
-# people can write `params[:key]` instead of `params['key']`
-# and they get the same value for both keys.
-class Hashish < Hash
-  def initialize(constructor = {})
-    if constructor.is_a?(Hash)
-      super()
-      update(constructor)
-    else
-      super(constructor)
-    end
-  end
-
-  def default(key = nil)
-    if key.is_a?(Symbol) && include?(key = key.to_s)
-      self[key]
-    else
-      super
-    end
-  end
-
-  alias_method :regular_writer, :[]= unless method_defined?(:regular_writer)
-  alias_method :regular_update, :update unless method_defined?(:regular_update)
-
-  # Assigns a new value to the hash:
-  #
-  #     hash = HashWithIndifferentAccess.new
-  #     hash[:key] = "value"
-  def []=(key, value)
-    regular_writer(convert_key(key), convert_value(value))
-  end
-
-  # Updates the instantized hash with values from the second:
-  #
-  #     hash_1 = HashWithIndifferentAccess.new
-  #     hash_1[:key] = "value"
-  #
-  #     hash_2 = HashWithIndifferentAccess.new
-  #     hash_2[:key] = "New Value!"
-  #
-  #     hash_1.update(hash_2) # => {"key"=>"New Value!"}
-  def update(other_hash)
-    other_hash.each_pair { |key, value| regular_writer(convert_key(key), convert_value(value)) }
-    self
-  end
-
-  alias_method :merge!, :update
-
-  # Checks the hash for a key matching the argument passed in:
-  #
-  #     hash = HashWithIndifferentAccess.new
-  #     hash["key"] = "value"
-  #     hash.key? :key  # => true
-  #     hash.key? "key" # => true
-  def key?(key)
-    super(convert_key(key))
-  end
-
-  alias_method :include?, :key?
-  alias_method :has_key?, :key?
-  alias_method :member?, :key?
-
-  # Fetches the value for the specified key, same as doing `hash[key]`.
-  def fetch(key, *extras)
-    super(convert_key(key), *extras)
-  end
-
-  # Returns an array of the values at the specified indices:
-  #
-  #     hash = HashWithIndifferentAccess.new
-  #     hash[:a] = "x"
-  #     hash[:b] = "y"
-  #     hash.values_at("a", "b") # => ["x", "y"]
-  def values_at(*indices)
-    indices.collect {|key| self[convert_key(key)]}
-  end
-
-  # Returns an exact copy of the hash.
-  def dup
-    HashWithIndifferentAccess.new(self)
-  end
-
-  # Merges the instantized and the specified hashes together, giving precedence to the values from the second hash
-  # Does not overwrite the existing hash.
-  def merge(hash)
-    self.dup.update(hash)
-  end
-
-  # Performs the opposite of merge, with the keys and values from the first hash taking precedence over the second.
-  # This overloaded definition prevents returning a regular hash, if reverse_merge is called on a HashWithDifferentAccess.
-  def reverse_merge(other_hash)
-    super other_hash.with_indifferent_access
-  end
-
-  def reverse_merge!(other_hash)
-    replace(reverse_merge( other_hash ))
-  end
-
-  # Removes a specified key from the hash.
-  def delete(key)
-    super(convert_key(key))
-  end
-
-  def stringify_keys!; self end
-  def symbolize_keys!; self end
-  def to_options!; self end
-
-  # Convert to a Hash with String keys.
-  def to_hash
-    Hash.new(default).merge!(self)
-  end
-
-  protected
-
-  def convert_key(key)
-    key.kind_of?(Symbol) ? key.to_s : key
-  end
-
-  def convert_value(value)
-    case value
-    when Hash
-      value.with_indifferent_access
-    when Array
-      value.collect { |e| e.is_a?(Hash) ? e.with_indifferent_access : e }
-    else
-      value
-    end
-  end
-
-end # Hashish
-
-class Hash
-  def with_indifferent_access
-    hash = Hashish.new(self)
-    hash.default = self.default
-    hash
-  end
-end

data/spec/core_ext/hashish_spec.rb

@@ -1,18 +0,0 @@
-require 'spec_helper'
-
-describe Hashish do
-  before(:each) do
-    @strings = { 'key' => 'value', 'four' => 20 }
-    @symbols = { :key  => 'value', :four  => 20 }
-  end
-
-  it 'should not give a fuck about symbols' do
-    hashish = Hashish.new(@strings)
-    hashish[:key].should == 'value'
-  end
-
-  it 'should not give a fuck about strings' do
-    hashish = Hashish.new(@symbols)
-    hashish['key'].should == 'value'
-  end
-end