matic 0.1.0 → 0.1.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    matic (0.1.0)
+    matic (0.1.1)
       activemodel (~> 3.0.0)
       activesupport (~> 3.0.0)
       mongomatic (~> 0.6.0)
@@ -21,7 +21,7 @@ GEM
     i18n (0.4.2)
     mongo (1.1.2)
       bson (>= 1.1.1)
-    mongomatic (0.6.1)
+    mongomatic (0.6.2)
       activesupport (>= 2.3.5)
       bson (~> 1.1)
       mongo (~> 1.1)

data/lib/matic.rb

@@ -10,44 +10,38 @@ module Matic
     end
 
     def field(attr_name)
-      # Plagiarized from ActiveModel
-      attribute_method_matchers.each do |matcher|
-        unless instance_method_already_implemented?(matcher.method_name(attr_name))
-          generate_method = "define_method_#{matcher.prefix}attribute#{matcher.suffix}"
-
-          if respond_to?(generate_method)
-            send(generate_method, attr_name)
-          else
-            method_name = matcher.method_name(attr_name)
-
-            generated_attribute_methods.module_eval <<-STR, __FILE__, __LINE__ + 1
-              if method_defined?(:#{method_name})
-                undef :#{method_name}
-              end
-              def #{method_name}(*args)
-                send(:#{matcher.method_missing_target}, '#{attr_name}', *args)
-              end
-            STR
-          end
-        end
-      end
+      generate_attribute_methods(attr_name)
 
       define_method(attr_name) do
         self[attr_name.to_s]
       end
 
       define_method("#{attr_name}=") do |val|
-        eval("#{attr_name}_will_change!") unless val == self[attr_name.to_s]
+        unless val == self[attr_name.to_s]
+          eval("#{attr_name}_will_change!")
+        end
+
         self[attr_name.to_s] = val
       end
     end
+
+    private
+
+    def generate_attribute_methods(attr_name)
+      attribute_method_matchers.each do |matcher|
+        method_name = matcher.method_name(attr_name)
+
+        generated_attribute_methods.module_eval <<-STR, __FILE__, __LINE__ + 1
+          def #{method_name}(*args)
+            send(:#{matcher.method_missing_target}, '#{attr_name}', *args)
+          end
+        STR
+      end
+    end
   end
 
   def insert(opts={})
-    if super
-      @previously_changed = changes
-      @changed_attributes.clear
-    end
+    clear_changes if super
   end
 
   def insert!(opts={})
@@ -55,10 +49,7 @@ module Matic
   end
 
   def update(opts={}, update_doc=@doc)
-    if super
-      @previously_changed = changes
-      @changed_attributes.clear
-    end
+    clear_changes if super
   end
 
   def update!(opts={}, update_doc=@doc)
@@ -68,4 +59,11 @@ module Matic
   def save
     is_new ? insert : update
   end
+
+  private
+
+  def clear_changes
+    @previously_changed = changes
+    @changed_attributes.clear
+  end
 end

data/lib/matic/version.rb

@@ -1,3 +1,3 @@
 module Matic
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/matic.gemspec

@@ -25,5 +25,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency("bson_ext", "~> 1.1.0")
   s.add_development_dependency("rake", "~> 0.8.7")
   s.add_development_dependency("rspec", "~> 2.0.0")
-  #s.add_development_dependency("ruby-debug19", "~> 0.11.0")
+  if RUBY_PLATFORM.include?("1.9")
+    s.add_development_dependency("ruby-debug19", "~> 0.11.0")
+  end
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: matic
 version: !ruby/object:Gem::Version 
-  hash: 27
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Hakan Ensari
@@ -27,7 +26,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 0
         - 6
@@ -43,7 +41,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 3
         - 0
@@ -59,7 +56,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 3
         - 0
@@ -75,7 +71,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
         segments: 
         - 1
         - 1
@@ -91,7 +86,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 49
         segments: 
         - 0
         - 8
@@ -107,7 +101,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 2
         - 0
@@ -155,7 +148,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -164,7 +156,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"