datts_right 0.0.22 → 0.0.23

data/Gemfile.lock

@@ -1,21 +1,78 @@
 PATH
   remote: .
   specs:
-    datts_right (0.0.21)
+    datts_right (0.0.23)
       datts_right
 
 GEM
   remote: http://rubygems.org/
   specs:
     ZenTest (4.5.0)
+    abstract (1.0.0)
+    actionmailer (3.0.5)
+      actionpack (= 3.0.5)
+      mail (~> 2.2.15)
+    actionpack (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.4)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.13)
+      rack-test (~> 0.5.7)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.5)
+      activesupport (= 3.0.5)
+      builder (~> 2.1.2)
+      i18n (~> 0.4)
+    activerecord (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
+      arel (~> 2.0.2)
+      tzinfo (~> 0.3.23)
+    activeresource (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
+    activesupport (3.0.5)
+    arel (2.0.9)
     autotest (4.4.6)
       ZenTest (>= 4.4.1)
+    builder (2.1.2)
     diff-lcs (1.1.2)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
     git (1.2.5)
+    i18n (0.5.0)
     jeweler (1.5.2)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
+    mail (2.2.15)
+      activesupport (>= 2.3.6)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.16)
+    polyglot (0.3.1)
+    rack (1.2.2)
+    rack-mount (0.6.14)
+      rack (>= 1.0.0)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    rails (3.0.5)
+      actionmailer (= 3.0.5)
+      actionpack (= 3.0.5)
+      activerecord (= 3.0.5)
+      activeresource (= 3.0.5)
+      activesupport (= 3.0.5)
+      bundler (~> 1.0)
+      railties (= 3.0.5)
+    railties (3.0.5)
+      actionpack (= 3.0.5)
+      activesupport (= 3.0.5)
+      rake (>= 0.8.7)
+      thor (~> 0.14.4)
     rake (0.8.7)
     rcov (0.9.9)
     rspec (2.3.0)
@@ -27,6 +84,10 @@ GEM
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.3.0)
     sqlite3 (1.3.3)
+    thor (0.14.6)
+    treetop (1.4.9)
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.26)
 
 PLATFORMS
   ruby
@@ -36,6 +97,7 @@ DEPENDENCIES
   bundler (~> 1.0.0)
   datts_right!
   jeweler (~> 1.5.2)
+  rails (>= 3.0.0)
   rcov
   rspec (~> 2.3.0)
   sqlite3

data/VERSION

@@ -1 +1 @@
-0.0.22
+0.0.23

data/datts_right.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{datts_right}
-  s.version = "0.0.22"
+  s.version = "0.0.23"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ramon Tayag"]
@@ -88,6 +88,7 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<datts_right>, [">= 0"])
+      s.add_development_dependency(%q<rails>, [">= 3.0.0"])
       s.add_development_dependency(%q<autotest>, [">= 0"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
@@ -96,6 +97,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
       s.add_dependency(%q<datts_right>, [">= 0"])
+      s.add_dependency(%q<rails>, [">= 3.0.0"])
       s.add_dependency(%q<autotest>, [">= 0"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
@@ -105,6 +107,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<datts_right>, [">= 0"])
+    s.add_dependency(%q<rails>, [">= 3.0.0"])
     s.add_dependency(%q<autotest>, [">= 0"])
     s.add_dependency(%q<sqlite3>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.3.0"])

data/lib/datts_right/instance_methods.rb

@@ -133,27 +133,33 @@ module DattsRight
     end
 
     def add_definitions(hash)
-      hash.each do |k, v|
-        add_definition k, v
+      if hash
+        hash.each do |k, v|
+          add_definition k, v
+        end
       end
     end
 
     def remove_definition(key)
-      key = key.to_sym
-      if dynamic_attributes_options[:definition]
-        if definition && definition[key]
-          definition.delete(key)
+      if key
+        key = key.to_sym
+        if dynamic_attributes_options[:definition]
+          if definition && definition[key]
+            definition.delete(key)
+          else
+            raise NotDefinedError, "#{key} is not defined"
+          end
         else
-          raise NotDefinedError, "#{key} is not defined"
+          raise NoDefinitionError
         end
-      else
-        raise NoDefinitionError
       end
     end
 
     def remove_definitions(*array)
-      array.each do |a|
-        remove_definition a
+      if array
+        array.each do |a|
+          remove_definition a
+        end
       end
     end
 

data/spec/datts_right/add_definitions_spec.rb

@@ -11,4 +11,8 @@ describe DattsRight, ".add_definitions(hash)" do
     c.should_receive(:add_definition).with(:another, :object_type => "string")
     c.add_definitions(:robot => {:object_type => "text"}, :another => {:object_type => "string"})
   end
+
+  it "should not explode if nil is passed" do
+    lambda {Category.create.add_definitions(nil)}.should_not raise_error(NoMethodError)
+  end
 end

data/spec/datts_right/remove_definitions_spec.rb

@@ -11,4 +11,8 @@ describe DattsRight, ".remove_definitions(array)" do
     c.should_receive(:remove_definition).with(:another)
     c.remove_definitions(:robot, :another)
   end
+
+  it "should not explode if nil is passed" do
+    lambda {Category.create.remove_definitions(nil)}.should_not raise_error(NoMethodError)
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: datts_right
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 49
   prerelease: 
   segments: 
   - 0
   - 0
-  - 22
-  version: 0.0.22
+  - 23
+  version: 0.0.23
 platform: ruby
 authors: 
 - Ramon Tayag
@@ -39,11 +39,13 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 7
         segments: 
+        - 3
         - 0
-        version: "0"
-  name: autotest
+        - 0
+        version: 3.0.0
+  name: rails
   version_requirements: *id002
   prerelease: false
 - !ruby/object:Gem::Dependency 
@@ -57,12 +59,26 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: sqlite3
+  name: autotest
   version_requirements: *id003
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: sqlite3
+  version_requirements: *id004
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -74,11 +90,11 @@ dependencies:
         - 0
         version: 2.3.0
   name: rspec
-  version_requirements: *id004
+  version_requirements: *id005
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -90,11 +106,11 @@ dependencies:
         - 0
         version: 1.0.0
   name: bundler
-  version_requirements: *id005
+  version_requirements: *id006
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -106,11 +122,11 @@ dependencies:
         - 2
         version: 1.5.2
   name: jeweler
-  version_requirements: *id006
+  version_requirements: *id007
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -120,7 +136,7 @@ dependencies:
         - 0
         version: "0"
   name: rcov
-  version_requirements: *id007
+  version_requirements: *id008
   prerelease: false
 description: Creates a separate table that saves all your dynamic attributes.
 email: ramon@tayag.net