utilio 0.0.1 → 0.0.2

data/.bundle/environment.rb

@@ -174,11 +174,12 @@ end
 module Bundler
   ENV_LOADED   = true
   LOCKED_BY    = '0.9.26'
-  FINGERPRINT  = "79020667ba715c035ff652102ae489830ed4e6f9"
+  FINGERPRINT  = "8c71b54c5126769ad4e8cbab25d4e9306f972fd9"
   HOME         = '/Users/bj/.rvm/gems/ruby-1.9.2-rc2/bundler'
-  AUTOREQUIRES = {:development=>[["rspec", false]], :test=>[["rspec", false]]}
+  AUTOREQUIRES = {:default=>[["guid", false]], :development=>[["rspec", false]], :test=>[["rspec", false]]}
   SPECS        = [
         {:name=>"diff-lcs", :load_paths=>["/Users/bj/.rvm/gems/ruby-1.9.2-rc2/gems/diff-lcs-1.1.2/lib"], :loaded_from=>"/Users/bj/.rvm/gems/ruby-1.9.2-rc2/specifications/diff-lcs-1.1.2.gemspec"},
+        {:name=>"guid", :load_paths=>["/Users/bj/.rvm/gems/ruby-1.9.2-rc2/gems/guid-0.1.1/lib"], :loaded_from=>"/Users/bj/.rvm/gems/ruby-1.9.2-rc2/specifications/guid-0.1.1.gemspec"},
         {:name=>"rspec-core", :load_paths=>["/Users/bj/.rvm/gems/ruby-1.9.2-rc2/gems/rspec-core-2.0.0.beta.19/lib"], :loaded_from=>"/Users/bj/.rvm/gems/ruby-1.9.2-rc2/specifications/rspec-core-2.0.0.beta.19.gemspec"},
         {:name=>"rspec-expectations", :load_paths=>["/Users/bj/.rvm/gems/ruby-1.9.2-rc2/gems/rspec-expectations-2.0.0.beta.19/lib"], :loaded_from=>"/Users/bj/.rvm/gems/ruby-1.9.2-rc2/specifications/rspec-expectations-2.0.0.beta.19.gemspec"},
         {:name=>"rspec-mocks", :load_paths=>["/Users/bj/.rvm/gems/ruby-1.9.2-rc2/gems/rspec-mocks-2.0.0.beta.19/lib"], :loaded_from=>"/Users/bj/.rvm/gems/ruby-1.9.2-rc2/specifications/rspec-mocks-2.0.0.beta.19.gemspec"},

data/.gitignore

@@ -19,3 +19,4 @@ rdoc
 pkg
 
 ## PROJECT::SPECIFIC
+nbproject

data/Gemfile

@@ -1,5 +1,7 @@
 source :rubygems
 
+gem 'guid'
+
 group :development, :test do
   gem 'rspec', '>= 2.0.0.beta.18'
 end

data/Gemfile.lock

@@ -1,11 +1,13 @@
 --- 
-hash: 79020667ba715c035ff652102ae489830ed4e6f9
+hash: 8c71b54c5126769ad4e8cbab25d4e9306f972fd9
 sources: 
 - Rubygems: 
     uri: http://gemcutter.org
 specs: 
 - diff-lcs: 
     version: 1.1.2
+- guid: 
+    version: 0.1.1
 - rspec-core: 
     version: 2.0.0.beta.19
 - rspec-expectations: 
@@ -15,6 +17,10 @@ specs:
 - rspec: 
     version: 2.0.0.beta.19
 dependencies: 
+  guid: 
+    version: ">= 0"
+    group: 
+    - :default
   rspec: 
     version: ">= 2.0.0.beta.18"
     group: 

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/autotest/discover.rb

@@ -0,0 +1 @@
+Autotest.add_discovery { "rspec2" }

data/lib/utilio/database.rb

@@ -3,11 +3,21 @@ require 'utilio/path'
 module Utilio
   class Database
     class << self
+      
+      DEFAULT_OPTS = {
+        environment: nil,
+        file: 'config/database.yml'
+      }
     
       # Load the configuration file from your application root
-      def config options={environment: nil, file: 'config/database.yml'}
+      def config options={}
+        options = DEFAULT_OPTS.merge(options)
         config = Path.yaml_file(options[:file])
-        options[:environment].nil? ? config : config[options[:environment]]
+        unless options[:environment].nil? || options[:environment].empty?
+          config[options[:environment]]
+        else
+          config
+        end
       end
     
     end

data/lib/utilio/path.rb

@@ -13,7 +13,7 @@ module Utilio
       # Get the root path of the application, optionally passing in additional folders to be joined and expanded
       # e.g. PathUtils.root 'db', 'migrate' # => /path/to/loudmouth/db/migrate
       def root *folders
-        File.expand_path(File.join(*([app_root, folders].flatten)))
+        File.expand_path(File.join(*([app_root, folders].flatten.uniq.tap{|path| path.delete(nil) })))
       end
     
       def app *folders

data/lib/utilio/security.rb

@@ -0,0 +1,23 @@
+require 'guid'
+
+module Utilio
+  class Security
+    
+  
+    class << self
+      
+      def self.hash_string(value)
+        Utils.secure_digest( value )
+      end
+
+      def self.secure_digest(*args)
+        Digest::SHA2.hexdigest(args.flatten.join('--'))
+      end
+
+      def self.generate_guid!
+        Guid.new.to_s
+      end
+    
+    end
+  end
+end

data/lib/utilio.rb

@@ -1,9 +1,13 @@
-%w(
-  path
-  database
-).each do |file|
-  require File.expand_path(File.join(File.dirname(__FILE__), 'utilio', File.basename(file, '.rb')))
-end
-
+# %w(
+#   path
+#   database
+#   security
+# ).each do |file|
+#   require File.expand_path(File.join(File.dirname(__FILE__), 'utilio', File.basename(file, '.rb')))
+# end
+# 
 module Utilio
+  autoload :Path, 'utilio/path'
+  autoload :Database, 'utilio/database'
+  autoload :Security, 'utilio/security'
 end

data/spec/utilio/config/database.yml

@@ -0,0 +1,6 @@
+development: 
+  database: development
+test: 
+  database: test
+production: 
+  database: production

data/spec/utilio/database_spec.rb

@@ -0,0 +1,31 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
+
+describe Utilio::Database do
+  
+  let(:config_file) { 'config/database.yml' }
+  
+  before :all do
+    Utilio::Path.root = File.dirname(__FILE__)
+  end
+  
+  it "should allow you to load a db configuration" do
+    lambda {
+      Utilio::Database.config(file: config_file).should_not be_nil
+    }.should_not raise_error
+  end
+  
+  it "should default to loading {ROOT}/config/database.yml without an env or file specified" do
+    Utilio::Database.config.should include('development','test','production')
+  end
+  
+  it "should load the correct env data" do
+    %w( development test production ).each do |env|
+      Utilio::Database.config(environment: env)['database'].should == env
+    end
+    
+    %w( bogus not_there ).each do |env|
+      Utilio::Database.config(environment: env).should be_nil
+    end
+  end
+  
+end

data/spec/{utilio_path_spec.rb → utilio/path_spec.rb}

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 
 describe Utilio::Path do
   
@@ -28,6 +28,10 @@ describe Utilio::Path do
     Utilio::Path.root.should == abs_path
   end
   
+  it "should not concatentate nil values to the root path" do
+    Utilio::Path.root(nil, 'one', nil, nil, 'two').should == File.join(fake_root, 'one', 'two')
+  end
+  
   it "should shortcut paths to an application's app folder" do
     Utilio::Path.app.should == fake_app
   end

data/spec/utilio/security_spec.rb

@@ -0,0 +1,4 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
+
+describe Utilio::Security do
+end

data/utilio.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{utilio}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["BJ Neilsen"]
-  s.date = %q{2010-08-06}
+  s.date = %q{2010-08-10}
   s.description = %q{}
   s.email = %q{bj.neilsen@gmail.com}
   s.extra_rdoc_files = [
@@ -27,14 +27,17 @@ Gem::Specification.new do |s|
      "README.md",
      "Rakefile",
      "VERSION",
+     "autotest/discover.rb",
      "lib/utilio.rb",
      "lib/utilio/database.rb",
      "lib/utilio/path.rb",
-     "spec/data/database.yml",
-     "spec/data/path.yml",
+     "lib/utilio/security.rb",
      "spec/spec_helper.rb",
-     "spec/utilio_database_spec.rb",
-     "spec/utilio_path_spec.rb",
+     "spec/utilio/config/database.yml",
+     "spec/utilio/data/path.yml",
+     "spec/utilio/database_spec.rb",
+     "spec/utilio/path_spec.rb",
+     "spec/utilio/security_spec.rb",
      "utilio.gemspec"
   ]
   s.homepage = %q{http://www.rand9.com}
@@ -44,8 +47,9 @@ Gem::Specification.new do |s|
   s.summary = %q{A general collection of application utilities for dealing with paths and active_record}
   s.test_files = [
     "spec/spec_helper.rb",
-     "spec/utilio_database_spec.rb",
-     "spec/utilio_path_spec.rb"
+     "spec/utilio/database_spec.rb",
+     "spec/utilio/path_spec.rb",
+     "spec/utilio/security_spec.rb"
   ]
 
   if s.respond_to? :specification_version then

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - BJ Neilsen
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-06 00:00:00 -06:00
+date: 2010-08-10 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -52,14 +52,17 @@ files:
 - README.md
 - Rakefile
 - VERSION
+- autotest/discover.rb
 - lib/utilio.rb
 - lib/utilio/database.rb
 - lib/utilio/path.rb
-- spec/data/database.yml
-- spec/data/path.yml
+- lib/utilio/security.rb
 - spec/spec_helper.rb
-- spec/utilio_database_spec.rb
-- spec/utilio_path_spec.rb
+- spec/utilio/config/database.yml
+- spec/utilio/data/path.yml
+- spec/utilio/database_spec.rb
+- spec/utilio/path_spec.rb
+- spec/utilio/security_spec.rb
 - utilio.gemspec
 has_rdoc: true
 homepage: http://www.rand9.com
@@ -95,5 +98,6 @@ specification_version: 3
 summary: A general collection of application utilities for dealing with paths and active_record
 test_files: 
 - spec/spec_helper.rb
-- spec/utilio_database_spec.rb
-- spec/utilio_path_spec.rb
+- spec/utilio/database_spec.rb
+- spec/utilio/path_spec.rb
+- spec/utilio/security_spec.rb

data/spec/data/database.yml

@@ -1 +0,0 @@
-database: 'test'

data/spec/utilio_database_spec.rb

@@ -1,15 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe Utilio::Database do
-  
-  let(:config_file) { 'data/database.yml' }
-  
-  before :all do
-    Utilio::Path.root = File.dirname(__FILE__)
-  end
-  
-  it "should allow you to load a db configuration" do
-    Utilio::Database.config(file: config_file).should_not be_nil
-  end
-  
-end