adify 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/adify.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{adify}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Eric Harrison"]
-  s.date = %q{2011-05-30}
+  s.date = %q{2011-07-05}
   s.description = %q{Adify lets you create ad tags easily and quickly with a simple common structure}
   s.email = %q{eharrison@classifiedadventures.com}
   s.extra_rdoc_files = [

data/lib/adify.rb

@@ -2,8 +2,6 @@ require 'action_controller'
 require "active_record"
 require "active_support"
 
-require 'deep_merge'
-
 require 'adify/controller'
 require "adify/model"
 require "adify/helper"
@@ -50,4 +48,7 @@ class Hash
   def update_values(&block)
     self.update(self){|k,v| block.call v}
   end
+  def deep_merge(h)
+    self.merge!(h) {|key, _old, _new| if _old.class == Hash then _old.recursive_merge(_new) else _new end  }
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: adify
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Eric Harrison
@@ -15,12 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-30 00:00:00 +10:00
+date: 2011-07-05 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rails
-  prerelease: false
+  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -32,11 +31,11 @@ dependencies:
         - 3
         - 5
         version: 2.3.5
-  type: :runtime
+  name: rails
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -48,11 +47,11 @@ dependencies:
         - 3
         - 5
         version: 2.3.5
-  type: :runtime
+  name: activesupport
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: activerecord
   prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -64,11 +63,11 @@ dependencies:
         - 3
         - 5
         version: 2.3.5
-  type: :runtime
+  name: activerecord
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: actionpack
   prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -80,11 +79,11 @@ dependencies:
         - 3
         - 5
         version: 2.3.5
-  type: :runtime
+  name: actionpack
   version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: deep_merge
   prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -94,11 +93,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  name: deep_merge
   version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rspec-rails
   prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -110,11 +109,11 @@ dependencies:
         - 3
         - 0
         version: 2.3.0
-  type: :development
+  name: rspec-rails
   version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -126,11 +125,11 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  type: :development
+  name: bundler
   version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: jeweler
   prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -142,11 +141,11 @@ dependencies:
         - 6
         - 0
         version: 1.6.0
-  type: :development
+  name: jeweler
   version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: rcov
   prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -156,11 +155,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  name: rcov
   version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: ruby-debug
   prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -170,11 +169,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  name: ruby-debug
   version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: sqlite3
   prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -184,8 +183,9 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  name: sqlite3
   version_requirements: *id011
+  prerelease: false
 description: Adify lets you create ad tags easily and quickly with a simple common structure
 email: eharrison@classifiedadventures.com
 executables: []