itrigga-core_ext 0.2.1 → 0.2.2

data/Gemfile

@@ -6,9 +6,18 @@ source "http://rubygems.org"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
+  gem "rspec", "1.3.0"
+  gem "rspec-rails", "1.3.2"
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.6.4"
   gem "rcov", ">= 0"
-  gem "rspec", ">= 0"
+  gem "fastercsv", ">= 1.5.4"
+end
+
+group :test do
+  gem "rspec", "1.3.0"
+  gem "rspec-rails", "1.3.2"
+  gem "bundler", "~> 1.0.0"
+  gem "rcov", ">= 0"
   gem "fastercsv", ">= 1.5.4"
 end

data/Gemfile.lock

@@ -1,23 +1,19 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    diff-lcs (1.1.2)
     fastercsv (1.5.4)
     git (1.2.5)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
+    rack (1.1.0)
     rake (0.8.7)
     rcov (0.9.9)
-    rspec (2.5.0)
-      rspec-core (~> 2.5.0)
-      rspec-expectations (~> 2.5.0)
-      rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.1)
-    rspec-expectations (2.5.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.5.0)
+    rspec (1.3.0)
+    rspec-rails (1.3.2)
+      rack (>= 1.0.0)
+      rspec (>= 1.3.0)
 
 PLATFORMS
   ruby
@@ -27,4 +23,5 @@ DEPENDENCIES
   fastercsv (>= 1.5.4)
   jeweler (~> 1.6.4)
   rcov
-  rspec
+  rspec (= 1.3.0)
+  rspec-rails (= 1.3.2)

data/Rakefile

@@ -35,29 +35,23 @@ Jeweler::Tasks.new do |gem|
 end
 Jeweler::RubygemsDotOrgTasks.new
 
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
+require 'spec/version'
+require 'spec/rake/spectask'
+require 'spec/ruby'
 
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-  test.rcov_opts << '--exclude "gems/*"'
+Spec::Rake::SpecTask.new(:spec) do |spec|
+  spec.spec_files = FileList['spec/**/*_spec.rb']
+  spec.spec_opts = ['--options', 'spec/spec.opts']
 end
 
-task :default => :test
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+task :default => :spec
 
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "itrigga-core_ext #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+desc "Run all specs with rcov"
+Spec::Rake::SpecTask.new(:rcov) do |t|
+  t.spec_files = FileList['spec/**/*_spec.rb']
+  t.spec_opts = ['--options', 'spec/spec.opts']
+  t.rcov = true
+  t.rcov_dir = 'coverage'
+  t.rcov_opts = ['--exclude', "features,kernel,load-diff-lcs\.rb,instance_exec\.rb,lib/spec.rb,lib/spec/runner.rb,^spec/*,bin/spec,examples,/gems,/Library/Ruby,\.autotest,#{ENV['GEM_HOME']}"]
+  t.rcov_opts << '--sort coverage --text-summary --aggregate coverage.data'
 end

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/itrigga-core_ext.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{itrigga-core_ext}
-  s.version = "0.2.0"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Al Davidson", "Anson Kelly"]
-  s.date = %q{2011-08-01}
+  s.date = %q{2011-10-07}
   s.description = %q{Adds methods for 
     Hash: 
     - symbolize_keys
@@ -36,12 +36,14 @@ Gem::Specification.new do |s|
     "lib/itrigga/core_ext.rb",
     "lib/itrigga/core_ext/array.rb",
     "lib/itrigga/core_ext/hash.rb",
+    "lib/itrigga/core_ext/nil.rb",
     "lib/itrigga/core_ext/string.rb",
     "pkg/core_ext-0.1.0.gem",
     "pkg/itrigga-core_ext-0.1.0.gem",
     "pkg/trigga-core_ext-0.1.0.gem",
-    "test/helper.rb",
-    "test/test_core_ext.rb"
+    "spec/hash_spec.rb",
+    "spec/spec.opts",
+    "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://gems.itrigga.com/trigga-core_ext}
   s.licenses = ["MIT"]
@@ -54,23 +56,26 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rspec>, ["= 1.3.0"])
+      s.add_development_dependency(%q<rspec-rails>, ["= 1.3.2"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<fastercsv>, [">= 1.5.4"])
     else
+      s.add_dependency(%q<rspec>, ["= 1.3.0"])
+      s.add_dependency(%q<rspec-rails>, ["= 1.3.2"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<rcov>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<fastercsv>, [">= 1.5.4"])
     end
   else
+    s.add_dependency(%q<rspec>, ["= 1.3.0"])
+    s.add_dependency(%q<rspec-rails>, ["= 1.3.2"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
     s.add_dependency(%q<rcov>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<fastercsv>, [">= 1.5.4"])
   end
 end

data/lib/itrigga/core_ext/hash.rb

@@ -17,4 +17,29 @@ class Hash
 		
 	end
   
+  
+  # Allows you to convert a hash to an array suitable for use in an ActiveRecord finder conditions clause
+  #
+  # @allowed_keys optional  an array of param names to include - if given, any keys NOT in this array will be excluded
+  # @column_aliases optional  a hash of param name => column name mappings, for the case where the param name needs mapping to an alternative column name
+  # e.g. 
+  #  {:fish=>'trout', :cheese=>'gruyere', :rodent=>'vole'}.to_conditions( [:fish, :cheese], {:cheese=>:fromage})
+  #   => ["(fish = ?) AND (fromage = ?)", 'trout', 'gruyere']
+  def to_conditions( allowed_keys, column_aliases={} )
+    conds = [ [] ]
+    allowed_keys ||= keys 
+    allowed_keys.to_a.each do |k|
+      
+      this_key =  ( keys.include?(k.to_sym) ? k.to_sym : (keys.include?(k.to_s) ? k.to_s : nil))
+      next unless this_key
+      next if self[this_key].blank?
+      
+      conds[0] << "#{column_aliases[this_key.to_sym] ? column_aliases[this_key.to_sym] : this_key.to_s} = ?"
+      conds << self[this_key]
+    end
+    
+    conds[0] = conds[0].map{ |c| "(#{c})" }.join( " AND " )
+    conds
+  end
+  
 end

data/spec/hash_spec.rb

@@ -0,0 +1,43 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe Hash do
+
+  describe "Hash.to_conditions" do
+    before(:each) do
+      @my_hash = { :blart=>'flange', :cheese=>'provolone', :ham=>'mortadella' }
+    end
+    
+    it "should return an array" do
+      @my_hash.to_conditions(:blart).class.should == Array
+    end
+    
+    describe "for each key in the hash" do
+      describe "when it's in the given allowed_keys" do
+        
+        it "should appear in the first element" do
+          @my_hash.to_conditions( :blart )[0].should =~ /blart/
+        end
+        
+        it "should append the value to the array" do
+          @my_hash.to_conditions(:blart).should include('flange')
+        end
+        
+      end
+      
+      describe "when it's NOT in the given allowed_keys" do
+        it "should not appear in the first element" do
+          @my_hash.to_conditions( :donkey )[0].should_not =~ /donkey/
+        end
+      end
+    end
+    
+    context "when column aliases are given" do
+      describe "for each given alias" do
+        it "should map the param called (key) to a returned column called (alias[key])" do
+          @my_hash.to_conditions(:blart, :blart=>'aliased_blart')[0].should =~ /aliased_blart\s*=\s*?/
+        end
+      end
+    end
+  end
+  
+end

data/spec/spec.opts

@@ -0,0 +1,5 @@
+--colour
+--format progress
+--loadby mtime
+--reverse
+--backtrace

data/spec/spec_helper.rb

@@ -0,0 +1,12 @@
+RAILS_ENV = 'test'
+ENV['RAILS_ENV'] = 'test'
+RAILS_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+
+$LOAD_PATH.unshift(File.join(RAILS_ROOT, 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+
+require 'itrigga/core_ext'
+
+# Requires supporting files with custom matchers and macros, etc,
+# in ./support/ and its subdirectories.
+Dir["RAILS_ROOT}/support/**/*.rb"].each {|f| require f}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: itrigga-core_ext
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Al Davidson
@@ -16,60 +16,77 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-10 00:00:00 +01:00
+date: 2011-10-07 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :development
   prerelease: false
-  name: bundler
+  name: rspec
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 27
         segments: 
         - 1
+        - 3
         - 0
-        - 0
-        version: 1.0.0
+        version: 1.3.0
   requirement: *id001
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: jeweler
+  name: rspec-rails
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 31
         segments: 
         - 1
-        - 6
-        - 4
-        version: 1.6.4
+        - 3
+        - 2
+        version: 1.3.2
   requirement: *id002
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: rcov
+  name: bundler
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 23
         segments: 
+        - 1
         - 0
-        version: "0"
+        - 0
+        version: 1.0.0
   requirement: *id003
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: rspec
+  name: jeweler
   version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 6
+        - 4
+        version: 1.6.4
+  requirement: *id004
+  type: :development
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: rcov
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -78,12 +95,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
+  requirement: *id005
   type: :development
+- !ruby/object:Gem::Dependency 
   prerelease: false
   name: fastercsv
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -94,7 +111,8 @@ dependencies:
         - 5
         - 4
         version: 1.5.4
-  requirement: *id005
+  requirement: *id006
+  type: :development
 description: "Adds methods for \n    Hash: \n    - symbolize_keys\n    - recursive_symbolize_keys\n    Array:\n    - to_csv (requires FasterCSV gem)\n    - select_with_index\n    - to_auto_complete_list\n    - active_record_type_condition_rendering\n  "
 email: aldavidson@itrigga.com
 executables: []
@@ -120,8 +138,9 @@ files:
 - pkg/core_ext-0.1.0.gem
 - pkg/itrigga-core_ext-0.1.0.gem
 - pkg/trigga-core_ext-0.1.0.gem
-- test/helper.rb
-- test/test_core_ext.rb
+- spec/hash_spec.rb
+- spec/spec.opts
+- spec/spec_helper.rb
 has_rdoc: true
 homepage: http://gems.itrigga.com/trigga-core_ext
 licenses: 

data/test/helper.rb

@@ -1,18 +0,0 @@
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'test/unit'
-require 'shoulda'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'core_ext'
-
-class Test::Unit::TestCase
-end

data/test/test_core_ext.rb

@@ -1,7 +0,0 @@
-require 'helper'
-
-class TestCoreExt < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
-  end
-end